[libgda/gtk3] Correction for bug #635819 - gtk 3 branch doesn't build anymore

[Vivien Malerba <vivien src gnome org>]

commit 396f32f42d0c2e2bfe094b76804db733e4feb8d6
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sat Nov 27 16:25:22 2010 +0100

    Correction for bug #635819 - gtk 3 branch doesn't build anymore
    
    don't use the size_request vfunc anymore

 control-center/cc-gray-bar.c             |   35 +++++++++++++++++++++++++----
 libgda-ui/data-entries/widget-embedder.c |   33 ++++++++++++++++++++++++---
 2 files changed, 59 insertions(+), 9 deletions(-)
---
diff --git a/control-center/cc-gray-bar.c b/control-center/cc-gray-bar.c
index 0c5e3cd..7feb6dd 100644
--- a/control-center/cc-gray-bar.c
+++ b/control-center/cc-gray-bar.c
@@ -36,8 +36,12 @@ static void cc_gray_bar_class_init   (CcGrayBarClass *klass);
 static void cc_gray_bar_init         (CcGrayBar      *bar,
 				      CcGrayBarClass *klass);
 static void cc_gray_bar_realize      (GtkWidget           *widget);
-static void cc_gray_bar_size_request (GtkWidget           *widget,
-				      GtkRequisition      *requisition);
+static void cc_gray_bar_get_preferred_width  (GtkWidget *widget,
+					      gint      *minimum,
+					      gint      *natural);
+static void cc_gray_bar_get_preferred_height (GtkWidget *widget,
+					      gint      *minimum,
+					      gint      *natural);
 static void cc_gray_bar_allocate     (GtkWidget           *widget,
 				      GtkAllocation       *allocation);
 static void cc_gray_bar_paint        (GtkWidget           *widget,
@@ -127,14 +131,34 @@ cc_gray_bar_size_request (GtkWidget *widget, GtkRequisition *requisition)
 	if (child)
 		g_object_get ((GObject*) child, "visible", &visible, NULL);
 	if (visible) {
-		gtk_widget_size_request (child, &child_requisition);
-
+		gtk_widget_get_preferred_size (child, &child_requisition, NULL);
 		requisition->width += child_requisition.width;
 		requisition->height += child_requisition.height;
 	}
 }
 
 static void
+cc_gray_bar_get_preferred_width (GtkWidget *widget,
+				 gint      *minimum,
+				 gint      *natural)
+{
+	GtkRequisition requisition;
+	cc_gray_bar_size_request (widget, &requisition);
+	*minimum = *natural = requisition.width;
+}
+
+static void
+cc_gray_bar_get_preferred_height (GtkWidget *widget,
+				  gint      *minimum,
+				  gint      *natural)
+{
+	GtkRequisition requisition;
+	cc_gray_bar_size_request (widget, &requisition);
+	*minimum = *natural = requisition.height;
+}
+
+
+static void
 cc_gray_bar_allocate (GtkWidget *widget, GtkAllocation *allocation)
 {
 	GtkBin *bin;
@@ -232,7 +256,8 @@ cc_gray_bar_class_init (CcGrayBarClass *klass)
 	object_class->finalize      = cc_gray_bar_finalize;
 	widget_class->style_set     = cc_gray_bar_style_set;
 	widget_class->realize       = cc_gray_bar_realize;
-	widget_class->size_request  = cc_gray_bar_size_request;
+	widget_class->get_preferred_width = cc_gray_bar_get_preferred_width;
+	widget_class->get_preferred_height = cc_gray_bar_get_preferred_height;
 	widget_class->size_allocate = cc_gray_bar_allocate;
 	widget_class->draw          = cc_gray_bar_draw;
 	widget_class->show_all      = cc_gray_bar_show_all;
diff --git a/libgda-ui/data-entries/widget-embedder.c b/libgda-ui/data-entries/widget-embedder.c
index a08442e..595db96 100644
--- a/libgda-ui/data-entries/widget-embedder.c
+++ b/libgda-ui/data-entries/widget-embedder.c
@@ -20,8 +20,12 @@
 #include "widget-embedder.h"
 static void     widget_embedder_realize       (GtkWidget       *widget);
 static void     widget_embedder_unrealize     (GtkWidget       *widget);
-static void     widget_embedder_size_request  (GtkWidget       *widget,
-                                               GtkRequisition  *requisition);
+static void     widget_embedder_get_preferred_width  (GtkWidget *widget,
+						      gint      *minimum,
+						      gint      *natural);
+static void     widget_embedder_get_preferred_height (GtkWidget *widget,
+						      gint      *minimum,
+						      gint      *natural);
 static void     widget_embedder_size_allocate (GtkWidget       *widget,
                                                GtkAllocation   *allocation);
 static gboolean widget_embedder_damage        (GtkWidget       *widget,
@@ -70,7 +74,8 @@ widget_embedder_class_init (WidgetEmbedderClass *klass)
 
 	widget_class->realize = widget_embedder_realize;
 	widget_class->unrealize = widget_embedder_unrealize;
-	widget_class->size_request = widget_embedder_size_request;
+	widget_class->get_preferred_width = widget_embedder_get_preferred_width;
+	widget_class->get_preferred_height = widget_embedder_get_preferred_height;
 	widget_class->size_allocate = widget_embedder_size_allocate;
 	widget_class->draw = widget_embedder_draw;
 
@@ -295,7 +300,7 @@ widget_embedder_size_request (GtkWidget      *widget,
 	child_requisition.height = 0;
 
 	if (bin->child && gtk_widget_get_visible (bin->child))
-		gtk_widget_size_request (bin->child, &child_requisition);
+		gtk_widget_get_preferred_size (bin->child, &child_requisition, NULL);
 
 	guint border_width;
 	border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
@@ -304,6 +309,26 @@ widget_embedder_size_request (GtkWidget      *widget,
 }
 
 static void
+widget_embedder_get_preferred_width (GtkWidget *widget,
+				     gint      *minimum,
+				     gint      *natural)
+{
+	GtkRequisition requisition;
+	widget_embedder_size_request (widget, &requisition);
+	*minimum = *natural = requisition.width;
+}
+
+static void
+widget_embedder_get_preferred_height (GtkWidget *widget,
+				      gint      *minimum,
+				      gint      *natural)
+{
+	GtkRequisition requisition;
+	widget_embedder_size_request (widget, &requisition);
+	*minimum = *natural = requisition.height;
+}
+
+static void
 widget_embedder_size_allocate (GtkWidget     *widget,
                                GtkAllocation *allocation)
 {