Use orientable widgets in GTK+ 3 build

(bzr r11512)

4 files changed, 39 insertions, 0 deletions

diff --git a/src/ege-output-action.cpp b/src/ege-output-action.cpp
index c1a5be694..1b356c55d 100644
--- a/src/ege-output-action.cpp
+++ b/src/ege-output-action.cpp
@@ -193,7 +193,12 @@ GtkWidget* create_tool_item( GtkAction* action )
     if ( IS_EGE_OUTPUT_ACTION(action) )
     {
         GValue value;
+#if GTK_CHECK_VERSION(3,0,0)
+        GtkWidget* hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
+	gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
+#else
         GtkWidget* hb = gtk_hbox_new( FALSE, 5 );
+#endif
         GtkWidget* lbl = 0;
         memset( &value, 0, sizeof(value) );
 
diff --git a/src/ege-select-one-action.cpp b/src/ege-select-one-action.cpp
index 42f2fafce..a0c91d09e 100644
--- a/src/ege-select-one-action.cpp
+++ b/src/ege-select-one-action.cpp
@@ -659,7 +659,12 @@ GtkWidget* create_tool_item( GtkAction* action )
         item = GTK_WIDGET( gtk_tool_item_new() );
 
         if ( act->private_data->appearanceMode == APPEARANCE_FULL ) {
+#if GTK_CHECK_VERSION(3,0,0)
+            GtkWidget* holder = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+            gtk_box_set_homogeneous(GTK_BOX(holder), FALSE);
+#else
             GtkWidget* holder = gtk_hbox_new( FALSE, 0 );
+#endif
 
             GtkRadioAction* ract = 0;
             GtkWidget* sub = 0;
@@ -768,7 +773,14 @@ GtkWidget* create_tool_item( GtkAction* action )
             gtk_container_add( GTK_CONTAINER(item), holder );
         } else {
             GtkCellRenderer * renderer = 0;
+
+#if GTK_CHECK_VERSION(3,0,0)
+            GtkWidget* holder = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
+            gtk_box_set_homogeneous(GTK_BOX(holder), FALSE);
+#else
             GtkWidget *holder = gtk_hbox_new( FALSE, 4 );
+#endif
+
             GtkEntry *entry = 0;
             GtkWidget *normal;
 
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index 5cb0402b2..a54e04407 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -866,16 +866,32 @@ void XmlTree::cmd_new_element_node()
     g_signal_connect(G_OBJECT(new_window), "destroy", gtk_main_quit, NULL);
     g_signal_connect(G_OBJECT(new_window), "key-press-event", G_CALLBACK(quit_on_esc), new_window);
 
+#if GTK_CHECK_VERSION(3,0,0)
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
+    gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE);
+#else
     vbox = gtk_vbox_new(FALSE, 4);
+#endif
+
     gtk_container_add(GTK_CONTAINER(new_window), vbox);
 
     name_entry = new Gtk::Entry();
     gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(name_entry->gobj()), FALSE, TRUE, 0);
 
+#if GTK_CHECK_VERSION(3,0,0)
+    sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
+#else
     sep = gtk_hseparator_new();
+#endif
+
     gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, TRUE, 0);
 
+#if GTK_CHECK_VERSION(3,0,0)
+    bbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
+#else
     bbox = gtk_hbutton_box_new();
+#endif
+
     gtk_container_set_border_width(GTK_CONTAINER(bbox), 4);
     gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
     gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 4bbe15224..5c3c46502 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -256,7 +256,13 @@ void ColorNotebook::init()
         }
     }
 
+#if GTK_CHECK_VERSION(3,0,0)
+    _buttonbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
+    gtk_box_set_homogeneous(GTK_BOX(_buttonbox), TRUE);
+#else
     _buttonbox = gtk_hbox_new (TRUE, 2);
+#endif
+
     gtk_widget_show (_buttonbox);
     _buttons = new GtkWidget *[_trackerList->len];