aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-08-22 09:41:36 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-08-22 09:41:36 -0500
commit821b008d809417bc6d25eae102ed88ce86a76c68 (patch)
treed414837668477a4019a9bb10ee45477b400b0ca6 /src
parentfc8fad250f546c4923d4839a77e897cf6b75dc04 (diff)
downloadayatana-ido-821b008d809417bc6d25eae102ed88ce86a76c68.tar.gz
ayatana-ido-821b008d809417bc6d25eae102ed88ce86a76c68.tar.bz2
ayatana-ido-821b008d809417bc6d25eae102ed88ce86a76c68.zip
remove the gtk2 conditional compiles for IdoEntryMenuItem
Diffstat (limited to 'src')
-rw-r--r--src/idoentrymenuitem.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/src/idoentrymenuitem.c b/src/idoentrymenuitem.c
index 17e8314..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;
@@ -231,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;
@@ -243,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;