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 /vcl/inc/osx/a11yfocustracker.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 'vcl/inc/osx/a11yfocustracker.hxx')
-rw-r--r-- | vcl/inc/osx/a11yfocustracker.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx index d4b4886f9ccc..9cd9e6fbd5e0 100644 --- a/vcl/inc/osx/a11yfocustracker.hxx +++ b/vcl/inc/osx/a11yfocustracker.hxx @@ -30,7 +30,7 @@ #include <vcl/vclevent.hxx> #include <set> -class Window; +namespace vcl { class Window; } class ToolBox; class DocumentFocusListener; @@ -53,16 +53,16 @@ public: protected: // received a WINDOW_GETFOCUS event for this window - void window_got_focus(Window *pWindow); + void window_got_focus(vcl::Window *pWindow); // received a TOOLBOX_HIGHLIGHT event for this window - void toolbox_highlight_on(Window *pWindow); + void toolbox_highlight_on(vcl::Window *pWindow); // received a TOOLBOX_HIGHLIGHTOFF event for this window - void toolbox_highlight_off(Window *pWindow); + void toolbox_highlight_off(vcl::Window *pWindow); // received a TABPAGE_ACTIVATE event for this window - void tabpage_activated(Window *pWindow); + void tabpage_activated(vcl::Window *pWindow); // received a MENU_HIGHLIGHT event for this window void menu_highlighted(const ::VclMenuEvent *pEvent); @@ -71,7 +71,7 @@ protected: void notify_toolbox_item_focus(ToolBox *pToolBox); // toolbox item opened a floating window (e.g. color chooser) - void toolbox_open_floater(Window *pWindow); + void toolbox_open_floater(vcl::Window *pWindow); // callback function for Application::addEventListener static long WindowEventHandler(AquaA11yFocusTracker *pFocusTracker, ::VclSimpleEvent const *pEvent); @@ -84,7 +84,7 @@ private: rtl::Reference< KeyboardFocusListener > m_aFocusListener; // the list of Windows that need deeper (focus) investigation - std::set< Window *> m_aDocumentWindowList; + std::set< vcl::Window *> m_aDocumentWindowList; // the link object needed for Application::addEventListener Link m_aWindowEventLink; |