Work around for some missing glibmm headers in gtkmm (should be fixed in gtkmm 3.4)

(bzr r11261)

7 files changed, 215 insertions, 0 deletions

diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index 676cb9b59..98b9125f6 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -30,6 +30,15 @@ static void sp_button_init (SPButton *button);
 static void sp_button_destroy (GtkObject *object);
 
 static void sp_button_size_request (GtkWidget *widget, GtkRequisition *requisition);
+
+static void sp_button_get_preferred_width(GtkWidget *widget, 
+                                          gint *minimal_width,
+					  gint *natural_width);
+
+static void sp_button_get_preferred_height(GtkWidget *widget, 
+                                           gint *minimal_height,
+					   gint *natural_height);
+
 static void sp_button_clicked (GtkButton *button);
 static void sp_button_perform_action (SPButton *button, gpointer data);
 static gint sp_button_process_event (SPButton *button, GdkEvent *event);
@@ -72,7 +81,12 @@ sp_button_class_init (SPButtonClass *klass)
 	parent_class = (GtkToggleButtonClass *)g_type_class_peek_parent (klass);
 
 	object_class->destroy = sp_button_destroy;
+#if GTK_CHECK_VERSION(3,0,0)
+	widget_class->get_preferred_width = sp_button_get_preferred_width;
+	widget_class->get_preferred_height = sp_button_get_preferred_height;
+#else
 	widget_class->size_request = sp_button_size_request;
+#endif
 	button_class->clicked = sp_button_clicked;
 }
 
@@ -129,6 +143,20 @@ sp_button_size_request (GtkWidget *widget, GtkRequisition *requisition)
 	requisition->height += 2 + 2 * MAX (2, style->ythickness);
 }
 
+static void sp_button_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width)
+{
+	GtkRequisition requisition;
+	sp_button_size_request(widget, &requisition);
+	*minimal_width = *natural_width = requisition.width;
+}
+
+static void sp_button_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height)
+{
+	GtkRequisition requisition;
+	sp_button_size_request(widget, &requisition);
+	*minimal_height = *natural_height = requisition.height;
+}
+
 static void
 sp_button_clicked (GtkButton *button)
 {
diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp
index 134cf9342..e03216893 100644
--- a/src/widgets/eek-preview.cpp
+++ b/src/widgets/eek-preview.cpp
@@ -177,6 +177,20 @@ static void eek_preview_size_request( GtkWidget* widget, GtkRequisition* req )
     req->height = height;
 }
 
+static void eek_preview_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width)
+{
+	GtkRequisition requisition;
+	eek_preview_size_request(widget, &requisition);
+	*minimal_width = *natural_width = requisition.width;
+}
+
+static void eek_preview_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height)
+{
+	GtkRequisition requisition;
+	eek_preview_size_request(widget, &requisition);
+	*minimal_height = *natural_height = requisition.height;
+}
+
 enum {
   CLICKED_SIGNAL,
   ALTCLICKED_SIGNAL,
@@ -578,7 +592,12 @@ static void eek_preview_class_init( EekPreviewClass *klass )
     /*widgetClass->unmap = ;*/
     /*widgetClass->realize = ;*/
     /*widgetClass->unrealize = ;*/
+#if GTK_CHECK_VERSION(3,0,0)
+    widgetClass->get_preferred_width = eek_preview_get_preferred_width;
+    widgetClass->get_preferred_height = eek_preview_get_preferred_height;
+#else
     widgetClass->size_request = eek_preview_size_request;
+#endif
     /*widgetClass->size_allocate = ;*/
     /*widgetClass->state_changed = ;*/
     /*widgetClass->style_set = ;*/
diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index b835dc36b..5beea3249 100644
--- a/src/widgets/gradient-image.cpp
+++ b/src/widgets/gradient-image.cpp
@@ -28,6 +28,15 @@ static void sp_gradient_image_init (SPGradientImage *image);
 static void sp_gradient_image_destroy (GtkObject *object);
 
 static void sp_gradient_image_size_request (GtkWidget *widget, GtkRequisition *requisition);
+
+static void sp_gradient_image_get_preferred_width(GtkWidget *widget, 
+                                                   gint *minimal_width,
+						   gint *natural_width);
+
+static void sp_gradient_image_get_preferred_height(GtkWidget *widget, 
+                                                    gint *minimal_height,
+						    gint *natural_height);
+
 static gint sp_gradient_image_expose (GtkWidget *widget, GdkEventExpose *event);
 
 static void sp_gradient_image_gradient_release (SPObject *, SPGradientImage *im);
@@ -69,7 +78,12 @@ sp_gradient_image_class_init (SPGradientImageClass *klass)
 
 	object_class->destroy = sp_gradient_image_destroy;
 
+#if GTK_CHECK_VERSION(3,0,0)
+	widget_class->get_preferred_width = sp_gradient_image_get_preferred_width;
+	widget_class->get_preferred_height = sp_gradient_image_get_preferred_height;
+#else
 	widget_class->size_request = sp_gradient_image_size_request;
+#endif
 	widget_class->expose_event = sp_gradient_image_expose;
 }
 
