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/cursor.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/cursor.hxx')
-rw-r--r-- | include/vcl/cursor.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx index 0fa4b8277ec5..2d3b83c0b119 100644 --- a/include/vcl/cursor.hxx +++ b/include/vcl/cursor.hxx @@ -25,7 +25,7 @@ #include <vcl/dllapi.h> struct ImplCursorData; -class Window; +namespace vcl { class Window; } // Cursor styles #define CURSOR_SHADOW ((sal_uInt16)0x0001) @@ -40,7 +40,7 @@ class VCL_DLLPUBLIC Cursor { private: ImplCursorData* mpData; - Window* mpWindow; // only for shadow cursor + vcl::Window* mpWindow; // only for shadow cursor long mnSlant; Size maSize; Point maPos; @@ -71,8 +71,8 @@ public: void Hide(); bool IsVisible() const { return mbVisible; } - void SetWindow( Window* pWindow ); - Window* GetWindow() const { return mpWindow; } + void SetWindow( vcl::Window* pWindow ); + vcl::Window* GetWindow() const { return mpWindow; } void SetPos( const Point& rNewPos ); const Point& GetPos() const { return maPos; } |