diff options
| author | Wolfgang Ulbrich <[email protected]> | 2015-12-14 17:48:57 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2015-12-14 17:48:57 +0100 |
| commit | 402caf8204916e5bb6fbeca2fbf4becfd616df27 (patch) | |
| tree | 76f8f20137b18013de9b6b991763e0dca3a39a1f | |
| parent | 8a8e85bf8de79e4ac183e653b0363a11ed0bad87 (diff) | |
| download | eom-402caf8204916e5bb6fbeca2fbf4becfd616df27.tar.bz2 eom-402caf8204916e5bb6fbeca2fbf4becfd616df27.tar.xz | |
GTK3: replace more deprecated GtkVBox usage
| -rw-r--r-- | cut-n-paste/toolbar-editor/egg-editable-toolbar.c | 9 | ||||
| -rw-r--r-- | cut-n-paste/toolbar-editor/egg-toolbar-editor.c | 9 | ||||
| -rw-r--r-- | src/eom-plugin-manager.c | 9 |
3 files changed, 27 insertions, 0 deletions
diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c index 0158cda..eb64a38 100644 --- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c +++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c @@ -86,7 +86,11 @@ struct _EggEditableToolbarPrivate GtkToolItem *dnd_toolitem; }; +#if GTK_CHECK_VERSION (3, 0, 0) +G_DEFINE_TYPE (EggEditableToolbar, egg_editable_toolbar, GTK_TYPE_BOX) +#else G_DEFINE_TYPE (EggEditableToolbar, egg_editable_toolbar, GTK_TYPE_VBOX); +#endif static int get_dock_position (EggEditableToolbar *etoolbar, @@ -1335,6 +1339,11 @@ egg_editable_toolbar_set_model (EggEditableToolbar *etoolbar, static void egg_editable_toolbar_init (EggEditableToolbar *etoolbar) { +#if GTK_CHECK_VERSION (3, 2, 0) + gtk_orientable_set_orientation (GTK_ORIENTABLE (etoolbar), + GTK_ORIENTATION_VERTICAL); +#endif + EggEditableToolbarPrivate *priv; priv = etoolbar->priv = EGG_EDITABLE_TOOLBAR_GET_PRIVATE (etoolbar); diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c index 204aa1a..6f4a740 100644 --- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c +++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c @@ -80,7 +80,11 @@ struct EggToolbarEditorPrivate gulong sig_handlers[SIGNAL_HANDLER_LIST_SIZE]; }; +#if GTK_CHECK_VERSION (3, 0, 0) +G_DEFINE_TYPE (EggToolbarEditor, egg_toolbar_editor, GTK_TYPE_BOX) +#else G_DEFINE_TYPE (EggToolbarEditor, egg_toolbar_editor, GTK_TYPE_VBOX); +#endif static gint compare_items (gconstpointer a, @@ -734,6 +738,11 @@ setup_editor (EggToolbarEditor *editor) { GtkWidget *scrolled_window; +#if GTK_CHECK_VERSION (3, 2, 0) + gtk_orientable_set_orientation (GTK_ORIENTABLE (editor), + GTK_ORIENTATION_VERTICAL); +#endif + gtk_container_set_border_width (GTK_CONTAINER (editor), 12); scrolled_window = gtk_scrolled_window_new (NULL, NULL); editor->priv->scrolled_window = scrolled_window; diff --git a/src/eom-plugin-manager.c b/src/eom-plugin-manager.c index f4576c3..0f68fbd 100644 --- a/src/eom-plugin-manager.c +++ b/src/eom-plugin-manager.c @@ -46,7 +46,11 @@ enum { #define EOM_PLUGIN_MANAGER_GET_PRIVATE(object) \ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_PLUGIN_MANAGER, EomPluginManagerPrivate)) +#if GTK_CHECK_VERSION (3, 0, 0) +G_DEFINE_TYPE (EomPluginManager, eom_plugin_manager, GTK_TYPE_BOX) +#else G_DEFINE_TYPE (EomPluginManager, eom_plugin_manager, GTK_TYPE_VBOX) +#endif #define PLUGIN_MANAGER_NAME_TITLE _("Plugin") #define PLUGIN_MANAGER_ACTIVE_TITLE _("Enabled") @@ -837,6 +841,11 @@ eom_plugin_manager_init (EomPluginManager *pm) eom_debug (DEBUG_PLUGINS); +#if GTK_CHECK_VERSION (3, 2, 0) + gtk_orientable_set_orientation (GTK_ORIENTABLE (pm), + GTK_ORIENTATION_VERTICAL); +#endif + pm->priv = EOM_PLUGIN_MANAGER_GET_PRIVATE (pm); gtk_box_set_spacing (GTK_BOX (pm), 6); |