aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-08-22 09:43:24 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-08-22 09:43:24 -0500
commit2c688719ecee952666a038ae18865e151340b87f (patch)
tree894e4730c0753f0a3189462755bd7decc69b5283 /src
parent821b008d809417bc6d25eae102ed88ce86a76c68 (diff)
downloadayatana-ido-2c688719ecee952666a038ae18865e151340b87f.tar.gz
ayatana-ido-2c688719ecee952666a038ae18865e151340b87f.tar.bz2
ayatana-ido-2c688719ecee952666a038ae18865e151340b87f.zip
remove the gtk2 conditional compiles for IdoCalendarMenuItem
Diffstat (limited to 'src')
-rw-r--r--src/idocalendarmenuitem.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/src/idocalendarmenuitem.c b/src/idocalendarmenuitem.c
index f5bd60f..84bee80 100644
--- a/src/idocalendarmenuitem.c
+++ b/src/idocalendarmenuitem.c
@@ -27,13 +27,8 @@
#include "idocalendarmenuitem.h"
#include "config.h"
-#if GTK_CHECK_VERSION (3, 0, 0)
static void ido_calendar_menu_item_select (GtkMenuItem *item);
static void ido_calendar_menu_item_deselect (GtkMenuItem *item);
-#else
-static void ido_calendar_menu_item_select (GtkItem *item);
-static void ido_calendar_menu_item_deselect (GtkItem *item);
-#endif
static gboolean ido_calendar_menu_item_button_release (GtkWidget *widget,
GdkEventButton *event);
static gboolean ido_calendar_menu_item_button_press (GtkWidget *widget,
@@ -71,27 +66,16 @@ ido_calendar_menu_item_class_init (IdoCalendarMenuItemClass *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_calendar_menu_item_button_release;
widget_class->button_press_event = ido_calendar_menu_item_button_press;
-#if GTK_CHECK_VERSION (3, 0, 0)
menu_item_class->select = ido_calendar_menu_item_select;
menu_item_class->deselect = ido_calendar_menu_item_deselect;
-#else
- item_class->select = ido_calendar_menu_item_select;
- item_class->deselect = ido_calendar_menu_item_deselect;
-#endif
menu_item_class->hide_on_activate = TRUE;
@@ -209,7 +193,6 @@ ido_calendar_menu_item_button_press (GtkWidget *widget,
gtk_widget_grab_focus (calendar);
}
-#if GTK_CHECK_VERSION (3, 0, 0)
GdkEvent * newevent = gdk_event_copy((GdkEvent *)(event));
GList * children = gdk_window_get_children(gtk_widget_get_window(calendar));
GList * child;
@@ -238,7 +221,6 @@ ido_calendar_menu_item_button_press (GtkWidget *widget,
((GdkEventButton *)newevent)->window = event->window;
gdk_event_free(newevent);
-#endif
return TRUE;
}
@@ -250,20 +232,14 @@ static gboolean
ido_calendar_menu_item_button_release (GtkWidget *widget,
GdkEventButton *event)
{
-#if GTK_CHECK_VERSION (3, 0, 0)
GtkWidget *calendar = IDO_CALENDAR_MENU_ITEM (widget)->priv->calendar;
GTK_WIDGET_GET_CLASS(calendar)->button_release_event(GTK_WIDGET(calendar), event);
-#endif
return TRUE;
}
static void
-#if GTK_CHECK_VERSION (3, 0, 0)
ido_calendar_menu_item_select (GtkMenuItem *item)
-#else
-ido_calendar_menu_item_select (GtkItem *item)
-#endif
{
IDO_CALENDAR_MENU_ITEM (item)->priv->selected = TRUE;
@@ -271,11 +247,7 @@ ido_calendar_menu_item_select (GtkItem *item)
}
static void
-#if GTK_CHECK_VERSION (3, 0, 0)
ido_calendar_menu_item_deselect (GtkMenuItem *item)
-#else
-ido_calendar_menu_item_deselect (GtkItem *item)
-#endif
{
IDO_CALENDAR_MENU_ITEM (item)->priv->selected = FALSE;