diff options
| author | Jasmine Hassan <[email protected]> | 2012-10-30 23:42:48 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:51 +0200 |
| commit | 5f7d0e33a04e69778509edb93beabbe0e62ab69b (patch) | |
| tree | c9bf66086d6b74705cea4de46383da7a99d79895 /eel/eel-canvas.h | |
| parent | 4fe815f4dc825928008a1fc09e53ebcbbc22569d (diff) | |
| download | caja-5f7d0e33a04e69778509edb93beabbe0e62ab69b.tar.bz2 caja-5f7d0e33a04e69778509edb93beabbe0e62ab69b.tar.xz | |
[eel-canvas] don't use GtkObject (GTK3)
the ::destroy signal of GtkObject has only been moved to GtkWidget in GTK3
(after GtkObject removal): http://developer.gnome.org/gtk3/3.0/ch25s02.html
So, we conditionals in this case, to keep working with GTK2
Nautilus commit message: This implies adding a 'destroy' signal to EelCanvasItem,
with similar semantics to gtk_object_destroy()
http://git.gnome.org/browse/nautilus/commit/?id=1f615321613751a5dbc84d5ef7f20edd104b8dc4
Diffstat (limited to 'eel/eel-canvas.h')
| -rw-r--r-- | eel/eel-canvas.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/eel/eel-canvas.h b/eel/eel-canvas.h index 453cdaee..b288dedf 100644 --- a/eel/eel-canvas.h +++ b/eel/eel-canvas.h @@ -115,7 +115,7 @@ extern "C" { struct _EelCanvasItem { - GtkObject object; + GInitiallyUnowned object; /* Parent canvas for this item */ EelCanvas *canvas; @@ -132,7 +132,9 @@ extern "C" { struct _EelCanvasItemClass { - GtkObjectClass parent_class; + GInitiallyUnownedClass parent_class; + + void (* destroy) (EelCanvasItem *item); /* Tell the item to update itself. The flags are from the update flags * defined above. The item should update its internal state from its @@ -195,6 +197,8 @@ extern "C" { EelCanvasItem *eel_canvas_item_new (EelCanvasGroup *parent, GType type, const gchar *first_arg_name, ...); + void eel_canvas_item_destroy (EelCanvasItem *item); + /* Constructors for use in derived classes and language wrappers */ void eel_canvas_item_construct (EelCanvasItem *item, EelCanvasGroup *parent, const gchar *first_arg_name, va_list args); |