diff options
| -rw-r--r-- | cut-n-paste/toolbar-editor/egg-editable-toolbar.c | 12 | ||||
| -rw-r--r-- | src/eom-print-image-setup.c | 6 | ||||
| -rw-r--r-- | src/eom-window.c | 24 |
3 files changed, 0 insertions, 42 deletions
diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c index c7a4007..006980e 100644 --- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c +++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c @@ -200,11 +200,7 @@ drag_begin_cb (GtkWidget *widget, gtk_widget_hide (widget); -#if GTK_CHECK_VERSION (2, 16, 0) action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (widget)); -#else - action = gtk_widget_get_action (widget); -#endif if (action == NULL) return; @@ -231,11 +227,7 @@ drag_end_cb (GtkWidget *widget, { gtk_widget_show (widget); -#if GTK_CHECK_VERSION (2, 16, 0) action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (widget)); -#else - action = gtk_widget_get_action (widget); -#endif if (action == NULL) return; @@ -509,11 +501,7 @@ configure_item_tooltip (GtkToolItem *item) { GtkAction *action; -#if GTK_CHECK_VERSION (2, 16, 0) action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (item)); -#else - action = gtk_widget_get_action (GTK_WIDGET (item)); -#endif if (action != NULL) { diff --git a/src/eom-print-image-setup.c b/src/eom-print-image-setup.c index 787b214..25b8bd6 100644 --- a/src/eom-print-image-setup.c +++ b/src/eom-print-image-setup.c @@ -36,12 +36,6 @@ #include "eom-print-image-setup.h" #include "eom-print-preview.h" -#if !GTK_CHECK_VERSION(2,24,0) - #define gtk_combo_box_text_new() gtk_combo_box_new_text() - #define gtk_combo_box_text_insert_text(x,y,z) gtk_combo_box_insert_text(x,y,z) - #define GTK_COMBO_BOX_TEXT(x) GTK_COMBO_BOX(x) -#endif - /** * SECTION: * @Title: Printing Custom Widget diff --git a/src/eom-window.c b/src/eom-window.c index 82bfe42..5e3e6c4 100644 --- a/src/eom-window.c +++ b/src/eom-window.c @@ -1388,11 +1388,7 @@ eom_window_obtain_desired_size (EomImage *image, img_width = width; img_height = height; -#if GTK_CHECK_VERSION (2, 20, 0) if (!gtk_widget_get_realized (window->priv->view)) { -#else - if (!GTK_WIDGET_REALIZED (window->priv->view)) { -#endif gtk_widget_realize (window->priv->view); } @@ -1400,11 +1396,7 @@ eom_window_obtain_desired_size (EomImage *image, view_width = allocation.width; view_height = allocation.height; -#if GTK_CHECK_VERSION (2, 20, 0) if (!gtk_widget_get_realized (GTK_WIDGET (window))) { -#else - if (!GTK_WIDGET_REALIZED (GTK_WIDGET (window))) { -#endif gtk_widget_realize (GTK_WIDGET (window)); } @@ -2809,11 +2801,7 @@ eom_window_cmd_show_hide_bar (GtkAction *action, gpointer user_data) if (visible) { /* Make sure the focus widget is realized to * avoid warnings on keypress events */ -#if GTK_CHECK_VERSION (2, 20, 0) if (!gtk_widget_get_realized (window->priv->thumbview)) -#else - if (!GTK_WIDGET_REALIZED (window->priv->thumbview)) -#endif gtk_widget_realize (window->priv->thumbview); gtk_widget_show (priv->nav); @@ -2823,21 +2811,13 @@ eom_window_cmd_show_hide_bar (GtkAction *action, gpointer user_data) * avoid warnings on keypress events. * Don't do it during init phase or the view * will get a bogus allocation. */ -#if GTK_CHECK_VERSION (2, 20, 0) if (!gtk_widget_get_realized (priv->view) -#else - if (!GTK_WIDGET_REALIZED (priv->view) -#endif && priv->status == EOM_WINDOW_STATUS_NORMAL) gtk_widget_realize (priv->view); gtk_widget_hide (priv->nav); -#if GTK_CHECK_VERSION (2, 20, 0) if (gtk_widget_get_realized (priv->view)) -#else - if (GTK_WIDGET_REALIZED (priv->view)) -#endif gtk_widget_grab_focus (priv->view); } g_settings_set_boolean (priv->ui_settings, EOM_CONF_UI_IMAGE_COLLECTION, visible); @@ -5010,11 +4990,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event) /* If the focus is not in the toolbar and we still haven't handled the event, give the scrollview a chance to do it. */ if (!gtk_container_get_focus_child (tbcontainer) && result == FALSE && -#if GTK_CHECK_VERSION (2, 20, 0) gtk_widget_get_realized (GTK_WIDGET (EOM_WINDOW (widget)->priv->view))) { -#else - GTK_WIDGET_REALIZED(GTK_WIDGET (EOM_WINDOW (widget)->priv->view))) { -#endif result = gtk_widget_event (GTK_WIDGET (EOM_WINDOW (widget)->priv->view), (GdkEvent *) event); } |