use GtkBox instead of GtkVBox/GtkHBox in both GTK+ builds

and fix deprecated usage of GtkHBox and GtkVBox in GTK+3 build

9 files changed, 9 insertions, 50 deletions

diff --git a/mate-volume-control/gvc-balance-bar.c b/mate-volume-control/gvc-balance-bar.c
index 7431773..c7f8919 100644
--- a/mate-volume-control/gvc-balance-bar.c
+++ b/mate-volume-control/gvc-balance-bar.c
@@ -74,11 +74,7 @@ static gboolean on_scale_scroll_event       (GtkWidget          *widget,
 static void     on_adjustment_value_changed (GtkAdjustment      *adjustment,
                                              GvcBalanceBar      *bar);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 G_DEFINE_TYPE (GvcBalanceBar, gvc_balance_bar, GTK_TYPE_BOX)
-#else
-G_DEFINE_TYPE (GvcBalanceBar, gvc_balance_bar, GTK_TYPE_HBOX)
-#endif
 
 static void
 create_scale_box (GvcBalanceBar *bar)
diff --git a/mate-volume-control/gvc-balance-bar.h b/mate-volume-control/gvc-balance-bar.h
index d5b142d..2530191 100644
--- a/mate-volume-control/gvc-balance-bar.h
+++ b/mate-volume-control/gvc-balance-bar.h
@@ -51,21 +51,13 @@ typedef struct _GvcBalanceBarPrivate  GvcBalanceBarPrivate;
 
 struct _GvcBalanceBar
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
         GtkBox                parent;
-#else
-        GtkHBox               parent;
-#endif
         GvcBalanceBarPrivate *priv;
 };
 
 struct _GvcBalanceBarClass
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
         GtkBoxClass           parent_class;
-#else
-        GtkHBoxClass          parent_class;
-#endif
 };
 
 GType               gvc_balance_bar_get_type            (void) G_GNUC_CONST;
diff --git a/mate-volume-control/gvc-channel-bar.c b/mate-volume-control/gvc-channel-bar.c
index e431651..a9cba92 100644
--- a/mate-volume-control/gvc-channel-bar.c
+++ b/mate-volume-control/gvc-channel-bar.c
@@ -89,11 +89,7 @@ static gboolean on_scale_scroll_event         (GtkWidget          *widget,
                                                GdkEventScroll     *event,
                                                GvcChannelBar      *bar);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 G_DEFINE_TYPE (GvcChannelBar, gvc_channel_bar, GTK_TYPE_BOX)
-#else
-G_DEFINE_TYPE (GvcChannelBar, gvc_channel_bar, GTK_TYPE_HBOX)
-#endif
 
 static void
 create_scale_box (GvcChannelBar *bar)
diff --git a/mate-volume-control/gvc-channel-bar.h b/mate-volume-control/gvc-channel-bar.h
index 1c80be9..6a91f78 100644
--- a/mate-volume-control/gvc-channel-bar.h
+++ b/mate-volume-control/gvc-channel-bar.h
@@ -43,21 +43,13 @@ typedef struct _GvcChannelBarPrivate  GvcChannelBarPrivate;
 
 struct _GvcChannelBar
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
         GtkBox                parent;
-#else
-        GtkHBox               parent;
-#endif
         GvcChannelBarPrivate *priv;
 };
 
 struct _GvcChannelBarClass
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
         GtkBoxClass           parent_class;
-#else
-        GtkHBoxClass          parent_class;
-#endif
 
         void (* changed) (GvcChannelBar *bar);
 };
diff --git a/mate-volume-control/gvc-combo-box.c b/mate-volume-control/gvc-combo-box.c
index 25c4639..c43f05d 100644
--- a/mate-volume-control/gvc-combo-box.c
+++ b/mate-volume-control/gvc-combo-box.c
@@ -71,11 +71,7 @@ static void gvc_combo_box_class_init (GvcComboBoxClass *klass);
 static void gvc_combo_box_init       (GvcComboBox      *combo);
 static void gvc_combo_box_dispose    (GObject          *object);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 G_DEFINE_TYPE (GvcComboBox, gvc_combo_box, GTK_TYPE_BOX)
-#else
-G_DEFINE_TYPE (GvcComboBox, gvc_combo_box, GTK_TYPE_HBOX)
-#endif
 
 MateMixerSwitch *
 gvc_combo_box_get_switch (GvcComboBox *combobox)
