diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-07-01 10:45:48 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-07-01 10:45:48 +0000 |
| commit | 9d4adaf483950d8c714a0a16bc11c2a649f3bc3e (patch) | |
| tree | 4c500607957f9285f299bdccd944ce78fbaf06ac /vcl/source | |
| parent | a526142609a77ee9dd702dc381c4283b21dcd39d (diff) | |
INTEGRATION: CWS pl04 (1.99.30); FILE MERGED
2005/06/10 12:24:39 pl 1.99.30.2: #i50549# remove some unnecessary debug output
2005/06/10 12:20:18 pl 1.99.30.1: #i50549# ExtTextInput must wait for asynchronous focus handling
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/winproc.cxx | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 4a86854c84f4..bf0487625354 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: winproc.cxx,v $ * - * $Revision: 1.99 $ + * $Revision: 1.100 $ * - * last change: $Author: rt $ $Date: 2005-05-20 09:29:55 $ + * last change: $Author: rt $ $Date: 2005-07-01 11:45:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1364,13 +1364,21 @@ static long ImplHandleExtTextInput( Window* pWindow, ULONG nTime, ULONG nCursorPos, USHORT nCursorFlags ) { ImplSVData* pSVData = ImplGetSVData(); - Window* pChild = pSVData->maWinData.mpExtTextInputWin; + Window* pChild; - if ( !pChild ) + int nTries = 200; + while( nTries-- ) { - pChild = ImplGetKeyInputWindow( pWindow ); + pChild = pSVData->maWinData.mpExtTextInputWin; if ( !pChild ) - return 0; + { + pChild = ImplGetKeyInputWindow( pWindow ); + if ( !pChild ) + return 0; + } + if( !pChild->mpWindowImpl->mpFrameData->mnFocusId ) + break; + Application::Yield(); } // If it is the first ExtTextInput call, we inform the information @@ -1394,9 +1402,7 @@ static long ImplHandleExtTextInput( Window* pWindow, ULONG nTime, // be aware of being recursively called in StartExtTextInput if ( !pChild->mpWindowImpl->mbExtTextInput ) - { return 0; - } // Test for changes BOOL bOnlyCursor = FALSE; |