diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-13 07:32:58 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-13 07:32:58 +0000 |
| commit | ad226e3a0258fa436f62c4bb5712811f4ac0dde2 (patch) | |
| tree | 1377d639cbac6d672a145a4f735fb914b0ef66b7 /vcl/source/window/window.cxx | |
| parent | dcb334b9a5e916cc4514ff0bb8e4ea80cc1d0664 (diff) | |
INTEGRATION: CWS vcl65 (1.238.76); FILE MERGED
2006/09/06 16:41:53 pl 1.238.76.3: #i55356# remove internal hangul/hanja conversion command as well as key emulation
2006/09/05 14:51:14 pl 1.238.76.2: RESYNC: (1.238-1.241); FILE MERGED
2006/08/08 14:09:09 fs 1.238.76.1: #i58384# ~Window: correct condition for removing myself from parent's maTopWindowChildren
Diffstat (limited to 'vcl/source/window/window.cxx')
| -rw-r--r-- | vcl/source/window/window.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index cfe4b0c52a3b..2776244d0f4b 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -4,9 +4,9 @@ * * $RCSfile: window.cxx,v $ * - * $Revision: 1.245 $ + * $Revision: 1.246 $ * - * last change: $Author: obo $ $Date: 2006-10-12 14:58:27 $ + * last change: $Author: obo $ $Date: 2006-10-13 08:32:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -899,7 +899,6 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste mpWindowImpl->mpFrameData->maResizeTimer.SetTimeout( 50 ); mpWindowImpl->mpFrameData->maResizeTimer.SetTimeoutHdl( LINK( this, Window, ImplHandleResizeTimerHdl ) ); mpWindowImpl->mpFrameData->mbInternalDragGestureRecognizer = FALSE; - mpWindowImpl->mpFrameData->mbTriggerHangulHanja = FALSE; if ( pRealParent && IsTopWindow() ) { @@ -4675,7 +4674,7 @@ Window::~Window() ImplRemoveWindow( TRUE ); // de-register as "top window child" at our parent, if necessary - if ( !mpWindowImpl->mpBorderWindow && mpWindowImpl->mpFrame ) + if ( mpWindowImpl->mbFrame ) { BOOL bIsTopWindow = mpWindowImpl->mpWinData && ( mpWindowImpl->mpWinData->mnIsTopWindow == 1 ); if ( mpWindowImpl->mpRealParent && bIsTopWindow ) |