diff options
| author | Benjamin Otte <otte@redhat.com> | 2016-10-09 02:32:00 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2016-10-16 18:18:58 +0200 |
| commit | 4df6ddad54d2cb6ebfdcbf2b6fee35ec4fa760b9 (patch) | |
| tree | 0d6d46d38a70de6930e51d279c0eb50265a0a203 /gtk/gtkapplicationwindow.c | |
| parent | 1518fe0a8f0a973f013e21c185f38111d69d6ac7 (diff) | |
| download | gtk+-4df6ddad54d2cb6ebfdcbf2b6fee35ec4fa760b9.tar.gz | |
API: container: Remove gtk_container_set_border_width()
Diffstat (limited to 'gtk/gtkapplicationwindow.c')
| -rw-r--r-- | gtk/gtkapplicationwindow.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c index 3e1e9692b0..7929812d62 100644 --- a/gtk/gtkapplicationwindow.c +++ b/gtk/gtkapplicationwindow.c @@ -579,16 +579,14 @@ gtk_application_window_real_get_preferred_width (GtkWidget *widget, if (window->priv->menubar != NULL) { gint menubar_min_width, menubar_nat_width; - gint border_width; GtkBorder border = { 0 }; gtk_widget_get_preferred_width (window->priv->menubar, &menubar_min_width, &menubar_nat_width); - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); _gtk_window_get_shadow_width (GTK_WINDOW (widget), &border); - menubar_min_width += 2 * border_width + border.left + border.right; - menubar_nat_width += 2 * border_width + border.left + border.right; + menubar_min_width += border.left + border.right; + menubar_nat_width += border.left + border.right; *minimum_width = MAX (*minimum_width, menubar_min_width); *natural_width = MAX (*natural_width, menubar_nat_width); @@ -615,16 +613,14 @@ gtk_application_window_real_get_preferred_width_for_height (GtkWidget *widget, if (window->priv->menubar != NULL) { gint menubar_min_width, menubar_nat_width; - gint border_width; GtkBorder border = { 0 }; gtk_widget_get_preferred_width_for_height (window->priv->menubar, menubar_height, &menubar_min_width, &menubar_nat_width); - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); _gtk_window_get_shadow_width (GTK_WINDOW (widget), &border); - menubar_min_width += 2 * border_width + border.left + border.right; - menubar_nat_width += 2 * border_width + border.left + border.right; + menubar_min_width += border.left + border.right; + menubar_nat_width += border.left + border.right; *minimum_width = MAX (*minimum_width, menubar_min_width); *natural_width = MAX (*natural_width, menubar_nat_width); |