diff options
| author | Wolfgang Ulbrich <[email protected]> | 2015-11-19 21:13:51 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2015-12-01 22:31:33 +0100 |
| commit | dc6b2065db9aa22aac346adaf337fb868b959f11 (patch) | |
| tree | 13ac577af60397bbff08819cc5ad2041f4da9397 /plugins | |
| parent | 9994dd399ab569d547e18cb5f01900f8db953312 (diff) | |
| download | pluma-dc6b2065db9aa22aac346adaf337fb868b959f11.tar.bz2 pluma-dc6b2065db9aa22aac346adaf337fb868b959f11.tar.xz | |
GTk3: don't use deprecated GTK_TYPE_{V/H}BOX
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/filebrowser/pluma-file-browser-widget.c | 9 | ||||
| -rw-r--r-- | plugins/filebrowser/pluma-file-browser-widget.h | 8 | ||||
| -rwxr-xr-x | plugins/taglist/pluma-taglist-plugin-panel.c | 9 | ||||
| -rwxr-xr-x | plugins/taglist/pluma-taglist-plugin-panel.h | 8 |
4 files changed, 34 insertions, 0 deletions
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, diff --git a/plugins/taglist/pluma-taglist-plugin-panel.c b/plugins/taglist/pluma-taglist-plugin-panel.c index 682bedd6..b4880ca0 100755 --- a/plugins/taglist/pluma-taglist-plugin-panel.c +++ b/plugins/taglist/pluma-taglist-plugin-panel.c @@ -69,7 +69,11 @@ struct _PlumaTaglistPluginPanelPrivate gchar *data_dir; }; +#if GTK_CHECK_VERSION (3, 0, 0) +PLUMA_PLUGIN_DEFINE_TYPE (PlumaTaglistPluginPanel, pluma_taglist_plugin_panel, GTK_TYPE_BOX) +#else PLUMA_PLUGIN_DEFINE_TYPE (PlumaTaglistPluginPanel, pluma_taglist_plugin_panel, GTK_TYPE_VBOX) +#endif enum { @@ -675,6 +679,11 @@ pluma_taglist_plugin_panel_init (PlumaTaglistPluginPanel *panel) panel->priv = PLUMA_TAGLIST_PLUGIN_PANEL_GET_PRIVATE (panel); panel->priv->data_dir = NULL; +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_orientable_set_orientation (GTK_ORIENTABLE (panel), + GTK_ORIENTATION_VERTICAL); +#endif + /* Build the window content */ panel->priv->tag_groups_combo = gtk_combo_box_text_new (); gtk_box_pack_start (GTK_BOX (panel), diff --git a/plugins/taglist/pluma-taglist-plugin-panel.h b/plugins/taglist/pluma-taglist-plugin-panel.h index bcd42ed4..03738835 100755 --- a/plugins/taglist/pluma-taglist-plugin-panel.h +++ b/plugins/taglist/pluma-taglist-plugin-panel.h @@ -58,7 +58,11 @@ typedef struct _PlumaTaglistPluginPanel PlumaTaglistPluginPanel; struct _PlumaTaglistPluginPanel { +#if GTK_CHECK_VERSION (3, 0, 0) + GtkBox vbox; +#else GtkVBox vbox; +#endif /*< private > */ PlumaTaglistPluginPanelPrivate *priv; @@ -71,7 +75,11 @@ typedef struct _PlumaTaglistPluginPanelClass PlumaTaglistPluginPanelClass; struct _PlumaTaglistPluginPanelClass { +#if GTK_CHECK_VERSION (3, 0, 0) + GtkBoxClass parent_class; +#else GtkVBoxClass parent_class; +#endif }; /* |