diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-17 09:21:02 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-17 09:21:02 +0000 |
commit | 7a2c344ab9fd5a1700efd4877666106c81bc0070 (patch) | |
tree | 55609a45e618ed5d549974efd2e61ba2de5bf01f /toolkit | |
parent | e725ed2b1c0dac167f36f8cea010e3861cab665d (diff) |
INTEGRATION: CWS dba23 (1.21.38); FILE MERGED
2005/01/21 08:28:25 oj 1.21.38.3: RESYNC: (1.21-1.22); FILE MERGED
2005/01/18 15:44:20 fs 1.21.38.2: #i40647# +mnDrawingOntoParent
2005/01/13 14:53:06 fs 1.21.38.1: #i40583# +mpImpl
Diffstat (limited to 'toolkit')
-rw-r--r-- | toolkit/inc/toolkit/awt/vclxwindow.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/toolkit/inc/toolkit/awt/vclxwindow.hxx b/toolkit/inc/toolkit/awt/vclxwindow.hxx index f90f7d7b16f3..e5b0d207d1af 100644 --- a/toolkit/inc/toolkit/awt/vclxwindow.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindow.hxx @@ -2,9 +2,9 @@ * * $RCSfile: vclxwindow.hxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: rt $ $Date: 2005-01-11 14:04:05 $ + * last change: $Author: vg $ $Date: 2005-02-17 10:21:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -128,6 +128,7 @@ struct SystemParentData; // class VCLXWINDOW // ---------------------------------------------------- +class VCLXWindowImpl; class TOOLKIT_DLLPUBLIC VCLXWindow : public ::com::sun::star::awt::XWindow2, public ::com::sun::star::awt::XVclWindowPeer, public ::com::sun::star::awt::XLayoutConstrains, @@ -156,13 +157,13 @@ private: ULONG mnListenerLockLevel; ULONG nDummy2; - void* pDummy1; + VCLXWindowImpl* mpImpl; void* pDummy2; sal_Bool mbDisposing; sal_Bool mbDesignMode; sal_Bool mbSynthesizingVCLEvent; - sal_Bool mbDummy2; + sal_Bool mbDrawingOntoParent; protected: |