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/tabpage.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/tabpage.hxx')
-rw-r--r-- | include/vcl/tabpage.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index 86f994618d4e..c7361972ccb1 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -30,17 +30,17 @@ class VCL_DLLPUBLIC TabPage - : public Window + : public vcl::Window , public VclBuilderContainer { private: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); public: - explicit TabPage( Window* pParent, WinBits nStyle = 0 ); - explicit TabPage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit TabPage( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit TabPage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; |