From 2c688719ecee952666a038ae18865e151340b87f Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 22 Aug 2012 09:43:24 -0500 Subject: remove the gtk2 conditional compiles for IdoCalendarMenuItem --- src/idocalendarmenuitem.c | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'src/idocalendarmenuitem.c') 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; -- cgit v1.2.3