From d9c92598612714683eab96fecf6e90a9531607e5 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 21 Sep 2010 16:35:17 +0200 Subject: Move GtkSizeRequest into GtkWidget It doesn't make sense to keep them separate as GtkSizeRequest requires a GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have one without the other. It also makes the code a lot easier because no casts are required when calling functions. Also, the names would translate to gtk_widget_get_width() and people agreed that this would be a too generic name, so a "preferred" was added to the names. So this patch moves the functions: gtk_size_request_get_request_mode() => gtk_widget_get_request_mode() gtk_size_request_get_width() => gtk_widget_get_preferred_width() gtk_size_request_get_height() => gtk_widget_get_preferred_height() gtk_size_request_get_size() => gtk_widget_get_preferred_size() gtk_size_request_get_width_for_height() => gtk_widget_get_preferred_width_for_height() gtk_size_request_get_height_for_width() => gtk_widget_get_preferred_height_for_width() ... and moves the corresponding vfuncs to the GtkWidgetClass. The patch also renames the implementations of the vfuncs in widgets to include the word "preferrred". --- gtk/gtktooltip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gtk/gtktooltip.c') diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index 77d56f9ac6..faa45a8fe3 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -938,8 +938,8 @@ gtk_tooltip_position (GtkTooltip *tooltip, screen = gtk_widget_get_screen (new_tooltip_widget); - gtk_size_request_get_size (GTK_SIZE_REQUEST (tooltip->current_window), - &requisition, NULL); + gtk_widget_get_preferred_size (GTK_WIDGET (tooltip->current_window), + &requisition, NULL); monitor_num = gdk_screen_get_monitor_at_point (screen, tooltip->last_x, -- cgit v1.2.1