diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-12-01 14:28:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-03 10:33:41 +0100 |
| commit | 12b01c535a05516e1b7c75c316f0cde8e12e3e0b (patch) | |
| tree | 82e5166cb74566d921af128015ecd20c9b22492c | |
| parent | a60d7fde5455a4c19ef36411e9f15cbded45175e (diff) | |
require at least gtk3 3.18.0 to build and run gtk3 bits
Change-Id: I02efb169ba1d0756d2d9c4b77c3c2b58e48c4a82
Reviewed-on: https://gerrit.libreoffice.org/45727
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/gtkinst.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 6 |
3 files changed, 2 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index cc53712e25af..c21a33a70712 100644 --- a/configure.ac +++ b/configure.ac @@ -9724,7 +9724,7 @@ if test "x$enable_gtk3" = "xyes"; then AC_MSG_ERROR([System cairo required for gtk3 support, do not combine --enable-gtk3 with --without-system-cairo]) fi : ${with_system_cairo:=yes} - PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.16 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="") + PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.18 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="") if test "x$ENABLE_GTK3" = "xTRUE"; then R="gtk3" dnl Avoid installed by unpackaged files for now. diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx index b6982a0a0a21..30f0aa51843f 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 < 16) + if (gtk_minor_version < 18) { g_warning("require a newer gtk than 3.%d for theme expectations", gtk_minor_version); return nullptr; diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index e8a077c8fb0d..1f90760f7666 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1903,11 +1903,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, SetType eType, tools::Rect gtk_window_fullscreen(GTK_WINDOW(m_pWindow)); else { -#if GTK_CHECK_VERSION(3,18,0) gtk_window_fullscreen_on_monitor(GTK_WINDOW(m_pWindow), pScreen, nMonitor); -#else - gtk_window_fullscreen(GTK_WINDOW(m_pWindow)); -#endif } } @@ -2281,10 +2277,8 @@ KeyIndicatorState GtkSalFrame::GetIndicatorState() nState |= KeyIndicatorState::CAPSLOCK; if (gdk_keymap_get_num_lock_state(pKeyMap)) nState |= KeyIndicatorState::NUMLOCK; -#if GTK_CHECK_VERSION(3,18,0) if (gdk_keymap_get_scroll_lock_state(pKeyMap)) nState |= KeyIndicatorState::SCROLLLOCK; -#endif return nState; } |