Resolves: tdf#103815 Revert "use same GtkInstance::AnyInput impl"
cause of the reported regression, it seems extradinary that this
would cause that, but it seems to be the case and I have no interest
in debugging the undebuggable scheduler.
This reverts commit 180a0eac23
.
This commit is contained in:
parent
1fed7ec4e4
commit
53bd86e096
1 changed files with 6 additions and 0 deletions
|
@ -119,6 +119,7 @@ extern "C"
|
|||
}
|
||||
}
|
||||
|
||||
#if GTK_CHECK_VERSION(3,0,0)
|
||||
static VclInputFlags categorizeEvent(const GdkEvent *pEvent)
|
||||
{
|
||||
VclInputFlags nType = VclInputFlags::NONE;
|
||||
|
@ -147,6 +148,7 @@ static VclInputFlags categorizeEvent(const GdkEvent *pEvent)
|
|||
}
|
||||
return nType;
|
||||
}
|
||||
#endif
|
||||
|
||||
GtkInstance::GtkInstance( SalYieldMutex* pMutex )
|
||||
#if GTK_CHECK_VERSION(3,0,0)
|
||||
|
@ -439,6 +441,9 @@ 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;
|
||||
|
||||
|
@ -466,6 +471,7 @@ bool GtkInstance::AnyInput( VclInputFlags nType )
|
|||
gdk_event_free(pEvent);
|
||||
aEvents.pop();
|
||||
}
|
||||
#endif
|
||||
return bRet;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue