diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-05 21:55:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-06 08:50:05 +0000 |
| commit | 180a0eac238ce456771ff20b8d3274b43408f54c (patch) | |
| tree | ee22ecfa6a5c4e8263a49dab687b8bf585c5da36 /vcl | |
| parent | 9ea5483d9bd44b136c89e45ef96bbf3df0a7cdef (diff) | |
use same GtkInstance::AnyInput impl for gtk2 and gtk3
Change-Id: Ib69884e0d02b0b245459eb05d5dfb54797d566ce
Reviewed-on: https://gerrit.libreoffice.org/28680
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/gtkinst.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx index 014ea7c2ff1e..6f82a22b695f 100644 --- a/vcl/unx/gtk/gtkinst.cxx +++ b/vcl/unx/gtk/gtkinst.cxx @@ -119,7 +119,6 @@ extern "C" } } -#if GTK_CHECK_VERSION(3,0,0) static VclInputFlags categorizeEvent(const GdkEvent *pEvent) { VclInputFlags nType = VclInputFlags::NONE; @@ -148,7 +147,6 @@ static VclInputFlags categorizeEvent(const GdkEvent *pEvent) } return nType; } -#endif GtkInstance::GtkInstance( SalYieldMutex* pMutex ) #if GTK_CHECK_VERSION(3,0,0) @@ -437,9 +435,6 @@ bool GtkInstance::AnyInput( VclInputFlags nType ) EnsureInit(); if( (nType & VclInputFlags::TIMER) && IsTimerExpired() ) return true; -#if !GTK_CHECK_VERSION(3,0,0) - bool bRet = X11SalInstance::AnyInput(nType); -#else if (!gdk_events_pending()) return false; @@ -467,7 +462,6 @@ bool GtkInstance::AnyInput( VclInputFlags nType ) gdk_event_free(pEvent); aEvents.pop(); } -#endif return bRet; } |