@@ -110,6 +124,20 @@ static void sp_gradient_image_size_request(GtkWidget * /*widget*/, GtkRequisitio
     requisition->height = 12;
 }
 
+static void sp_gradient_image_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width)
+{
+	GtkRequisition requisition;
+	sp_gradient_image_size_request(widget, &requisition);
+	*minimal_width = *natural_width = requisition.width;
+}
+
+static void sp_gradient_image_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height)
+{
+	GtkRequisition requisition;
+	sp_gradient_image_size_request(widget, &requisition);
+	*minimal_height = *natural_height = requisition.height;
+}
+
 static gint
 sp_gradient_image_expose (GtkWidget *widget, GdkEventExpose *event)
 {
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 7f027870d..a58645015 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -61,6 +61,15 @@ struct IconImpl {
     static void clear(SPIcon *icon);
 
     static void sizeRequest(GtkWidget *widget, GtkRequisition *requisition);
+    
+    static void getPreferredWidth(GtkWidget *widget, 
+		    gint *minimal_width,
+		    gint *natural_width);
+
+    static void getPreferredHeight(GtkWidget *widget, 
+		    gint *minimal_height,
+		    gint *natural_height);
+
     static void sizeAllocate(GtkWidget *widget, GtkAllocation *allocation);
     static int expose(GtkWidget *widget, GdkEventExpose *event);
 
@@ -172,7 +181,12 @@ void IconImpl::classInit(SPIconClass *klass)
 
     object_class->dispose = IconImpl::dispose;
 
+#if GTK_CHECK_VERSION(3,0,0)
+    widget_class->get_preferred_width = IconImpl::getPreferredWidth;
+    widget_class->get_preferred_height = IconImpl::getPreferredHeight;
+#else
     widget_class->size_request = IconImpl::sizeRequest;
+#endif
     widget_class->size_allocate = IconImpl::sizeAllocate;
     widget_class->expose_event = IconImpl::expose;
     widget_class->screen_changed = IconImpl::screenChanged;
@@ -225,6 +239,20 @@ void IconImpl::sizeRequest(GtkWidget *widget, GtkRequisition *requisition)
     requisition->height = size;
 }
 
+void IconImpl::getPreferredWidth(GtkWidget *widget, gint *minimal_width, gint *natural_width)
+{
+	GtkRequisition requisition;
+	sizeRequest(widget, &requisition);
+	*minimal_width = *natural_width = requisition.width;
+}
+
+void IconImpl::getPreferredHeight(GtkWidget *widget, gint *minimal_height, gint *natural_height)
+{
+	GtkRequisition requisition;
+	sizeRequest(widget, &requisition);
+	*minimal_height = *natural_height = requisition.height;
+}
+
 void IconImpl::sizeAllocate(GtkWidget *widget, GtkAllocation *allocation)
 {
     gtk_widget_set_allocation(widget, allocation);
diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp
index a76bf3081..dd6ec1cc4 100644
--- a/src/widgets/ruler.cpp
+++ b/src/widgets/ruler.cpp
@@ -61,6 +61,15 @@ static void     gtk_deprecated_ruler_realize         (GtkWidget      *widget);
 static void     gtk_deprecated_ruler_unrealize       (GtkWidget      *widget);
 static void     gtk_deprecated_ruler_size_request    (GtkWidget      *widget,
                                                       GtkRequisition *requisition);
+
+static void     gtk_deprecated_ruler_get_preferred_width(GtkWidget *widget, 
+                                                         gint *minimal_width,
+							 gint *natural_width);
+
+static void     gtk_deprecated_ruler_get_preferred_height(GtkWidget *widget, 
+                                                    gint *minimal_height,
+						    gint *natural_height);
+
 static void     gtk_deprecated_ruler_size_allocate   (GtkWidget      *widget,
                                                       GtkAllocation  *allocation);
 static gboolean gtk_deprecated_ruler_motion_notify   (GtkWidget      *widget,
@@ -96,7 +105,12 @@ gtk_deprecated_ruler_class_init (GtkDeprecatedRulerClass *klass)
 
   widget_class->realize = gtk_deprecated_ruler_realize;
   widget_class->unrealize = gtk_deprecated_ruler_unrealize;
+#if GTK_CHECK_VERSION(3,0,0)
+  widget_class->get_preferred_width = gtk_deprecated_ruler_get_preferred_width;
+  widget_class->get_preferred_height = gtk_deprecated_ruler_get_preferred_height;
+#else
   widget_class->size_request = gtk_deprecated_ruler_size_request;
+#endif
   widget_class->size_allocate = gtk_deprecated_ruler_size_allocate;
   widget_class->motion_notify_event = gtk_deprecated_ruler_motion_notify;
   widget_class->expose_event = gtk_deprecated_ruler_expose;
@@ -470,6 +484,20 @@ gtk_deprecated_ruler_size_request (GtkWidget      *widget,
     }
 }
 
+static void gtk_deprecated_ruler_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width)
+{
+	GtkRequisition requisition;
+	gtk_deprecated_ruler_size_request(widget, &requisition);
+	*minimal_width = *natural_width = requisition.width;
+}
+
+static void gtk_deprecated_ruler_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height)
+{
+	GtkRequisition requisition;
+	gtk_deprecated_ruler_size_request(widget, &requisition);
+	*minimal_height = *natural_height = requisition.height;
+}
+
 static void
 gtk_deprecated_ruler_size_allocate (GtkWidget     *widget,
 			 GtkAllocation *allocation)
