From dc6b2065db9aa22aac346adaf337fb868b959f11 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Thu, 19 Nov 2015 21:13:51 +0100 Subject: GTk3: don't use deprecated GTK_TYPE_{V/H}BOX --- plugins/filebrowser/pluma-file-browser-widget.c | 9 +++++++++ plugins/filebrowser/pluma-file-browser-widget.h | 8 ++++++++ 2 files changed, 17 insertions(+) (limited to 'plugins/filebrowser') diff --git a/plugins/filebrowser/pluma-file-browser-widget.c b/plugins/filebrowser/pluma-file-browser-widget.c index cc2575ca..9dca7c99 100644 --- a/plugins/filebrowser/pluma-file-browser-widget.c +++ b/plugins/filebrowser/pluma-file-browser-widget.c @@ -240,8 +240,13 @@ static void on_action_filter_binary (GtkAction * action, static void on_action_bookmark_open (GtkAction * action, PlumaFileBrowserWidget * obj); +#if GTK_CHECK_VERSION (3, 0, 0) +PLUMA_PLUGIN_DEFINE_TYPE (PlumaFileBrowserWidget, pluma_file_browser_widget, + GTK_TYPE_BOX) +#else PLUMA_PLUGIN_DEFINE_TYPE (PlumaFileBrowserWidget, pluma_file_browser_widget, GTK_TYPE_VBOX) +#endif static void free_name_icon (gpointer data) @@ -1260,6 +1265,10 @@ pluma_file_browser_widget_init (PlumaFileBrowserWidget * obj) free_name_icon); gtk_box_set_spacing (GTK_BOX (obj), 3); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_orientable_set_orientation (GTK_ORIENTABLE (obj), + GTK_ORIENTATION_VERTICAL); +#endif obj->priv->busy_cursor = gdk_cursor_new (GDK_WATCH); } diff --git a/plugins/filebrowser/pluma-file-browser-widget.h b/plugins/filebrowser/pluma-file-browser-widget.h index 79e95c62..d7be9e4d 100644 --- a/plugins/filebrowser/pluma-file-browser-widget.h +++ b/plugins/filebrowser/pluma-file-browser-widget.h @@ -48,14 +48,22 @@ gboolean (*PlumaFileBrowserWidgetFilterFunc) (PlumaFileBrowserWidget * obj, struct _PlumaFileBrowserWidget { +#if GTK_CHECK_VERSION (3, 0, 0) + GtkBox parent; +#else GtkVBox parent; +#endif PlumaFileBrowserWidgetPrivate *priv; }; struct _PlumaFileBrowserWidgetClass { +#if GTK_CHECK_VERSION (3, 0, 0) + GtkBoxClass parent_class; +#else GtkVBoxClass parent_class; +#endif /* Signals */ void (*uri_activated) (PlumaFileBrowserWidget * widget, -- cgit v1.2.1