Trunk merge

(bzr r11073.1.20)

1 files changed, 32 insertions, 0 deletions

diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index b835dc36b..114d76293 100644
--- a/src/widgets/gradient-image.cpp
+++ b/src/widgets/gradient-image.cpp
@@ -28,6 +28,17 @@ 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);
+
+#if GTK_CHECK_VERSION(3,0,0)
+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);
+#endif
+
 static gint sp_gradient_image_expose (GtkWidget *widget, GdkEventExpose *event);
 
 static void sp_gradient_image_gradient_release (SPObject *, SPGradientImage *im);
@@ -69,7 +80,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 +126,22 @@ static void sp_gradient_image_size_request(GtkWidget * /*widget*/, GtkRequisitio
     requisition->height = 12;
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+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;
+}
+#endif
+
 static gint
 sp_gradient_image_expose (GtkWidget *widget, GdkEventExpose *event)
 {