Trunk merge

(bzr r11073.1.15)

1 files changed, 48 insertions, 3 deletions

diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index d67160483..3f34c8ad1 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -167,7 +167,7 @@ sp_paint_selector_class_init(SPPaintSelectorClass *klass)
                                                 G_STRUCT_OFFSET(SPPaintSelectorClass, mode_changed),
 						NULL, NULL,
                                                 g_cclosure_marshal_VOID__UINT,
-                                                G_TYPE_NONE, 1, GTK_TYPE_UINT);
+                                                G_TYPE_NONE, 1, G_TYPE_UINT);
     psel_signals[GRABBED] =  g_signal_new("grabbed",
                                             G_TYPE_FROM_CLASS(object_class),
                                             (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE),
@@ -202,7 +202,7 @@ sp_paint_selector_class_init(SPPaintSelectorClass *klass)
                                                     G_STRUCT_OFFSET(SPPaintSelectorClass, fillrule_changed),
 						    NULL, NULL,
                                                     g_cclosure_marshal_VOID__UINT,
-                                                    G_TYPE_NONE, 1, GTK_TYPE_UINT);
+                                                    G_TYPE_NONE, 1, G_TYPE_UINT);
 
     object_class->destroy = sp_paint_selector_destroy;
 }
@@ -216,7 +216,12 @@ sp_paint_selector_init(SPPaintSelector *psel)
     psel->mode = static_cast<SPPaintSelector::Mode>(-1); // huh?  do you mean 0xff?  --  I think this means "not in the enum"
 
     /* Paint style button box */
+#if GTK_CHECK_VERSION(3,0,0)
+    psel->style = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+    gtk_box_set_homogeneous(GTK_BOX(psel->style), FALSE);
+#else
     psel->style = gtk_hbox_new(FALSE, 0);
+#endif
     gtk_widget_show(psel->style);
     gtk_container_set_border_width(GTK_CONTAINER(psel->style), 4);
     gtk_box_pack_start(GTK_BOX(psel), psel->style, FALSE, FALSE, 0);
@@ -239,7 +244,12 @@ sp_paint_selector_init(SPPaintSelector *psel)
 
     /* Fillrule */
     {
+#if GTK_CHECK_VERSION(3,0,0)
+	psel->fillrulebox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+	gtk_box_set_homogeneous(GTK_BOX(psel->fillrulebox), FALSE);
+#else
         psel->fillrulebox = gtk_hbox_new(FALSE, 0);
+#endif
         gtk_box_pack_end(GTK_BOX(psel->style), psel->fillrulebox, FALSE, FALSE, 0);
 
         GtkWidget *w;
@@ -268,12 +278,22 @@ sp_paint_selector_init(SPPaintSelector *psel)
 
     /* Frame */
     psel->label = gtk_label_new("");
+#if GTK_CHECK_VERSION(3,0,0)
+    GtkWidget *lbbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
+    gtk_box_set_homogeneous(GTK_BOX(lbbox), FALSE);
+#else
     GtkWidget *lbbox = gtk_hbox_new(FALSE, 4);
+#endif
     gtk_widget_show(psel->label);
     gtk_box_pack_start(GTK_BOX(lbbox), psel->label, false, false, 4);
     gtk_box_pack_start(GTK_BOX(psel), lbbox, false, false, 4);
 
+#if GTK_CHECK_VERSION(3,0,0)
+    psel->frame = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
+    gtk_box_new(GTK_BOX(psel->frame), FALSE);
+#else
     psel->frame = gtk_vbox_new(FALSE, 4);
+#endif
     gtk_widget_show(psel->frame);
     //gtk_container_set_border_width(GTK_CONTAINER(psel->frame), 0);
     gtk_box_pack_start(GTK_BOX(psel), psel->frame, TRUE, TRUE, 0);
@@ -657,7 +677,12 @@ static void sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelec
         sp_paint_selector_clear_frame(psel);
         /* Create new color selector */
         /* Create vbox */
+#if GTK_CHECK_VERSION(3,0,0)
+	GtkWidget *vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
+	gtk_box_new(GTK_BOX(vb), FALSE);
+#else
         GtkWidget *vb = gtk_vbox_new(FALSE, 4);
+#endif
         gtk_widget_show(vb);
 
         /* Color selector */
@@ -820,7 +845,12 @@ sp_pattern_menu_build (GtkWidget *m, GSList *pattern_list, SPDocument */*source*
         gchar const *patid = repr->attribute("id");
         g_object_set_data (G_OBJECT(i), "pattern", (void *) patid);
 
+#if GTK_CHECK_VERSION(3,0,0)
+                GtkWidget *hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
+                gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
+#else
                 GtkWidget *hb = gtk_hbox_new(FALSE, 4);
+#endif
                 gtk_widget_show(hb);
 
         // create label
@@ -955,7 +985,7 @@ void SPPaintSelector::updatePatternList( SPPattern *pattern )
 
         GtkMenu *m = GTK_MENU(gtk_option_menu_get_menu(GTK_OPTION_MENU(mnu)));
 
-        GList *kids = GTK_MENU_SHELL(m)->children;
+        GList *kids = gtk_container_get_children(GTK_CONTAINER(m));
 
         int patpos = 0;
         int i = 0;
@@ -993,11 +1023,21 @@ static void sp_paint_selector_set_mode_pattern(SPPaintSelector *psel, SPPaintSel
         sp_paint_selector_clear_frame(psel);
 
         /* Create vbox */
+#if GTK_CHECK_VERSION(3,0,0)
+	tbl = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
+	gtk_box_new(GTK_BOX(tbl), FALSE);
+#else
         tbl = gtk_vbox_new(FALSE, 4);
+#endif
         gtk_widget_show(tbl);
 
         {
+#if GTK_CHECK_VERSION(3,0,0)
+            GtkWidget *hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
+            gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
+#else
             GtkWidget *hb = gtk_hbox_new(FALSE, 1);
+#endif
 
             GtkWidget *mnu = gtk_option_menu_new();
             ink_pattern_menu(mnu);
@@ -1011,7 +1051,12 @@ static void sp_paint_selector_set_mode_pattern(SPPaintSelector *psel, SPPaintSel
         }
 
         {
+#if GTK_CHECK_VERSION(3,0,0)
+            GtkWidget *hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+            gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
+#else
             GtkWidget *hb = gtk_hbox_new(FALSE, 0);
+#endif
             GtkWidget *l = gtk_label_new(NULL);
             gtk_label_set_markup(GTK_LABEL(l), _("Use the <b>Node tool</b> to adjust position, scale, and rotation of the pattern on canvas. Use <b>Object &gt; Pattern &gt; Objects to Pattern</b> to create a new pattern from selection."));
             gtk_label_set_line_wrap(GTK_LABEL(l), true);