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/tabctrl.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/tabctrl.hxx')
| -rw-r--r-- | include/vcl/tabctrl.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index f1c0f1ab4594..5351e452e924 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -72,7 +72,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); virtual void FillLayoutData() const SAL_OVERRIDE; virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; @@ -80,7 +80,7 @@ protected: SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); public: - TabControl( Window* pParent, + TabControl( vcl::Window* pParent, WinBits nStyle = WB_STDTABCONTROL ); virtual ~TabControl(); |