Replace deprecated gtk_vbox_new and gtk_widget_size_request

(bzr r11213)

9 files changed, 100 insertions, 0 deletions

diff --git a/src/dialogs/find.cpp b/src/dialogs/find.cpp
index b0a4e36cc..3bd22b8eb 100644
--- a/src/dialogs/find.cpp
+++ b/src/dialogs/find.cpp
@@ -108,7 +108,11 @@ void
 sp_find_squeeze_window()
 {
     GtkRequisition r;
+#if GTK_CHECK_VERSION(3,0,0)
+    gtk_widget_get_preferred_size(dlg, &r, NULL);
+#else
     gtk_widget_size_request(dlg, &r);
+#endif
     gtk_window_resize ((GtkWindow *) dlg, r.width, r.height);
 }
 
@@ -549,7 +553,12 @@ sp_find_types_checkbox_indented (GtkWidget *w, const gchar *data, gboolean activ
 GtkWidget *
 sp_find_types ()
 {
+#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);
 
     {
@@ -576,7 +585,12 @@ sp_find_types ()
     }
 
     {
+#if GTK_CHECK_VERSION(3,0,0)
+        GtkWidget *vb_all = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+        gtk_box_new(GTK_BOX(vb_all), FALSE);
+#else
         GtkWidget *vb_all = gtk_vbox_new (FALSE, 0);
+#endif
         gtk_widget_show (vb_all);
 
         {
@@ -719,7 +733,12 @@ sp_find_dialog_old (void)
         gtk_container_set_border_width (GTK_CONTAINER (dlg), 4);
 
         /* Toplevel vbox */
+#if GTK_CHECK_VERSION(3,0,0)
+        GtkWidget *vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+        gtk_box_new(GTK_BOX(vb), FALSE);
+#else
         GtkWidget *vb = gtk_vbox_new (FALSE, 0);
+#endif
         gtk_container_add (GTK_CONTAINER (dlg), vb);
 
         sp_find_new_searchfield (dlg, vb, _("_Text:"), "text", _("Find objects by their text content (exact or partial match)"));
diff --git a/src/ink-comboboxentry-action.cpp b/src/ink-comboboxentry-action.cpp
index b9dac24e9..6b5266709 100644
--- a/src/ink-comboboxentry-action.cpp
+++ b/src/ink-comboboxentry-action.cpp
@@ -378,7 +378,11 @@ GtkWidget* create_tool_item( GtkAction* action )
     // Optionally widen the combobox width... which widens the drop-down list in list mode.
     if( ink_comboboxentry_action->extra_width > 0 ) {
       GtkRequisition req;
+#if GTK_CHECK_VERSION(3,0,0)
+      gtk_widget_get_preferred_size(GTK_WIDGET(ink_comboboxentry_action->combobox), &req, NULL);
+#else
       gtk_widget_size_request( GTK_WIDGET( ink_comboboxentry_action->combobox ), &req );
+#endif
       gtk_widget_set_size_request( GTK_WIDGET( ink_comboboxentry_action->combobox ),
 				   req.width + ink_comboboxentry_action->extra_width, -1 );
     }
@@ -527,7 +531,11 @@ void ink_comboboxentry_action_set_extra_width( Ink_ComboBoxEntry_Action* action,
   // Widget may not have been created....
   if( action->combobox ) {
     GtkRequisition req;
+#if GTK_CHECK_VERSION(3,0,0)
+    gtk_widget_get_preferred_size(GTK_WIDGET(action->combobox), &req, NULL);
+#else
     gtk_widget_size_request( GTK_WIDGET( action->combobox ), &req );
+#endif
     gtk_widget_set_size_request( GTK_WIDGET( action->combobox ), req.width + action->extra_width, -1 );
   }
 }
diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index f6adc71c0..885846685 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -121,7 +121,11 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) {
     get_vbox()->pack_start(*manage(label), false, false);
 
     Gtk::Requisition requisition;
+#if GTK_CHECK_VERSION(3,0,0)
+    gtk_widget_get_preferred_size(reinterpret_cast<GtkWidget*>(gobj()), &requisition, NULL);
+#else
     gtk_widget_size_request (reinterpret_cast<GtkWidget*>(gobj()), &requisition);
+#endif
     // allow window to shrink
     set_size_request(0, 0);
     set_default_size(requisition.width, requisition.height);
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index 2e44a1132..7b7c66553 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -93,7 +93,12 @@ CloneTiler::CloneTiler (void) :
 
         dlg = GTK_WIDGET(gobj());
 
+#if GTK_CHECK_VERSION(3,0,0)
+        GtkWidget *mainbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
+        gtk_box_new(GTK_BOX(mainbox), FALSE);
+#else
         GtkWidget *mainbox = gtk_vbox_new(FALSE, 4);
+#endif
         gtk_container_set_border_width (GTK_CONTAINER (mainbox), 6);
 
         contents->pack_start (*Gtk::manage(Glib::wrap(mainbox)), true, true, 0);
@@ -796,7 +801,12 @@ CloneTiler::CloneTiler (void) :
         }
 
         {
+#if GTK_CHECK_VERSION(3,0,0)
+            GtkWidget *vvb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+            gtk_box_new(GTK_BOX(vvb), FALSE);
+#else
             GtkWidget *vvb = gtk_vbox_new (FALSE, 0);
+#endif
             gtk_box_pack_start (GTK_BOX (vb), vvb, FALSE, FALSE, 0);
             g_object_set_data (G_OBJECT(dlg), "dotrace", (gpointer) vvb);
 
@@ -2574,7 +2584,12 @@ void CloneTiler::clonetiler_apply(GtkWidget */*widget*/, GtkWidget *dlg)
 GtkWidget * CloneTiler::clonetiler_new_tab(GtkWidget *nb, const gchar *label)
 {
     GtkWidget *l = gtk_label_new_with_mnemonic (label);
+#if GTK_CHECK_VERSION(3,0,0)
+    GtkWidget *vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, VB_MARGIN);
+    gtk_box_new(GTK_BOX(vb), FALSE);
+#else
     GtkWidget *vb = gtk_vbox_new (FALSE, VB_MARGIN);
+#endif
     gtk_container_set_border_width (GTK_CONTAINER (vb), VB_MARGIN);
     gtk_notebook_append_page (GTK_NOTEBOOK (nb), vb, l);
     return vb;
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index c5c278e2d..44d3c2f9a 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -332,7 +332,12 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     dtw->_interaction_disabled_counter = 0;
 
     /* Main table */
+#if GTK_CHECK_VERSION(3,0,0)
+    dtw->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+    gtk_box_new(GTK_BOX(dtw->vbox), FALSE);
+#else
     dtw->vbox = gtk_vbox_new (FALSE, 0);
+#endif
     gtk_container_add( GTK_CONTAINER(dtw), GTK_WIDGET(dtw->vbox) );
 
 #if GTK_CHECK_VERSION(3,0,0)
@@ -412,7 +417,12 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     gtk_table_attach (GTK_TABLE (canvas_tbl), dtw->hscrollbar, 1, 2, 2, 3, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(GTK_SHRINK), 0, 0);
 
     /* Vertical scrollbar and the sticky zoom button */
+#if GTK_CHECK_VERSION(3,0,0)
+    dtw->vscrollbar_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+    gtk_box_new(GTK_BOX(dtw->vscrollbar_box), FALSE);
+#else
     dtw->vscrollbar_box = gtk_vbox_new (FALSE, 0);
+#endif
     dtw->sticky_zoom = sp_button_new_from_data ( Inkscape::ICON_SIZE_DECORATION,
                                                  SP_BUTTON_TYPE_TOGGLE,
                                                  NULL,
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index ba6fca16a..ff361a6b8 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -176,7 +176,12 @@ static void sp_font_selector_init(SPFontSelector *fsel)
         gtk_widget_show(f);
         gtk_box_pack_start(GTK_BOX (fsel), f, TRUE, TRUE, 0);
 
+#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);
         gtk_container_set_border_width(GTK_CONTAINER (vb), 4);
         gtk_container_add(GTK_CONTAINER(f), vb);
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 13b112dc6..d97f79cd4 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -288,7 +288,12 @@ sp_paint_selector_init(SPPaintSelector *psel)
     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);
@@ -672,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 */
@@ -1013,7 +1023,12 @@ 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);
 
         {
diff --git a/src/widgets/shrink-wrap-button.cpp b/src/widgets/shrink-wrap-button.cpp
index ba422034e..8d5bad21c 100644
--- a/src/widgets/shrink-wrap-button.cpp
+++ b/src/widgets/shrink-wrap-button.cpp
@@ -21,7 +21,11 @@ void minimum_size(GtkWidget *widget, GtkRequisition *requisition, void *) {
     GtkWidget *child(gtk_bin_get_child(GTK_BIN(widget)));
 
     if (child) {
+#if GTK_CHECK_VERSION(3,0,0)
+        gtk_widget_get_preferred_size(child, requisition, NULL);
+#else
         gtk_widget_size_request(child, requisition);
+#endif
     } else {
         requisition->width = 0;
         requisition->height = 0;
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index ff9718815..aa87fb873 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -1058,14 +1058,24 @@ static GtkWidget* toolboxNewCommon( GtkWidget* tb, BarId id, GtkPositionType han
 
 GtkWidget *ToolboxFactory::createToolToolbox()
 {
+#if GTK_CHECK_VERSION(3,0,0)
+    GtkWidget *tb = gtk_box_new(GTK_ORIENTATION, 0);
+    gtk_box_new(GTK_BOX(tb), FALSE);
+#else
     GtkWidget *tb = gtk_vbox_new(FALSE, 0);
+#endif
 
     return toolboxNewCommon( tb, BAR_TOOL, GTK_POS_TOP );
 }
 
 GtkWidget *ToolboxFactory::createAuxToolbox()
 {
+#if GTK_CHECK_VERSION(3,0,0)
+    GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+    gtk_box_new(GTK_BOX(tb), FALSE);
+#else
     GtkWidget *tb = gtk_vbox_new(FALSE, 0);
+#endif
 
     return toolboxNewCommon( tb, BAR_AUX, GTK_POS_LEFT );
 }
@@ -1076,14 +1086,24 @@ GtkWidget *ToolboxFactory::createAuxToolbox()
 
 GtkWidget *ToolboxFactory::createCommandsToolbox()
 {
+#if GTK_CHECK_VERSION(3,0,0)
+    GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+    gtk_box_new(GTK_BOX(tb), FALSE);
+#else
     GtkWidget *tb = gtk_vbox_new(FALSE, 0);
+#endif
 
     return toolboxNewCommon( tb, BAR_COMMANDS, GTK_POS_LEFT );
 }
 
 GtkWidget *ToolboxFactory::createSnapToolbox()
 {
+#if GTK_CHECK_VERSION(3,0,0)
+    GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+    gtk_box_new(GTK_BOX(tb), FALSE);
+#else
     GtkWidget *tb = gtk_vbox_new(FALSE, 0);
+#endif
 
     return toolboxNewCommon( tb, BAR_SNAP, GTK_POS_LEFT );
 }