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/seleng.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/seleng.hxx')
| -rw-r--r-- | include/vcl/seleng.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index bdb2e3cb4248..afe30c39a87a 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -24,7 +24,7 @@ #include <vcl/timer.hxx> #include <vcl/event.hxx> -class Window; +namespace vcl { class Window; } class CommandEvent; // Timerticks @@ -77,7 +77,7 @@ class VCL_DLLPUBLIC SelectionEngine { private: FunctionSet* pFunctionSet; - Window* pWin; + vcl::Window* pWin; Rectangle aArea; Timer aWTimer; // generate fake mouse moves MouseEvent aLastMove; @@ -91,7 +91,7 @@ private: // determines to deselect or not when Ctrl-key is pressed on CursorPosChanging public: - SelectionEngine( Window* pWindow, + SelectionEngine( vcl::Window* pWindow, FunctionSet* pFunctions = NULL, sal_uLong nAutoRepeatInterval = SELENG_AUTOREPEAT_INTERVAL ); ~SelectionEngine(); @@ -129,8 +129,8 @@ public: { return aLastMove.GetPosPixel(); } const MouseEvent& GetMouseEvent() const { return aLastMove; } - void SetWindow( Window*); - Window* GetWindow() const { return pWin; } + void SetWindow( vcl::Window*); + vcl::Window* GetWindow() const { return pWin; } void LockModifiers( sal_uInt16 nModifiers ) { nLockedMods = nModifiers; } |