vcl: rename other members of StateChangedType for consistency

Change-Id: Ifd3339813e5d3dfb54566fd226aaf2d2a199d59a

35 files changed, 254 insertions, 254 deletions

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index ef0c8c310685..39fd3c62ee90 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -162,7 +162,7 @@ bool Button::SetModeImage( const Image& rImage )
     if ( rImage != mpButtonData->maImage )
     {
         mpButtonData->maImage = rImage;
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
         queue_resize();
     }
     return true;
@@ -183,7 +183,7 @@ void Button::SetImageAlign( ImageAlign eAlign )
     if ( mpButtonData->meImageAlign != eAlign )
     {
         mpButtonData->meImageAlign = eAlign;
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
     }
 }
 
@@ -548,7 +548,7 @@ void Button::ImplSetSymbolAlign( SymbolAlign eAlign )
     if ( mpButtonData->meSymbolAlign != eAlign )
     {
         mpButtonData->meSymbolAlign = eAlign;
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
     }
 }
 
@@ -1398,17 +1398,17 @@ void PushButton::StateChanged( StateChangedType nType )
 {
     Button::StateChanged( nType );
 
-    if ( (nType == StateChangedType::ENABLE) ||
-         (nType == StateChangedType::TEXT) ||
-         (nType == StateChangedType::IMAGE) ||
-         (nType == StateChangedType::DATA) ||
-         (nType == StateChangedType::STATE) ||
-         (nType == StateChangedType::UPDATEMODE) )
+    if ( (nType == StateChangedType::Enable) ||
+         (nType == StateChangedType::Text) ||
+         (nType == StateChangedType::Image) ||
+         (nType == StateChangedType::Data) ||
+         (nType == StateChangedType::State) ||
+         (nType == StateChangedType::UpdateMode) )
     {
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate();
     }
-    else if ( nType == StateChangedType::STYLE )
+    else if ( nType == StateChangedType::Style )
     {
         SetStyle( ImplInitStyle( GetWindow( WINDOW_PREV ), GetStyle() ) );
 
@@ -1424,18 +1424,18 @@ void PushButton::StateChanged( StateChangedType nType )
                 Invalidate();
         }
     }
-    else if ( (nType == StateChangedType::ZOOM) ||
-              (nType == StateChangedType::CONTROLFONT) )
+    else if ( (nType == StateChangedType::Zoom) ||
+              (nType == StateChangedType::ControlFont) )
     {
         ImplInitSettings( true, false, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         ImplInitSettings( false, true, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings( false, false, true );
         Invalidate();
@@ -1531,7 +1531,7 @@ void PushButton::SetSymbol( SymbolType eSymbol )
     if ( meSymbol != eSymbol )
     {
         meSymbol = eSymbol;
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
     }
 }
 
@@ -1545,7 +1545,7 @@ void PushButton::SetDropDown( sal_uInt16 nStyle )
     if ( mnDDStyle != nStyle )
     {
         mnDDStyle = nStyle;
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
     }
 }
 
@@ -1567,7 +1567,7 @@ void PushButton::SetState( TriState eState )
             ImplGetButtonState() |= BUTTON_DRAW_DONTKNOW;
         }
 
-        StateChanged( StateChangedType::STATE );
+        StateChanged( StateChangedType::State );
         Toggle();
     }
 }
@@ -1577,7 +1577,7 @@ void PushButton::SetPressed( bool bPressed )
     if ( mbPressed != bPressed )
     {
         mbPressed = bPressed;
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
     }
 }
 
@@ -2520,21 +2520,21 @@ void RadioButton::StateChanged( StateChangedType nType )
 {
     Button::StateChanged( nType );
 
-    if ( nType == StateChangedType::STATE )
+    if ( nType == StateChangedType::State )
     {
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate( maStateRect );
     }
-    else if ( (nType == StateChangedType::ENABLE) ||
-              (nType == StateChangedType::TEXT) ||
-              (nType == StateChangedType::IMAGE) ||
-              (nType == StateChangedType::DATA) ||
-              (nType == StateChangedType::UPDATEMODE) )
+    else if ( (nType == StateChangedType::Enable) ||
+              (nType == StateChangedType::Text) ||
+              (nType == StateChangedType::Image) ||
+              (nType == StateChangedType::Data) ||
+              (nType == StateChangedType::UpdateMode) )
     {
         if ( IsUpdateMode() )
             Invalidate();
     }
-    else if ( nType == StateChangedType::STYLE )
+    else if ( nType == StateChangedType::Style )
     {
         SetStyle( ImplInitStyle( GetWindow( WINDOW_PREV ), GetStyle() ) );
 
@@ -2545,18 +2545,18 @@ void RadioButton::StateChanged( StateChangedType nType )
                 Invalidate();
         }
     }
