diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2012-08-22 09:57:08 -0500 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2012-08-22 09:57:08 -0500 |
commit | 2481b74fa64122365eef5293ae86d71b5fae3fa6 (patch) | |
tree | cc3845ff2ee2c8ec173b072de9fabe29670588c4 /src/idoentrymenuitem.c | |
parent | 8f279d3f26f588bb022f3f0d05edff6858035eab (diff) | |
parent | 73302803e066d8d36e425feda15f57fca44f4bc5 (diff) | |
download | ayatana-ido-2481b74fa64122365eef5293ae86d71b5fae3fa6.tar.gz ayatana-ido-2481b74fa64122365eef5293ae86d71b5fae3fa6.tar.bz2 ayatana-ido-2481b74fa64122365eef5293ae86d71b5fae3fa6.zip |
merge lp:~charlesk/ido/nogtk2 to remove gtk2 support from the configure script and the source
Diffstat (limited to 'src/idoentrymenuitem.c')
-rw-r--r-- | src/idoentrymenuitem.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/idoentrymenuitem.c b/src/idoentrymenuitem.c index 088c559..5390d0b 100644 --- a/src/idoentrymenuitem.c +++ b/src/idoentrymenuitem.c @@ -27,13 +27,8 @@ #include "idoentrymenuitem.h" #include "config.h" -#if GTK_CHECK_VERSION (3, 0, 0) static void ido_entry_menu_item_select (GtkMenuItem *item); static void ido_entry_menu_item_deselect (GtkMenuItem *item); -#else -static void ido_entry_menu_item_select (GtkItem *item); -static void ido_entry_menu_item_deselect (GtkItem *item); -#endif static gboolean ido_entry_menu_item_button_release (GtkWidget *widget, GdkEventButton *event); static gboolean ido_entry_menu_item_key_press (GtkWidget *widget, @@ -66,27 +61,16 @@ ido_entry_menu_item_class_init (IdoEntryMenuItemClass *klass) GObjectClass *gobject_class; GtkWidgetClass *widget_class; GtkMenuItemClass *menu_item_class; -#if ! GTK_CHECK_VERSION (3, 0, 0) - GtkItemClass *item_class; -#endif gobject_class = G_OBJECT_CLASS (klass); widget_class = GTK_WIDGET_CLASS (klass); menu_item_class = GTK_MENU_ITEM_CLASS (klass); -#if ! GTK_CHECK_VERSION (3, 0, 0) - item_class = GTK_ITEM_CLASS (klass); -#endif widget_class->button_release_event = ido_entry_menu_item_button_release; widget_class->button_press_event = ido_entry_menu_item_button_press; -#if GTK_CHECK_VERSION (3, 0, 0) menu_item_class->select = ido_entry_menu_item_select; menu_item_class->deselect = ido_entry_menu_item_deselect; -#else - item_class->select = ido_entry_menu_item_select; - item_class->deselect = ido_entry_menu_item_deselect; -#endif menu_item_class->hide_on_activate = TRUE; @@ -119,11 +103,7 @@ ido_entry_menu_item_init (IdoEntryMenuItem *item) G_CALLBACK (entry_move_focus_cb), item); -#ifdef USE_GTK3 priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); -#else - priv->box = gtk_hbox_new (FALSE, 0); -#endif gtk_box_pack_start (GTK_BOX (priv->box), priv->entry, FALSE, FALSE, 0); @@ -235,11 +215,7 @@ ido_entry_menu_item_button_release (GtkWidget *widget, } static void -#if GTK_CHECK_VERSION (3, 0, 0) ido_entry_menu_item_select (GtkMenuItem *item) -#else -ido_entry_menu_item_select (GtkItem *item) -#endif { IDO_ENTRY_MENU_ITEM (item)->priv->selected = TRUE; @@ -247,11 +223,7 @@ ido_entry_menu_item_select (GtkItem *item) } static void -#if GTK_CHECK_VERSION (3, 0, 0) ido_entry_menu_item_deselect (GtkMenuItem *item) -#else -ido_entry_menu_item_deselect (GtkItem *item) -#endif { IDO_ENTRY_MENU_ITEM (item)->priv->selected = FALSE; |