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/osx | |
| 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/osx')
| -rw-r--r-- | vcl/osx/a11yfocustracker.cxx | 14 | ||||
| -rw-r--r-- | vcl/osx/salinst.cxx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx index 1ce09a61a89b..877d2a7060e4 100644 --- a/vcl/osx/a11yfocustracker.cxx +++ b/vcl/osx/a11yfocustracker.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; -static inline Window * +static inline vcl::Window * getWindow(const ::VclSimpleEvent *pEvent) { return static_cast< const ::VclWindowEvent *> (pEvent)->GetWindow(); @@ -124,11 +124,11 @@ void AquaA11yFocusTracker::notify_toolbox_item_focus(ToolBox *pToolBox) } } -void AquaA11yFocusTracker::toolbox_open_floater(Window *pWindow) +void AquaA11yFocusTracker::toolbox_open_floater(vcl::Window *pWindow) { bool bToolboxFound = false; bool bFloatingWindowFound = false; - Window * pFloatingWindow = NULL; + vcl::Window * pFloatingWindow = NULL; while ( pWindow != NULL ) { if ( pWindow->GetType() == WINDOW_TOOLBOX ) { bToolboxFound = true; @@ -157,7 +157,7 @@ void AquaA11yFocusTracker::toolbox_open_floater(Window *pWindow) } } -void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow) +void AquaA11yFocusTracker::toolbox_highlight_on(vcl::Window *pWindow) { // Make sure either the toolbox or its parent toolbox has the focus if ( ! pWindow->HasFocus() ) @@ -170,7 +170,7 @@ void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow) notify_toolbox_item_focus(static_cast <ToolBox *> (pWindow)); } -void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow) +void AquaA11yFocusTracker::toolbox_highlight_off(vcl::Window *pWindow) { ToolBox* pToolBoxParent = dynamic_cast< ToolBox * >( pWindow->GetParent() ); @@ -179,7 +179,7 @@ void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow) notify_toolbox_item_focus( pToolBoxParent ); } -void AquaA11yFocusTracker::tabpage_activated(Window *pWindow) +void AquaA11yFocusTracker::tabpage_activated(vcl::Window *pWindow) { Reference< XAccessible > xAccessible( pWindow->GetAccessible() ); @@ -205,7 +205,7 @@ void AquaA11yFocusTracker::menu_highlighted(const VclMenuEvent *pEvent) } } -void AquaA11yFocusTracker::window_got_focus(Window *pWindow) +void AquaA11yFocusTracker::window_got_focus(vcl::Window *pWindow) { // The menu bar is handled through VCLEVENT_MENU_HIGHLIGHTED if( ! pWindow || !pWindow->IsReallyVisible() || pWindow->GetType() == WINDOW_MENUBARWINDOW ) diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 93d1e1a53e19..d8adf03893e2 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -515,7 +515,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) break; } AquaSalFrame* pFrame = pSalData->maFrames.front(); - Window* pWindow = pFrame ? pFrame->GetWindow() : NULL; + vcl::Window* pWindow = pFrame ? pFrame->GetWindow() : NULL; if( pWindow ) { |