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 /svtools/source/control/toolbarmenu.cxx | |
| 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 'svtools/source/control/toolbarmenu.cxx')
| -rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 2be0e430d8bb..fb03917624d5 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -41,7 +41,7 @@ namespace svtools { -static Window* GetTopMostParentSystemWindow( Window* pWindow ) +static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow ) { OSL_ASSERT( pWindow ); if ( pWindow ) @@ -437,7 +437,7 @@ IMPL_LINK( ToolbarMenu, HighlightHdl, Control *, pControl ) -ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWindow, WinBits nBits ) +ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, vcl::Window* pParentWindow, WinBits nBits ) : DockingWindow(pParentWindow, nBits) { implInit(rFrame); @@ -445,7 +445,7 @@ ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWind -ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWindow, const ResId& rResId ) +ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, vcl::Window* pParentWindow, const ResId& rResId ) : DockingWindow(pParentWindow, rResId) { implInit(rFrame); @@ -462,7 +462,7 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame) initWindow(); - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } @@ -471,7 +471,7 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame) ToolbarMenu::~ToolbarMenu() { - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->RemoveWindow( this ); @@ -584,7 +584,7 @@ void ToolbarMenu::initWindow() -static long ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) +static long ImplGetNativeCheckAndRadioSize( vcl::Window* pWin, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) { rMaxWidth = rCheckHeight = rRadioHeight = 0; @@ -1283,7 +1283,7 @@ void ToolbarMenu::KeyInput( const KeyEvent& rKEvent ) } -static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRect, bool i_bHighlight ) +static void ImplPaintCheckBackground( vcl::Window* i_pWindow, const Rectangle& i_rRect, bool i_bHighlight ) { bool bNativeOk = false; if( i_pWindow->IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) ) |