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/split.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/split.hxx')
-rw-r--r-- | include/vcl/split.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index ff42f32030b3..b478317fe718 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -25,10 +25,10 @@ #define SPLITTER_DEFAULTSTEPSIZE 0xFFFF -class VCL_DLLPUBLIC Splitter : public Window +class VCL_DLLPUBLIC Splitter : public vcl::Window { private: - Window* mpRefWin; + vcl::Window* mpRefWin; long mnSplitPos; long mnLastSplitPos; long mnStartSplitPos; @@ -59,11 +59,11 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nWinStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nWinStyle ); public: - explicit Splitter( Window* pParent, WinBits nStyle = WB_VSCROLL ); - explicit Splitter( Window* pParent, const ResId& ); + explicit Splitter( vcl::Window* pParent, WinBits nStyle = WB_VSCROLL ); + explicit Splitter( vcl::Window* pParent, const ResId& ); virtual ~Splitter(); virtual void StartSplit(); @@ -86,9 +86,9 @@ public: void StartDrag(); void SetDragRectPixel( const Rectangle& rDragRect, - Window* pRefWin = NULL ); + vcl::Window* pRefWin = NULL ); const Rectangle& GetDragRectPixel() const { return maDragRect; } - Window* GetDragWindow() const { return mpRefWin; } + vcl::Window* GetDragWindow() const { return mpRefWin; } virtual void SetSplitPosPixel( long nPos ); long GetSplitPosPixel() const { return mnSplitPos; } |