diff options
| author | Timm Bäder <mail@baedert.org> | 2017-03-05 08:55:55 +0100 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2017-03-05 09:24:41 +0100 |
| commit | b6790b112f7947deb8e178f0ca863fdb2d250b1d (patch) | |
| tree | 59520f5fbd37208316f15ee6bffa6a9eaee78b78 /testsuite/gtk/revealer-size.c | |
| parent | 7f79c36cb73685031852a51e674aac19ea0dd9af (diff) | |
| download | gtk+-b6790b112f7947deb8e178f0ca863fdb2d250b1d.tar.gz | |
tests/revealer-size: Use gtk_widget_measure
Diffstat (limited to 'testsuite/gtk/revealer-size.c')
| -rw-r--r-- | testsuite/gtk/revealer-size.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/testsuite/gtk/revealer-size.c b/testsuite/gtk/revealer-size.c index 752992c04c..fefae48b73 100644 --- a/testsuite/gtk/revealer-size.c +++ b/testsuite/gtk/revealer-size.c @@ -24,19 +24,25 @@ keep_size (int direction, gtk_revealer_set_reveal_child (revealer, TRUE); - gtk_widget_get_preferred_width (GTK_WIDGET (child), &min_child_width, NULL); - gtk_widget_get_preferred_height (GTK_WIDGET (child), &min_child_height, NULL); + gtk_widget_measure (child, GTK_ORIENTATION_HORIZONTAL, -1, + &min_child_width, NULL, NULL, NULL); + gtk_widget_measure (child, GTK_ORIENTATION_VERTICAL, -1, + &min_child_height, NULL, NULL, NULL); - gtk_widget_get_preferred_width (GTK_WIDGET (revealer), &min_width, NULL); - gtk_widget_get_preferred_height (GTK_WIDGET (revealer), &min_height, NULL); + gtk_widget_measure (GTK_WIDGET (revealer), GTK_ORIENTATION_HORIZONTAL, -1, + &min_width, NULL, NULL, NULL); + gtk_widget_measure (GTK_WIDGET (revealer), GTK_ORIENTATION_VERTICAL, -1, + &min_height, NULL, NULL, NULL); g_assert_cmpint (min_width, ==, min_child_width); g_assert_cmpint (min_height, ==, min_child_height); gtk_revealer_set_reveal_child (revealer, FALSE); - gtk_widget_get_preferred_width (GTK_WIDGET (revealer), &min_width, NULL); - gtk_widget_get_preferred_height (GTK_WIDGET (revealer), &min_height, NULL); + gtk_widget_measure (GTK_WIDGET (revealer), GTK_ORIENTATION_HORIZONTAL, -1, + &min_width, NULL, NULL, NULL); + gtk_widget_measure (GTK_WIDGET (revealer), GTK_ORIENTATION_VERTICAL, -1, + &min_height, NULL, NULL, NULL); if (direction & KEEP_WIDTH) g_assert_cmpint (min_width, ==, min_child_width); |