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 --- shell/ev-properties-fonts.c | 7 ++++--- shell/ev-properties-license.c | 7 ++++--- shell/ev-sidebar-annotations.c | 7 ++++++- shell/ev-sidebar-annotations.h | 4 ++-- shell/ev-sidebar-attachments.c | 3 ++- shell/ev-sidebar-attachments.h | 4 ++-- shell/ev-sidebar-bookmarks.c | 3 ++- shell/ev-sidebar-bookmarks.h | 4 ++-- shell/ev-sidebar-layers.c | 3 ++- shell/ev-sidebar-layers.h | 4 ++-- shell/ev-sidebar-links.c | 4 +++- shell/ev-sidebar-links.h | 4 ++-- shell/ev-sidebar-thumbnails.c | 4 +++- shell/ev-sidebar-thumbnails.h | 4 ++-- shell/ev-sidebar.c | 4 +++- shell/ev-sidebar.h | 4 ++-- 16 files changed, 43 insertions(+), 27 deletions(-) (limited to 'shell') diff --git a/shell/ev-properties-fonts.c b/shell/ev-properties-fonts.c index ac3c2c4e..d62ed6eb 100644 --- a/shell/ev-properties-fonts.c +++ b/shell/ev-properties-fonts.c @@ -31,7 +31,7 @@ #include "ev-properties-fonts.h" struct _EvPropertiesFonts { - GtkVBox base_instance; + GtkBox base_instance; GtkWidget *fonts_treeview; GtkWidget *fonts_progress_label; @@ -41,13 +41,13 @@ struct _EvPropertiesFonts { }; struct _EvPropertiesFontsClass { - GtkVBoxClass base_class; + GtkBoxClass base_class; }; static void job_fonts_finished_cb (EvJob *job, EvPropertiesFonts *properties); -G_DEFINE_TYPE (EvPropertiesFonts, ev_properties_fonts, GTK_TYPE_VBOX) +G_DEFINE_TYPE (EvPropertiesFonts, ev_properties_fonts, GTK_TYPE_BOX) static void ev_properties_fonts_dispose (GObject *object) @@ -109,6 +109,7 @@ ev_properties_fonts_init (EvPropertiesFonts *properties) GtkCellRenderer *renderer; GtkTreeViewColumn *column; + gtk_orientable_set_orientation (GTK_ORIENTABLE (properties), GTK_ORIENTATION_VERTICAL); gtk_container_set_border_width (GTK_CONTAINER (properties), 12); gtk_box_set_spacing (GTK_BOX (properties), 6); diff --git a/shell/ev-properties-license.c b/shell/ev-properties-license.c index 5e41d893..154991a4 100644 --- a/shell/ev-properties-license.c +++ b/shell/ev-properties-license.c @@ -29,14 +29,14 @@ #include "ev-properties-license.h" struct _EvPropertiesLicense { - GtkVBox base_instance; + GtkBox base_instance; }; struct _EvPropertiesLicenseClass { - GtkVBoxClass base_class; + GtkBoxClass base_class; }; -G_DEFINE_TYPE (EvPropertiesLicense, ev_properties_license, GTK_TYPE_VBOX) +G_DEFINE_TYPE (EvPropertiesLicense, ev_properties_license, GTK_TYPE_BOX) static void ev_properties_license_class_init (EvPropertiesLicenseClass *properties_license_class) @@ -154,6 +154,7 @@ ev_properties_license_set_license (EvPropertiesLicense *properties, static void ev_properties_license_init (EvPropertiesLicense *properties) { + gtk_orientable_set_orientation (GTK_ORIENTABLE (properties), GTK_ORIENTATION_VERTICAL); gtk_box_set_spacing (GTK_BOX (properties), 12); gtk_container_set_border_width (GTK_CONTAINER (properties), 12); } diff --git a/shell/ev-sidebar-annotations.c b/shell/ev-sidebar-annotations.c index 0213beba..bba131b8 100644 --- a/shell/ev-sidebar-annotations.c +++ b/shell/ev-sidebar-annotations.c @@ -67,7 +67,7 @@ static guint signals[N_SIGNALS] = { 0 }; G_DEFINE_TYPE_EXTENDED (EvSidebarAnnotations, ev_sidebar_annotations, - GTK_TYPE_VBOX, + GTK_TYPE_BOX, 0, G_IMPLEMENT_INTERFACE (EV_TYPE_SIDEBAR_PAGE, ev_sidebar_annotations_page_iface_init)) @@ -128,6 +128,10 @@ ev_sidebar_annotations_add_annots_list (EvSidebarAnnotations *ev_annots) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow), GTK_SHADOW_IN); +#if GTK_CHECK_VERSION (3, 0, 0) + // Use as much vertical space as available + gtk_widget_set_vexpand (GTK_WIDGET (swindow), TRUE); +#endif /* Create tree view */ loading_model = ev_sidebar_annotations_create_simple_model (_("Loading…")); @@ -236,6 +240,7 @@ ev_sidebar_annotations_init (EvSidebarAnnotations *ev_annots) gtk_notebook_set_show_border (GTK_NOTEBOOK (ev_annots->priv->notebook), FALSE); ev_sidebar_annotations_add_annots_list (ev_annots); ev_sidebar_annotations_add_annots_palette (ev_annots); + gtk_orientable_set_orientation (GTK_ORIENTABLE (ev_annots), GTK_ORIENTATION_VERTICAL); gtk_container_add (GTK_CONTAINER (ev_annots), ev_annots->priv->notebook); gtk_widget_show (ev_annots->priv->notebook); } diff --git a/shell/ev-sidebar-annotations.h b/shell/ev-sidebar-annotations.h index a0aebede..9aa7181c 100644 --- a/shell/ev-sidebar-annotations.h +++ b/shell/ev-sidebar-annotations.h @@ -38,13 +38,13 @@ typedef struct _EvSidebarAnnotationsPrivate EvSidebarAnnotationsPrivate; #define EV_SIDEBAR_ANNOTATIONS_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_SIDEBAR_ANNOTATIONS, EvSidebarAnnotationsClass)) struct _EvSidebarAnnotations { - GtkVBox base_instance; + GtkBox base_instance; EvSidebarAnnotationsPrivate *priv; }; struct _EvSidebarAnnotationsClass { - GtkVBoxClass base_class; + GtkBoxClass base_class; void (* annot_activated) (EvSidebarAnnotations *sidebar_annots, EvMapping *mapping); diff --git a/shell/ev-sidebar-attachments.c b/shell/ev-sidebar-attachments.c index 2b03e225..84e6cb38 100644 --- a/shell/ev-sidebar-attachments.c +++ b/shell/ev-sidebar-attachments.c @@ -71,7 +71,7 @@ static void ev_sidebar_attachments_page_iface_init (EvSidebarPageInterface *ifac G_DEFINE_TYPE_EXTENDED (EvSidebarAttachments, ev_sidebar_attachments, - GTK_TYPE_VBOX, + GTK_TYPE_BOX, 0, G_IMPLEMENT_INTERFACE (EV_TYPE_SIDEBAR_PAGE, ev_sidebar_attachments_page_iface_init)) @@ -536,6 +536,7 @@ ev_sidebar_attachments_init (EvSidebarAttachments *ev_attachbar) ev_attachbar->priv = EV_SIDEBAR_ATTACHMENTS_GET_PRIVATE (ev_attachbar); + gtk_orientable_set_orientation (GTK_ORIENTABLE (ev_attachbar), GTK_ORIENTATION_VERTICAL); swindow = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_NEVER, diff --git a/shell/ev-sidebar-attachments.h b/shell/ev-sidebar-attachments.h index f6766943..c6fc978b 100644 --- a/shell/ev-sidebar-attachments.h +++ b/shell/ev-sidebar-attachments.h @@ -41,13 +41,13 @@ typedef struct _EvSidebarAttachmentsPrivate EvSidebarAttachmentsPrivate; #define EV_SIDEBAR_ATTACHMENTS_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_SIDEBAR_ATTACHMENTS, EvSidebarAttachmentsClass)) struct _EvSidebarAttachments { - GtkVBox base_instance; + GtkBox base_instance; EvSidebarAttachmentsPrivate *priv; }; struct _EvSidebarAttachmentsClass { - GtkVBoxClass base_class; + GtkBoxClass base_class; /* Signals */ void (*popup_menu) (EvSidebarAttachments *ev_attachbar, diff --git a/shell/ev-sidebar-bookmarks.c b/shell/ev-sidebar-bookmarks.c index 9507e567..1e31fbc6 100644 --- a/shell/ev-sidebar-bookmarks.c +++ b/shell/ev-sidebar-bookmarks.c @@ -62,7 +62,7 @@ static void ev_sidebar_bookmarks_page_iface_init (EvSidebarPageInterface *iface) G_DEFINE_TYPE_EXTENDED (EvSidebarBookmarks, ev_sidebar_bookmarks, - GTK_TYPE_VBOX, + GTK_TYPE_BOX, 0, G_IMPLEMENT_INTERFACE (EV_TYPE_SIDEBAR_PAGE, ev_sidebar_bookmarks_page_iface_init)) @@ -426,6 +426,7 @@ ev_sidebar_bookmarks_init (EvSidebarBookmarks *sidebar_bookmarks) EvSidebarBookmarksPrivate); priv = sidebar_bookmarks->priv; + gtk_orientable_set_orientation (GTK_ORIENTABLE (sidebar_bookmarks), GTK_ORIENTATION_VERTICAL); gtk_box_set_spacing (GTK_BOX (sidebar_bookmarks), 6); swindow = gtk_scrolled_window_new (NULL, NULL); diff --git a/shell/ev-sidebar-bookmarks.h b/shell/ev-sidebar-bookmarks.h index 84b1d5c9..005ea14b 100644 --- a/shell/ev-sidebar-bookmarks.h +++ b/shell/ev-sidebar-bookmarks.h @@ -40,13 +40,13 @@ typedef struct _EvSidebarBookmarksPrivate EvSidebarBookmarksPrivate; #define EV_SIDEBAR_BOOKMARKS_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_SIDEBAR_BOOKMARKS, EvSidebarBookmarksClass)) struct _EvSidebarBookmarks { - GtkVBox base_instance; + GtkBox base_instance; EvSidebarBookmarksPrivate *priv; }; struct _EvSidebarBookmarksClass { - GtkVBoxClass base_class; + GtkBoxClass base_class; void (*add_bookmark) (EvSidebarBookmarks *sidebar_bookmarks); }; diff --git a/shell/ev-sidebar-layers.c b/shell/ev-sidebar-layers.c index 80afd0ef..ce12ba61 100644 --- a/shell/ev-sidebar-layers.c +++ b/shell/ev-sidebar-layers.c @@ -55,7 +55,7 @@ static guint signals[N_SIGNALS] = { 0 }; G_DEFINE_TYPE_EXTENDED (EvSidebarLayers, ev_sidebar_layers, - GTK_TYPE_VBOX, + GTK_TYPE_BOX, 0, G_IMPLEMENT_INTERFACE (EV_TYPE_SIDEBAR_PAGE, ev_sidebar_layers_page_iface_init)) @@ -282,6 +282,7 @@ ev_sidebar_layers_init (EvSidebarLayers *ev_layers) ev_layers->priv = EV_SIDEBAR_LAYERS_GET_PRIVATE (ev_layers); + gtk_orientable_set_orientation (GTK_ORIENTABLE (ev_layers), GTK_ORIENTATION_VERTICAL); swindow = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_NEVER, diff --git a/shell/ev-sidebar-layers.h b/shell/ev-sidebar-layers.h index 1c7ef3f7..f01f4cf2 100644 --- a/shell/ev-sidebar-layers.h +++ b/shell/ev-sidebar-layers.h @@ -38,13 +38,13 @@ typedef struct _EvSidebarLayersPrivate EvSidebarLayersPrivate; #define EV_SIDEBAR_LAYERS_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_SIDEBAR_LAYERS, EvSidebarLayersClass)) struct _EvSidebarLayers { - GtkVBox base_instance; + GtkBox base_instance; EvSidebarLayersPrivate *priv; }; struct _EvSidebarLayersClass { - GtkVBoxClass base_class; + GtkBoxClass base_class; /* Signals */ void (* layers_visibility_changed) (EvSidebarLayers *ev_layers); diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c index ab798a1b..79f5fe66 100644 --- a/shell/ev-sidebar-links.c +++ b/shell/ev-sidebar-links.c @@ -82,7 +82,7 @@ static guint signals[N_SIGNALS] = { 0 }; G_DEFINE_TYPE_EXTENDED (EvSidebarLinks, ev_sidebar_links, - GTK_TYPE_VBOX, + GTK_TYPE_BOX, 0, G_IMPLEMENT_INTERFACE (EV_TYPE_SIDEBAR_PAGE, ev_sidebar_links_page_iface_init)) @@ -453,6 +453,8 @@ ev_sidebar_links_init (EvSidebarLinks *ev_sidebar_links) { ev_sidebar_links->priv = EV_SIDEBAR_LINKS_GET_PRIVATE (ev_sidebar_links); + gtk_orientable_set_orientation (GTK_ORIENTABLE (ev_sidebar_links), GTK_ORIENTATION_VERTICAL); + ev_sidebar_links_construct (ev_sidebar_links); } diff --git a/shell/ev-sidebar-links.h b/shell/ev-sidebar-links.h index 7d11fd00..495a6f07 100644 --- a/shell/ev-sidebar-links.h +++ b/shell/ev-sidebar-links.h @@ -44,13 +44,13 @@ typedef struct _EvSidebarLinksPrivate EvSidebarLinksPrivate; #define EV_SIDEBAR_LINKS_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_SIDEBAR_LINKS, EvSidebarLinksClass)) struct _EvSidebarLinks { - GtkVBox base_instance; + GtkBox base_instance; EvSidebarLinksPrivate *priv; }; struct _EvSidebarLinksClass { - GtkVBoxClass base_class; + GtkBoxClass base_class; void (* link_activated) (EvSidebarLinks *sidebar_links, EvLink *link); diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c index df02bb5c..8f7f6517 100644 --- a/shell/ev-sidebar-thumbnails.c +++ b/shell/ev-sidebar-thumbnails.c @@ -101,7 +101,7 @@ static void adjustment_changed_cb (EvSidebarThumbnails G_DEFINE_TYPE_EXTENDED (EvSidebarThumbnails, ev_sidebar_thumbnails, - GTK_TYPE_VBOX, + GTK_TYPE_BOX, 0, G_IMPLEMENT_INTERFACE (EV_TYPE_SIDEBAR_PAGE, ev_sidebar_thumbnails_page_iface_init)) @@ -657,6 +657,8 @@ ev_sidebar_init_tree_view (EvSidebarThumbnails *ev_sidebar_thumbnails) GtkTreeSelection *selection; GtkCellRenderer *renderer; + gtk_orientable_set_orientation (GTK_ORIENTABLE (ev_sidebar_thumbnails), GTK_ORIENTATION_VERTICAL); + priv = ev_sidebar_thumbnails->priv; priv->tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->list_store)); diff --git a/shell/ev-sidebar-thumbnails.h b/shell/ev-sidebar-thumbnails.h index 218b0794..b93d47eb 100644 --- a/shell/ev-sidebar-thumbnails.h +++ b/shell/ev-sidebar-thumbnails.h @@ -40,13 +40,13 @@ typedef struct _EvSidebarThumbnailsPrivate EvSidebarThumbnailsPrivate; #define EV_SIDEBAR_THUMBNAILS_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_SIDEBAR_THUMBNAILS, EvSidebarThumbnailsClass)) struct _EvSidebarThumbnails { - GtkVBox base_instance; + GtkBox base_instance; EvSidebarThumbnailsPrivate *priv; }; struct _EvSidebarThumbnailsClass { - GtkVBoxClass base_class; + GtkBoxClass base_class; }; GType ev_sidebar_thumbnails_get_type (void) G_GNUC_CONST; diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c index d8d4424f..44a146f5 100644 --- a/shell/ev-sidebar.c +++ b/shell/ev-sidebar.c @@ -62,7 +62,7 @@ struct _EvSidebarPrivate { GtkTreeModel *page_model; }; -G_DEFINE_TYPE (EvSidebar, ev_sidebar, GTK_TYPE_VBOX) +G_DEFINE_TYPE (EvSidebar, ev_sidebar, GTK_TYPE_BOX) #define EV_SIDEBAR_GET_PRIVATE(object) \ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_SIDEBAR, EvSidebarPrivate)) @@ -346,6 +346,8 @@ ev_sidebar_init (EvSidebar *ev_sidebar) ev_sidebar->priv = EV_SIDEBAR_GET_PRIVATE (ev_sidebar); + gtk_orientable_set_orientation (GTK_ORIENTABLE (ev_sidebar), GTK_ORIENTATION_VERTICAL); + /* data model */ ev_sidebar->priv->page_model = (GtkTreeModel *) gtk_list_store_new (PAGE_COLUMN_NUM_COLS, diff --git a/shell/ev-sidebar.h b/shell/ev-sidebar.h index 407d7637..9fc5b39a 100644 --- a/shell/ev-sidebar.h +++ b/shell/ev-sidebar.h @@ -42,13 +42,13 @@ typedef struct _EvSidebarPrivate EvSidebarPrivate; #define EV_SIDEBAR_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_SIDEBAR, EvSidebarClass)) struct _EvSidebar { - GtkVBox base_instance; + GtkBox base_instance; EvSidebarPrivate *priv; }; struct _EvSidebarClass { - GtkVBoxClass base_class; + GtkBoxClass base_class; }; GType ev_sidebar_get_type (void) G_GNUC_CONST; -- cgit v1.2.1