diff options
| author | Matthias Huetsch <mhu@openoffice.org> | 2003-02-11 10:30:24 +0000 |
|---|---|---|
| committer | Matthias Huetsch <mhu@openoffice.org> | 2003-02-11 10:30:24 +0000 |
| commit | 35f8f706280434ba35022c7954e15d133ce8a276 (patch) | |
| tree | 302ad2d04eebd0b32f056c5bb37c9aaae901e424 /vcl | |
| parent | c7902911b800566b68a05d0c118b19dca27c7da0 (diff) | |
#107292# Merged 'AnyInput for timers' fix (see #106997#).
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/app/salinst.cxx | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/vcl/unx/source/app/salinst.cxx b/vcl/unx/source/app/salinst.cxx index c53bd46526ca..fe12c5ebe18b 100644 --- a/vcl/unx/source/app/salinst.cxx +++ b/vcl/unx/source/app/salinst.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salinst.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: pl $ $Date: 2001-08-27 09:42:34 $ + * last change: $Author: mhu $ $Date: 2003-02-11 11:30:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -284,28 +284,27 @@ BOOL SalInstance::AnyInput(USHORT nType) { SalData *pSalData = GetSalData(); Display *pDisplay = pSalData->GetDefDisp()->GetDisplay(); + BOOL bRet = FALSE; - // XtInputMask nMask = XtAppPending( SVData().GetAppContext() ); - // if( nMask ) - if (XPending(pDisplay) ) + if( (nType & INPUT_TIMER) && + pSalData->GetDefDisp()->GetXLib()->CheckTimeout( false ) ) { - // if ( INPUT_TIMER & nType && XtIMTimer & nMask ) - // return TRUE; - // else - { - PredicateReturn aInput; - XEvent aEvent; + bRet = TRUE; + } + else if (XPending(pDisplay) ) + { + PredicateReturn aInput; + XEvent aEvent; - aInput.bRet = FALSE; - aInput.nType = nType; + aInput.bRet = FALSE; + aInput.nType = nType; - XCheckIfEvent(pDisplay, &aEvent, ImplPredicateEvent, - (char *)&aInput ); + XCheckIfEvent(pDisplay, &aEvent, ImplPredicateEvent, + (char *)&aInput ); - return aInput.bRet; - } + bRet = aInput.bRet; } - return FALSE ; + return bRet; } #ifdef _VOS_NO_NAMESPACE |