summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2016-01-21 20:35:13 +0100
committerWolfgang Ulbrich <[email protected]>2016-01-21 20:35:13 +0100
commitcc6a1d11d8903c3051d0af400559679cc5b4aed6 (patch)
tree14397b19f92730f20711c95ee550bab6d6fcdb99
parentcb297b4c850e5c3149fad22fabcd7b18d05bd884 (diff)
downloadcaja-cc6a1d11d8903c3051d0af400559679cc5b4aed6.tar.bz2
caja-cc6a1d11d8903c3051d0af400559679cc5b4aed6.tar.xz
GTK3 query-editor: fix deprecated GTK_TYPE_VBOX usage
-rw-r--r--src/caja-query-editor.c10
-rw-r--r--src/caja-query-editor.h8
2 files changed, 18 insertions, 0 deletions
diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c
index 67556ddc..205f18ee 100644
--- a/src/caja-query-editor.c
+++ b/src/caja-query-editor.c
@@ -143,7 +143,11 @@ static CajaQueryEditorRowOps row_type[] =
EEL_CLASS_BOILERPLATE (CajaQueryEditor,
caja_query_editor,
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GTK_TYPE_BOX)
+#else
GTK_TYPE_VBOX)
+#endif
static void
caja_query_editor_finalize (GObject *object)
@@ -1027,9 +1031,15 @@ caja_query_editor_init (CajaQueryEditor *editor)
editor->details->is_visible = TRUE;
editor->details->invisible_vbox = gtk_vbox_new (FALSE, 6);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (editor), GTK_ORIENTATION_VERTICAL);
+#endif
gtk_box_pack_start (GTK_BOX (editor), editor->details->invisible_vbox,
FALSE, FALSE, 0);
editor->details->visible_vbox = gtk_vbox_new (FALSE, 6);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (editor), GTK_ORIENTATION_VERTICAL);
+#endif
gtk_box_pack_start (GTK_BOX (editor), editor->details->visible_vbox,
FALSE, FALSE, 0);
/* Only show visible vbox */
diff --git a/src/caja-query-editor.h b/src/caja-query-editor.h
index 8a7f71b9..2a443624 100644
--- a/src/caja-query-editor.h
+++ b/src/caja-query-editor.h
@@ -45,13 +45,21 @@ typedef struct CajaQueryEditorDetails CajaQueryEditorDetails;
typedef struct CajaQueryEditor
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBox parent;
+#else
GtkVBox parent;
+#endif
CajaQueryEditorDetails *details;
} CajaQueryEditor;
typedef struct
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkBoxClass parent_class;
+#else
GtkVBoxClass parent_class;
+#endif
void (* changed) (CajaQueryEditor *editor,
CajaQuery *query,