[glade3] Remove some unneded GTK+ version checks
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade3] Remove some unneded GTK+ version checks
- Date: Tue, 4 May 2010 19:48:54 +0000 (UTC)
commit a9c478b3979aa43f01c4fb7423208e9ed7f60cd2
Author: Javier Jardón <jjardon gnome org>
Date: Tue Apr 13 01:49:35 2010 +0200
Remove some unneded GTK+ version checks
We already depends on GTK+ 2.20
plugins/gtk+/glade-gtk.c | 2 --
src/glade-window.c | 9 ---------
2 files changed, 0 insertions(+), 11 deletions(-)
---
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index 189b350..188c899 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -6971,11 +6971,9 @@ glade_gtk_image_menu_item_set_use_stock (GObject *object, const GValue *value)
glade_widget_property_set_sensitive (widget, "accel-group", FALSE, NOT_SELECTED_MSG);
}
-#if GTK_CHECK_VERSION (2, 16, 0)
gtk_image_menu_item_set_use_stock (GTK_IMAGE_MENU_ITEM (object), use_stock);
sync_use_appearance (widget);
-#endif
}
static gboolean
diff --git a/src/glade-window.c b/src/glade-window.c
index 398e1ca..7d91ada 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -2310,11 +2310,7 @@ menu_item_selected_cb (GtkWidget *item, GladeWindow *window)
GtkAction *action;
gchar *tooltip;
-#if (GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION < 16)
- action = gtk_widget_get_action (item);
-#else
action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (item));
-#endif
g_object_get (G_OBJECT (action), "tooltip", &tooltip, NULL);
if (tooltip != NULL)
@@ -3322,13 +3318,8 @@ glade_window_init (GladeWindow *window)
undo_action = gtk_ui_manager_get_action (priv->ui, "/MenuBar/EditMenu/Undo");
redo_action = gtk_ui_manager_get_action (priv->ui, "/MenuBar/EditMenu/Redo");
-#if (GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION < 16)
- gtk_action_connect_proxy (undo_action, GTK_WIDGET (priv->undo));
- gtk_action_connect_proxy (redo_action, GTK_WIDGET (priv->redo));
-#else
gtk_activatable_set_related_action (GTK_ACTIVATABLE (priv->undo), undo_action);
gtk_activatable_set_related_action (GTK_ACTIVATABLE (priv->redo), redo_action);
-#endif
/* main contents */
hpaned1 = gtk_hpaned_new ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]