diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-12-01 14:44:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-05 13:38:43 +0100 |
| commit | 75e828cad5e652f111278b103b72b9a9a344b689 (patch) | |
| tree | 5e76b03eec796187426a7767f3d95a0b91d24861 /vcl/unx/gtk | |
| parent | effe6b3d84302afce3d5095e4f376e7e3bf669e0 (diff) | |
require at least gtk3 3.20.0 to build and run gtk3 bits
Change-Id: I2caf8c32d47ce195a3b714e50256d8425a5a117e
Reviewed-on: https://gerrit.libreoffice.org/45735
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/gtk')
| -rw-r--r-- | vcl/unx/gtk/gtkinst.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/gtksalmenu.cxx | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx index 30f0aa51843f..2aeffb894952 100644 --- a/vcl/unx/gtk/gtkinst.cxx +++ b/vcl/unx/gtk/gtkinst.cxx @@ -82,7 +82,7 @@ extern "C" XInitThreads(); #if GTK_CHECK_VERSION(3,0,0) - if (gtk_minor_version < 18) + if (gtk_minor_version < 20) { g_warning("require a newer gtk than 3.%d for theme expectations", gtk_minor_version); return nullptr; diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index 6f16984ba6d0..61be00fe48c3 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -630,12 +630,7 @@ void GtkSalMenu::ShowCloseButton(bool bShow) "min-width: 18px;" "min-height: 18px;" "}"; - 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_css_provider_load_from_data(pProvider, data, -1, nullptr); gtk_style_context_add_provider(pButtonContext, GTK_STYLE_PROVIDER(pProvider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); |