summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2016-01-19 01:29:48 +0100
committerWolfgang Ulbrich <[email protected]>2016-01-19 01:29:48 +0100
commit54820f4200c190318ed1213d12ce585b9b422619 (patch)
tree107bd89607c818652cac8df3cb1c81deaac95891 /src
parent1ff346876afd37a957aa490be25bdd2fd90e4773 (diff)
downloadcaja-54820f4200c190318ed1213d12ce585b9b422619.tar.bz2
caja-54820f4200c190318ed1213d12ce585b9b422619.tar.xz
GTK: some missing GTK_TYPE_{H/V}BOX adjustments
this completes https://github.com/mate-desktop/caja/commit/cf39567
Diffstat (limited to 'src')
-rw-r--r--src/caja-emblem-sidebar.h8
-rw-r--r--src/caja-side-pane.c7
-rw-r--r--src/caja-side-pane.h8
-rw-r--r--src/caja-sidebar-title.h8
-rw-r--r--src/caja-trash-bar.h8
-rw-r--r--src/caja-x-content-bar.h8
-rw-r--r--src/caja-zoom-control.h8
7 files changed, 55 insertions, 0 deletions
diff --git a/src/caja-emblem-sidebar.h b/src/caja-emblem-sidebar.h
index 19238a26..6435ef53 100644
--- a/src/caja-emblem-sidebar.h
+++ b/src/caja-emblem-sidebar.h
@@ -47,13 +47,21 @@ typedef struct CajaEmblemSidebarDetails CajaEmblemSidebarDetails;
typedef struct
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBox parent_slot;
+#else
GtkVBox parent_slot;
+#endif
CajaEmblemSidebarDetails *details;
} CajaEmblemSidebar;
typedef struct
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBoxClass parent_slot;
+#else
GtkVBoxClass parent_slot;
+#endif
} CajaEmblemSidebarClass;
diff --git a/src/caja-side-pane.c b/src/caja-side-pane.c
index 3ccb289c..c1a6a959 100644
--- a/src/caja-side-pane.c
+++ b/src/caja-side-pane.c
@@ -72,7 +72,11 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
+#if GTK_CHECK_VERSION (3, 0, 0)
+EEL_CLASS_BOILERPLATE (CajaSidePane, caja_side_pane, GTK_TYPE_BOX)
+#else
EEL_CLASS_BOILERPLATE (CajaSidePane, caja_side_pane, GTK_TYPE_VBOX)
+#endif
static SidePanel *
panel_for_widget (CajaSidePane *side_pane, GtkWidget *widget)
@@ -320,6 +324,9 @@ caja_side_pane_init (GObject *object)
gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
side_pane->details->title_hbox = hbox;
gtk_widget_show (hbox);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (object), GTK_ORIENTATION_VERTICAL);
+#endif
gtk_box_pack_start (GTK_BOX (side_pane), hbox, FALSE, FALSE, 0);
select_button = gtk_toggle_button_new ();
diff --git a/src/caja-side-pane.h b/src/caja-side-pane.h
index e4ea145d..9ed67fe6 100644
--- a/src/caja-side-pane.h
+++ b/src/caja-side-pane.h
@@ -46,13 +46,21 @@ extern "C" {
typedef struct
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBox parent;
+#else
GtkVBox parent;
+#endif
CajaSidePaneDetails *details;
} CajaSidePane;
typedef struct
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBoxClass parent_slot;
+#else
GtkVBoxClass parent_slot;
+#endif
void (*close_requested) (CajaSidePane *side_pane);
void (*switch_page) (CajaSidePane *side_pane,
diff --git a/src/caja-sidebar-title.h b/src/caja-sidebar-title.h
index 757d5c3b..04d93815 100644
--- a/src/caja-sidebar-title.h
+++ b/src/caja-sidebar-title.h
@@ -49,13 +49,21 @@ typedef struct CajaSidebarTitleDetails CajaSidebarTitleDetails;
typedef struct
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBox box;
+#else
GtkVBox box;
+#endif
CajaSidebarTitleDetails *details;
} CajaSidebarTitle;
typedef struct
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBoxClass parent_class;
+#else
GtkVBoxClass parent_class;
+#endif
} CajaSidebarTitleClass;
GType caja_sidebar_title_get_type (void);
diff --git a/src/caja-trash-bar.h b/src/caja-trash-bar.h
index f7849891..fb0d7baa 100644
--- a/src/caja-trash-bar.h
+++ b/src/caja-trash-bar.h
@@ -42,14 +42,22 @@ extern "C" {
typedef struct
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBox box;
+#else
GtkHBox box;
+#endif
CajaTrashBarPrivate *priv;
} CajaTrashBar;
typedef struct
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBoxClass parent_class;
+#else
GtkHBoxClass parent_class;
+#endif
} CajaTrashBarClass;
GType caja_trash_bar_get_type (void) G_GNUC_CONST;
diff --git a/src/caja-x-content-bar.h b/src/caja-x-content-bar.h
index a6ae116f..fc6fead6 100644
--- a/src/caja-x-content-bar.h
+++ b/src/caja-x-content-bar.h
@@ -43,14 +43,22 @@ extern "C" {
typedef struct
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBox box;
+#else
GtkHBox box;
+#endif
CajaXContentBarPrivate *priv;
} CajaXContentBar;
typedef struct
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBoxClass parent_class;
+#else
GtkHBoxClass parent_class;
+#endif
} CajaXContentBarClass;
GType caja_x_content_bar_get_type (void) G_GNUC_CONST;
diff --git a/src/caja-zoom-control.h b/src/caja-zoom-control.h
index 623add8a..fb72d3c8 100644
--- a/src/caja-zoom-control.h
+++ b/src/caja-zoom-control.h
@@ -49,13 +49,21 @@ typedef struct CajaZoomControlDetails CajaZoomControlDetails;
struct CajaZoomControl
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBox parent;
+#else
GtkHBox parent;
+#endif
CajaZoomControlDetails *details;
};
struct CajaZoomControlClass
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBoxClass parent_class;
+#else
GtkHBoxClass parent_class;
+#endif
void (*zoom_in) (CajaZoomControl *control);
void (*zoom_out) (CajaZoomControl *control);