summaryrefslogtreecommitdiff
path: root/mate-panel/panel-widget.c
diff options
context:
space:
mode:
Diffstat (limited to 'mate-panel/panel-widget.c')
-rw-r--r--mate-panel/panel-widget.c27
1 files changed, 0 insertions, 27 deletions
diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c
index 4841d94f..c9fbb846 100644
--- a/mate-panel/panel-widget.c
+++ b/mate-panel/panel-widget.c
@@ -78,11 +78,7 @@ static void panel_widget_cadd (GtkContainer *container,
GtkWidget *widget);
static void panel_widget_cremove (GtkContainer *container,
GtkWidget *widget);
-#if GTK_CHECK_VERSION (3, 0, 0)
static void panel_widget_dispose (GObject *obj);
-#else
-static void panel_widget_destroy (GtkObject *obj);
-#endif
static void panel_widget_finalize (GObject *obj);
static void panel_widget_realize (GtkWidget *widget);
static void panel_widget_unrealize (GtkWidget *panel);
@@ -300,12 +296,7 @@ remove_all_move_bindings (PanelWidget *panel)
static void
panel_widget_class_init (PanelWidgetClass *class)
{
-#if GTK_CHECK_VERSION (3, 0, 0)
GObjectClass *object_class = (GObjectClass*) class;
-#else
- GtkObjectClass *object_class = (GtkObjectClass*) class;
- GObjectClass *gobject_class = (GObjectClass*) class;
-#endif
GtkWidgetClass *widget_class = (GtkWidgetClass*) class;
GtkContainerClass *container_class = (GtkContainerClass*) class;
@@ -437,13 +428,8 @@ panel_widget_class_init (PanelWidgetClass *class)
class->tab_move = panel_widget_tab_move;
class->end_move = panel_widget_end_move;
-#if GTK_CHECK_VERSION (3, 0, 0)
object_class->dispose = panel_widget_dispose;
object_class->finalize = panel_widget_finalize;
-#else
- object_class->destroy = panel_widget_destroy;
- gobject_class->finalize = panel_widget_finalize;
-#endif
#if GTK_CHECK_VERSION (3, 0, 0)
widget_class->get_preferred_width = panel_widget_get_preferred_width;
@@ -1833,11 +1819,7 @@ panel_widget_destroy_open_dialogs (PanelWidget *panel_widget)
}
static void
-#if GTK_CHECK_VERSION (3, 0, 0)
panel_widget_dispose (GObject *obj)
-#else
-panel_widget_destroy (GtkObject *obj)
-#endif
{
PanelWidget *panel;
@@ -1858,12 +1840,7 @@ panel_widget_destroy (GtkObject *obj)
panel->master_widget = NULL;
}
-#if GTK_CHECK_VERSION (3, 0, 0)
G_OBJECT_CLASS (panel_widget_parent_class)->dispose (obj);
-#else
- if (GTK_OBJECT_CLASS (panel_widget_parent_class)->destroy)
- GTK_OBJECT_CLASS (panel_widget_parent_class)->destroy (obj);
-#endif
}
static void
@@ -2506,11 +2483,7 @@ panel_widget_applet_key_press_event (GtkWidget *widget,
if (!mate_panel_applet_in_drag)
return FALSE;
-#if GTK_CHECK_VERSION (3, 0, 0)
return gtk_bindings_activate (G_OBJECT (panel),
-#else
- return gtk_bindings_activate (GTK_OBJECT (panel),
-#endif
((GdkEventKey *)event)->keyval,
((GdkEventKey *)event)->state);
}