diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-07-05 14:53:58 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-07-05 14:53:58 +0000 |
| commit | 814b9a4fea56dc1e7d9b0da6c1b59ae92f02fe72 (patch) | |
| tree | d644777dc61dcaced3444ac2fbeca55a41b8605c /toolkit/inc | |
| parent | 1a7e76bb5d77cc64d9c00f803bb18256686ec55b (diff) | |
INTEGRATION: CWS frmcontrols04 (1.13.134); FILE MERGED
2004/03/03 13:35:03 dv 1.13.134.1: #i24682# Since the type WinBits is 64 bits long, the type itself should be used instead of SALUINT32
Diffstat (limited to 'toolkit/inc')
| -rw-r--r-- | toolkit/inc/toolkit/awt/vclxtoolkit.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx b/toolkit/inc/toolkit/awt/vclxtoolkit.hxx index 0ad5e9515be9..fff18a93423b 100644 --- a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx +++ b/toolkit/inc/toolkit/awt/vclxtoolkit.hxx @@ -2,9 +2,9 @@ * * $RCSfile: vclxtoolkit.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: vg $ $Date: 2003-04-24 16:20:24 $ + * last change: $Author: obo $ $Date: 2004-07-05 15:53:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,6 +99,9 @@ #ifndef _LINK_HXX #include <tools/link.hxx> #endif +#ifndef _SV_WINTYPES_HXX +#include <vcl/wintypes.hxx> +#endif class Window; class VCLXWindow; @@ -116,7 +119,7 @@ namespace awt { } } } } extern "C" { - typedef Window* (SAL_CALL *FN_SvtCreateWindow)( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor* pDescriptor, Window* pParent, sal_uInt32 nWinBits ); + typedef Window* (SAL_CALL *FN_SvtCreateWindow)( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor* pDescriptor, Window* pParent, WinBits nWinBits ); }; @@ -170,7 +173,7 @@ protected: virtual void SAL_CALL disposing(); - Window* ImplCreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor& rDescriptor, Window* pParent, sal_uInt32 nWinBits ); + Window* ImplCreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor& rDescriptor, Window* pParent, WinBits nWinBits ); public: |