diff --git a/mate-volume-control/gvc-combo-box.h b/mate-volume-control/gvc-combo-box.h
index 0767704..fc82be5 100644
--- a/mate-volume-control/gvc-combo-box.h
+++ b/mate-volume-control/gvc-combo-box.h
@@ -43,21 +43,14 @@ typedef struct _GvcComboBoxPrivate  GvcComboBoxPrivate;
 
 struct _GvcComboBox
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
         GtkBox                  parent;
-#else
-        GtkHBox                 parent;
-#endif
         GvcComboBoxPrivate     *priv;
 };
 
 struct _GvcComboBoxClass
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
         GtkBoxClass             parent_class;
-#else
-        GtkHBoxClass            parent_class;
-#endif
+
         void (* changing)       (GvcComboBox           *combobox,
                                  MateMixerSwitchOption *option);
         void (* button_clicked) (GvcComboBox           *combobox);
diff --git a/mate-volume-control/gvc-mixer-dialog.c b/mate-volume-control/gvc-mixer-dialog.c
index f2fd978..6bb8e7a 100644
--- a/mate-volume-control/gvc-mixer-dialog.c
+++ b/mate-volume-control/gvc-mixer-dialog.c
@@ -2125,7 +2125,11 @@ gvc_mixer_dialog_constructor (GType                  type,
         gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
 
         /* Output page */
+#if GTK_CHECK_VERSION (3, 0, 0)
+        self->priv->output_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+#else
         self->priv->output_box = gtk_vbox_new (FALSE, 12);
+#endif
         gtk_container_set_border_width (GTK_CONTAINER (self->priv->output_box), 12);
         label = gtk_label_new (_("Output"));
         gtk_notebook_append_page (GTK_NOTEBOOK (self->priv->notebook),
@@ -2164,7 +2168,11 @@ gvc_mixer_dialog_constructor (GType                  type,
         make_label_bold (GTK_LABEL (label));
         gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_NONE);
         gtk_box_pack_start (GTK_BOX (self->priv->output_box), box, FALSE, FALSE, 12);
+#if GTK_CHECK_VERSION (3, 0, 0)
+        self->priv->output_settings_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#else
         self->priv->output_settings_box = gtk_vbox_new (FALSE, 0);
+#endif
         gtk_container_add (GTK_CONTAINER (box), self->priv->output_settings_box);
 
         self->priv->output_settings_frame = box;
diff --git a/mate-volume-control/gvc-sound-theme-chooser.c b/mate-volume-control/gvc-sound-theme-chooser.c
index 55c4ee2..a30518d 100644
--- a/mate-volume-control/gvc-sound-theme-chooser.c
+++ b/mate-volume-control/gvc-sound-theme-chooser.c
@@ -54,11 +54,7 @@ static void     gvc_sound_theme_chooser_class_init (GvcSoundThemeChooserClass *k
 static void     gvc_sound_theme_chooser_init       (GvcSoundThemeChooser      *sound_theme_chooser);
 static void     gvc_sound_theme_chooser_dispose   (GObject            *object);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 G_DEFINE_TYPE (GvcSoundThemeChooser, gvc_sound_theme_chooser, GTK_TYPE_BOX)
-#else
-G_DEFINE_TYPE (GvcSoundThemeChooser, gvc_sound_theme_chooser, GTK_TYPE_VBOX)
-#endif
 
 #define KEY_SOUNDS_SCHEMA          "org.mate.sound"
 #define EVENT_SOUNDS_KEY           "event-sounds"
@@ -1142,8 +1138,6 @@ gvc_sound_theme_chooser_new (void)
 {
         return g_object_new (GVC_TYPE_SOUND_THEME_CHOOSER,
                                 "spacing", 6,
-#if GTK_CHECK_VERSION (3, 0, 0)
                                 "orientation", GTK_ORIENTATION_VERTICAL,
-#endif
                                 NULL);
 }
diff --git a/mate-volume-control/gvc-sound-theme-chooser.h b/mate-volume-control/gvc-sound-theme-chooser.h
index c7bfac0..55fd1cb 100644
--- a/mate-volume-control/gvc-sound-theme-chooser.h
+++ b/mate-volume-control/gvc-sound-theme-chooser.h
@@ -36,21 +36,13 @@ typedef struct GvcSoundThemeChooserPrivate GvcSoundThemeChooserPrivate;
 
 typedef struct
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
         GtkBox                       parent;
-#else
-        GtkVBox                      parent;
-#endif
         GvcSoundThemeChooserPrivate *priv;
 } GvcSoundThemeChooser;
 
 typedef struct
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
         GtkBoxClass           parent_class;
-#else
-        GtkVBoxClass          parent_class;
-#endif
 } GvcSoundThemeChooserClass;
 
 GType               gvc_sound_theme_chooser_get_type            (void);