From d4e9df8989ef35e8c8ccaa4ce3b067ca25de71c2 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Wed, 22 Jun 2016 16:13:54 +0200 Subject: Do not use deprecated GTK_TYPE_VBOX definitions --- cut-n-paste/toolbar-editor/egg-editable-toolbar.c | 4 +++- cut-n-paste/toolbar-editor/egg-editable-toolbar.h | 4 ++-- cut-n-paste/toolbar-editor/egg-toolbar-editor.c | 6 +++++- cut-n-paste/toolbar-editor/egg-toolbar-editor.h | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) (limited to 'cut-n-paste') diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c index 2e40162c..c81aea4c 100644 --- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c +++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c @@ -87,7 +87,7 @@ struct _EggEditableToolbarPrivate GtkToolItem *dnd_toolitem; }; -G_DEFINE_TYPE (EggEditableToolbar, egg_editable_toolbar, GTK_TYPE_VBOX); +G_DEFINE_TYPE (EggEditableToolbar, egg_editable_toolbar, GTK_TYPE_BOX); static int get_dock_position (EggEditableToolbar *etoolbar, @@ -1382,6 +1382,8 @@ egg_editable_toolbar_init (EggEditableToolbar *etoolbar) { EggEditableToolbarPrivate *priv; + gtk_orientable_set_orientation (GTK_ORIENTABLE (etoolbar), GTK_ORIENTATION_VERTICAL); + priv = etoolbar->priv = EGG_EDITABLE_TOOLBAR_GET_PRIVATE (etoolbar); priv->save_hidden = TRUE; diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.h b/cut-n-paste/toolbar-editor/egg-editable-toolbar.h index 669af415..b4dd1bd1 100644 --- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.h +++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.h @@ -41,7 +41,7 @@ typedef struct _EggEditableToolbarClass EggEditableToolbarClass; struct _EggEditableToolbar { - GtkVBox parent_object; + GtkBox parent_object; /*< private >*/ EggEditableToolbarPrivate *priv; @@ -49,7 +49,7 @@ struct _EggEditableToolbar struct _EggEditableToolbarClass { - GtkVBoxClass parent_class; + GtkBoxClass parent_class; void (* action_request) (EggEditableToolbar *etoolbar, const char *action_name); diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c index 4cfacf79..e17b03a2 100644 --- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c +++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c @@ -77,7 +77,7 @@ struct EggToolbarEditorPrivate gulong sig_handlers[SIGNAL_HANDLER_LIST_SIZE]; }; -G_DEFINE_TYPE (EggToolbarEditor, egg_toolbar_editor, GTK_TYPE_VBOX); +G_DEFINE_TYPE (EggToolbarEditor, egg_toolbar_editor, GTK_TYPE_BOX); static gint compare_items (gconstpointer a, @@ -673,6 +673,10 @@ setup_editor (EggToolbarEditor *editor) static void egg_toolbar_editor_init (EggToolbarEditor *t) { +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_orientable_set_orientation (GTK_ORIENTABLE (t), GTK_ORIENTATION_VERTICAL); +#endif + t->priv = EGG_TOOLBAR_EDITOR_GET_PRIVATE (t); t->priv->manager = NULL; diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.h b/cut-n-paste/toolbar-editor/egg-toolbar-editor.h index 3b897c50..6fcde399 100644 --- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.h +++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.h @@ -40,7 +40,7 @@ typedef struct EggToolbarEditorPrivate EggToolbarEditorPrivate; struct EggToolbarEditor { - GtkVBox parent_object; + GtkBox parent_object; /*< private >*/ EggToolbarEditorPrivate *priv; @@ -48,7 +48,7 @@ struct EggToolbarEditor struct EggToolbarEditorClass { - GtkVBoxClass parent_class; + GtkBoxClass parent_class; }; -- cgit v1.2.1