Merged trunk

(bzr r14954.1.30)

1 files changed, 5 insertions, 16 deletions

diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index 6276d3391..04cf9d02a 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -98,11 +98,7 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) {
     tabs->append_page(*manage(
         make_scrolled_text(license_text)), _("_License"), true);
 
-#if WITH_GTKMM_3_0
     get_content_area()->pack_end(*manage(tabs), true, true);
-#else
-    get_vbox()->pack_end(*manage(tabs), true, true);
-#endif
 
     tabs->show_all();
 
@@ -130,23 +126,16 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) {
     link->set_selectable(true);
     link->show();
 
-#if WITH_GTKMM_3_0
     get_content_area()->pack_start(*manage(label), false, false);
     get_content_area()->pack_start(*manage(link), false, false);
-#else
-    get_vbox()->pack_start(*manage(label), false, false);
-    get_vbox()->pack_start(*manage(link), false, false);
-#endif
 
-    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
+    Gtk::Requisition minimum_size;
+    Gtk::Requisition natural_size;
+    get_preferred_size(minimum_size, natural_size);
+    
     // allow window to shrink
     set_size_request(0, 0);
-    set_default_size(requisition.width, requisition.height);
+    set_default_size(minimum_size.width, minimum_size.height);
 }