[evolution] Avoid gtk_widget_get_child_requisition().



commit b15e0d6df6e3e626a7c8b33fd1d0504fca7ca5b5
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Nov 30 11:40:04 2012 -0500

    Avoid gtk_widget_get_child_requisition().
    
    Use gtk_widget_get_preferred_size() instead.

 widgets/misc/e-calendar-item.c |    2 +-
 widgets/table/e-cell-combo.c   |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 414311b..16ce645 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -3645,7 +3645,7 @@ e_calendar_item_position_menu (GtkMenu *menu,
 	GtkRequisition requisition;
 	gint screen_width, screen_height;
 
-	gtk_widget_get_child_requisition (GTK_WIDGET (menu), &requisition);
+	gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL);
 
 	*x -= (gtk_widget_get_direction(GTK_WIDGET(menu)) == GTK_TEXT_DIR_RTL)
 		? requisition.width - 2
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index b3e1c52..bc82042 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -510,7 +510,7 @@ e_cell_combo_get_popup_pos (ECellCombo *ecc,
 		+ ((GnomeCanvas *) canvas)->zoom_yofs;
 
 	widget = gtk_scrolled_window_get_vscrollbar (popup);
-	gtk_widget_get_child_requisition (widget, &requisition);
+	gtk_widget_get_preferred_size (widget, &requisition, NULL);
 
 	scrollbar_width =
 		requisition.width
@@ -524,7 +524,7 @@ e_cell_combo_get_popup_pos (ECellCombo *ecc,
 	avail_width = screen_width - scrollbar_width;
 
 	widget = gtk_scrolled_window_get_vscrollbar (popup);
-	gtk_widget_get_child_requisition (widget, &requisition);
+	gtk_widget_get_preferred_size (widget, &requisition, NULL);
 
 	gtk_widget_get_preferred_size (ecc->popup_tree_view, &list_requisition, NULL);
 	min_height = MIN (list_requisition.height, requisition.height);
@@ -566,7 +566,7 @@ e_cell_combo_get_popup_pos (ECellCombo *ecc,
 		       + 2 * popup_style->xthickness);
 
 	widget = gtk_scrolled_window_get_hscrollbar (popup);
-	gtk_widget_get_child_requisition (widget, &requisition);
+	gtk_widget_get_preferred_size (widget, &requisition, NULL);
 
 	/* Add on the height of the horizontal scrollbar if we need it. */
 	if (show_hscroll)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]