diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /include/vcl/wrkwin.hxx | |
parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'include/vcl/wrkwin.hxx')
-rw-r--r-- | include/vcl/wrkwin.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index 1c06d52d83bc..5b3a266790f2 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -50,7 +50,7 @@ private: mbFullScreenMode:1; SAL_DLLPRIVATE void ImplInitWorkWindowData(); - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ); private: SAL_DLLPRIVATE WorkWindow( const WorkWindow& rWin ); @@ -58,12 +58,12 @@ private: protected: explicit WorkWindow( WindowType nType ); - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = NULL ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = NULL ); SAL_DLLPRIVATE void ImplSetFrameState( sal_uLong aFrameState ); public: - explicit WorkWindow( Window* pParent, WinBits nStyle = WB_STDWORK ); - explicit WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); + explicit WorkWindow( vcl::Window* pParent, WinBits nStyle = WB_STDWORK ); + explicit WorkWindow( vcl::Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); explicit WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version virtual ~WorkWindow(); |