@@ -995,6 +1023,14 @@ static gint sp_vruler_motion_notify (GtkWidget      *widget,
 				      GdkEventMotion *event);
 static void sp_vruler_size_request (GtkWidget *widget, GtkRequisition *requisition);
 
+static void sp_vruler_get_preferred_width(GtkWidget *widget, 
+                                          gint *minimal_width,
+					  gint *natural_width);
+
+static void sp_vruler_get_preferred_height(GtkWidget *widget, 
+                                           gint *minimal_height,
+					   gint *natural_height);
+
 static GtkWidgetClass *vruler_parent_class;
 
 GType
@@ -1033,7 +1069,13 @@ sp_vruler_class_init (SPVRulerClass *klass)
   ruler_class = (GtkDeprecatedRulerClass*) klass;
 
   widget_class->motion_notify_event = sp_vruler_motion_notify;
+
+#if GTK_CHECK_VERSION(3,0,0)
+  widget_class->get_preferred_width = sp_vruler_get_preferred_width;
+  widget_class->get_preferred_height = sp_vruler_get_preferred_height;
+#else
   widget_class->size_request = sp_vruler_size_request;
+#endif
 
   ruler_class->draw_ticks = sp_ruler_common_draw_ticks;
 }
@@ -1091,6 +1133,20 @@ sp_vruler_size_request (GtkWidget *widget, GtkRequisition *requisition)
   requisition->width = style->xthickness * 2 + RULER_WIDTH;
 }
 
