diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-01-17 21:45:22 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-01-17 21:45:22 +0100 |
| commit | 57c2e8090698e8d05beec0c53e3a116fd8b88862 (patch) | |
| tree | 51b24fec5c03202d7a16987c248d42f7f4c956d9 /libcaja-private | |
| parent | 312f33c5b54c735d15e78c9b96672b8b555f4834 (diff) | |
| download | caja-57c2e8090698e8d05beec0c53e3a116fd8b88862.tar.bz2 caja-57c2e8090698e8d05beec0c53e3a116fd8b88862.tar.xz | |
GTK3: more deprecated GtkVBox/GtkHBox fixes
Diffstat (limited to 'libcaja-private')
| -rw-r--r-- | libcaja-private/caja-column-chooser.c | 8 | ||||
| -rw-r--r-- | libcaja-private/caja-column-chooser.h | 8 | ||||
| -rw-r--r-- | libcaja-private/caja-mime-application-chooser.h | 8 |
3 files changed, 23 insertions, 1 deletions
diff --git a/libcaja-private/caja-column-chooser.c b/libcaja-private/caja-column-chooser.c index 33410720..42bd904e 100644 --- a/libcaja-private/caja-column-chooser.c +++ b/libcaja-private/caja-column-chooser.c @@ -69,8 +69,11 @@ enum }; static guint signals[LAST_SIGNAL] = { 0 }; - +#if GTK_CHECK_VERSION (3, 0, 0) +G_DEFINE_TYPE(CajaColumnChooser, caja_column_chooser, GTK_TYPE_BOX); +#else G_DEFINE_TYPE(CajaColumnChooser, caja_column_chooser, GTK_TYPE_HBOX); +#endif static void caja_column_chooser_constructed (GObject *object); @@ -471,6 +474,9 @@ caja_column_chooser_init (CajaColumnChooser *chooser) g_object_set (G_OBJECT (chooser), "homogeneous", FALSE, "spacing", 8, +#if GTK_CHECK_VERSION (3, 0, 0) + "orientation", GTK_ORIENTATION_HORIZONTAL, +#endif NULL); add_tree_view (chooser); diff --git a/libcaja-private/caja-column-chooser.h b/libcaja-private/caja-column-chooser.h index e54eb00a..87612d44 100644 --- a/libcaja-private/caja-column-chooser.h +++ b/libcaja-private/caja-column-chooser.h @@ -44,14 +44,22 @@ typedef struct _CajaColumnChooserDetails CajaColumnChooserDetails; typedef struct { +#if GTK_CHECK_VERSION (3, 0, 0) + GtkBox parent; +#else GtkHBox parent; +#endif CajaColumnChooserDetails *details; } CajaColumnChooser; typedef struct { +#if GTK_CHECK_VERSION (3, 0, 0) + GtkBoxClass parent_slot; +#else GtkHBoxClass parent_slot; +#endif void (*changed) (CajaColumnChooser *chooser); void (*use_default) (CajaColumnChooser *chooser); diff --git a/libcaja-private/caja-mime-application-chooser.h b/libcaja-private/caja-mime-application-chooser.h index 3446024e..65d455a9 100644 --- a/libcaja-private/caja-mime-application-chooser.h +++ b/libcaja-private/caja-mime-application-chooser.h @@ -39,13 +39,21 @@ typedef struct _CajaMimeApplicationChooserDetails CajaMimeApplicationChooserDeta struct _CajaMimeApplicationChooser { +#if GTK_CHECK_VERSION (3, 0, 0) + GtkBox parent; +#else GtkVBox parent; +#endif CajaMimeApplicationChooserDetails *details; }; struct _CajaMimeApplicationChooserClass { +#if GTK_CHECK_VERSION (3, 0, 0) + GtkBoxClass parent_class; +#else GtkVBoxClass parent_class; +#endif }; GType caja_mime_application_chooser_get_type (void); |