diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-03-24 08:35:27 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-03-24 08:38:59 -0400 |
| commit | 7da97a3642d728c05d9a290e7608d337aaa697eb (patch) | |
| tree | b147655178b486b3db6cd39dad4b1ea0f36e6d7c /gtk/gtkdialog.c | |
| parent | 329263f091e59426555b28a598185d3284514998 (diff) | |
| download | gtk+-7da97a3642d728c05d9a290e7608d337aaa697eb.tar.gz | |
Revert "Don't let themes override explicit border-width in dialogs"
This reverts commit 6e4567e73bceb66200b9605c51b4b5ad6e807483.
For some reason, this causes buttons in message dialogs to have an
unwanted border.
Diffstat (limited to 'gtk/gtkdialog.c')
| -rw-r--r-- | gtk/gtkdialog.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index d95be7132d..d32a6570a7 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -35,7 +35,6 @@ #include "gtkmarshalers.h" #include "gtkbox.h" #include "gtkboxprivate.h" -#include "gtkcontainerprivate.h" #include "gtkmain.h" #include "gtkintl.h" #include "gtkbindings.h" @@ -567,15 +566,6 @@ gtk_dialog_class_init (GtkDialogClass *class) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); - /** - * GtkDialog:content-area-border: - * - * The default border width used around the - * content area of the dialog, as returned by - * gtk_dialog_get_content_area(), unless gtk_container_set_border_width() - * was called on that widget directly. - * - */ gtk_widget_class_install_style_property (widget_class, g_param_spec_int ("content-area-border", P_("Content area border"), @@ -666,11 +656,9 @@ update_spacings (GtkDialog *dialog) "button-spacing", &button_spacing, "action-area-border", &action_area_border, NULL); - - if (!_gtk_container_get_border_width_set (GTK_CONTAINER (priv->vbox))) - gtk_container_set_border_width (GTK_CONTAINER (priv->vbox), - content_area_border); - + + gtk_container_set_border_width (GTK_CONTAINER (priv->vbox), + content_area_border); if (!_gtk_box_get_spacing_set (GTK_BOX (priv->vbox))) { gtk_box_set_spacing (GTK_BOX (priv->vbox), content_area_spacing); @@ -679,10 +667,8 @@ update_spacings (GtkDialog *dialog) gtk_box_set_spacing (GTK_BOX (priv->action_area), button_spacing); - - if (!_gtk_container_get_border_width_set (GTK_CONTAINER (priv->action_area))) - gtk_container_set_border_width (GTK_CONTAINER (priv->action_area), - action_area_border); + gtk_container_set_border_width (GTK_CONTAINER (priv->action_area), + action_area_border); } static void |