+static void sp_vruler_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width)
+{
+	GtkRequisition requisition;
+	sp_vruler_size_request(widget, &requisition);
+	*minimal_width = *natural_width = requisition.width;
+}
+
+static void sp_vruler_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height)
+{
+	GtkRequisition requisition;
+	sp_vruler_size_request(widget, &requisition);
+	*minimal_height = *natural_height = requisition.height;
+}
+
 static void
 sp_ruler_common_draw_ticks(GtkDeprecatedRuler *ruler)
 {
diff --git a/src/widgets/sp-color-slider.cpp b/src/widgets/sp-color-slider.cpp
index b74be502b..c983a4302 100644
--- a/src/widgets/sp-color-slider.cpp
+++ b/src/widgets/sp-color-slider.cpp
@@ -32,6 +32,15 @@ static void sp_color_slider_destroy (GtkObject *object);
 
 static void sp_color_slider_realize (GtkWidget *widget);
 static void sp_color_slider_size_request (GtkWidget *widget, GtkRequisition *requisition);
+
+static void sp_color_slider_get_preferred_width(GtkWidget *widget, 
+                                                   gint *minimal_width,
+						   gint *natural_width);
+
+static void sp_color_slider_get_preferred_height(GtkWidget *widget, 
+                                                    gint *minimal_height,
+						    gint *natural_height);
+
 static void sp_color_slider_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
 /*  static void sp_color_slider_draw (GtkWidget *widget, GdkRectangle *area); */
 /*  static void sp_color_slider_draw_focus (GtkWidget *widget); */
@@ -117,7 +126,12 @@ sp_color_slider_class_init (SPColorSliderClass *klass)
 	object_class->destroy = sp_color_slider_destroy;
 
 	widget_class->realize = sp_color_slider_realize;
+#if GTK_CHECK_VERSION(3,0,0)
+	widget_class->get_preferred_width = sp_color_slider_get_preferred_width;
+	widget_class->get_preferred_height = sp_color_slider_get_preferred_height;
+#else
 	widget_class->size_request = sp_color_slider_size_request;
+#endif
 	widget_class->size_allocate = sp_color_slider_size_allocate;
 /*  	widget_class->draw = sp_color_slider_draw; */
 /*  	widget_class->draw_focus = sp_color_slider_draw_focus; */
@@ -225,6 +239,20 @@ sp_color_slider_size_request (GtkWidget *widget, GtkRequisition *requisition)
 	requisition->height = SLIDER_HEIGHT + style->ythickness * 2;
 }
 
+static void sp_color_slider_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width)
+{
+	GtkRequisition requisition;
+	sp_color_slider_size_request(widget, &requisition);
+	*minimal_width = *natural_width = requisition.width;
+}
+
+static void sp_color_slider_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height)
+{
+	GtkRequisition requisition;
+	sp_color_slider_size_request(widget, &requisition);
+	*minimal_height = *natural_height = requisition.height;
+}
+
 static void
 sp_color_slider_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 {
diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index 8645d90f7..8225b6923 100644
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -35,6 +35,15 @@ static void sp_widget_show (GtkWidget *widget);
 static void sp_widget_hide (GtkWidget *widget);
 static gint sp_widget_expose (GtkWidget *widget, GdkEventExpose *event);
 static void sp_widget_size_request (GtkWidget *widget, GtkRequisition *requisition);
+
+static void sp_widget_get_preferred_width(GtkWidget *widget, 
+                                                   gint *minimal_width,
+						   gint *natural_width);
+
+static void sp_widget_get_preferred_height(GtkWidget *widget, 
+                                                    gint *minimal_height,
+						    gint *natural_height);
+
 static void sp_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
 
 static void sp_widget_modify_selection (Inkscape::Application *inkscape, Inkscape::Selection *selection, guint flags, SPWidget *spw);
@@ -115,7 +124,12 @@ sp_widget_class_init (SPWidgetClass *klass)
 	widget_class->show = sp_widget_show;
 	widget_class->hide = sp_widget_hide;
 	widget_class->expose_event = sp_widget_expose;
+#if GTK_CHECK_VERSION(3,0,0)
+	widget_class->get_preferred_width = sp_widget_get_preferred_width;
+	widget_class->get_preferred_height = sp_widget_get_preferred_height;
+#else
 	widget_class->size_request = sp_widget_size_request;
+#endif
 	widget_class->size_allocate = sp_widget_size_allocate;
 }
 
@@ -212,6 +226,20 @@ sp_widget_size_request (GtkWidget *widget, GtkRequisition *requisition)
 		gtk_widget_size_request (child, requisition);
 }
 
+static void sp_widget_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width)
+{
+	GtkRequisition requisition;
+	sp_widget_size_request(widget, &requisition);
+	*minimal_width = *natural_width = requisition.width;
+}
+
+static void sp_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height)
+{
+	GtkRequisition requisition;
+	sp_widget_size_request(widget, &requisition);
+	*minimal_height = *natural_height = requisition.height;
+}
+
 static void
 sp_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 {