aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-12-01 00:40:04 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-12-01 00:40:04 +0800
commitb15e0d6df6e3e626a7c8b33fd1d0504fca7ca5b5 (patch)
treeca9264390cf2efb85518efbcb1dde909f6c45d5c /widgets
parent30d3ec19b94270cc91215130135005bb1a37ef0d (diff)
downloadgsoc2013-evolution-b15e0d6df6e3e626a7c8b33fd1d0504fca7ca5b5.tar
gsoc2013-evolution-b15e0d6df6e3e626a7c8b33fd1d0504fca7ca5b5.tar.gz
gsoc2013-evolution-b15e0d6df6e3e626a7c8b33fd1d0504fca7ca5b5.tar.bz2
gsoc2013-evolution-b15e0d6df6e3e626a7c8b33fd1d0504fca7ca5b5.tar.lz
gsoc2013-evolution-b15e0d6df6e3e626a7c8b33fd1d0504fca7ca5b5.tar.xz
gsoc2013-evolution-b15e0d6df6e3e626a7c8b33fd1d0504fca7ca5b5.tar.zst
gsoc2013-evolution-b15e0d6df6e3e626a7c8b33fd1d0504fca7ca5b5.zip
Avoid gtk_widget_get_child_requisition().
Use gtk_widget_get_preferred_size() instead.
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/e-calendar-item.c2
-rw-r--r--widgets/table/e-cell-combo.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 414311bb2b..16ce64583b 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 b3e1c524cf..bc82042d7a 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)