Kaydet (Commit) 180a0eac authored tarafından Caolán McNamara's avatar Caolán McNamara

use same GtkInstance::AnyInput impl for gtk2 and gtk3

Change-Id: Ib69884e0d02b0b245459eb05d5dfb54797d566ce
Reviewed-on: https://gerrit.libreoffice.org/28680Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 9ea5483d
...@@ -119,7 +119,6 @@ extern "C" ...@@ -119,7 +119,6 @@ extern "C"
} }
} }
#if GTK_CHECK_VERSION(3,0,0)
static VclInputFlags categorizeEvent(const GdkEvent *pEvent) static VclInputFlags categorizeEvent(const GdkEvent *pEvent)
{ {
VclInputFlags nType = VclInputFlags::NONE; VclInputFlags nType = VclInputFlags::NONE;
...@@ -148,7 +147,6 @@ static VclInputFlags categorizeEvent(const GdkEvent *pEvent) ...@@ -148,7 +147,6 @@ static VclInputFlags categorizeEvent(const GdkEvent *pEvent)
} }
return nType; return nType;
} }
#endif
GtkInstance::GtkInstance( SalYieldMutex* pMutex ) GtkInstance::GtkInstance( SalYieldMutex* pMutex )
#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,0,0)
...@@ -437,9 +435,6 @@ bool GtkInstance::AnyInput( VclInputFlags nType ) ...@@ -437,9 +435,6 @@ bool GtkInstance::AnyInput( VclInputFlags nType )
EnsureInit(); EnsureInit();
if( (nType & VclInputFlags::TIMER) && IsTimerExpired() ) if( (nType & VclInputFlags::TIMER) && IsTimerExpired() )
return true; return true;
#if !GTK_CHECK_VERSION(3,0,0)
bool bRet = X11SalInstance::AnyInput(nType);
#else
if (!gdk_events_pending()) if (!gdk_events_pending())
return false; return false;
...@@ -467,7 +462,6 @@ bool GtkInstance::AnyInput( VclInputFlags nType ) ...@@ -467,7 +462,6 @@ bool GtkInstance::AnyInput( VclInputFlags nType )
gdk_event_free(pEvent); gdk_event_free(pEvent);
aEvents.pop(); aEvents.pop();
} }
#endif
return bRet; return bRet;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment