summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-10-07 16:08:25 +0200
committerNoel Grandin <noelgrandin@gmail.com>2014-10-11 15:14:32 +0000
commitcb7ede2d9970a4d162dc71922f578922c0d6235a (patch)
tree141884aa4a9d7c2c3cfb6fdf850ddf71cad0e7a4 /vcl/source/window
parent0bc6ea3637e279fa2807d8ee649fb33f1ae6da47 (diff)
convert vcl StateChangedType to enum class
Change-Id: Ifa46523619ae7fb8d112525b8df594836e51bb8f Reviewed-on: https://gerrit.libreoffice.org/11843 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/brdwin.cxx6
-rw-r--r--vcl/source/window/btndlg.cxx2
-rw-r--r--vcl/source/window/dialog.cxx4
-rw-r--r--vcl/source/window/dockingarea.cxx2
-rw-r--r--vcl/source/window/dockwin.cxx4
-rw-r--r--vcl/source/window/event.cxx2
-rw-r--r--vcl/source/window/floatwin.cxx4
-rw-r--r--vcl/source/window/globalization.cxx2
-rw-r--r--vcl/source/window/layout.cxx2
-rw-r--r--vcl/source/window/menubarwindow.cxx4
-rw-r--r--vcl/source/window/menufloatingwindow.cxx2
-rw-r--r--vcl/source/window/msgbox.cxx2
-rw-r--r--vcl/source/window/splitwin.cxx7
-rw-r--r--vcl/source/window/status.cxx12
-rw-r--r--vcl/source/window/tabdlg.cxx2
-rw-r--r--vcl/source/window/tabpage.cxx4
-rw-r--r--vcl/source/window/toolbox.cxx14
-rw-r--r--vcl/source/window/window.cxx34
-rw-r--r--vcl/source/window/window2.cxx20
19 files changed, 65 insertions, 64 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index a9640614c887..d008582da02d 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1967,9 +1967,9 @@ void ImplBorderWindow::Resize()
void ImplBorderWindow::StateChanged( StateChangedType nType )
{
- if ( (nType == STATE_CHANGE_TEXT) ||
- (nType == STATE_CHANGE_IMAGE) ||
- (nType == STATE_CHANGE_DATA) )
+ if ( (nType == StateChangedType::TEXT) ||
+ (nType == StateChangedType::IMAGE) ||
+ (nType == StateChangedType::DATA) )
{
if ( IsReallyVisible() && mbFrameBorder )
{
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index b5871954b713..3c9880134a86 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -227,7 +227,7 @@ void ButtonDialog::Resize()
void ButtonDialog::StateChanged( StateChangedType nType )
{
- if ( nType == STATE_CHANGE_INITSHOW )
+ if ( nType == StateChangedType::INITSHOW )
{
ImplPosControls();
for (btn_iterator it = maItemList.begin(); it != maItemList.end(); ++it)
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index c654423092cf..afb219726e30 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -616,7 +616,7 @@ Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize)
void Dialog::StateChanged( StateChangedType nType )
{
- if (nType == STATE_CHANGE_INITSHOW)
+ if (nType == StateChangedType::INITSHOW)
{
DoInitialLayout();
@@ -636,7 +636,7 @@ void Dialog::StateChanged( StateChangedType nType )
SystemWindow::StateChanged( nType );
- if (nType == STATE_CHANGE_CONTROLBACKGROUND)
+ if (nType == StateChangedType::CONTROLBACKGROUND)
{
ImplInitSettings();
Invalidate();
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 6d6416d6ce04..8266c642d9cd 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -129,7 +129,7 @@ void DockingAreaWindow::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
- if ( nType == STATE_CHANGE_VISIBLE )
+ if ( nType == StateChangedType::VISIBLE )
ImplInvalidateMenubar( this );
}
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index bf04f1afc719..c487bfe7b390 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -691,12 +691,12 @@ void DockingWindow::StateChanged( StateChangedType nType )
{
switch(nType)
{
- case STATE_CHANGE_CONTROLBACKGROUND:
+ case StateChangedType::CONTROLBACKGROUND:
ImplInitSettings();
Invalidate();
break;
- case STATE_CHANGE_STYLE:
+ case StateChangedType::STYLE:
mbDockable = (GetStyle() & WB_DOCKABLE) != 0;
break;
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 2f900ff97266..95bb1586274e 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -423,7 +423,7 @@ void Window::ImplCallInitShow()
{
mpWindowImpl->mbReallyShown = true;
mpWindowImpl->mbInInitShow = true;
- StateChanged( STATE_CHANGE_INITSHOW );
+ StateChanged( StateChangedType::INITSHOW );
mpWindowImpl->mbInInitShow = false;
vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap;
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index bc1642d43194..ec8c6a5566f7 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -537,14 +537,14 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt )
void FloatingWindow::StateChanged( StateChangedType nType )
{
- if (nType == STATE_CHANGE_INITSHOW)
+ if (nType == StateChangedType::INITSHOW)
{
DoInitialLayout();
}
SystemWindow::StateChanged( nType );
- if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
+ if ( nType == StateChangedType::CONTROLBACKGROUND )
{
ImplInitSettings();
Invalidate();
diff --git a/vcl/source/window/globalization.cxx b/vcl/source/window/globalization.cxx
index 59081a2a48d3..ed9f17e746a7 100644
--- a/vcl/source/window/globalization.cxx
+++ b/vcl/source/window/globalization.cxx
@@ -24,7 +24,7 @@ namespace vcl {
void Window::EnableRTL ( bool bEnable )
{
- StateChanged( STATE_CHANGE_MIRRORING );
+ StateChanged( StateChangedType::MIRRORING );
OutputDevice::EnableRTL(bEnable);
}
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index f448b0242500..1709f34bb695 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1573,7 +1573,7 @@ void VclExpander::StateChanged(StateChangedType nType)
{
VclBin::StateChanged( nType );
- if (nType == STATE_CHANGE_INITSHOW)
+ if (nType == StateChangedType::INITSHOW)
{
vcl::Window *pChild = get_child();
if (pChild)
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 840c5e19e83c..7a96ac850c87 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -980,8 +980,8 @@ void MenuBarWindow::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
- if ( ( nType == STATE_CHANGE_CONTROLFOREGROUND ) ||
- ( nType == STATE_CHANGE_CONTROLBACKGROUND ) )
+ if ( ( nType == StateChangedType::CONTROLFOREGROUND ) ||
+ ( nType == StateChangedType::CONTROLBACKGROUND ) )
{
ImplInitMenuWindow( this, false, true );
Invalidate();
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 2e34bde30433..9b2b4392ba5a 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -1159,7 +1159,7 @@ void MenuFloatingWindow::StateChanged( StateChangedType nType )
{
FloatingWindow::StateChanged( nType );
- if ( ( nType == STATE_CHANGE_CONTROLFOREGROUND ) || ( nType == STATE_CHANGE_CONTROLBACKGROUND ) )
+ if ( ( nType == StateChangedType::CONTROLFOREGROUND ) || ( nType == StateChangedType::CONTROLBACKGROUND ) )
{
ImplInitMenuWindow( this, false, false );
Invalidate();
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index f6c6399e8db1..035d97f7e968 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -353,7 +353,7 @@ void MessBox::ImplPosControls()
void MessBox::StateChanged( StateChangedType nType )
{
- if ( nType == STATE_CHANGE_INITSHOW )
+ if ( nType == StateChangedType::INITSHOW )
{
ImplPosControls();
}
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 3d99653d5975..4c07b25392a2 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -2602,18 +2602,19 @@ void SplitWindow::StateChanged( StateChangedType nType )
{
switch ( nType )
{
- case STATE_CHANGE_INITSHOW:
+ case StateChangedType::INITSHOW:
if ( IsUpdateMode() )
ImplCalcLayout();
break;
- case STATE_CHANGE_UPDATEMODE:
+ case StateChangedType::UPDATEMODE:
if ( IsUpdateMode() && IsReallyShown() )
ImplCalcLayout();
break;
- case STATE_CHANGE_CONTROLBACKGROUND:
+ case StateChangedType::CONTROLBACKGROUND:
ImplInitSettings();
Invalidate();
break;
+ default:;
}
DockingWindow::StateChanged( nType );
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 545b0a6e0bb3..82d99d01141c 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -814,23 +814,23 @@ void StatusBar::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
- if ( nType == STATE_CHANGE_INITSHOW )
+ if ( nType == StateChangedType::INITSHOW )
ImplFormat();
- else if ( nType == STATE_CHANGE_UPDATEMODE )
+ else if ( nType == StateChangedType::UPDATEMODE )
Invalidate();
- else if ( (nType == STATE_CHANGE_ZOOM) ||
- (nType == STATE_CHANGE_CONTROLFONT) )
+ else if ( (nType == StateChangedType::ZOOM) ||
+ (nType == StateChangedType::CONTROLFONT) )
{
mbFormat = true;
ImplInitSettings( true, false, false );
Invalidate();
}
- else if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
+ else if ( nType == StateChangedType::CONTROLFOREGROUND )
{
ImplInitSettings( false, true, false );
Invalidate();
}
- else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::CONTROLBACKGROUND )
{
ImplInitSettings( false, false, true );
Invalidate();
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index b67b978d9166..c3258b4f0390 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -226,7 +226,7 @@ TabDialog::~TabDialog()
void TabDialog::StateChanged( StateChangedType nType )
{
- if ( nType == STATE_CHANGE_INITSHOW )
+ if ( nType == StateChangedType::INITSHOW )
{
// Calculate the Layout only for the initialized state
if ( mbPosControls )
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index f96cbebd0cb7..c7648f05692c 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -89,14 +89,14 @@ void TabPage::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
- if ( nType == STATE_CHANGE_INITSHOW )
+ if ( nType == StateChangedType::INITSHOW )
{
if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
ImplWindowAutoMnemonic( this );
// FIXME: no layouting, workaround some clipping issues
ImplAdjustNWFSizes();
}
- else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::CONTROLBACKGROUND )
{
ImplInitSettings();
Invalidate();
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index d6245bf763f1..adcf55128543 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4416,29 +4416,29 @@ void ToolBox::StateChanged( StateChangedType nType )
{
DockingWindow::StateChanged( nType );
- if ( nType == STATE_CHANGE_INITSHOW )
+ if ( nType == StateChangedType::INITSHOW )
ImplFormat();
- else if ( nType == STATE_CHANGE_ENABLE )
+ else if ( nType == StateChangedType::ENABLE )
ImplUpdateItem();
- else if ( nType == STATE_CHANGE_UPDATEMODE )
+ else if ( nType == StateChangedType::UPDATEMODE )
{
if ( IsUpdateMode() )
Invalidate();
}
- else if ( (nType == STATE_CHANGE_ZOOM) ||
- (nType == STATE_CHANGE_CONTROLFONT) )
+ else if ( (nType == StateChangedType::ZOOM) ||
+ (nType == StateChangedType::CONTROLFONT) )
{
mbCalc = true;
mbFormat = true;
ImplInitSettings( true, false, false );
Invalidate();
}
- else if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
+ else if ( nType == StateChangedType::CONTROLFOREGROUND )
{
ImplInitSettings( false, true, false );
Invalidate();
}
- else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::CONTROLBACKGROUND )
{
ImplInitSettings( false, false, true ); // font, foreground, background
Invalidate();
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index be0e35cd1613..8d8eb6cea652 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1981,16 +1981,16 @@ void Window::StateChanged(StateChangedType eType)
switch (eType)
{
//stuff that doesn't invalidate the layout
- case STATE_CHANGE_CONTROLFOREGROUND:
- case STATE_CHANGE_CONTROLBACKGROUND:
- case STATE_CHANGE_TRANSPARENT:
- case STATE_CHANGE_UPDATEMODE:
- case STATE_CHANGE_READONLY:
- case STATE_CHANGE_ENABLE:
- case STATE_CHANGE_STATE:
- case STATE_CHANGE_DATA:
- case STATE_CHANGE_INITSHOW:
- case STATE_CHANGE_CONTROL_FOCUS:
+ case StateChangedType::CONTROLFOREGROUND:
+ case StateChangedType::CONTROLBACKGROUND:
+ case StateChangedType::TRANSPARENT:
+ case StateChangedType::UPDATEMODE:
+ case StateChangedType::READONLY:
+ case StateChangedType::ENABLE:
+ case StateChangedType::STATE:
+ case StateChangedType::DATA:
+ case StateChangedType::INITSHOW:
+ case StateChangedType::CONTROL_FOCUS:
break;
//stuff that does invalidate the layout
default:
@@ -2025,7 +2025,7 @@ void Window::SetStyle( WinBits nStyle )
{
mpWindowImpl->mnPrevStyle = mpWindowImpl->mnStyle;
mpWindowImpl->mnStyle = nStyle;
- StateChanged( STATE_CHANGE_STYLE );
+ StateChanged( StateChangedType::STYLE );
}
}
@@ -2049,7 +2049,7 @@ void Window::SetExtendedStyle( WinBits nExtendedStyle )
}
mpWindowImpl->mnPrevExtendedStyle = mpWindowImpl->mnExtendedStyle;
mpWindowImpl->mnExtendedStyle = nExtendedStyle;
- StateChanged( STATE_CHANGE_EXTENDEDSTYLE );
+ StateChanged( StateChangedType::EXTENDEDSTYLE );
}
}
@@ -2262,7 +2262,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
mpWindowImpl->mpFrame->Show( false, false );
}
- StateChanged( STATE_CHANGE_VISIBLE );
+ StateChanged( StateChangedType::VISIBLE );
if ( mpWindowImpl->mbReallyVisible )
{
@@ -2350,7 +2350,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
ImplCallResize();
}
- StateChanged( STATE_CHANGE_VISIBLE );
+ StateChanged( StateChangedType::VISIBLE );
vcl::Window* pTestParent;
if ( ImplIsOverlapWindow() )
@@ -2535,7 +2535,7 @@ void Window::Enable( bool bEnable, bool bChild )
mpWindowImpl->mbDisabled = !bEnable;
if ( mpWindowImpl->mpSysObj )
mpWindowImpl->mpSysObj->Enable( bEnable && !mpWindowImpl->mbInputDisabled );
- StateChanged( STATE_CHANGE_ENABLE );
+ StateChanged( StateChangedType::ENABLE );
ImplCallEventListeners( bEnable ? VCLEVENT_WINDOW_ENABLED : VCLEVENT_WINDOW_DISABLED );
}
@@ -3089,7 +3089,7 @@ void Window::SetUpdateMode( bool bUpdate )
{
mpWindowImpl->mbNoUpdate = !bUpdate;
- StateChanged( STATE_CHANGE_UPDATEMODE );
+ StateChanged( StateChangedType::UPDATEMODE );
}
void Window::GrabFocus()
@@ -3161,7 +3161,7 @@ void Window::SetText( const OUString& rStr )
pWindow->ImplCallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldTitle );
}
- StateChanged( STATE_CHANGE_TEXT );
+ StateChanged( StateChangedType::TEXT );
}
OUString Window::GetText() const
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index f3588f59e548..bf09d53b4e94 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -512,7 +512,7 @@ void Window::SetZoom( const boost::rational<long>& rZoom )
if ( mpWindowImpl->maZoom != rZoom )
{
mpWindowImpl->maZoom = rZoom;
- StateChanged( STATE_CHANGE_ZOOM );
+ StateChanged( StateChangedType::ZOOM );
}
}
@@ -579,7 +579,7 @@ void Window::SetControlFont()
{
delete mpWindowImpl->mpControlFont;
mpWindowImpl->mpControlFont = NULL;
- StateChanged( STATE_CHANGE_CONTROLFONT );
+ StateChanged( StateChangedType::CONTROLFONT );
}
}
@@ -600,7 +600,7 @@ void Window::SetControlFont( const vcl::Font& rFont )
else
mpWindowImpl->mpControlFont = new vcl::Font( rFont );
- StateChanged( STATE_CHANGE_CONTROLFONT );
+ StateChanged( StateChangedType::CONTROLFONT );
}
vcl::Font Window::GetControlFont() const
@@ -620,7 +620,7 @@ void Window::SetControlForeground()
{
mpWindowImpl->maControlForeground = Color( COL_TRANSPARENT );
mpWindowImpl->mbControlForeground = false;
- StateChanged( STATE_CHANGE_CONTROLFOREGROUND );
+ StateChanged( StateChangedType::CONTROLFOREGROUND );
}
}
@@ -632,7 +632,7 @@ void Window::SetControlForeground( const Color& rColor )
{
mpWindowImpl->maControlForeground = Color( COL_TRANSPARENT );
mpWindowImpl->mbControlForeground = false;
- StateChanged( STATE_CHANGE_CONTROLFOREGROUND );
+ StateChanged( StateChangedType::CONTROLFOREGROUND );
}
}
else
@@ -641,7 +641,7 @@ void Window::SetControlForeground( const Color& rColor )
{
mpWindowImpl->maControlForeground = rColor;
mpWindowImpl->mbControlForeground = true;
- StateChanged( STATE_CHANGE_CONTROLFOREGROUND );
+ StateChanged( StateChangedType::CONTROLFOREGROUND );
}
}
}
@@ -652,7 +652,7 @@ void Window::SetControlBackground()
{
mpWindowImpl->maControlBackground = Color( COL_TRANSPARENT );
mpWindowImpl->mbControlBackground = false;
- StateChanged( STATE_CHANGE_CONTROLBACKGROUND );
+ StateChanged( StateChangedType::CONTROLBACKGROUND );
}
}
@@ -664,7 +664,7 @@ void Window::SetControlBackground( const Color& rColor )
{
mpWindowImpl->maControlBackground = Color( COL_TRANSPARENT );
mpWindowImpl->mbControlBackground = false;
- StateChanged( STATE_CHANGE_CONTROLBACKGROUND );
+ StateChanged( StateChangedType::CONTROLBACKGROUND );
}
}
else
@@ -673,7 +673,7 @@ void Window::SetControlBackground( const Color& rColor )
{
mpWindowImpl->maControlBackground = rColor;
mpWindowImpl->mbControlBackground = true;
- StateChanged( STATE_CHANGE_CONTROLBACKGROUND );
+ StateChanged( StateChangedType::CONTROLBACKGROUND );
}
}
}
@@ -1430,7 +1430,7 @@ void Window::queue_resize(StateChangedType eReason)
bool bSomeoneCares = queue_ungrouped_resize(this);
WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
- if (eReason != STATE_CHANGE_VISIBLE)
+ if (eReason != StateChangedType::VISIBLE)
{
pWindowImpl->mnOptimalWidthCache = -1;
pWindowImpl->mnOptimalHeightCache = -1;