diff options
| author | lukefromdc <[email protected]> | 2016-11-22 15:02:51 -0500 |
|---|---|---|
| committer | lukefromdc <[email protected]> | 2016-11-22 15:02:51 -0500 |
| commit | 276eb145ce96d5f75f8d3901daf6310f60ddbb81 (patch) | |
| tree | 544f41e76c9a91973867065696fc2e414ca60170 /eel/eel-image-table.c | |
| parent | 969e4d021fe49654fe6e5ee7e88c920fec126505 (diff) | |
| download | caja-276eb145ce96d5f75f8d3901daf6310f60ddbb81.tar.bz2 caja-276eb145ce96d5f75f8d3901daf6310f60ddbb81.tar.xz | |
move to GTK+3 (>= 3.14), drop libunique, GTK+2 code, and --with-gtk build option
*Remove GTK_VERSION_CHECK (3, 0, 0) and libunique selectors
*Remove GTK2 and libunique specific code.
*Leaves selector for specific GTK3 versions.
*Remove #DEFINES for vbox/hbox previously required for GTK2 compatability
*Keep vbox in caja-spatial-window.c, it is necessary for the desktop to work
*spatial-window vbox issue at https://github.com/mate-desktop/caja/issues/591
Diffstat (limited to 'eel/eel-image-table.c')
| -rw-r--r-- | eel/eel-image-table.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/eel/eel-image-table.c b/eel/eel-image-table.c index be0a7d54..31cec4dd 100644 --- a/eel/eel-image-table.c +++ b/eel/eel-image-table.c @@ -62,11 +62,8 @@ static guint image_table_signals[LAST_SIGNAL] = { 0 }; /* Ancestor methods */ GtkWidget * find_windowed_ancestor (GtkWidget *widget); -#if GTK_CHECK_VERSION (3, 0, 0) + static void signal_connect_while_realized (GtkWidget *object, -#else -static void signal_connect_while_realized (GtkObject *object, -#endif const char *name, GCallback callback, gpointer callback_data, @@ -132,9 +129,6 @@ eel_image_table_realize (GtkWidget *widget) | GDK_LEAVE_NOTIFY_MASK | GDK_POINTER_MOTION_MASK); -#if !GTK_CHECK_VERSION (3, 0, 0) -#define windowed_ancestor GTK_OBJECT(windowed_ancestor) -#endif signal_connect_while_realized (windowed_ancestor, "enter_notify_event", @@ -431,11 +425,7 @@ while_realized_disconnecter (GObject *object, * or &widget are destroyed. **/ static void -#if GTK_CHECK_VERSION (3, 0, 0) signal_connect_while_realized (GtkWidget *object, -#else -signal_connect_while_realized (GtkObject *object, -#endif const char *name, GCallback callback, gpointer callback_data, @@ -443,11 +433,7 @@ signal_connect_while_realized (GtkObject *object, { RealizeDisconnectInfo *info; -#if GTK_CHECK_VERSION (3, 0, 0) g_return_if_fail (GTK_IS_WIDGET (object)); -#else - g_return_if_fail (GTK_IS_OBJECT (object)); -#endif g_return_if_fail (name != NULL); g_return_if_fail (name[0] != '\0'); g_return_if_fail (callback != NULL); |