diff options
| author | Timm Bäder <mail@baedert.org> | 2017-03-04 08:18:36 +0100 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2017-03-04 08:44:49 +0100 |
| commit | 846e6dc0b1e531b90b6ad914b3fd0c2c2b989bc1 (patch) | |
| tree | 3246783439df7d8ee0514d5a5b528b23603ab05e /gtk/gtkmenubar.c | |
| parent | b16a322c4c38bf9d7ef02586063375250f8ae7d1 (diff) | |
| download | gtk+-846e6dc0b1e531b90b6ad914b3fd0c2c2b989bc1.tar.gz | |
menus: Use gtk_widget_measure to measure widget sizes
Diffstat (limited to 'gtk/gtkmenubar.c')
| -rw-r--r-- | gtk/gtkmenubar.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index 2d9439cea6..d7470fcb44 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -454,10 +454,10 @@ gtk_menu_bar_allocate (GtkCssGadget *gadget, continue; request.data = child; - gtk_widget_get_preferred_width_for_height (child, - remaining_space.height, - &request.minimum_size, - &request.natural_size); + gtk_widget_measure (child, GTK_ORIENTATION_HORIZONTAL, + remaining_space.height, + &request.minimum_size, &request.natural_size, + NULL, NULL); gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child), &toggle_size); request.minimum_size += toggle_size; @@ -508,10 +508,10 @@ gtk_menu_bar_allocate (GtkCssGadget *gadget, continue; request.data = child; - gtk_widget_get_preferred_height_for_width (child, - remaining_space.width, - &request.minimum_size, - &request.natural_size); + gtk_widget_measure (child, GTK_ORIENTATION_VERTICAL, + remaining_space.width, + &request.minimum_size, &request.natural_size, + NULL, NULL); gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child), &toggle_size); request.minimum_size += toggle_size; |