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/combobox.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/combobox.hxx')
| -rw-r--r-- | include/vcl/combobox.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index b80d088ab748..3928a4cb1be6 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -81,7 +81,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplCalcEditHeight(); @@ -92,8 +92,8 @@ protected: virtual void FillLayoutData() const SAL_OVERRIDE; public: - explicit ComboBox( Window* pParent, WinBits nStyle = 0 ); - explicit ComboBox( Window* pParent, const ResId& ); + explicit ComboBox( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit ComboBox( vcl::Window* pParent, const ResId& ); virtual ~ComboBox(); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; |