diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-21 13:51:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-22 10:37:59 +0200 |
| commit | 321b34419160da6829e30fc67f3d107fcb936390 (patch) | |
| tree | 56ba938925bf854233453b349894c0087bdce158 /vcl/source/window/dockmgr.cxx | |
| parent | fc36c689cad5b76a3b256f19cf7caeaa9359560c (diff) | |
convert TITLE_BUTTON constants to scoped enum
Change-Id: Ibfee4c394724570d9f64098d3703a08b7246ad2c
Diffstat (limited to 'vcl/source/window/dockmgr.cxx')
| -rw-r--r-- | vcl/source/window/dockmgr.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 96b776c051ab..b9bfd03b3f84 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -61,7 +61,7 @@ public: virtual void Move() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; - virtual void TitleButtonClick( sal_uInt16 nButton ) SAL_OVERRIDE; + virtual void TitleButtonClick( TitleButton nButton ) SAL_OVERRIDE; virtual void Pin() SAL_OVERRIDE; virtual void Roll() SAL_OVERRIDE; virtual void PopupModeEnd() SAL_OVERRIDE; @@ -257,7 +257,7 @@ void ImplDockFloatWin2::Resize() } } -void ImplDockFloatWin2::TitleButtonClick( sal_uInt16 nButton ) +void ImplDockFloatWin2::TitleButtonClick( TitleButton nButton ) { FloatingWindow::TitleButtonClick( nButton ); mpDockWin->TitleButtonClick( nButton ); @@ -1061,9 +1061,9 @@ void ImplDockingWindowWrapper::ToggleFloatingMode() mbStartDockingEnabled = false; } -void ImplDockingWindowWrapper::TitleButtonClick( sal_uInt16 nType ) +void ImplDockingWindowWrapper::TitleButtonClick( TitleButton nType ) { - if( nType == TITLE_BUTTON_MENU ) + if( nType == TitleButton::Menu ) { ToolBox *pToolBox = dynamic_cast< ToolBox* >( GetWindow() ); if( pToolBox ) @@ -1071,7 +1071,7 @@ void ImplDockingWindowWrapper::TitleButtonClick( sal_uInt16 nType ) pToolBox->ExecuteCustomMenu(); } } - if( nType == TITLE_BUTTON_DOCKING ) + if( nType == TitleButton::Docking ) { SetFloatingMode( !IsFloatingMode() ); } @@ -1085,15 +1085,15 @@ void ImplDockingWindowWrapper::Resizing( Size& rSize ) pDockingWindow->Resizing( rSize ); } -void ImplDockingWindowWrapper::ShowTitleButton( sal_uInt16 nButton, bool bVisible ) +void ImplDockingWindowWrapper::ShowTitleButton( TitleButton nButton, bool bVisible ) { if ( mpFloatWin ) mpFloatWin->ShowTitleButton( nButton, bVisible ); else { - if ( nButton == TITLE_BUTTON_DOCKING ) + if ( nButton == TitleButton::Docking ) mbDockBtn = bVisible; - else // if ( nButton == TITLE_BUTTON_HIDE ) + else // if ( nButton == TitleButton::Hide ) mbHideBtn = bVisible; } } @@ -1251,8 +1251,8 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode ) pWin->SetOutputSizePixel( GetWindow()->GetSizePixel() ); pWin->SetPosPixel( maFloatPos ); // pass on DockingData to FloatingWindow - pWin->ShowTitleButton( TITLE_BUTTON_DOCKING, mbDockBtn ); - pWin->ShowTitleButton( TITLE_BUTTON_HIDE, mbHideBtn ); + pWin->ShowTitleButton( TitleButton::Docking, mbDockBtn ); + pWin->ShowTitleButton( TitleButton::Hide, mbHideBtn ); pWin->SetPin( mbPinned ); if ( mbRollUp ) pWin->RollUp(); @@ -1275,8 +1275,8 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode ) // store FloatingData in FloatingWindow maFloatPos = mpFloatWin->GetPosPixel(); - mbDockBtn = mpFloatWin->IsTitleButtonVisible( TITLE_BUTTON_DOCKING ); - mbHideBtn = mpFloatWin->IsTitleButtonVisible( TITLE_BUTTON_HIDE ); + mbDockBtn = mpFloatWin->IsTitleButtonVisible( TitleButton::Docking ); + mbHideBtn = mpFloatWin->IsTitleButtonVisible( TitleButton::Hide ); mbPinned = mpFloatWin->IsPinned(); mbRollUp = mpFloatWin->IsRollUp(); maRollUpOutSize = mpFloatWin->GetRollUpOutputSizePixel(); |