diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-12-05 15:55:20 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-05 15:55:59 +0000 |
| commit | 8c8fa0783ddfee50e55deae307901a1691b88009 (patch) | |
| tree | 71dc3753aba107cba52ec06b4c1008add3560b2b /vcl/unx/gtk/gtksalmenu.cxx | |
| parent | 070396471b5bb2ce834d141decea88869eb1c6a7 (diff) | |
Revert "require at least gtk3 3.20.0 to build and run gtk3 bits"
Linux-deb-x86_64_56-lhm-ubuntu-trusty is at 3.18, not defunct
Linux-Ubuntu-x86_64_54-TDE
This reverts commit 75e828cad5e652f111278b103b72b9a9a344b689.
Change-Id: I8939e4bb1876186f5ed75b3ad4c2626e37e4c81c
Diffstat (limited to 'vcl/unx/gtk/gtksalmenu.cxx')
| -rw-r--r-- | vcl/unx/gtk/gtksalmenu.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index 61be00fe48c3..6f16984ba6d0 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -630,7 +630,12 @@ void GtkSalMenu::ShowCloseButton(bool bShow) "min-width: 18px;" "min-height: 18px;" "}"; - gtk_css_provider_load_from_data(pProvider, data, -1, nullptr); + const gchar olddata[] = "* { " + "padding: 0;" + "margin-left: 8px;" + "margin-right: 8px;" + "}"; + gtk_css_provider_load_from_data(pProvider, gtk_check_version(3, 20, 0) == nullptr ? data : olddata, -1, nullptr); gtk_style_context_add_provider(pButtonContext, GTK_STYLE_PROVIDER(pProvider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); |