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 /framework/source/classes | |
| 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 'framework/source/classes')
| -rw-r--r-- | framework/source/classes/fwktabwindow.cxx | 8 | ||||
| -rw-r--r-- | framework/source/classes/menumanager.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index 64973e673f3f..54fde624f95f 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -48,7 +48,7 @@ namespace framework { // class FwkTabControl --------------------------------------------------- -FwkTabControl::FwkTabControl(Window* pParent) +FwkTabControl::FwkTabControl(vcl::Window* pParent) : TabControl(pParent) { } @@ -66,7 +66,7 @@ void FwkTabControl::BroadcastEvent( sal_uLong nEvent ) // class FwkTabPage ------------------------------------------------ FwkTabPage::FwkTabPage( - Window* pParent, const OUString& rPageURL, + vcl::Window* pParent, const OUString& rPageURL, const css::uno::Reference< css::awt::XContainerWindowEventHandler >& rEventHdl, const css::uno::Reference< css::awt::XContainerWindowProvider >& rProvider ) : @@ -104,7 +104,7 @@ void FwkTabPage::CreateDialog() uno::Reference< awt::XWindowPeer > xWinPeer( xPageControl->getPeer() ); if ( xWinPeer.is() ) { - Window* pWindow = VCLUnoHelper::GetWindow( xWinPeer ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWinPeer ); if ( pWindow ) pWindow->SetStyle( pWindow->GetStyle() | WB_DIALOGCONTROL | WB_CHILDDLGCTRL ); } @@ -172,7 +172,7 @@ void FwkTabPage::Resize() } // class FwkTabWindow --------------------------------------------- -FwkTabWindow::FwkTabWindow( Window* pParent ) +FwkTabWindow::FwkTabWindow( vcl::Window* pParent ) : Window(pParent) , m_aTabCtrl(this) { diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 4a5b1395d39b..965d4895762c 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -626,7 +626,7 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XCompone if ( xFrame == xCurrentFrame ) nActiveItemId = nItemId; - Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); if ( pWin && pWin->IsVisible() ) { aNewWindowListVector.push_back( pWin->GetText() ); @@ -846,7 +846,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu ) if ( xFrame.is() && nTaskId == nCurItemId ) { - Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); pWin->GrabFocus(); pWin->ToTop( TOTOP_RESTOREWHENMIN ); break; |