fdo#84938: convert CTRL_STATE_ #defines to 'enum class'

Change-Id: I1451180d258315a310a048b27510b4b58fa9145c

4 files changed, 94 insertions, 94 deletions

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 0e142aaa7267..5d257633171a 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -350,7 +350,7 @@ public:
     GdkX11Pixmap*  m_pixmap;
     GdkX11Pixmap*  m_mask;
 
-    NWPixmapCacheData() : m_nType(0), m_nState(0), m_pixmap(0), m_mask(0) {}
+    NWPixmapCacheData() : m_nType(0), m_nState(ControlState::NONE), m_pixmap(0), m_mask(0) {}
     ~NWPixmapCacheData()
         { SetPixmap( NULL, NULL ); };
     void SetPixmap( GdkX11Pixmap* pPixmap, GdkX11Pixmap* pMask );
@@ -424,7 +424,7 @@ void NWPixmapCache::ThemeChanged()
 
 bool  NWPixmapCache::Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkX11Pixmap** pPixmap, GdkX11Pixmap** pMask )
 {
-    aState &= ~CTRL_CACHING_ALLOWED; // mask clipping flag
+    aState &= ~ControlState::CACHING_ALLOWED; // mask clipping flag
     int i;
     for(i=0; i<m_size; i++)
     {
@@ -444,10 +444,10 @@ bool  NWPixmapCache::Find( ControlType aType, ControlState aState, const Rectang
 
 void NWPixmapCache::Fill( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkX11Pixmap* pPixmap, GdkX11Pixmap* pMask )
 {
-    if( !(aState & CTRL_CACHING_ALLOWED) )
+    if( !(aState & ControlState::CACHING_ALLOWED) )
         return;
 
-    aState &= ~CTRL_CACHING_ALLOWED; // mask clipping flag
+    aState &= ~ControlState::CACHING_ALLOWED; // mask clipping flag
     m_idx = (m_idx+1) % m_size; // just wrap
     pData[m_idx].m_nType = aType;
     pData[m_idx].m_nState = aState;
@@ -1404,7 +1404,7 @@ bool GtkSalGraphics::NWPaintGTKArrow(
             const OUString& )
 {
     GtkArrowType arrowType(aValue.getNumericVal()&1?GTK_ARROW_DOWN:GTK_ARROW_UP);
-    GtkStateType stateType(nState&CTRL_STATE_PRESSED?GTK_STATE_ACTIVE:GTK_STATE_NORMAL);
+    GtkStateType stateType(nState&ControlState::PRESSED?GTK_STATE_ACTIVE:GTK_STATE_NORMAL);
 
     GdkRectangle clipRect;
     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
@@ -1606,12 +1606,12 @@ bool GtkSalGraphics::NWPaintGTKButtonReal(
        else
            shadowType=GTK_SHADOW_OUT;
 
-       if(nState & CTRL_STATE_ROLLOVER)
+       if(nState & ControlState::ROLLOVER)
            stateType=GTK_STATE_PRELIGHT;
        else
            stateType=GTK_STATE_NORMAL;
 
-       if(nState & CTRL_STATE_PRESSED)
+       if(nState & ControlState::PRESSED)
        {
            stateType=GTK_STATE_ACTIVE;
            shadowType=GTK_SHADOW_IN;
@@ -1661,7 +1661,7 @@ bool GtkSalGraphics::NWPaintGTKButtonReal(
         bDrawFocus = false;
 
     gint xi = x, yi = y, wi = w, hi = h;
-    if ( (nState & CTRL_STATE_DEFAULT) && bDrawFocus )
+    if ( (nState & ControlState::DEFAULT) && bDrawFocus )
     {
         xi += aDefBorder.left;
         yi += aDefBorder.top;
@@ -1697,7 +1697,7 @@ bool GtkSalGraphics::NWPaintGTKButtonReal(
 
         if ( GTK_IS_BUTTON(button) )
         {
-            if ( (nState & CTRL_STATE_DEFAULT) )
+            if ( (nState & ControlState::DEFAULT) )
                 gtk_paint_box( button->style, gdkDrawable, GTK_STATE_NORMAL, GTK_SHADOW_IN,
                                &clipRect, button, "buttondefault", x, y, w, h );
 
@@ -1768,7 +1768,7 @@ static Rectangle NWGetButtonArea( SalX11Screen nScreen,
     if ( (w < 16) || (h < 16) )
         bDrawFocus = false;
 
-    if ( (nState & CTRL_STATE_DEFAULT) && bDrawFocus )
+    if ( (nState & ControlState::DEFAULT) && bDrawFocus )
     {
         x -= aDefBorder.left;
         y -= aDefBorder.top;
@@ -2136,7 +2136,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
                    x, y,
                    scrollbarRect.GetWidth(), scrollbarRect.GetHeight() );
 
-    if ( nState & CTRL_STATE_FOCUSED )
+    if ( nState & ControlState::FOCUSED )
     {
         gtk_paint_focus( style, gdkDrawable, GTK_STATE_ACTIVE,
                          gdkRect, GTK_WIDGET(scrollbarWidget), "trough",
@@ -2467,10 +2467,10 @@ bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
     const SpinbuttonValue *    pSpinVal = (aValue.getType() == CTRL_SPINBUTTONS) ? static_cast<const SpinbuttonValue *>(&aValue) : NULL;
     Rectangle            upBtnRect;
     ControlPart        upBtnPart = PART_BUTTON_UP;
-    ControlState        upBtnState = CTRL_STATE_ENABLED;
+    ControlState        upBtnState = ControlState::ENABLED;
     Rectangle            downBtnRect;
     ControlPart        downBtnPart = PART_BUTTON_DOWN;
-    ControlState        downBtnState = CTRL_STATE_ENABLED;
+    ControlState        downBtnState = ControlState::ENABLED;
 
     NWEnsureGTKButton( m_nXScreen );
     NWEnsureGTKSpinButton( m_nXScreen );
@@ -2822,7 +2822,7 @@ bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
             pixmapRect.Move( -2, 0 );
             pixmapRect.SetSize( Size( pixmapRect.GetWidth() + 2, pixmapRect.GetHeight() ) );
         }
-        if ( nState & CTRL_STATE_SELECTED )
+        if ( nState & ControlState::SELECTED )
         {
             // In GTK+, the selected tab is 2px taller than all other tabs
             pixmapRect.Move( 0, -2 );
@@ -2881,7 +2881,7 @@ bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
 
             case CTRL_TAB_ITEM:
             {
-                stateType = ( nState & CTRL_STATE_SELECTED ) ? GTK_STATE_NORMAL : GTK_STATE_ACTIVE;
+                stateType = ( nState & ControlState::SELECTED ) ? GTK_STATE_NORMAL : GTK_STATE_ACTIVE;
 
                 // First draw the background
                 gtk_paint_flat_box(gWidgetData[m_nXScreen].gNotebookWidget->style, gdkPixmap,
@@ -2892,7 +2892,7 @@ bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
                                        pixmapRect.GetHeight()+rControlRectangle.Top());
 
                 // Now the tab itself
-                if( nState & CTRL_STATE_ROLLOVER )
+                if( nState & ControlState::ROLLOVER )
                     g_object_set_data(G_OBJECT(gdkPixmap),tabPrelitDataName,reinterpret_cast<gpointer>(TRUE));
 
                 gtk_paint_extension( gWidgetData[m_nXScreen].gNotebookWidget->style, gdkPixmap, stateType, GTK_SHADOW_OUT, NULL, gWidgetData[m_nXScreen].gNotebookWidget,
@@ -2901,7 +2901,7 @@ bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
 
                 g_object_steal_data(G_OBJECT(gdkPixmap),tabPrelitDataName);
 
-                if ( nState & CTRL_STATE_SELECTED )
+                if ( nState & ControlState::SELECTED )
                 {
                     gtk_paint_flat_box( m_pWindow->style, gdkPixmap, stateType, GTK_SHADOW_NONE, NULL, m_pWindow,
                         "base", 0, (pixmapRect.GetHeight() - 1), pixmapRect.GetWidth(), 1 );
@@ -3017,7 +3017,7 @@ bool GtkSalGraphics::NWPaintGTKToolbar(
 
     NWEnsureGTKToolbar( m_nXScreen );
     if( nPart == PART_BUTTON ) // toolbar buttons cannot focus in gtk
-        nState &= ~CTRL_STATE_FOCUSED;
+        nState &= ~ControlState::FOCUSED;
     NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
 
     x = rControlRectangle.Left();
@@ -3031,7 +3031,7 @@ bool GtkSalGraphics::NWPaintGTKToolbar(
         NWSetWidgetState( gWidgetData[m_nXScreen].gToolbarWidget, nState, stateType );
 
         GTK_WIDGET_UNSET_FLAGS( gWidgetData[m_nXScreen].gToolbarWidget, GTK_SENSITIVE );
-        if ( nState & CTRL_STATE_ENABLED )
+        if ( nState & ControlState::ENABLED )
             GTK_WIDGET_SET_FLAGS( gWidgetData[m_nXScreen].gToolbarWidget, GTK_SENSITIVE );
 
         if( nPart == PART_DRAW_BACKGROUND_HORZ )
@@ -3045,7 +3045,7 @@ bool GtkSalGraphics::NWPaintGTKToolbar(
         NWSetWidgetState( gWidgetData[m_nXScreen].gHandleBoxWidget, nState, stateType );
 
         GTK_WIDGET_UNSET_FLAGS( gWidgetData[m_nXScreen].gHandleBoxWidget, GTK_SENSITIVE );
-        if ( nState & CTRL_STATE_ENABLED )
+        if ( nState & ControlState::ENABLED )
             GTK_WIDGET_SET_FLAGS( gWidgetData[m_nXScreen].gHandleBoxWidget, GTK_SENSITIVE );
 
         gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(gWidgetData[m_nXScreen].gHandleBoxWidget), shadowType );
@@ -3063,8 +3063,8 @@ bool GtkSalGraphics::NWPaintGTKToolbar(
     // handle button
     else if( nPart == PART_BUTTON )
     {
-        bool bPaintButton = (nState & CTRL_STATE_PRESSED)
-            || (nState & CTRL_STATE_ROLLOVER);
+        bool bPaintButton = (nState & ControlState::PRESSED)
+            || (nState & ControlState::ROLLOVER);
         if( aValue.getTristateVal() == BUTTONVALUE_ON )
         {
             gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pButtonWidget),TRUE);
@@ -3197,7 +3197,7 @@ bool GtkSalGraphics::NWPaintGTKMenubar(
 
     if( nPart == PART_MENU_ITEM )
     {
-        if( nState & CTRL_STATE_SELECTED )
+        if( nState & ControlState::SELECTED )
         {
             gtk_widget_style_get( gWidgetData[m_nXScreen].gMenuItemMenubarWidget,
                                   "selected_shadow_type", &selected_shadow_type,
@@ -3218,7 +3218,7 @@ bool GtkSalGraphics::NWPaintGTKMenubar(
             NWSetWidgetState( gWidgetData[m_nXScreen].gMenubarWidget, nState, stateType );
 
             GTK_WIDGET_UNSET_FLAGS( gWidgetData[m_nXScreen].gMenubarWidget, GTK_SENSITIVE );
-            if ( nState & CTRL_STATE_ENABLED )
+            if ( nState & ControlState::ENABLED )
                 GTK_WIDGET_SET_FLAGS( gWidgetData[m_nXScreen].gMenubarWidget, GTK_SENSITIVE );
 
             // for translucent menubar styles paint background first
@@ -3242,7 +3242,7 @@ bool GtkSalGraphics::NWPaintGTKMenubar(
 
         else if( nPart == PART_MENU_ITEM )
         {
-            if( nState & CTRL_STATE_SELECTED )
+            if( nState & ControlState::SELECTED )
             {
                 gtk_paint_box( gWidgetData[m_nXScreen].gMenuItemMenubarWidget->style,
                                gdkDrawable,
@@ -3270,7 +3270,7 @@ bool GtkSalGraphics::NWPaintGTKPopupMenu(
     // #i50745# gtk does not draw disabled menu entries (and crux theme
     // even crashes) in very old (Fedora Core 4 vintage) gtk's
     if (gtk_major_version <= 2 && gtk_minor_version <= 8 &&
-        nPart == PART_MENU_ITEM && ! (nState & CTRL_STATE_ENABLED) )
+        nPart == PART_MENU_ITEM && ! (nState & ControlState::ENABLED) )
         return true;
 
     GtkStateType    stateType;
@@ -3288,7 +3288,7 @@ bool GtkSalGraphics::NWPaintGTKPopupMenu(
     h = rControlRectangle.GetHeight();
 
     if( nPart == PART_MENU_ITEM &&
-        ( nState & (CTRL_STATE_SELECTED|CTRL_STATE_ROLLOVER) ) )
+        ( nState & (ControlState::SELECTED|ControlState::ROLLOVER) ) )
     {
         gtk_widget_style_get( gWidgetData[m_nXScreen].gMenuItemMenuWidget,
                               "selected_shadow_type", &selected_shadow_type,
@@ -3298,7 +3298,7 @@ bool GtkSalGraphics::NWPaintGTKPopupMenu(
     NWSetWidgetState( gWidgetData[m_nXScreen].gMenuWidget, nState, stateType );
 
     GTK_WIDGET_UNSET_FLAGS( gWidgetData[m_nXScreen].gMenuWidget, GTK_SENSITIVE );
-    if ( nState & CTRL_STATE_ENABLED )
+    if ( nState & ControlState::ENABLED )
         GTK_WIDGET_SET_FLAGS( gWidgetData[m_nXScreen].gMenuWidget, GTK_SENSITIVE );
 
     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
@@ -3330,9 +3330,9 @@ bool GtkSalGraphics::NWPaintGTKPopupMenu(
         }
         else if( nPart == PART_MENU_ITEM )
         {
-            if( nState & (CTRL_STATE_SELECTED|CTRL_STATE_ROLLOVER) )
+            if( nState & (ControlState::SELECTED|ControlState::ROLLOVER) )
             {
-                if( nState & CTRL_STATE_ENABLED )
+                if( nState & ControlState::ENABLED )
                 gtk_paint_box( gWidgetData[m_nXScreen].gMenuItemMenuWidget->style,
                                gdkDrawable,
                                GTK_STATE_PRELIGHT,
@@ -3353,7 +3353,7 @@ bool GtkSalGraphics::NWPaintGTKPopupMenu(
             GtkShadowType nShadowType;
             NWConvertVCLStateToGTKState( nState, &nStateType, &nShadowType );
 
-            if ( (nState & CTRL_STATE_SELECTED) && (nState & CTRL_STATE_ENABLED) )
+            if ( (nState & ControlState::SELECTED) && (nState & ControlState::ENABLED) )
                 nStateType = GTK_STATE_PRELIGHT;
 
             NWSetWidgetState( pWidget, nState, nStateType );
@@ -3397,7 +3397,7 @@ bool GtkSalGraphics::NWPaintGTKPopupMenu(
             GtkShadowType nShadowType;
             NWConvertVCLStateToGTKState( nState, &nStateType, &nShadowType );
 
-            if ( (nState & CTRL_STATE_SELECTED) && (nState & CTRL_STATE_ENABLED) )
+            if ( (nState & ControlState::SELECTED) && (nState & ControlState::ENABLED) )
                 nStateType = GTK_STATE_PRELIGHT;
 
             NWSetWidgetState( gWidgetData[m_nXScreen].gMenuItemMenuWidget,
@@ -3610,7 +3610,7 @@ bool GtkSalGraphics::NWPaintGTKSlider(
                               "trough-border", &trough_border,
                               NULL);
 
-        GtkStateType eState = (nState & CTRL_STATE_ENABLED) ? GTK_STATE_NORMAL : GTK_STATE_INSENSITIVE;
+        GtkStateType eState = (nState & ControlState::ENABLED) ? GTK_STATE_NORMAL : GTK_STATE_INSENSITIVE;
         if( nPart == PART_TRACK_HORZ_AREA )
         {
             gtk_paint_box( pWidget->style,
@@ -4265,14 +4265,14 @@ static void NWConvertVCLStateToGTKState( ControlState nVCLState,
     *nGTKShadow = GTK_SHADOW_OUT;
     *nGTKState = GTK_STATE_INSENSITIVE;
 
-    if ( nVCLState & CTRL_STATE_ENABLED )
+    if ( nVCLState & ControlState::ENABLED )
     {
-        if ( nVCLState & CTRL_STATE_PRESSED )
+        if ( nVCLState & ControlState::PRESSED )
         {
             *nGTKState = GTK_STATE_ACTIVE;
             *nGTKShadow = GTK_SHADOW_IN;
         }
-        else if ( nVCLState & CTRL_STATE_ROLLOVER )
+        else if ( nVCLState & ControlState::ROLLOVER )
         {
             *nGTKState = GTK_STATE_PRELIGHT;
             *nGTKShadow = GTK_SHADOW_OUT;
@@ -4296,11 +4296,11 @@ static void NWSetWidgetState( GtkWidget* widget, ControlState nState, GtkStateTy
     GTK_WIDGET_UNSET_FLAGS( widget, GTK_SENSITIVE );
     GTK_WIDGET_SET_FLAGS( widget, gWidgetDefaultFlags[reinterpret_cast<long>(widget)] );
 
-    if ( nState & CTRL_STATE_DEFAULT )
+    if ( nState & ControlState::DEFAULT )
         GTK_WIDGET_SET_FLAGS( widget, GTK_HAS_DEFAULT );
-    if ( !GTK_IS_TOGGLE_BUTTON(widget) && (nState & CTRL_STATE_FOCUSED) )
+    if ( !GTK_IS_TOGGLE_BUTTON(widget) && (nState & ControlState::FOCUSED) )
         GTK_WIDGET_SET_FLAGS( widget, GTK_HAS_FOCUS );
-    if ( nState & CTRL_STATE_ENABLED )
+    if ( nState & ControlState::ENABLED )
         GTK_WIDGET_SET_FLAGS( widget, GTK_SENSITIVE );
     gtk_widget_set_state( widget, nGtkState );
 }
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 0bb0c34fbf72..53bc1a310453 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -42,22 +42,22 @@ static void NWConvertVCLStateToGTKState( ControlState nVCLState,
     *nGTKShadow = GTK_SHADOW_OUT;
     *nGTKState = GTK_STATE_FLAG_NORMAL;
 
-    if (!( nVCLState & CTRL_STATE_ENABLED ))
+    if (!( nVCLState & ControlState::ENABLED ))
         *nGTKState = GTK_STATE_FLAG_INSENSITIVE;
 
-    if ( nVCLState & CTRL_STATE_PRESSED )
+    if ( nVCLState & ControlState::PRESSED )
     {
         *nGTKState = (GtkStateFlags) (*nGTKState | GTK_STATE_FLAG_ACTIVE);
         *nGTKShadow = GTK_SHADOW_IN;
     }
 
-    if ( nVCLState & CTRL_STATE_ROLLOVER )
+    if ( nVCLState & ControlState::ROLLOVER )
         *nGTKState = (GtkStateFlags) (*nGTKState | GTK_STATE_FLAG_PRELIGHT);
 
-    if ( nVCLState & CTRL_STATE_SELECTED )
+    if ( nVCLState & ControlState::SELECTED )
         *nGTKState = (GtkStateFlags) (*nGTKState | GTK_STATE_FLAG_SELECTED);
 
-    if ( nVCLState & CTRL_STATE_FOCUSED )
+    if ( nVCLState & ControlState::FOCUSED )
         *nGTKState = (GtkStateFlags) (*nGTKState | GTK_STATE_FLAG_FOCUSED);
 }
 
@@ -412,7 +412,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context,
     if ( has_slider )
     {
         NWConvertVCLStateToGTKState( pScrollbarVal->mnThumbState, &stateFlags, &shadowType );
-        if ( pScrollbarVal->mnThumbState & CTRL_STATE_PRESSED )
+        if ( pScrollbarVal->mnThumbState & ControlState::PRESSED )
             stateFlags = (GtkStateFlags) (stateFlags | GTK_STATE_PRELIGHT);
 
         gtk_style_context_save(context);
@@ -601,9 +601,9 @@ void GtkSalGraphics::PaintSpinButton(GtkStyleContext *context,
     GtkShadowType        shadowType;
     const SpinbuttonValue *    pSpinVal = (aValue.getType() == CTRL_SPINBUTTONS) ? static_cast<const SpinbuttonValue *>(&aValue) : NULL;
     ControlPart        upBtnPart = PART_BUTTON_UP;
-    ControlState        upBtnState = CTRL_STATE_ENABLED;
+    ControlState        upBtnState = ControlState::ENABLED;
     ControlPart        downBtnPart = PART_BUTTON_DOWN;
-    ControlState        downBtnState = CTRL_STATE_ENABLED;
+    ControlState        downBtnState = ControlState::ENABLED;
 
     if ( pSpinVal )
     {
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index f0e5ebe01f97..e1a7322abfe2 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -516,7 +516,7 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget,
     pWidget->move( 0, 0 );
 
     // Enable/disable the widget
-    pWidget->setEnabled( nState & CTRL_STATE_ENABLED );
+    pWidget->setEnabled( nState & ControlState::ENABLED );
 
     // Create pixmap to paint to
     KDEX11Pixmap xPixmap( pWidget->width(), pWidget->height() );
@@ -598,15 +598,15 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget,
         QStyle::SCFlags eActive = QStyle::SC_None;
         if ( pValue )
         {
-            if ( pValue->mnUpperState & CTRL_STATE_PRESSED )
+            if ( pValue->mnUpperState & ControlState::PRESSED )
                 eActive = QStyle::SC_SpinWidgetUp;
-            else if ( pValue->mnLowerState & CTRL_STATE_PRESSED )
+            else if ( pValue->mnLowerState & ControlState::PRESSED )
                 eActive = QStyle::SC_SpinWidgetDown;
 
             // Update the enable/disable state of the widget
-            if ( ( nState & CTRL_STATE_ENABLED ) ||
-                ( pValue->mnUpperState & CTRL_STATE_ENABLED ) ||
-                ( pValue->mnLowerState & CTRL_STATE_ENABLED ) )
+            if ( ( nState & ControlState::ENABLED ) ||
+                ( pValue->mnUpperState & ControlState::ENABLED ) ||
+                ( pValue->mnLowerState & ControlState::ENABLED ) )
             {
                 pWidget->setEnabled( true );
                 nStyle |= QStyle::Style_Enabled;
@@ -615,8 +615,8 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget,
                 pWidget->setEnabled( false );
 
             // Mouse-over effect
-            if ( (pValue->mnUpperState & CTRL_STATE_ROLLOVER) ||
-                (pValue->mnLowerState & CTRL_STATE_ROLLOVER) )
+            if ( (pValue->mnUpperState & ControlState::ROLLOVER) ||
+                (pValue->mnLowerState & ControlState::ROLLOVER) )
             nStyle |= QStyle::Style_MouseOver;
         }
 
@@ -692,38 +692,38 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget,
         if ( strcmp( QMotifPlusStyle_String, pStyleName ) == 0 )
         {
             nStyle |= QStyle::Style_MouseOver;
-            if ( pValue->mnThumbState & CTRL_STATE_ROLLOVER )
+            if ( pValue->mnThumbState & ControlState::ROLLOVER )
                 eActive = QStyle::SC_ScrollBarSlider;
         }
         else if ( strcmp( QSGIStyle_String, pStyleName ) == 0 )
         {
             nStyle |= QStyle::Style_MouseOver;
-            if ( pValue->mnButton1State & CTRL_STATE_ROLLOVER )
+            if ( pValue->mnButton1State & ControlState::ROLLOVER )
                 eActive = QStyle::SC_ScrollBarSubLine;
-            else if ( pValue->mnButton2State & CTRL_STATE_ROLLOVER )
+            else if ( pValue->mnButton2State & ControlState::ROLLOVER )
                 eActive = QStyle::SC_ScrollBarAddLine;
-            else if ( pValue->mnThumbState & CTRL_STATE_ROLLOVER )
+            else if ( pValue->mnThumbState & ControlState::ROLLOVER )
                 eActive = QStyle::SC_ScrollBarSlider;
         }
 
-        if ( pValue->mnButton1State & CTRL_STATE_PRESSED )
+        if ( pValue->mnButton1State & ControlState::PRESSED )
            eActive = QStyle::SC_ScrollBarSubLine;
-        else if ( pValue->mnButton2State & CTRL_STATE_PRESSED )
+        else if ( pValue->mnButton2State & ControlState::PRESSED )
             eActive = QStyle::SC_ScrollBarAddLine;
-        else if ( pValue->mnThumbState & CTRL_STATE_PRESSED )
+        else if ( pValue->mnThumbState & ControlState::PRESSED )
             eActive = QStyle::SC_ScrollBarSlider;
-        else if ( pValue->mnPage1State & CTRL_STATE_PRESSED )
+        else if ( pValue->mnPage1State & ControlState::PRESSED )
             eActive = QStyle::SC_ScrollBarSubPage;
-        else if ( pValue->mnPage2State & CTRL_STATE_PRESSED )
+        else if ( pValue->mnPage2State & ControlState::PRESSED )
             eActive = QStyle::SC_ScrollBarAddPage;
 
         // Update the enable/disable state of the widget
-        if ( ( nState & CTRL_STATE_ENABLED ) ||
-            ( pValue->mnButton1State & CTRL_STATE_ENABLED ) ||
-            ( pValue->mnButton2State & CTRL_STATE_ENABLED ) ||
-            ( pValue->mnThumbState & CTRL_STATE_ENABLED ) ||
-            ( pValue->mnPage1State & CTRL_STATE_ENABLED ) ||
-            ( pValue->mnPage2State & CTRL_STATE_ENABLED ) )
+        if ( ( nState & ControlState::ENABLED ) ||
+            ( pValue->mnButton1State & ControlState::ENABLED ) ||
+            ( pValue->mnButton2State & ControlState::ENABLED ) ||
+            ( pValue->mnThumbState & ControlState::ENABLED ) ||
+            ( pValue->mnPage1State & ControlState::ENABLED ) ||
+            ( pValue->mnPage2State & ControlState::ENABLED ) )
         {
             pWidget->setEnabled( true );
             nStyle |= QStyle::Style_Enabled;
@@ -1201,13 +1201,13 @@ QStyle::SFlags WidgetPainter::vclStateValue2SFlags( ControlState nState,
     const ImplControlValue& aValue )
 {
     QStyle::SFlags nStyle =
-    ( (nState & CTRL_STATE_DEFAULT)?  QStyle::Style_ButtonDefault: QStyle::Style_Default ) |
-    ( (nState & CTRL_STATE_ENABLED)?  QStyle::Style_Enabled:       QStyle::Style_Default ) |
-    ( (nState & CTRL_STATE_FOCUSED)?  QStyle::Style_HasFocus:      QStyle::Style_Default ) |
-    ( (nState & CTRL_STATE_PRESSED)?  QStyle::Style_Down:          QStyle::Style_Raised )  |
-    ( (nState & CTRL_STATE_SELECTED)? QStyle::Style_Selected :     QStyle::Style_Default ) |
-    ( (nState & CTRL_STATE_ROLLOVER)? QStyle::Style_MouseOver:     QStyle::Style_Default );
-    //TODO ( (nState & CTRL_STATE_HIDDEN)?   QStyle::Style_: QStyle::Style_Default ) |
+    ( (nState & ControlState::DEFAULT)?  QStyle::Style_ButtonDefault: QStyle::Style_Default ) |
+    ( (nState & ControlState::ENABLED)?  QStyle::Style_Enabled:       QStyle::Style_Default ) |
+    ( (nState & ControlState::FOCUSED)?  QStyle::Style_HasFocus:      QStyle::Style_Default ) |
+    ( (nState & ControlState::PRESSED)?  QStyle::Style_Down:          QStyle::Style_Raised )  |
+    ( (nState & ControlState::SELECTED)? QStyle::Style_Selected :     QStyle::Style_Default ) |
+    ( (nState & ControlState::ROLLOVER)? QStyle::Style_MouseOver:     QStyle::Style_Default );
+    //TODO ( (nState & ControlState::HIDDEN)?   QStyle::Style_: QStyle::Style_Default ) |
 
     switch ( aValue.getTristateVal() )
     {
@@ -1413,7 +1413,7 @@ bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart,
     if ( (nType == CTRL_PUSHBUTTON) && (nPart == PART_ENTIRE_CONTROL) )
     {
     bReturn = pWidgetPainter->drawStyledWidget(
-        pWidgetPainter->pushButton( rControlRegion, (nState & CTRL_STATE_DEFAULT) ),
+        pWidgetPainter->pushButton( rControlRegion, (nState & ControlState::DEFAULT) ),
         nState, aValue, this );
     }
     else if ( (nType == CTRL_RADIOBUTTON) && (nPart == PART_ENTIRE_CONTROL) )
@@ -1542,14 +1542,14 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
     {
     // Metrics of the push button
     case CTRL_PUSHBUTTON:
-        pWidget = pWidgetPainter->pushButton( rControlRegion, ( nState & CTRL_STATE_DEFAULT ) );
+        pWidget = pWidgetPainter->pushButton( rControlRegion, ( nState & ControlState::DEFAULT ) );
 
         switch ( nPart )
         {
         case PART_ENTIRE_CONTROL:
             qRect = qBoundingRect;
 
-            if ( nState & CTRL_STATE_DEFAULT )
+            if ( nState & ControlState::DEFAULT )
             {
             int nIndicatorSize = QApplication::style().pixelMetric(
                 QStyle::PM_ButtonDefaultIndicator, pWidget );
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index bb73d894227f..d0f5e63812ed 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -46,13 +46,13 @@ QStyle::State vclStateValue2StateFlag( ControlState nControlState,
     const ImplControlValue& aValue )
 {
     QStyle::State nState =
-        ( (nControlState & CTRL_STATE_DEFAULT)?  QStyle::State_None:      QStyle::State_None ) |
-        ( (nControlState & CTRL_STATE_ENABLED)?  QStyle::State_Enabled:   QStyle::State_None ) |
-        ( (nControlState & CTRL_STATE_FOCUSED)?  QStyle::State_HasFocus:  QStyle::State_None ) |
-        ( (nControlState & CTRL_STATE_PRESSED)?  QStyle::State_Sunken:    QStyle::State_None ) |
-        ( (nControlState & CTRL_STATE_SELECTED)? QStyle::State_Selected : QStyle::State_None ) |
-        ( (nControlState & CTRL_STATE_ROLLOVER)? QStyle::State_MouseOver: QStyle::State_None );
-        //TODO ( (nControlState & CTRL_STATE_HIDDEN)?   QStyle::State_:   QStyle::State_None ) |
+        ( (nControlState & ControlState::DEFAULT)?  QStyle::State_None:      QStyle::State_None ) |
+        ( (nControlState & ControlState::ENABLED)?  QStyle::State_Enabled:   QStyle::State_None ) |
+        ( (nControlState & ControlState::FOCUSED)?  QStyle::State_HasFocus:  QStyle::State_None ) |
+        ( (nControlState & ControlState::PRESSED)?  QStyle::State_Sunken:    QStyle::State_None ) |
+        ( (nControlState & ControlState::SELECTED)? QStyle::State_Selected : QStyle::State_None ) |
+        ( (nControlState & ControlState::ROLLOVER)? QStyle::State_MouseOver: QStyle::State_None );
+        //TODO ( (nControlState & ControlState::HIDDEN)?   QStyle::State_:   QStyle::State_None ) |
 
     switch ( aValue.getTristateVal() )
     {
@@ -274,11 +274,11 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         if (part == PART_MENU_ITEM)
         {
             QStyleOptionMenuItem option;
-            if ( ( nControlState & CTRL_STATE_ROLLOVER )
+            if ( ( nControlState & ControlState::ROLLOVER )
                 && QApplication::style()->styleHint( QStyle::SH_MenuBar_MouseTracking ) )
                 option.state |= QStyle::State_Selected;
 
-            if ( nControlState & CTRL_STATE_SELECTED ) // Passing State_Sunken is currently not documented.
+            if ( nControlState & ControlState::SELECTED ) // Passing State_Sunken is currently not documented.
                 option.state |= QStyle::State_Sunken;  // But some kinds of QStyle interpret it.
 
             draw( QStyle::CE_MenuBarItem, &option, m_image,
@@ -337,7 +337,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
             QStyleOptionMenuItem option;
             option.checkType = ( part == PART_MENU_ITEM_CHECK_MARK )
                 ? QStyleOptionMenuItem::NonExclusive : QStyleOptionMenuItem::Exclusive;
-            option.checked = ( nControlState & CTRL_STATE_PRESSED );
+            option.checked = ( nControlState & ControlState::PRESSED );
             // widgetRect is now the rectangle for the checkbox/radiobutton itself, but Qt
             // paints the whole menu item, so translate position (and it'll be clipped);
             // it is also necessary to fill the background transparently first, as this
@@ -484,7 +484,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
             option.pageStep = sbVal->mnVisibleSize;
 
             //setup the active control...always the slider
-            if (sbVal->mnThumbState & CTRL_STATE_ROLLOVER)
+            if (sbVal->mnThumbState & ControlState::ROLLOVER)
                 option.activeSubControls = QStyle::SC_ScrollBarSlider;
 
             draw( QStyle::CC_ScrollBar, &option, m_image,
@@ -503,9 +503,9 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         if( value.getType() == CTRL_SPINBUTTONS )
         {
             const SpinbuttonValue* pSpinVal = static_cast<const SpinbuttonValue *>(&value);
-            if( (pSpinVal->mnUpperState & CTRL_STATE_PRESSED) )
+            if( (pSpinVal->mnUpperState & ControlState::PRESSED) )
                 option.activeSubControls |= QStyle::SC_SpinBoxUp;
-            if( (pSpinVal->mnLowerState & CTRL_STATE_PRESSED) )
+            if( (pSpinVal->mnLowerState & ControlState::PRESSED) )
                 option.activeSubControls |= QStyle::SC_SpinBoxDown;
         }
 
@@ -671,7 +671,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
             {
                 styleOption.state = vclStateValue2StateFlag(controlState, val);
 
-                if ( controlState & CTRL_STATE_DEFAULT )
+                if ( controlState & ControlState::DEFAULT )
                 {
                     int size = QApplication::style()->pixelMetric(
                         QStyle::PM_ButtonDefaultIndicator, &styleOption );