From cf39567d3b05b69383c252812c5adf26382c866a Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Mon, 18 Jan 2016 15:41:50 +0100 Subject: GTK3: fix deprecated GTK_TYPE_{H/V}BOX usage --- libcaja-private/caja-keep-last-vertical-box.c | 7 +++++++ libcaja-private/caja-mime-application-chooser.c | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'libcaja-private') diff --git a/libcaja-private/caja-keep-last-vertical-box.c b/libcaja-private/caja-keep-last-vertical-box.c index 212fcc93..40260a09 100644 --- a/libcaja-private/caja-keep-last-vertical-box.c +++ b/libcaja-private/caja-keep-last-vertical-box.c @@ -31,7 +31,11 @@ static void caja_keep_last_vertical_box_init (CajaKeepLastVerticalBox static void caja_keep_last_vertical_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation); +#if GTK_CHECK_VERSION (3, 0, 0) +G_DEFINE_TYPE (CajaKeepLastVerticalBox, caja_keep_last_vertical_box, GTK_TYPE_BOX) +#else G_DEFINE_TYPE (CajaKeepLastVerticalBox, caja_keep_last_vertical_box, GTK_TYPE_VBOX) +#endif #define parent_class caja_keep_last_vertical_box_parent_class /* Standard class initialization function */ @@ -49,6 +53,9 @@ caja_keep_last_vertical_box_class_init (CajaKeepLastVerticalBoxClass *klass) static void caja_keep_last_vertical_box_init (CajaKeepLastVerticalBox *box) { +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_orientable_set_orientation (GTK_ORIENTABLE (box), GTK_ORIENTATION_VERTICAL); +#endif } diff --git a/libcaja-private/caja-mime-application-chooser.c b/libcaja-private/caja-mime-application-chooser.c index 438a92fe..e6103618 100644 --- a/libcaja-private/caja-mime-application-chooser.c +++ b/libcaja-private/caja-mime-application-chooser.c @@ -70,7 +70,11 @@ enum NUM_COLUMNS }; +#if GTK_CHECK_VERSION (3, 0, 0) +G_DEFINE_TYPE (CajaMimeApplicationChooser, caja_mime_application_chooser, GTK_TYPE_BOX); +#else G_DEFINE_TYPE (CajaMimeApplicationChooser, caja_mime_application_chooser, GTK_TYPE_VBOX); +#endif static void refresh_model (CajaMimeApplicationChooser *chooser); static void refresh_model_soon (CajaMimeApplicationChooser *chooser); @@ -376,6 +380,9 @@ caja_mime_application_chooser_init (CajaMimeApplicationChooser *chooser) chooser->details = g_new0 (CajaMimeApplicationChooserDetails, 1); chooser->details->for_multiple_files = FALSE; +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_orientable_set_orientation (GTK_ORIENTABLE (chooser), GTK_ORIENTATION_VERTICAL); +#endif gtk_container_set_border_width (GTK_CONTAINER (chooser), 8); gtk_box_set_spacing (GTK_BOX (chooser), 0); gtk_box_set_homogeneous (GTK_BOX (chooser), FALSE); -- cgit v1.2.1