From 846c8ea8d17a834902d29ae8a6e587cfcaab2708 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Mon, 27 May 2013 15:35:20 +0200 Subject: [PATCH] GtkXPaned: Convert size_request to get_preferred_height/width --- lib/gtk-contrib/gtkxpaned.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/lib/gtk-contrib/gtkxpaned.c b/lib/gtk-contrib/gtkxpaned.c index f653f93c92..a7d45cb0f1 100644 --- a/lib/gtk-contrib/gtkxpaned.c +++ b/lib/gtk-contrib/gtkxpaned.c @@ -75,6 +75,30 @@ static void gtk_xpaned_init (GtkXPaned * xpaned); static void gtk_xpaned_size_request (GtkWidget * widget, GtkRequisition * requisition); +static void +gtk_xpaned_get_preferred_width (GtkWidget *widget, + gint *minimal_width, + gint *natural_width) +{ + GtkRequisition requisition; + + gtk_xpaned_size_request (widget, &requisition); + + *minimal_width = *natural_width = requisition.width; +} + +static void +gtk_xpaned_get_preferred_height (GtkWidget *widget, + gint *minimal_height, + gint *natural_height) +{ + GtkRequisition requisition; + + gtk_xpaned_size_request (widget, &requisition); + + *minimal_height = *natural_height = requisition.height; +} + static void gtk_xpaned_size_allocate (GtkWidget * widget, GtkAllocation * allocation); @@ -275,7 +299,9 @@ gtk_xpaned_class_init (GtkXPanedClass * class) widget_class->button_press_event = gtk_xpaned_button_press; widget_class->button_release_event = gtk_xpaned_button_release; widget_class->motion_notify_event = gtk_xpaned_motion; - widget_class->size_request = gtk_xpaned_size_request; + widget_class->get_preferred_width = gtk_xpaned_get_preferred_width; + widget_class->get_preferred_height = gtk_xpaned_get_preferred_height; + widget_class->size_allocate = gtk_xpaned_size_allocate; container_class->add = gtk_xpaned_add; -- 2.30.2