-    else if ( (nType == StateChangedType::ZOOM) ||
-              (nType == StateChangedType::CONTROLFONT) )
+    else if ( (nType == StateChangedType::Zoom) ||
+              (nType == StateChangedType::ControlFont) )
     {
         ImplInitSettings( true, false, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         ImplInitSettings( false, true, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings( false, false, true );
         Invalidate();
@@ -2613,7 +2613,7 @@ bool RadioButton::SetModeRadioImage( const Image& rImage )
     if ( rImage != maImage )
     {
         maImage = rImage;
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
         queue_resize();
     }
     return true;
@@ -2631,7 +2631,7 @@ void RadioButton::SetState( bool bCheck )
     if ( mbChecked != bCheck )
     {
         mbChecked = bCheck;
-        StateChanged( StateChangedType::STATE );
+        StateChanged( StateChangedType::State );
         Toggle();
     }
 }
@@ -2688,7 +2688,7 @@ void RadioButton::Check( bool bCheck )
         mbChecked = bCheck;
         ImplDelData aDelData;
         ImplAddDel( &aDelData );
-        StateChanged( StateChangedType::STATE );
+        StateChanged( StateChangedType::State );
         if ( aDelData.IsDead() )
             return;
         if ( bCheck && mbRadioCheck )
@@ -3454,21 +3454,21 @@ void CheckBox::StateChanged( StateChangedType nType )
 {
     Button::StateChanged( nType );
 
-    if ( nType == StateChangedType::STATE )
+    if ( nType == StateChangedType::State )
     {
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate( maStateRect );
     }
-    else if ( (nType == StateChangedType::ENABLE) ||
-              (nType == StateChangedType::TEXT) ||
-              (nType == StateChangedType::IMAGE) ||
-              (nType == StateChangedType::DATA) ||
-              (nType == StateChangedType::UPDATEMODE) )
+    else if ( (nType == StateChangedType::Enable) ||
+              (nType == StateChangedType::Text) ||
+              (nType == StateChangedType::Image) ||
+              (nType == StateChangedType::Data) ||
+              (nType == StateChangedType::UpdateMode) )
     {
         if ( IsUpdateMode() )
             Invalidate();
     }
-    else if ( nType == StateChangedType::STYLE )
+    else if ( nType == StateChangedType::Style )
     {
         SetStyle( ImplInitStyle( GetWindow( WINDOW_PREV ), GetStyle() ) );
 
@@ -3479,18 +3479,18 @@ void CheckBox::StateChanged( StateChangedType nType )
                 Invalidate();
         }
     }
-    else if ( (nType == StateChangedType::ZOOM) ||
-              (nType == StateChangedType::CONTROLFONT) )
+    else if ( (nType == StateChangedType::Zoom) ||
+              (nType == StateChangedType::ControlFont) )
     {
         ImplInitSettings( true, false, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         ImplInitSettings( false, true, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings( false, false, true );
         Invalidate();
@@ -3550,7 +3550,7 @@ void CheckBox::SetState( TriState eState )
     if ( meState != eState )
     {
         meState = eState;
-        StateChanged( StateChangedType::STATE );
+        StateChanged( StateChangedType::State );
         Toggle();
     }
 }
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index e9e24ee3cabc..05b1e7d6f2bd 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -607,13 +607,13 @@ void ComboBox::StateChanged( StateChangedType nType )
 {
     Edit::StateChanged( nType );
 
-    if ( nType == StateChangedType::READONLY )
+    if ( nType == StateChangedType::ReadOnly )
     {
         mpImplLB->SetReadOnly( IsReadOnly() );
         if ( mpBtn )
             mpBtn->Enable( IsEnabled() && !IsReadOnly() );
     }
-    else if ( nType == StateChangedType::ENABLE )
+    else if ( nType == StateChangedType::Enable )
     {
         mpSubEdit->Enable( IsEnabled() );
         mpImplLB->Enable( IsEnabled() && !IsReadOnly() );
@@ -621,47 +621,47 @@ void ComboBox::StateChanged( StateChangedType nType )
             mpBtn->Enable( IsEnabled() && !IsReadOnly() );
         Invalidate();
     }
-    else if( nType == StateChangedType::UPDATEMODE )
+    else if( nType == StateChangedType::UpdateMode )
     {
         mpImplLB->SetUpdateMode( IsUpdateMode() );
     }
-    else if ( nType == StateChangedType::ZOOM )
+    else if ( nType == StateChangedType::Zoom )
     {
         mpImplLB->SetZoom( GetZoom() );
         mpSubEdit->SetZoom( GetZoom() );
         ImplCalcEditHeight();
         Resize();
     }
-    else if ( nType == StateChangedType::CONTROLFONT )
+    else if ( nType == StateChangedType::ControlFont )
     {
         mpImplLB->SetControlFont( GetControlFont() );
         mpSubEdit->SetControlFont( GetControlFont() );
         ImplCalcEditHeight();
         Resize();
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         mpImplLB->SetControlForeground( GetControlForeground() );
         mpSubEdit->SetControlForeground( GetControlForeground() );
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         mpImplLB->SetControlBackground( GetControlBackground() );
         mpSubEdit->SetControlBackground( GetControlBackground() );
     }
-    else if ( nType == StateChangedType::STYLE )
+    else if ( nType == StateChangedType::Style )
     {
         SetStyle( ImplInitStyle( GetStyle() ) );
         mpImplLB->GetMainWindow()->EnableSort( ( GetStyle() & WB_SORT ) != 0 );
     }
-    else if( nType == StateChangedType::MIRRORING )
+    else if( nType == StateChangedType::Mirroring )
     {
         if( mpBtn )
         {
             mpBtn->EnableRTL( IsRTLEnabled() );
             ImplInitDropDownButton( mpBtn );
         }
-        mpSubEdit->StateChanged( StateChangedType::MIRRORING );
+        mpSubEdit->StateChanged( StateChangedType::Mirroring );
         mpImplLB->EnableRTL( IsRTLEnabled() );
         Resize();
     }
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 9dcdfc0cea38..af9b3d4f8ce4 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -81,7 +81,7 @@ void Control::EnableRTL( bool bEnable )
     // convenience: for controls also switch layout mode
     SetLayoutMode( bEnable ? TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT :
                                 TEXT_LAYOUT_TEXTORIGIN_LEFT );
-    StateChanged( StateChangedType::MIRRORING );
+    StateChanged( StateChangedType::Mirroring );
     OutputDevice::EnableRTL(bEnable);
 }
 
@@ -261,7 +261,7 @@ bool Control::Notify( NotifyEvent& rNEvt )
             if ( !mbHasControlFocus )
             {
                 mbHasControlFocus = true;
-                StateChanged( StateChangedType::CONTROL_FOCUS );
+                StateChanged( StateChangedType::ControlFocus );
                 if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_GETFOCUS, maGetFocusHdl, this ) )
                     // been destroyed within the handler
                     return true;
@@ -275,7 +275,7 @@ bool Control::Notify( NotifyEvent& rNEvt )
                 if ( !pFocusWin || !ImplIsWindowOrChild( pFocusWin ) )
                 {
                     mbHasControlFocus = false;
-                    StateChanged( StateChangedType::CONTROL_FOCUS );
+                    StateChanged( StateChangedType::ControlFocus );
                     if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_LOSEFOCUS, maLoseFocusHdl, this ) )
                         // been destroyed within the handler
                         return true;
@@ -288,11 +288,11 @@ bool Control::Notify( NotifyEvent& rNEvt )
 
 void Control::StateChanged( StateChangedType nStateChange )
 {
-    if( nStateChange == StateChangedType::INITSHOW   ||
-        nStateChange == StateChangedType::VISIBLE    ||
-        nStateChange == StateChangedType::ZOOM       ||
-        nStateChange == StateChangedType::BORDER     ||
-        nStateChange == StateChangedType::CONTROLFONT
+    if( nStateChange == StateChangedType::InitShow   ||
+        nStateChange == StateChangedType::Visible    ||
+        nStateChange == StateChangedType::Zoom       ||
+        nStateChange == StateChangedType::Border     ||
+        nStateChange == StateChangedType::ControlFont
         )
     {
         ImplClearLayoutData();
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 0e2dba38ead4..ce232fdabe0f 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2207,7 +2207,7 @@ void Edit::Command( const CommandEvent& rCEvt )
 
 void Edit::StateChanged( StateChangedType nType )
 {
-    if ( nType == StateChangedType::INITSHOW )
+    if ( nType == StateChangedType::InitShow )
     {
         if ( !mpSubEdit )
         {
@@ -2219,7 +2219,7 @@ void Edit::StateChanged( StateChangedType nType )
         // update background (eventual SetPaintTransparent)
         ImplInitSettings( false, false, true );
     }
-    else if ( nType == StateChangedType::ENABLE )
+    else if ( nType == StateChangedType::Enable )
     {
         if ( !mpSubEdit )
         {
@@ -2227,10 +2227,10 @@ void Edit::StateChanged( StateChangedType nType )
             ImplInvalidateOrRepaint();
         }
     }
-    else if ( nType == StateChangedType::STYLE || nType == StateChangedType::MIRRORING )
+    else if ( nType == StateChangedType::Style || nType == StateChangedType::Mirroring )
     {
         WinBits nStyle = GetStyle();
-        if( nType == StateChangedType::STYLE )
+        if( nType == StateChangedType::Style )
         {
             nStyle = ImplInitStyle( GetStyle() );
             SetStyle( nStyle );
@@ -2246,12 +2246,12 @@ void Edit::StateChanged( StateChangedType nType )
         {
             if( GetParent()->GetStyle() & WB_LEFT )
                 mnAlign = EDIT_ALIGN_RIGHT;
-            if ( nType == StateChangedType::MIRRORING )
+            if ( nType == StateChangedType::Mirroring )
                 SetLayoutMode( TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT );
         }
         else if( mbIsSubEdit && !GetParent()->IsRTLEnabled() )
         {
-            if ( nType == StateChangedType::MIRRORING )
+            if ( nType == StateChangedType::Mirroring )
                 SetLayoutMode( TEXT_LAYOUT_TEXTORIGIN_LEFT );
         }
 
@@ -2266,7 +2266,7 @@ void Edit::StateChanged( StateChangedType nType )
         }
 
     }
-    else if ( nType == StateChangedType::ZOOM )
+    else if ( nType == StateChangedType::Zoom )
     {
         if ( !mpSubEdit )
         {
@@ -2275,7 +2275,7 @@ void Edit::StateChanged( StateChangedType nType )
             Invalidate();
         }
     }
-    else if ( nType == StateChangedType::CONTROLFONT )
+    else if ( nType == StateChangedType::ControlFont )
     {
         if ( !mpSubEdit )
         {
@@ -2284,7 +2284,7 @@ void Edit::StateChanged( StateChangedType nType )
             Invalidate();
         }
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         if ( !mpSubEdit )
         {
@@ -2292,7 +2292,7 @@ void Edit::StateChanged( StateChangedType nType )
             Invalidate();
         }
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         if ( !mpSubEdit )
         {
@@ -2455,7 +2455,7 @@ void Edit::SetReadOnly( bool bReadOnly )
         if ( mpSubEdit )
             mpSubEdit->SetReadOnly( bReadOnly );
 
-        StateChanged( StateChangedType::READONLY );
+        StateChanged( StateChangedType::ReadOnly );
     }
 }
 
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index c8acbd1aaa1d..7b42fee92ffb 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -287,14 +287,14 @@ void FixedText::StateChanged( StateChangedType nType )
 {
     Control::StateChanged( nType );
 
-    if ( (nType == StateChangedType::ENABLE) ||
-         (nType == StateChangedType::TEXT) ||
-         (nType == StateChangedType::UPDATEMODE) )
+    if ( (nType == StateChangedType::Enable) ||
+         (nType == StateChangedType::Text) ||
+         (nType == StateChangedType::UpdateMode) )
     {
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate();
     }
-    else if ( nType == StateChangedType::STYLE )
+    else if ( nType == StateChangedType::Style )
     {
         SetStyle( ImplInitStyle( GetStyle() ) );
         if ( (GetPrevStyle() & FIXEDTEXT_VIEW_STYLE) !=
@@ -304,18 +304,18 @@ void FixedText::StateChanged( StateChangedType nType )
             Invalidate();
         }
     }
-    else if ( (nType == StateChangedType::ZOOM)  ||
-              (nType == StateChangedType::CONTROLFONT) )
+    else if ( (nType == StateChangedType::Zoom)  ||
+              (nType == StateChangedType::ControlFont) )
     {
         ImplInitSettings( true, false, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         ImplInitSettings( false, true, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings( false, false, true );
         Invalidate();
@@ -660,33 +660,33 @@ void FixedLine::StateChanged( StateChangedType nType )
 {
     Control::StateChanged( nType );
 
-    if ( (nType == StateChangedType::ENABLE) ||
-         (nType == StateChangedType::TEXT) ||
-         (nType == StateChangedType::UPDATEMODE) )
+    if ( (nType == StateChangedType::Enable) ||
+         (nType == StateChangedType::Text) ||
+         (nType == StateChangedType::UpdateMode) )
     {
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate();
     }
-    else if ( nType == StateChangedType::STYLE )
+    else if ( nType == StateChangedType::Style )
     {
         SetStyle( ImplInitStyle( GetStyle() ) );
         if ( (GetPrevStyle() & FIXEDLINE_VIEW_STYLE) !=
              (GetStyle() & FIXEDLINE_VIEW_STYLE) )
             Invalidate();
     }
-    else if ( (nType == StateChangedType::ZOOM)  ||
-              (nType == StateChangedType::STYLE) ||
-              (nType == StateChangedType::CONTROLFONT) )
+    else if ( (nType == StateChangedType::Zoom)  ||
+              (nType == StateChangedType::Style) ||
+              (nType == StateChangedType::ControlFont) )
     {
         ImplInitSettings( true, false, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         ImplInitSettings( false, true, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings( false, false, true );
         Invalidate();
@@ -810,20 +810,20 @@ void FixedBitmap::StateChanged( StateChangedType nType )
 {
     Control::StateChanged( nType );
 
-    if ( (nType == StateChangedType::DATA) ||
-         (nType == StateChangedType::UPDATEMODE) )
+    if ( (nType == StateChangedType::Data) ||
+         (nType == StateChangedType::UpdateMode) )
     {
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate();
     }
-    else if ( nType == StateChangedType::STYLE )
+    else if ( nType == StateChangedType::Style )
     {
         SetStyle( ImplInitStyle( GetStyle() ) );
         if ( (GetPrevStyle() & FIXEDBITMAP_VIEW_STYLE) !=
              (GetStyle() & FIXEDBITMAP_VIEW_STYLE) )
             Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings();
         Invalidate();
@@ -845,7 +845,7 @@ void FixedBitmap::DataChanged( const DataChangedEvent& rDCEvt )
 void FixedBitmap::SetBitmap( const Bitmap& rBitmap )
 {
     maBitmap = rBitmap;
-    StateChanged( StateChangedType::DATA );
+    StateChanged( StateChangedType::Data );
     queue_resize();
 }
 
@@ -984,21 +984,21 @@ void FixedImage::StateChanged( StateChangedType nType )
 {
     Control::StateChanged( nType );
 
-    if ( (nType == StateChangedType::ENABLE) ||
-         (nType == StateChangedType::DATA) ||
-         (nType == StateChangedType::UPDATEMODE) )
+    if ( (nType == StateChangedType::Enable) ||
+         (nType == StateChangedType::Data) ||
+         (nType == StateChangedType::UpdateMode) )
     {
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate();
     }
-    else if ( nType == StateChangedType::STYLE )
+    else if ( nType == StateChangedType::Style )
     {
         SetStyle( ImplInitStyle( GetStyle() ) );
         if ( (GetPrevStyle() & FIXEDIMAGE_VIEW_STYLE) !=
              (GetStyle() & FIXEDIMAGE_VIEW_STYLE) )
             Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings();
         Invalidate();
@@ -1022,7 +1022,7 @@ void FixedImage::SetImage( const Image& rImage )
     if ( rImage != maImage )
     {
         maImage = rImage;
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
         queue_resize();
     }
 }
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index e6b0b9a83bdc..9d6de9fe488a 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -223,32 +223,32 @@ void GroupBox::StateChanged( StateChangedType nType )
 {
     Control::StateChanged( nType );
 
-    if ( (nType == StateChangedType::ENABLE) ||
-         (nType == StateChangedType::TEXT) ||
-         (nType == StateChangedType::UPDATEMODE) )
+    if ( (nType == StateChangedType::Enable) ||
+         (nType == StateChangedType::Text) ||
+         (nType == StateChangedType::UpdateMode) )
     {
         if ( IsUpdateMode() )
             Invalidate();
     }
-    else if ( nType == StateChangedType::STYLE )
+    else if ( nType == StateChangedType::Style )
     {
         SetStyle( ImplInitStyle( GetStyle() ) );
         if ( (GetPrevStyle() & GROUP_VIEW_STYLE) !=
              (GetStyle() & GROUP_VIEW_STYLE) )
             Invalidate();
     }
-    else if ( (nType == StateChangedType::ZOOM)  ||
-              (nType == StateChangedType::CONTROLFONT) )
+    else if ( (nType == StateChangedType::Zoom)  ||
+              (nType == StateChangedType::ControlFont) )
     {
         ImplInitSettings( true, false, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         ImplInitSettings( false, true, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings( false, false, true );
         Invalidate();
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index fbbcad1e6160..4c934146323e 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2071,34 +2071,34 @@ void ImplListBoxWindow::StateChanged( StateChangedType nType )
 {
     Control::StateChanged( nType );
 
-    if ( nType == StateChangedType::ZOOM )
+    if ( nType == StateChangedType::Zoom )
     {
         ImplInitSettings( true, false, false );
         ImplCalcMetrics();
         Invalidate();
     }
-    else if ( nType == StateChangedType::UPDATEMODE )
+    else if ( nType == StateChangedType::UpdateMode )
     {
         if ( IsUpdateMode() && IsReallyVisible() )
             Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLFONT )
+    else if ( nType == StateChangedType::ControlFont )
     {
         ImplInitSettings( true, false, false );
         ImplCalcMetrics();
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         ImplInitSettings( false, true, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings( false, false, true );
         Invalidate();
     }
-    else if( nType == StateChangedType::ENABLE )
+    else if( nType == StateChangedType::Enable )
     {
         Invalidate();
     }
@@ -2190,7 +2190,7 @@ void ImplListBox::Clear()
     }
     mpVScrollBar->SetThumbPos( 0 );
     mpHScrollBar->SetThumbPos( 0 );
-    StateChanged( StateChangedType::DATA );
+    StateChanged( StateChangedType::Data );
 }
 
 sal_Int32 ImplListBox::InsertEntry( sal_Int32 nPos, const OUString& rStr )
@@ -2202,7 +2202,7 @@ sal_Int32 ImplListBox::InsertEntry( sal_Int32 nPos, const OUString& rStr )
         delete pNewEntry;
         return nNewPos;
     }
-    StateChanged( StateChangedType::DATA );
+    StateChanged( StateChangedType::Data );
     return nNewPos;
 }
 
@@ -2215,14 +2215,14 @@ sal_Int32 ImplListBox::InsertEntry( sal_Int32 nPos, const OUString& rStr, const
         delete pNewEntry;
         return nNewPos;
     }
-    StateChanged( StateChangedType::DATA );
+    StateChanged( StateChangedType::Data );
     return nNewPos;
 }
 
 void ImplListBox::RemoveEntry( sal_Int32 nPos )
 {
     maLBWindow->RemoveEntry( nPos );
-    StateChanged( StateChangedType::DATA );
+    StateChanged( StateChangedType::Data );
 }
 
 void ImplListBox::SetEntryFlags( sal_Int32 nPos, long nFlags )
@@ -2259,7 +2259,7 @@ void ImplListBox::Resize()
 
 IMPL_LINK_NOARG(ImplListBox, MRUChanged)
 {
-    StateChanged( StateChangedType::DATA );
+    StateChanged( StateChangedType::Data );
     return 1;
 }
 
@@ -2455,18 +2455,18 @@ void ImplListBox::ImplResizeControls()
 
 void ImplListBox::StateChanged( StateChangedType nType )
 {
-    if ( nType == StateChangedType::INITSHOW )
+    if ( nType == StateChangedType::InitShow )
     {
         ImplCheckScrollBars();
     }
-    else if ( ( nType == StateChangedType::UPDATEMODE ) || ( nType == StateChangedType::DATA ) )
+    else if ( ( nType == StateChangedType::UpdateMode ) || ( nType == StateChangedType::Data ) )
     {
         bool bUpdate = IsUpdateMode();
         maLBWindow->SetUpdateMode( bUpdate );
         if ( bUpdate && IsReallyVisible() )
             ImplCheckScrollBars();
     }
-    else if( nType == StateChangedType::ENABLE )
+    else if( nType == StateChangedType::Enable )
     {
         mpHScrollBar->Enable( IsEnabled() );
         mpVScrollBar->Enable( IsEnabled() );
@@ -2475,24 +2475,24 @@ void ImplListBox::StateChanged( StateChangedType nType )
 
         Invalidate();
     }
-    else if ( nType == StateChangedType::ZOOM )
+    else if ( nType == StateChangedType::Zoom )
     {
         maLBWindow->SetZoom( GetZoom() );
         Resize();
     }
-    else if ( nType == StateChangedType::CONTROLFONT )
+    else if ( nType == StateChangedType::ControlFont )
     {
         maLBWindow->SetControlFont( GetControlFont() );
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         maLBWindow->SetControlForeground( GetControlForeground() );
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         maLBWindow->SetControlBackground( GetControlBackground() );
     }
-    else if( nType == StateChangedType::MIRRORING )
+    else if( nType == StateChangedType::Mirroring )
     {
         maLBWindow->EnableRTL( IsRTLEnabled() );
         mpHScrollBar->EnableRTL( IsRTLEnabled() );
@@ -2575,7 +2575,7 @@ void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep )
     {
         maLBWindow->GetEntryList()->SetMRUCount( nMRUCount );
         SetSeparatorPos( nMRUCount ? nMRUCount-1 : 0 );
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
     }
 }
 
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 06da9a114911..9090184c9578 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -777,14 +777,14 @@ long ListBox::GetIndexForPoint( const Point& rPoint, sal_Int32& rPos ) const
 
 void ListBox::StateChanged( StateChangedType nType )
 {
-    if( nType == StateChangedType::READONLY )
+    if( nType == StateChangedType::ReadOnly )
     {
         if( mpImplWin )
             mpImplWin->Enable( !IsReadOnly() );
         if( mpBtn )
             mpBtn->Enable( !IsReadOnly() );
     }
-    else if( nType == StateChangedType::ENABLE )
+    else if( nType == StateChangedType::Enable )
     {
         mpImplLB->Enable( IsEnabled() );
         if( mpImplWin )
@@ -801,11 +801,11 @@ void ListBox::StateChanged( StateChangedType nType )
         if( mpBtn )
             mpBtn->Enable( IsEnabled() );
     }
-    else if( nType == StateChangedType::UPDATEMODE )
+    else if( nType == StateChangedType::UpdateMode )
     {
         mpImplLB->SetUpdateMode( IsUpdateMode() );
     }
-    else if ( nType == StateChangedType::ZOOM )
+    else if ( nType == StateChangedType::Zoom )
     {
         mpImplLB->SetZoom( GetZoom() );
         if ( mpImplWin )
@@ -816,7 +816,7 @@ void ListBox::StateChanged( StateChangedType nType )
         }
         Resize();
     }
-    else if ( nType == StateChangedType::CONTROLFONT )
+    else if ( nType == StateChangedType::ControlFont )
     {
         mpImplLB->SetControlFont( GetControlFont() );
         if ( mpImplWin )
@@ -827,7 +827,7 @@ void ListBox::StateChanged( StateChangedType nType )
         }
         Resize();
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         mpImplLB->SetControlForeground( GetControlForeground() );
         if ( mpImplWin )
@@ -838,7 +838,7 @@ void ListBox::StateChanged( StateChangedType nType )
             mpImplWin->Invalidate();
         }
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         mpImplLB->SetControlBackground( GetControlBackground() );
         if ( mpImplWin )
@@ -858,14 +858,14 @@ void ListBox::StateChanged( StateChangedType nType )
             mpImplWin->Invalidate();
         }
     }
-    else if ( nType == StateChangedType::STYLE )
+    else if ( nType == StateChangedType::Style )
     {
         SetStyle( ImplInitStyle( GetStyle() ) );
         mpImplLB->GetMainWindow()->EnableSort( ( GetStyle() & WB_SORT ) != 0 );
         bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) != 0;
         mpImplLB->SetMultiSelectionSimpleMode( bSimpleMode );
     }
-    else if( nType == StateChangedType::MIRRORING )
+    else if( nType == StateChangedType::Mirroring )
     {
         if( mpBtn )
         {
@@ -1404,7 +1404,7 @@ void ListBox::SetReadOnly( bool bReadOnly )
     if ( mpImplLB->IsReadOnly() != bReadOnly )
     {
         mpImplLB->SetReadOnly( bReadOnly );
-        StateChanged( StateChangedType::READONLY );
+        StateChanged( StateChangedType::ReadOnly );
     }
 }
 
diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx
index 609911cbbced..b4807544250d 100644
--- a/vcl/source/control/prgsbar.cxx
+++ b/vcl/source/control/prgsbar.cxx
@@ -184,20 +184,20 @@ void ProgressBar::SetValue( sal_uInt16 nNewPercent )
 void ProgressBar::StateChanged( StateChangedType nType )
 {
 /* FIXME: !!! We do not support text output at the moment
-    if ( (nType == StateChangedType::ZOOM) ||
-         (nType == StateChangedType::CONTROLFONT) )
+    if ( (nType == StateChangedType::Zoom) ||
+         (nType == StateChangedType::ControlFont) )
     {
         ImplInitSettings( true, false, false );
         Invalidate();
     }
     else
 */
-    if ( nType == StateChangedType::CONTROLFOREGROUND )
+    if ( nType == StateChangedType::ControlForeground )
     {
         ImplInitSettings( false, true, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings( false, false, true );
         Invalidate();
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 0f4e8316f56e..65960d72bc6c 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -1185,14 +1185,14 @@ void ScrollBar::StateChanged( StateChangedType nType )
 {
     Control::StateChanged( nType );
 
-    if ( nType == StateChangedType::INITSHOW )
+    if ( nType == StateChangedType::InitShow )
         ImplCalc( false );
-    else if ( nType == StateChangedType::DATA )
+    else if ( nType == StateChangedType::Data )
     {
         if ( IsReallyVisible() && IsUpdateMode() )
             ImplCalc( true );
     }
-    else if ( nType == StateChangedType::UPDATEMODE )
+    else if ( nType == StateChangedType::UpdateMode )
     {
         if ( IsReallyVisible() && IsUpdateMode() )
         {
@@ -1200,12 +1200,12 @@ void ScrollBar::StateChanged( StateChangedType nType )
             Invalidate();
         }
     }
-    else if ( nType == StateChangedType::ENABLE )
+    else if ( nType == StateChangedType::Enable )
     {
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate();
     }
-    else if ( nType == StateChangedType::STYLE )
+    else if ( nType == StateChangedType::Style )
     {
         ImplInitStyle( GetStyle() );
         if ( IsReallyVisible() && IsUpdateMode() )
@@ -1382,7 +1382,7 @@ void ScrollBar::SetRange( const Range& rRange )
         if ( mnThumbPos < mnMinRange )
             mnThumbPos = mnMinRange;
 
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
     }
 }
 
@@ -1396,7 +1396,7 @@ void ScrollBar::SetThumbPos( long nNewThumbPos )
     if ( mnThumbPos != nNewThumbPos )
     {
         mnThumbPos = nNewThumbPos;
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
     }
 }
 
@@ -1411,7 +1411,7 @@ void ScrollBar::SetVisibleSize( long nNewSize )
             mnThumbPos = mnMaxRange-mnVisibleSize;
         if ( mnThumbPos < mnMinRange )
             mnThumbPos = mnMinRange;
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
     }
 }
 
@@ -1482,7 +1482,7 @@ void ScrollBarBox::StateChanged( StateChangedType nType )
 {
     Window::StateChanged( nType );
 
-    if ( nType == StateChangedType::CONTROLBACKGROUND )
+    if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings();
         Invalidate();
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index e85ce8099702..ba41c6fc9d3c 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -831,14 +831,14 @@ void Slider::StateChanged( StateChangedType nType )
 {
     Control::StateChanged( nType );
 
-    if ( nType == StateChangedType::INITSHOW )
+    if ( nType == StateChangedType::InitShow )
         ImplCalc( false );
-    else if ( nType == StateChangedType::DATA )
+    else if ( nType == StateChangedType::Data )
     {
         if ( IsReallyVisible() && IsUpdateMode() )
             ImplCalc( true );
     }
-    else if ( nType == StateChangedType::UPDATEMODE )
+    else if ( nType == StateChangedType::UpdateMode )
     {
         if ( IsReallyVisible() && IsUpdateMode() )
         {
@@ -846,12 +846,12 @@ void Slider::StateChanged( StateChangedType nType )
             Invalidate();
         }
     }
-    else if ( nType == StateChangedType::ENABLE )
+    else if ( nType == StateChangedType::Enable )
     {
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate();
     }
-    else if ( nType == StateChangedType::STYLE )
+    else if ( nType == StateChangedType::Style )
     {
         if ( IsReallyVisible() && IsUpdateMode() )
         {
@@ -864,7 +864,7 @@ void Slider::StateChanged( StateChangedType nType )
             }
         }
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings();
         Invalidate();
@@ -924,7 +924,7 @@ void Slider::SetRange( const Range& rRange )
         if ( mnThumbPos < mnMinRange )
             mnThumbPos = mnMinRange;
 
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
     }
 }
 
@@ -938,7 +938,7 @@ void Slider::SetThumbPos( long nNewThumbPos )
     if ( mnThumbPos != nNewThumbPos )
     {
         mnThumbPos = nNewThumbPos;
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
     }
 }
 
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 509b520c66f3..dd68d91e5bef 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -76,7 +76,7 @@ void SpinButton::Up()
     if ( ImplIsUpperEnabled() )
     {
         mnValue += mnValueStep;
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
 
         ImplMoveFocus( true );
     }
@@ -89,7 +89,7 @@ void SpinButton::Down()
     if ( ImplIsLowerEnabled() )
     {
         mnValue -= mnValueStep;
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
 
         ImplMoveFocus( false );
     }
@@ -309,12 +309,12 @@ void SpinButton::StateChanged( StateChangedType nType )
 {
     switch ( nType )
     {
-    case StateChangedType::DATA:
-    case StateChangedType::ENABLE:
+    case StateChangedType::Data:
+    case StateChangedType::Enable:
         Invalidate();
         break;
 
-    case StateChangedType::STYLE:
+    case StateChangedType::Style:
     {
         bool bNewRepeat = 0 != ( GetStyle() & WB_REPEAT );
         if ( bNewRepeat != mbRepeat )
@@ -372,7 +372,7 @@ void SpinButton::SetRange( const Range& rRange )
         if ( mnValue < mnMinRange )
             mnValue = mnMinRange;
 
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
     }
 }
 
@@ -387,7 +387,7 @@ void SpinButton::SetValue( long nValue )
     if ( mnValue != nValue )
     {
         mnValue = nValue;
-        StateChanged( StateChangedType::DATA );
+        StateChanged( StateChangedType::Data );
     }
 }
 
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index d73eb50786c1..68a9a519946c 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -779,7 +779,7 @@ void SpinField::StateChanged( StateChangedType nType )
 {
     Edit::StateChanged( nType );
 
-    if ( nType == StateChangedType::ENABLE )
+    if ( nType == StateChangedType::Enable )
     {
         if ( mbSpin || ( GetStyle() & WB_DROPDOWN ) )
         {
@@ -794,45 +794,45 @@ void SpinField::StateChanged( StateChangedType nType )
                 Invalidate( maDropDownRect );
         }
     }
-    else if ( nType == StateChangedType::STYLE )
+    else if ( nType == StateChangedType::Style )
     {
         if ( GetStyle() & WB_REPEAT )
             mbRepeat = true;
         else
             mbRepeat = false;
     }
-    else if ( nType == StateChangedType::ZOOM )
+    else if ( nType == StateChangedType::Zoom )
     {
         Resize();
         if ( mpEdit )
             mpEdit->SetZoom( GetZoom() );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLFONT )
+    else if ( nType == StateChangedType::ControlFont )
     {
         if ( mpEdit )
             mpEdit->SetControlFont( GetControlFont() );
         ImplInitSettings( true, false, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         if ( mpEdit )
             mpEdit->SetControlForeground( GetControlForeground() );
         ImplInitSettings( false, true, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         if ( mpEdit )
             mpEdit->SetControlBackground( GetControlBackground() );
         ImplInitSettings( false, false, true );
         Invalidate();
     }
-    else if( nType == StateChangedType::MIRRORING )
+    else if( nType == StateChangedType::Mirroring )
     {
         if( mpEdit )
-            mpEdit->StateChanged( StateChangedType::MIRRORING );
+            mpEdit->StateChanged( StateChangedType::Mirroring );
         Resize();
     }
 }
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 8e1ca335fc13..c68fb1bea99a 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1502,29 +1502,29 @@ void TabControl::StateChanged( StateChangedType nType )
 {
     Control::StateChanged( nType );
 
-    if ( nType == StateChangedType::INITSHOW )
+    if ( nType == StateChangedType::InitShow )
     {
         ImplPosCurTabPage();
         if( mpTabCtrlData->mpListBox )
             Resize();
     }
-    else if ( nType == StateChangedType::UPDATEMODE )
+    else if ( nType == StateChangedType::UpdateMode )
     {
         if ( IsUpdateMode() )
             Invalidate();
     }
-    else if ( (nType == StateChangedType::ZOOM)  ||
-              (nType == StateChangedType::CONTROLFONT) )
+    else if ( (nType == StateChangedType::Zoom)  ||
+              (nType == StateChangedType::ControlFont) )
     {
         ImplInitSettings( true, false, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         ImplInitSettings( false, true, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings( false, false, true );
         Invalidate();
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 1ac2ee5ce0ea..c04606f3f00d 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1248,43 +1248,43 @@ void VclMultiLineEdit::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16&
 
 void VclMultiLineEdit::StateChanged( StateChangedType nType )
 {
-    if( nType == StateChangedType::ENABLE )
+    if( nType == StateChangedType::Enable )
     {
         pImpVclMEdit->Enable( IsEnabled() );
         ImplInitSettings( true, false, false );
     }
-    else if( nType == StateChangedType::READONLY )
+    else if( nType == StateChangedType::ReadOnly )
     {
         pImpVclMEdit->SetReadOnly( IsReadOnly() );
     }
-    else if ( nType == StateChangedType::ZOOM )
+    else if ( nType == StateChangedType::Zoom )
     {
         pImpVclMEdit->GetTextWindow()->SetZoom( GetZoom() );
         ImplInitSettings( true, false, false );
         Resize();
     }
-    else if ( nType == StateChangedType::CONTROLFONT )
+    else if ( nType == StateChangedType::ControlFont )
     {
         ImplInitSettings( true, false, false );
         Resize();
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         ImplInitSettings( false, true, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings( false, false, true );
         Invalidate();
     }
-    else if ( nType == StateChangedType::STYLE )
+    else if ( nType == StateChangedType::Style )
     {
         pImpVclMEdit->InitFromStyle( GetStyle() );
         SetStyle( ImplInitStyle( GetStyle() ) );
     }
-    else if ( nType == StateChangedType::INITSHOW )
+    else if ( nType == StateChangedType::InitShow )
     {
         if( IsPaintTransparent() )
         {
diff --git a/vcl/source/uipreviewer/previewer.cxx b/vcl/source/uipreviewer/previewer.cxx
index bb93b1207dd8..47a5c28e7d3a 100644
--- a/vcl/source/uipreviewer/previewer.cxx
+++ b/vcl/source/uipreviewer/previewer.cxx
@@ -80,7 +80,7 @@ int UIPreviewApp::Main()
             pRealDialog->SetText(OUString("LibreOffice ui-previewer"));
             pRealDialog->SetStyle(pDialog->GetStyle()|WB_CLOSEABLE);
             /*
-               Force a new StateChangedType::INITSHOW for the edge case where pRoot
+               Force a new StateChangedType::InitShow for the edge case where pRoot
                is not a dialog or contents of a dialog, but instead a visible floating window
                which may have had initshow already done before it was given children
             */
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 82aa0bea8d2d..b54914f9082e 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1980,9 +1980,9 @@ void ImplBorderWindow::Resize()
 
 void ImplBorderWindow::StateChanged( StateChangedType nType )
 {
-    if ( (nType == StateChangedType::TEXT) ||
-         (nType == StateChangedType::IMAGE) ||
-         (nType == StateChangedType::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 2e8532cecba7..7846e41828e8 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -234,7 +234,7 @@ void ButtonDialog::Resize()
 
 void ButtonDialog::StateChanged( StateChangedType nType )
 {
-    if ( nType == StateChangedType::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 3381ef6f5991..e72bf4f383c8 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -635,7 +635,7 @@ Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize)
 
 void Dialog::StateChanged( StateChangedType nType )
 {
-    if (nType == StateChangedType::INITSHOW)
+    if (nType == StateChangedType::InitShow)
     {
         DoInitialLayout();
 
@@ -655,7 +655,7 @@ void Dialog::StateChanged( StateChangedType nType )
 
     SystemWindow::StateChanged( nType );
 
-    if (nType == StateChangedType::CONTROLBACKGROUND)
+    if (nType == StateChangedType::ControlBackground)
     {
         ImplInitSettings();
         Invalidate();
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index e94d6073931a..24fc270a5198 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -135,7 +135,7 @@ void DockingAreaWindow::StateChanged( StateChangedType nType )
 {
     Window::StateChanged( nType );
 
-    if ( nType == StateChangedType::VISIBLE )
+    if ( nType == StateChangedType::Visible )
         ImplInvalidateMenubar( this );
 }
 
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 3ea561f2598a..d5545623f0b6 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -742,16 +742,16 @@ void DockingWindow::StateChanged( StateChangedType nType )
 {
     switch(nType)
     {
-        case StateChangedType::INITSHOW:
+        case StateChangedType::InitShow:
             DoInitialLayout();
             break;
 
-        case StateChangedType::CONTROLBACKGROUND:
+        case StateChangedType::ControlBackground:
             ImplInitSettings();
             Invalidate();
             break;
 
-        case StateChangedType::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 bd2b36d39c39..162f3572d8cc 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -418,7 +418,7 @@ void Window::ImplCallInitShow()
 {
     mpWindowImpl->mbReallyShown   = true;
     mpWindowImpl->mbInInitShow    = true;
-    StateChanged( StateChangedType::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 65a5ef452458..39030b7ab122 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -551,14 +551,14 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt )
 
 void FloatingWindow::StateChanged( StateChangedType nType )
 {
-    if (nType == StateChangedType::INITSHOW)
+    if (nType == StateChangedType::InitShow)
     {
         DoInitialLayout();
     }
 
     SystemWindow::StateChanged( nType );
 
-    if ( nType == StateChangedType::CONTROLBACKGROUND )
+    if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings();
         Invalidate();
diff --git a/vcl/source/window/globalization.cxx b/vcl/source/window/globalization.cxx
index ed9f17e746a7..980a5867094e 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( StateChangedType::MIRRORING );
+    StateChanged( StateChangedType::Mirroring );
     OutputDevice::EnableRTL(bEnable);
 }
 
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 3bfa40a049d9..ee0a0248de1b 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1601,7 +1601,7 @@ void VclExpander::StateChanged(StateChangedType nType)
 {
     VclBin::StateChanged( nType );
 
-    if (nType == StateChangedType::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 83754722d925..8c21f8423349 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -989,8 +989,8 @@ void MenuBarWindow::StateChanged( StateChangedType nType )
 {
     Window::StateChanged( nType );
 
-    if ( ( nType == StateChangedType::CONTROLFOREGROUND ) ||
-         ( nType == StateChangedType::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 e28cfff00c7a..247821ce6639 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -1160,7 +1160,7 @@ void MenuFloatingWindow::StateChanged( StateChangedType nType )
 {
     FloatingWindow::StateChanged( nType );
 
-    if ( ( nType == StateChangedType::CONTROLFOREGROUND ) || ( nType == StateChangedType::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 9f2fd75973c7..8ddba996b1a3 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -354,7 +354,7 @@ void MessBox::ImplPosControls()
 
 void MessBox::StateChanged( StateChangedType nType )
 {
-    if ( nType == StateChangedType::INITSHOW )
+    if ( nType == StateChangedType::InitShow )
     {
         ImplPosControls();
     }
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 6be4c7ea10fd..be52f6cd315d 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -2607,15 +2607,15 @@ void SplitWindow::StateChanged( StateChangedType nType )
 {
     switch ( nType )
     {
-    case StateChangedType::INITSHOW:
+    case StateChangedType::InitShow:
         if ( IsUpdateMode() )
             ImplCalcLayout();
         break;
-    case StateChangedType::UPDATEMODE:
+    case StateChangedType::UpdateMode:
         if ( IsUpdateMode() && IsReallyShown() )
             ImplCalcLayout();
         break;
-    case StateChangedType::CONTROLBACKGROUND:
+    case StateChangedType::ControlBackground:
         ImplInitSettings();
         Invalidate();
         break;
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 37397f912471..8896cea4c09f 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -824,23 +824,23 @@ void StatusBar::StateChanged( StateChangedType nType )
 {
     Window::StateChanged( nType );
 
-    if ( nType == StateChangedType::INITSHOW )
+    if ( nType == StateChangedType::InitShow )
         ImplFormat();
-    else if ( nType == StateChangedType::UPDATEMODE )
+    else if ( nType == StateChangedType::UpdateMode )
         Invalidate();
-    else if ( (nType == StateChangedType::ZOOM) ||
-              (nType == StateChangedType::CONTROLFONT) )
+    else if ( (nType == StateChangedType::Zoom) ||
+              (nType == StateChangedType::ControlFont) )
     {
         mbFormat = true;
         ImplInitSettings( true, false, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         ImplInitSettings( false, true, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::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 e5c9061389e3..a99daecc3390 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -233,7 +233,7 @@ void TabDialog::dispose()
 
 void TabDialog::StateChanged( StateChangedType nType )
 {
-    if ( nType == StateChangedType::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 308ca926afe7..787411221f6e 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -100,14 +100,14 @@ void TabPage::StateChanged( StateChangedType nType )
 {
     Window::StateChanged( nType );
 
-    if ( nType == StateChangedType::INITSHOW )
+    if ( nType == StateChangedType::InitShow )
     {
         if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
             ImplWindowAutoMnemonic( this );
         // FIXME: no layouting, workaround some clipping issues
         ImplAdjustNWFSizes();
     }
-    else if ( nType == StateChangedType::CONTROLBACKGROUND )
+    else if ( nType == StateChangedType::ControlBackground )
     {
         ImplInitSettings();
         Invalidate();
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 26590b7ab5c0..de02402ce2d3 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4422,29 +4422,29 @@ void ToolBox::StateChanged( StateChangedType nType )
 {
     DockingWindow::StateChanged( nType );
 
-    if ( nType == StateChangedType::INITSHOW )
+    if ( nType == StateChangedType::InitShow )
         ImplFormat();
-    else if ( nType == StateChangedType::ENABLE )
+    else if ( nType == StateChangedType::Enable )
         ImplUpdateItem();
-    else if ( nType == StateChangedType::UPDATEMODE )
+    else if ( nType == StateChangedType::UpdateMode )
     {
         if ( IsUpdateMode() )
             Invalidate();
     }
-    else if ( (nType == StateChangedType::ZOOM) ||
-              (nType == StateChangedType::CONTROLFONT) )
+    else if ( (nType == StateChangedType::Zoom) ||
+              (nType == StateChangedType::ControlFont) )
     {
         mbCalc = true;
         mbFormat = true;
         ImplInitSettings( true, false, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::CONTROLFOREGROUND )
+    else if ( nType == StateChangedType::ControlForeground )
     {
         ImplInitSettings( false, true, false );
         Invalidate();
     }
-    else if ( nType == StateChangedType::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 5c30ba0a1434..677de2ce717a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2023,16 +2023,16 @@ void Window::StateChanged(StateChangedType eType)
     switch (eType)
     {
         //stuff that doesn't invalidate the layout
-        case StateChangedType::CONTROLFOREGROUND:
-        case StateChangedType::CONTROLBACKGROUND:
+        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:
+        case StateChangedType::UpdateMode:
+        case StateChangedType::ReadOnly:
+        case StateChangedType::Enable:
+        case StateChangedType::State:
+        case StateChangedType::Data:
+        case StateChangedType::InitShow:
+        case StateChangedType::ControlFocus:
             break;
         //stuff that does invalidate the layout
         default:
@@ -2067,7 +2067,7 @@ void Window::SetStyle( WinBits nStyle )
     {
         mpWindowImpl->mnPrevStyle = mpWindowImpl->mnStyle;
         mpWindowImpl->mnStyle = nStyle;
-        StateChanged( StateChangedType::STYLE );
+        StateChanged( StateChangedType::Style );
     }
 }
 
@@ -2091,7 +2091,7 @@ void Window::SetExtendedStyle( WinBits nExtendedStyle )
         }
         mpWindowImpl->mnPrevExtendedStyle = mpWindowImpl->mnExtendedStyle;
         mpWindowImpl->mnExtendedStyle = nExtendedStyle;
-        StateChanged( StateChangedType::EXTENDEDSTYLE );
+        StateChanged( StateChangedType::ExtendedStyle );
     }
 }
 
@@ -2303,7 +2303,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
             mpWindowImpl->mpFrame->Show( false, false );
         }
 
-        StateChanged( StateChangedType::VISIBLE );
+        StateChanged( StateChangedType::Visible );
 
         if ( mpWindowImpl->mbReallyVisible )
         {
@@ -2391,7 +2391,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
             ImplCallResize();
         }
 
-        StateChanged( StateChangedType::VISIBLE );
+        StateChanged( StateChangedType::Visible );
 
         vcl::Window* pTestParent;
         if ( ImplIsOverlapWindow() )
@@ -2578,7 +2578,7 @@ void Window::Enable( bool bEnable, bool bChild )
         mpWindowImpl->mbDisabled = !bEnable;
         if ( mpWindowImpl->mpSysObj )
             mpWindowImpl->mpSysObj->Enable( bEnable && !mpWindowImpl->mbInputDisabled );
-        StateChanged( StateChangedType::ENABLE );
+        StateChanged( StateChangedType::Enable );
 
         CallEventListeners( bEnable ? VCLEVENT_WINDOW_ENABLED : VCLEVENT_WINDOW_DISABLED );
     }
@@ -3132,7 +3132,7 @@ void Window::SetUpdateMode( bool bUpdate )
 {
 
     mpWindowImpl->mbNoUpdate = !bUpdate;
-    StateChanged( StateChangedType::UPDATEMODE );
+    StateChanged( StateChangedType::UpdateMode );
 }
 
 void Window::GrabFocus()
@@ -3203,7 +3203,7 @@ void Window::SetText( const OUString& rStr )
             pWindow->CallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldTitle );
     }
 
-    StateChanged( StateChangedType::TEXT );
+    StateChanged( StateChangedType::Text );
 }
 
 OUString Window::GetText() const
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 3e14d44ad657..fa7cee61135e 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -512,7 +512,7 @@ void Window::SetZoom( const Fraction& rZoom )
     if ( mpWindowImpl->maZoom != rZoom )
     {
         mpWindowImpl->maZoom = rZoom;
-        StateChanged( StateChangedType::ZOOM );
+        StateChanged( StateChangedType::Zoom );
     }
 }
 
@@ -579,7 +579,7 @@ void Window::SetControlFont()
     {
         delete mpWindowImpl->mpControlFont;
         mpWindowImpl->mpControlFont = NULL;
-        StateChanged( StateChangedType::CONTROLFONT );
+        StateChanged( StateChangedType::ControlFont );
     }
 }
 
@@ -600,7 +600,7 @@ void Window::SetControlFont( const vcl::Font& rFont )
     else
         mpWindowImpl->mpControlFont = new vcl::Font( rFont );
 
-    StateChanged( StateChangedType::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( StateChangedType::CONTROLFOREGROUND );
+        StateChanged( StateChangedType::ControlForeground );
     }
 }
 
@@ -632,7 +632,7 @@ void Window::SetControlForeground( const Color& rColor )
         {
             mpWindowImpl->maControlForeground = Color( COL_TRANSPARENT );
             mpWindowImpl->mbControlForeground = false;
-            StateChanged( StateChangedType::CONTROLFOREGROUND );
+            StateChanged( StateChangedType::ControlForeground );
         }
     }
     else
@@ -641,7 +641,7 @@ void Window::SetControlForeground( const Color& rColor )
         {
             mpWindowImpl->maControlForeground = rColor;
             mpWindowImpl->mbControlForeground = true;
-            StateChanged( StateChangedType::CONTROLFOREGROUND );
+            StateChanged( StateChangedType::ControlForeground );
         }
     }
 }
@@ -652,7 +652,7 @@ void Window::SetControlBackground()
     {
         mpWindowImpl->maControlBackground = Color( COL_TRANSPARENT );
         mpWindowImpl->mbControlBackground = false;
-        StateChanged( StateChangedType::CONTROLBACKGROUND );
+        StateChanged( StateChangedType::ControlBackground );
     }
 }
 
@@ -664,7 +664,7 @@ void Window::SetControlBackground( const Color& rColor )
         {
             mpWindowImpl->maControlBackground = Color( COL_TRANSPARENT );
             mpWindowImpl->mbControlBackground = false;
-            StateChanged( StateChangedType::CONTROLBACKGROUND );
+            StateChanged( StateChangedType::ControlBackground );
         }
     }
     else
@@ -673,7 +673,7 @@ void Window::SetControlBackground( const Color& rColor )
         {
             mpWindowImpl->maControlBackground = rColor;
             mpWindowImpl->mbControlBackground = true;
-            StateChanged( StateChangedType::CONTROLBACKGROUND );
+            StateChanged( StateChangedType::ControlBackground );
         }
     }
 }
@@ -1448,7 +1448,7 @@ void Window::queue_resize(StateChangedType eReason)
 
     bool bSomeoneCares = queue_ungrouped_resize(this);
 
-    if (eReason != StateChangedType::VISIBLE)
+    if (eReason != StateChangedType::Visible)
     {
         InvalidateSizeCache();
     }