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 /toolkit/inc | |
| 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 'toolkit/inc')
| -rw-r--r-- | toolkit/inc/helper/unowrapper.hxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/toolkit/inc/helper/unowrapper.hxx b/toolkit/inc/helper/unowrapper.hxx index 8e131ccddd44..15eab553a095 100644 --- a/toolkit/inc/helper/unowrapper.hxx +++ b/toolkit/inc/helper/unowrapper.hxx @@ -52,26 +52,26 @@ public: virtual void ReleaseAllGraphics( OutputDevice* pOutDev ) SAL_OVERRIDE; // Window - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, bool bCreate ) SAL_OVERRIDE; - virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ) SAL_OVERRIDE; - - void WindowDestroyed( Window* pWindow ) SAL_OVERRIDE; - void WindowEvent_Move( Window* pWindow ); - void WindowEvent_Resize( Window* pWindow ); - void WindowEvent_Show( Window* pWindow, bool bShow ); - void WindowEvent_Close( Window* pWindow ); - void WindowEvent_Minimize( Window* pWindow ); - void WindowEvent_Normalize( Window* pWindow ); - void WindowEvent_Activate( Window* pWindow, bool bActivated ); - void WindowEvent_MouseButtonUp( Window* pWindow, const MouseEvent& rEvt ); - void WindowEvent_MouseButtonDown( Window* pWindow, const MouseEvent& rEvt ); - void WindowEvent_MouseMove( Window* pWindow, const MouseEvent& rEvt ); - void WindowEvent_Command( Window* pWindow, const CommandEvent& rCEvt ); - void WindowEvent_KeyInput( Window* pWindow, const KeyEvent& rEvt ); - void WindowEvent_KeyUp( Window* pWindow, const KeyEvent& rEvt ); - void WindowEvent_GetFocus( Window* pWindow ); - void WindowEvent_LoseFocus( Window* pWindow ); - void WindowEvent_Paint( Window* pWindow, const Rectangle& rRect ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( vcl::Window* pWindow, bool bCreate ) SAL_OVERRIDE; + virtual void SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ) SAL_OVERRIDE; + + void WindowDestroyed( vcl::Window* pWindow ) SAL_OVERRIDE; + void WindowEvent_Move( vcl::Window* pWindow ); + void WindowEvent_Resize( vcl::Window* pWindow ); + void WindowEvent_Show( vcl::Window* pWindow, bool bShow ); + void WindowEvent_Close( vcl::Window* pWindow ); + void WindowEvent_Minimize( vcl::Window* pWindow ); + void WindowEvent_Normalize( vcl::Window* pWindow ); + void WindowEvent_Activate( vcl::Window* pWindow, bool bActivated ); + void WindowEvent_MouseButtonUp( vcl::Window* pWindow, const MouseEvent& rEvt ); + void WindowEvent_MouseButtonDown( vcl::Window* pWindow, const MouseEvent& rEvt ); + void WindowEvent_MouseMove( vcl::Window* pWindow, const MouseEvent& rEvt ); + void WindowEvent_Command( vcl::Window* pWindow, const CommandEvent& rCEvt ); + void WindowEvent_KeyInput( vcl::Window* pWindow, const KeyEvent& rEvt ); + void WindowEvent_KeyUp( vcl::Window* pWindow, const KeyEvent& rEvt ); + void WindowEvent_GetFocus( vcl::Window* pWindow ); + void WindowEvent_LoseFocus( vcl::Window* pWindow ); + void WindowEvent_Paint( vcl::Window* pWindow, const Rectangle& rRect ); // Accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > |