summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-02-06 12:17:53 +0000
committerKurt Zenker <kz@openoffice.org>2006-02-06 12:17:53 +0000
commit1df0db5a28c6cbb8cf234e0f94568a2612ac4786 (patch)
tree05ac00610f400eb19d8eb993e35ecec78de863dc /vcl/source/window
parent9a056b0953bd7b3f6f7996b8375ae3b13ff912f1 (diff)
INTEGRATION: CWS pb11 (1.224.74); FILE MERGED
2006/01/24 17:41:40 ssa 1.224.74.2: #i48361# floaters for subtoolbars should not appear as toplevel windows so they have to be easily recognized by the toolkit 2006/01/23 17:29:43 ssa 1.224.74.1: #i48361# merge from vcl47
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/window.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 8f6ada45378b..17ebbca2141b 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: window.cxx,v $
*
- * $Revision: 1.226 $
+ * $Revision: 1.227 $
*
- * last change: $Author: kz $ $Date: 2006-01-31 18:24:59 $
+ * last change: $Author: kz $ $Date: 2006-02-06 13:17:53 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -666,6 +666,7 @@ void Window::ImplInitData( WindowType nType )
mpWindowImpl->mbPushButton = FALSE; // TRUE: PushButton is the base class
mpWindowImpl->mbToolBox = FALSE; // TRUE: ToolBox is the base class
mpWindowImpl->mbMenuFloatingWindow= FALSE; // TRUE: MenuFloatingWindow is the base class
+ mpWindowImpl->mbToolbarFloatingWindow= FALSE; // TRUE: ImplPopupFloatWin is the base class, used for subtoolbars
mpWindowImpl->mbSplitter = FALSE; // TRUE: Splitter is the base class
mpWindowImpl->mbVisible = FALSE; // TRUE: Show( TRUE ) called
mpWindowImpl->mbOverlapVisible = FALSE; // TRUE: Hide called for visible window from ImplHideAllOverlapWindow()