diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-05-18 08:54:42 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-05-18 08:54:42 +0000 |
| commit | b0aec7c6a2841e104324aa7b93e2aaaf9797ce43 (patch) | |
| tree | 4e32f209c1dfa307bf806e408c58d98523d61f14 /vcl | |
| parent | 0bf4645736af9f3a8d8b91b2a9c0af3ec5404cf9 (diff) | |
INTEGRATION: CWS mbapp3fix1 (1.31.20); FILE MERGED
2006/05/11 12:15:14 pl 1.31.20.1: #i65207# avoid timer in Window::Show by posting event
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/app/salinst.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index e04c9a263f1b..5eaf5d3be08e 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salinst.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: rt $ $Date: 2006-05-03 16:38:03 $ + * last change: $Author: vg $ $Date: 2006-05-18 09:54:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -741,13 +741,6 @@ void ImplSalYield( BOOL bWait ) bMsg = true; } } - - if( bMsg ) - { - pSalData->mnLastEventTime = aMsg.time; - if( pSalData->mnNextTimerTime && pSalData->mnNextTimerTime < aMsg.time ) - SalTimerProc( 0, 0, SALTIMERPROC_RECURSIVE, aMsg.time ); - } } // ----------------------------------------------------------------------- @@ -885,6 +878,9 @@ LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar ReleaseDC( (HWND)wParam, (HDC)lParam ); rDef = FALSE; break; + case SAL_MSG_POSTTIMER: + SalTimerProc( 0, 0, SALTIMERPROC_RECURSIVE, lParam ); + break; } return nRet; |