Convert WindowType to scoped enum

Change-Id: I85cfe02f28729e13f2c0dd3d91cd89e6f3e3b6a9
Reviewed-on: https://gerrit.libreoffice.org/34219
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 339 insertions, 344 deletions

diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index e1396e11b45c..7d3600bc93c7 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -436,7 +436,7 @@ void VCLXAccessibleComponent::FillAccessibleStateSet( utl::AccessibleStateSetHel
         }
         //If a combobox or list's edit child isn't read-only,EDITABLE state
         //should be set.
-        if( pWindow && pWindow->GetType() == WINDOW_COMBOBOX )
+        if( pWindow && pWindow->GetType() == WindowType::COMBOBOX )
         {
             if( !( pWindow->GetStyle() & WB_READONLY) ||
                 !static_cast<Edit*>(pWindow.get())->IsReadOnly() )
@@ -448,14 +448,14 @@ void VCLXAccessibleComponent::FillAccessibleStateSet( utl::AccessibleStateSetHel
         while( pWindow && pChild )
         {
             VclPtr<vcl::Window> pWinTemp = pChild->GetWindow( GetWindowType::FirstChild );
-            if( pWinTemp && pWinTemp->GetType() == WINDOW_EDIT )
+            if( pWinTemp && pWinTemp->GetType() == WindowType::EDIT )
             {
                 if( !( pWinTemp->GetStyle() & WB_READONLY) ||
                     !static_cast<Edit*>(pWinTemp.get())->IsReadOnly() )
                     rStateSet.AddState( accessibility::AccessibleStateType::EDITABLE );
                 break;
             }
-            if( pChild->GetType() == WINDOW_EDIT )
+            if( pChild->GetType() == WindowType::EDIT )
             {
                 if( !( pChild->GetStyle() & WB_READONLY) ||
                     !static_cast<Edit*>(pChild.get())->IsReadOnly())
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index 0f8a3bb657b0..ec437aadae06 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -185,7 +185,7 @@ void VCLXContainer::setGroup( const css::uno::Sequence< css::uno::Reference< css
             vcl::Window* pSortBehind = pPrevWin;
             // #57096# Sort all radios consecutively
             bool bNewPrevWin = true;
-            if ( pWin->GetType() == WINDOW_RADIOBUTTON )
+            if ( pWin->GetType() == WindowType::RADIOBUTTON )
             {
                 if ( pPrevRadio )
                 {
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index b80d2607525a..5feba0603a6d 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -124,9 +124,6 @@
 
 #include "helper/unowrapper.hxx"
 
-#define VCLWINDOW_FRAMEWINDOW               0x1000
-#define VCLWINDOW_SYSTEMCHILDWINDOW         0x1001
-
 #if defined(_WIN32)
 #define SYSTEM_DEPENDENT_TYPE css::lang::SystemDependent::SYSTEM_WIN32
 #elif defined(MACOSX)
@@ -308,36 +305,36 @@ public:
 
 };
 
-WinBits ImplGetWinBits( sal_uInt32 nComponentAttribs, sal_uInt16 nCompType )
+WinBits ImplGetWinBits( sal_uInt32 nComponentAttribs, WindowType nCompType )
 {
     WinBits nWinBits = 0;
 
     bool bMessBox = false;
-    if ( ( nCompType == WINDOW_INFOBOX ) ||
-         ( nCompType == WINDOW_MESSBOX ) ||
-         ( nCompType == WINDOW_QUERYBOX ) ||
-         ( nCompType == WINDOW_WARNINGBOX ) ||
-         ( nCompType == WINDOW_ERRORBOX ) )
+    if ( ( nCompType == WindowType::INFOBOX ) ||
+         ( nCompType == WindowType::MESSBOX ) ||
+         ( nCompType == WindowType::QUERYBOX ) ||
+         ( nCompType == WindowType::WARNINGBOX ) ||
+         ( nCompType == WindowType::ERRORBOX ) )
     {
         bMessBox = true;
     }
 
     bool bDecoratedWindow = false;
     if  (   bMessBox
-        ||  ( nCompType == WINDOW_DIALOG )
-        ||  ( nCompType == WINDOW_MODELESSDIALOG )
-        ||  ( nCompType == WINDOW_MODALDIALOG )
-        ||  ( nCompType == WINDOW_SYSTEMDIALOG )
-        ||  ( nCompType == WINDOW_PATHDIALOG )
-        ||  ( nCompType == WINDOW_FILEDIALOG )
-        ||  ( nCompType == WINDOW_PRINTERSETUPDIALOG )
-        ||  ( nCompType == WINDOW_PRINTDIALOG )
-        ||  ( nCompType == WINDOW_COLORDIALOG )
-        ||  ( nCompType == WINDOW_FONTDIALOG )
-        ||  ( nCompType == WINDOW_DOCKINGWINDOW )
-        ||  ( nCompType == WINDOW_TABDIALOG )
-        ||  ( nCompType == WINDOW_BUTTONDIALOG )
-        ||  ( nCompType == WINDOW_SYSTEMCHILDWINDOW )
+        ||  ( nCompType == WindowType::DIALOG )
+        ||  ( nCompType == WindowType::MODELESSDIALOG )
+        ||  ( nCompType == WindowType::MODALDIALOG )
+        ||  ( nCompType == WindowType::SYSTEMDIALOG )
+        ||  ( nCompType == WindowType::PATHDIALOG )
+        ||  ( nCompType == WindowType::FILEDIALOG )
+        ||  ( nCompType == WindowType::PRINTERSETUPDIALOG )
+        ||  ( nCompType == WindowType::PRINTDIALOG )
+        ||  ( nCompType == WindowType::COLORDIALOG )
+        ||  ( nCompType == WindowType::FONTDIALOG )
+        ||  ( nCompType == WindowType::DOCKINGWINDOW )
+        ||  ( nCompType == WindowType::TABDIALOG )
+        ||  ( nCompType == WindowType::BUTTONDIALOG )
+        ||  ( nCompType == WindowType::SYSTEMCHILDWINDOW )
         )
     {
         bDecoratedWindow = true;
@@ -404,7 +401,7 @@ WinBits ImplGetWinBits( sal_uInt32 nComponentAttribs, sal_uInt16 nCompType )
         if( nComponentAttribs & css::awt::VclWindowPeerAttribute::DEF_NO )
             nWinBits |= WB_DEF_NO;
     }
-    if ( nCompType == WINDOW_MULTILINEEDIT || nCompType == WINDOW_DIALOG || nCompType == WINDOW_GROUPBOX )
+    if ( nCompType == WindowType::MULTILINEEDIT || nCompType == WindowType::DIALOG || nCompType == WindowType::GROUPBOX )
     {
         if( nComponentAttribs & css::awt::VclWindowPeerAttribute::AUTOHSCROLL )
             nWinBits |= WB_AUTOHSCROLL;
@@ -438,72 +435,72 @@ struct ComponentInfo
 
 static ComponentInfo aComponentInfos [] =
 {
-    { "buttondialog",       WINDOW_BUTTONDIALOG },
-    { "cancelbutton",       WINDOW_CANCELBUTTON },
-    { "checkbox",           WINDOW_CHECKBOX },
-    { "combobox",           WINDOW_COMBOBOX },
-    { "control",            WINDOW_CONTROL },
-    { "currencybox",        WINDOW_CURRENCYBOX },
-    { "currencyfield",      WINDOW_CURRENCYFIELD },
-    { "datebox",            WINDOW_DATEBOX },
-    { "datefield",          WINDOW_DATEFIELD },
-    { "dialog",             WINDOW_DIALOG },
-    { "dockingarea",        WINDOW_DOCKINGAREA },
-    { "dockingwindow",      WINDOW_DOCKINGWINDOW },
-    { "edit",               WINDOW_EDIT },
-    { "errorbox",           WINDOW_ERRORBOX },
-    { "fixedbitmap",        WINDOW_FIXEDBITMAP },
-    { "fixedimage",         WINDOW_FIXEDIMAGE },
-    { "fixedline",          WINDOW_FIXEDLINE },
-    { "fixedtext",          WINDOW_FIXEDTEXT },
-    { "floatingwindow",     WINDOW_FLOATINGWINDOW },
-    { "framewindow",        VCLWINDOW_FRAMEWINDOW },
-    { "groupbox",           WINDOW_GROUPBOX },
-    { "frame",          WINDOW_GROUPBOX },
-    { "helpbutton",         WINDOW_HELPBUTTON },
-    { "imagebutton",        WINDOW_IMAGEBUTTON },
-    { "infobox",            WINDOW_INFOBOX },
-    { "listbox",            WINDOW_LISTBOX },
-    { "longcurrencybox",    WINDOW_LONGCURRENCYBOX },
-    { "longcurrencyfield",  WINDOW_LONGCURRENCYFIELD },
-    { "menubutton",         WINDOW_MENUBUTTON },
-    { "messbox",            WINDOW_MESSBOX },
-    { "metricbox",          WINDOW_METRICBOX },
-    { "metricfield",        WINDOW_METRICFIELD },
-    { "modaldialog",        WINDOW_MODALDIALOG },
-    { "modelessdialog",     WINDOW_MODELESSDIALOG },
-    { "morebutton",         WINDOW_MOREBUTTON },
-    { "multilineedit",      WINDOW_MULTILINEEDIT },
-    { "multilistbox",       WINDOW_MULTILISTBOX },
-    { "numericbox",         WINDOW_NUMERICBOX },
-    { "numericfield",       WINDOW_NUMERICFIELD },
-    { "okbutton",           WINDOW_OKBUTTON },
-    { "patternbox",         WINDOW_PATTERNBOX },
-    { "patternfield",       WINDOW_PATTERNFIELD },
-    { "pushbutton",         WINDOW_PUSHBUTTON },
-    { "querybox",           WINDOW_QUERYBOX },
-    { "radiobutton",        WINDOW_RADIOBUTTON },
-    { "scrollbar",          WINDOW_SCROLLBAR },
-    { "scrollbarbox",       WINDOW_SCROLLBARBOX },
-    { "animatedimages",     WINDOW_CONTROL },
-    { "spinbutton",         WINDOW_SPINBUTTON },
-    { "spinfield",          WINDOW_SPINFIELD },
-    { "splitter",           WINDOW_SPLITTER },
-    { "splitwindow",        WINDOW_SPLITWINDOW },
-    { "statusbar",          WINDOW_STATUSBAR },
-    { "systemchildwindow",  VCLWINDOW_SYSTEMCHILDWINDOW },
-    { "tabcontrol",         WINDOW_TABCONTROL },
-    { "tabdialog",          WINDOW_TABDIALOG },
-    { "tabpage",            WINDOW_TABPAGE },
-    { "timebox",            WINDOW_TIMEBOX },
-    { "timefield",          WINDOW_TIMEFIELD },
-    { "toolbox",            WINDOW_TOOLBOX },
-    { "tristatebox",        WINDOW_TRISTATEBOX },
-    { "warningbox",         WINDOW_WARNINGBOX },
-    { "window",             WINDOW_WINDOW },
-    { "workwindow",         WINDOW_WORKWINDOW },
-    { "tabpagecontainer",   WINDOW_CONTROL },
-    { "tabpagemodel",       WINDOW_TABPAGE }
+    { "buttondialog",       WindowType::BUTTONDIALOG },
+    { "cancelbutton",       WindowType::CANCELBUTTON },
+    { "checkbox",           WindowType::CHECKBOX },
+    { "combobox",           WindowType::COMBOBOX },
+    { "control",            WindowType::CONTROL },
+    { "currencybox",        WindowType::CURRENCYBOX },
+    { "currencyfield",      WindowType::CURRENCYFIELD },
+    { "datebox",            WindowType::DATEBOX },
+    { "datefield",          WindowType::DATEFIELD },
+    { "dialog",             WindowType::DIALOG },
+    { "dockingarea",        WindowType::DOCKINGAREA },
+    { "dockingwindow",      WindowType::DOCKINGWINDOW },
+    { "edit",               WindowType::EDIT },
+    { "errorbox",           WindowType::ERRORBOX },
+    { "fixedbitmap",        WindowType::FIXEDBITMAP },
+    { "fixedimage",         WindowType::FIXEDIMAGE },
+    { "fixedline",          WindowType::FIXEDLINE },
+    { "fixedtext",          WindowType::FIXEDTEXT },
+    { "floatingwindow",     WindowType::FLOATINGWINDOW },
+    { "framewindow",        WindowType::TOOLKIT_FRAMEWINDOW },
+    { "groupbox",           WindowType::GROUPBOX },
+    { "frame",              WindowType::GROUPBOX },
+    { "helpbutton",         WindowType::HELPBUTTON },
+    { "imagebutton",        WindowType::IMAGEBUTTON },
+    { "infobox",            WindowType::INFOBOX },
+    { "listbox",            WindowType::LISTBOX },
+    { "longcurrencybox",    WindowType::LONGCURRENCYBOX },
+    { "longcurrencyfield",  WindowType::LONGCURRENCYFIELD },
+    { "menubutton",         WindowType::MENUBUTTON },
+    { "messbox",            WindowType::MESSBOX },
+    { "metricbox",          WindowType::METRICBOX },
+    { "metricfield",        WindowType::METRICFIELD },
+    { "modaldialog",        WindowType::MODALDIALOG },
+    { "modelessdialog",     WindowType::MODELESSDIALOG },
+    { "morebutton",         WindowType::MOREBUTTON },
+    { "multilineedit",      WindowType::MULTILINEEDIT },
+    { "multilistbox",       WindowType::MULTILISTBOX },
+    { "numericbox",         WindowType::NUMERICBOX },
+    { "numericfield",       WindowType::NUMERICFIELD },
+    { "okbutton",           WindowType::OKBUTTON },
+    { "patternbox",         WindowType::PATTERNBOX },
+    { "patternfield",       WindowType::PATTERNFIELD },
+    { "pushbutton",         WindowType::PUSHBUTTON },
+    { "querybox",           WindowType::QUERYBOX },
+    { "radiobutton",        WindowType::RADIOBUTTON },
+    { "scrollbar",          WindowType::SCROLLBAR },
+    { "scrollbarbox",       WindowType::SCROLLBARBOX },
+    { "animatedimages",     WindowType::CONTROL },
+    { "spinbutton",         WindowType::SPINBUTTON },
+    { "spinfield",          WindowType::SPINFIELD },
+    { "splitter",           WindowType::SPLITTER },
+    { "splitwindow",        WindowType::SPLITWINDOW },
+    { "statusbar",          WindowType::STATUSBAR },
+    { "systemchildwindow",  WindowType::TOOLKIT_SYSTEMCHILDWINDOW },
+    { "tabcontrol",         WindowType::TABCONTROL },
+    { "tabdialog",          WindowType::TABDIALOG },
+    { "tabpage",            WindowType::TABPAGE },
+    { "timebox",            WindowType::TIMEBOX },
+    { "timefield",          WindowType::TIMEFIELD },
+    { "toolbox",            WindowType::TOOLBOX },
+    { "tristatebox",        WindowType::TRISTATEBOX },
+    { "warningbox",         WindowType::WARNINGBOX },
+    { "window",             WindowType::WINDOW },
+    { "workwindow",         WindowType::WORKWINDOW },
+    { "tabpagecontainer",   WindowType::CONTROL },
+    { "tabpagemodel",       WindowType::TABPAGE }
 };
 
 extern "C"
@@ -515,7 +512,7 @@ static int SAL_CALL ComponentInfoCompare( const void* pFirst, const void* pSecon
 }
 }
 
-sal_uInt16 ImplGetComponentType( const OUString& rServiceName )
+WindowType ImplGetComponentType( const OUString& rServiceName )
 {
     static bool bSorted = false;
     if( !bSorted )
@@ -541,7 +538,7 @@ sal_uInt16 ImplGetComponentType( const OUString& rServiceName )
                         sizeof( ComponentInfo ),
                         ComponentInfoCompare ));
 
-    return pInf ? pInf->nWinType : 0;
+    return pInf ? pInf->nWinType : WindowType::NONE;
 }
 
 
@@ -800,7 +797,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
     aServiceName = aServiceName.toAsciiLowerCase();
 
     VclPtr<vcl::Window> pNewWindow;
-    sal_uInt16 nType = ImplGetComponentType( aServiceName );
+    WindowType nType = ImplGetComponentType( aServiceName );
     bool bFrameControl = false;
     if ( aServiceName == "frame" )
         bFrameControl = true;
@@ -814,19 +811,19 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
         // Wenn die Component einen Parent braucht, dann NULL zurueckgeben,
         // spaeter mal css::uno::Exception...
         bool bException = true;
-        if  (   ( nType == WINDOW_DIALOG )
-            ||  ( nType == WINDOW_MODALDIALOG )
-            ||  ( nType == WINDOW_MODELESSDIALOG )
-            ||  ( nType == WINDOW_MESSBOX )
-            ||  ( nType == WINDOW_INFOBOX )
-            ||  ( nType == WINDOW_WARNINGBOX )
-            ||  ( nType == WINDOW_ERRORBOX )
-            ||  ( nType == WINDOW_QUERYBOX )
+        if  (   ( nType == WindowType::DIALOG )
+            ||  ( nType == WindowType::MODALDIALOG )
+            ||  ( nType == WindowType::MODELESSDIALOG )
+            ||  ( nType == WindowType::MESSBOX )
+            ||  ( nType == WindowType::INFOBOX )
+            ||  ( nType == WindowType::WARNINGBOX )
+            ||  ( nType == WindowType::ERRORBOX )
+            ||  ( nType == WindowType::QUERYBOX )
             )
             bException = false;
-        else if ( ( nType == WINDOW_WINDOW ) ||
-                  ( nType == WINDOW_WORKWINDOW ) ||
-                  ( nType == VCLWINDOW_FRAMEWINDOW ) )
+        else if ( ( nType == WindowType::WINDOW ) ||
+                  ( nType == WindowType::WORKWINDOW ) ||
+                  ( nType == WindowType::TOOLKIT_FRAMEWINDOW ) )
         {
             if ( rDescriptor.Type == css::awt::WindowClass_TOP )
                 bException = false;
@@ -839,72 +836,72 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
         }
     }
 
-    if ( nType )
+    if ( nType != WindowType::NONE )
     {
         SolarMutexGuard aVclGuard;
-        switch ( (WindowType)nType )
+        switch ( nType )
         {
-            case WINDOW_CANCELBUTTON:
+            case WindowType::CANCELBUTTON:
                 pNewWindow = VclPtr<CancelButton>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXButton;
             break;
-            case WINDOW_CHECKBOX:
+            case WindowType::CHECKBOX:
                  pNewWindow = VclPtr<CheckBox>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXCheckBox;
             break;
-            case WINDOW_COMBOBOX:
+            case WindowType::COMBOBOX:
                 pNewWindow = VclPtr<ComboBox>::Create( pParent, nWinBits|WB_AUTOHSCROLL );
                 static_cast<ComboBox*>(pNewWindow.get())->EnableAutoSize( false );
                 *ppNewComp = new VCLXComboBox;
             break;
-            case WINDOW_CURRENCYBOX:
+            case WindowType::CURRENCYBOX:
                 pNewWindow = VclPtr<CurrencyBox>::Create( pParent, nWinBits );
             break;
-            case WINDOW_CURRENCYFIELD:
+            case WindowType::CURRENCYFIELD:
                 pNewWindow = VclPtr<CurrencyField>::Create( pParent, nWinBits );
                 static_cast<CurrencyField*>(pNewWindow.get())->EnableEmptyFieldValue( true );
                 *ppNewComp = new VCLXNumericField;
                 static_cast<VCLXFormattedSpinField*>(*ppNewComp)->SetFormatter( static_cast<FormatterBase*>(static_cast<CurrencyField*>(pNewWindow.get())) );
             break;
-            case WINDOW_DATEBOX:
+            case WindowType::DATEBOX:
                 pNewWindow = VclPtr<DateBox>::Create( pParent, nWinBits );
             break;
-            case WINDOW_DATEFIELD:
+            case WindowType::DATEFIELD:
                 pNewWindow = VclPtr<DateField>::Create( pParent, nWinBits );
                 static_cast<DateField*>(pNewWindow.get())->EnableEmptyFieldValue( true );
                 *ppNewComp = new VCLXDateField;
                 static_cast<VCLXFormattedSpinField*>(*ppNewComp)->SetFormatter( static_cast<FormatterBase*>(static_cast<DateField*>(pNewWindow.get())) );
             break;
-            case WINDOW_DOCKINGAREA:
+            case WindowType::DOCKINGAREA:
                 pNewWindow = VclPtr<DockingAreaWindow>::Create( pParent );
             break;
-            case WINDOW_MULTILINEEDIT:
-            case WINDOW_EDIT:
+            case WindowType::MULTILINEEDIT:
+            case WindowType::EDIT:
                 pNewWindow = VclPtr<Edit>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXEdit;
             break;
-            case WINDOW_ERRORBOX:
+            case WindowType::ERRORBOX:
                 pNewWindow = VclPtr<ErrorBox>::Create( pParent, nWinBits, OUString() );
                 *ppNewComp = new VCLXMessageBox;
             break;
-            case WINDOW_FIXEDBITMAP:
+            case WindowType::FIXEDBITMAP:
                 pNewWindow = VclPtr<FixedBitmap>::Create( pParent, nWinBits );
             break;
-            case WINDOW_FIXEDIMAGE:
+            case WindowType::FIXEDIMAGE:
                 pNewWindow = VclPtr<ImageControl>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXImageControl;
             break;
-            case WINDOW_FIXEDLINE:
+            case WindowType::FIXEDLINE:
                 pNewWindow = VclPtr<FixedLine>::Create( pParent, nWinBits );
             break;
-            case WINDOW_FIXEDTEXT:
+            case WindowType::FIXEDTEXT:
                 pNewWindow = VclPtr<FixedText>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXFixedText;
             break;
-            case WINDOW_FLOATINGWINDOW:
+            case WindowType::FLOATINGWINDOW:
                 pNewWindow = VclPtr<FloatingWindow>::Create( pParent, nWinBits );
             break;
-            case WINDOW_GROUPBOX:
+            case WindowType::GROUPBOX:
                 pNewWindow = VclPtr<GroupBox>::Create( pParent, nWinBits );
                 if ( bFrameControl )
                 {
@@ -915,50 +912,50 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                 pGroupBox->SetMouseTransparent( false );
                 }
             break;
-            case WINDOW_HELPBUTTON:
+            case WindowType::HELPBUTTON:
                 pNewWindow = VclPtr<HelpButton>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXButton;
             break;
-            case WINDOW_IMAGEBUTTON:
+            case WindowType::IMAGEBUTTON:
                  pNewWindow = VclPtr<ImageButton>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXButton;
             break;
-            case WINDOW_INFOBOX:
+            case WindowType::INFOBOX:
                 pNewWindow = VclPtr<InfoBox>::Create( pParent, OUString() );
                 *ppNewComp = new VCLXMessageBox;
             break;
-            case WINDOW_LISTBOX:
+            case WindowType::LISTBOX:
                 pNewWindow = VclPtr<ListBox>::Create( pParent, nWinBits|WB_SIMPLEMODE|WB_AUTOHSCROLL );
                 static_cast<ListBox*>(pNewWindow.get())->EnableAutoSize( false );
                 *ppNewComp = new VCLXListBox;
             break;
-            case WINDOW_LONGCURRENCYBOX:
+            case WindowType::LONGCURRENCYBOX:
                 pNewWindow = VclPtr<LongCurrencyBox>::Create( pParent, nWinBits );
             break;
-            case WINDOW_LONGCURRENCYFIELD:
+            case WindowType::LONGCURRENCYFIELD:
                 pNewWindow = VclPtr<LongCurrencyField>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXCurrencyField;
                 static_cast<VCLXFormattedSpinField*>(*ppNewComp)->SetFormatter( static_cast<FormatterBase*>(static_cast<LongCurrencyField*>(pNewWindow.get())) );
             break;
-            case WINDOW_MENUBUTTON:
+            case WindowType::MENUBUTTON:
                 pNewWindow = VclPtr<MenuButton>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXButton;
             break;
-            case WINDOW_MESSBOX:
+            case WindowType::MESSBOX:
                 pNewWindow = VclPtr<MessBox>::Create( pParent, nWinBits, OUString(), OUString() );
                 *ppNewComp = new VCLXMessageBox;
             break;
-            case WINDOW_METRICBOX:
+            case WindowType::METRICBOX:
                 pNewWindow = VclPtr<MetricBox>::Create( pParent, nWinBits );
             break;
-            case WINDOW_METRICFIELD:
+            case WindowType::METRICFIELD:
                 pNewWindow = VclPtr<MetricField>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXMetricField;
                 static_cast<VCLXFormattedSpinField*>(*ppNewComp)->SetFormatter( static_cast<FormatterBase*>(static_cast<MetricField*>(pNewWindow.get())) );
             break;
-            case WINDOW_DIALOG:
-            case WINDOW_MODALDIALOG:
-            case WINDOW_MODELESSDIALOG:
+            case WindowType::DIALOG:
+            case WindowType::MODALDIALOG:
+            case WindowType::MODELESSDIALOG:
             {
                 // Modal/Modeless nur durch Show/Execute
                 if ( (pParent == nullptr ) && ( rDescriptor.ParentIndex == -1 ) )
@@ -975,44 +972,44 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                     *ppNewComp = new VCLXDialog;
             }
             break;
-            case WINDOW_MOREBUTTON:
+            case WindowType::MOREBUTTON:
                 pNewWindow = VclPtr<MoreButton>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXButton;
             break;
-            case WINDOW_MULTILISTBOX:
+            case WindowType::MULTILISTBOX:
                 pNewWindow = VclPtr<MultiListBox>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXListBox;
             break;
-            case WINDOW_NUMERICBOX:
+            case WindowType::NUMERICBOX:
                 pNewWindow = VclPtr<NumericBox>::Create( pParent, nWinBits );
             break;
-            case WINDOW_NUMERICFIELD:
+            case WindowType::NUMERICFIELD:
                 pNewWindow = VclPtr<NumericField>::Create( pParent, nWinBits );
                 static_cast<NumericField*>(pNewWindow.get())->EnableEmptyFieldValue( true );
                 *ppNewComp = new VCLXNumericField;
                 static_cast<VCLXFormattedSpinField*>(*ppNewComp)->SetFormatter( static_cast<FormatterBase*>(static_cast<NumericField*>(pNewWindow.get())) );
             break;
-            case WINDOW_OKBUTTON:
+            case WindowType::OKBUTTON:
                 pNewWindow = VclPtr<OKButton>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXButton;
             break;
-            case WINDOW_PATTERNBOX:
+            case WindowType::PATTERNBOX:
                 pNewWindow = VclPtr<PatternBox>::Create( pParent, nWinBits );
             break;
-            case WINDOW_PATTERNFIELD:
+            case WindowType::PATTERNFIELD:
                 pNewWindow = VclPtr<PatternField>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXPatternField;
                 static_cast<VCLXFormattedSpinField*>(*ppNewComp)->SetFormatter( static_cast<FormatterBase*>(static_cast<PatternField*>(pNewWindow.get())) );
             break;
-            case WINDOW_PUSHBUTTON:
+            case WindowType::PUSHBUTTON:
                 pNewWindow = VclPtr<PushButton>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXButton;
             break;
-            case WINDOW_QUERYBOX:
+            case WindowType::QUERYBOX:
                 pNewWindow = VclPtr<QueryBox>::Create( pParent, nWinBits, OUString() );
                 *ppNewComp = new VCLXMessageBox;
             break;
-            case WINDOW_RADIOBUTTON:
+            case WindowType::RADIOBUTTON:
                 pNewWindow = VclPtr<RadioButton>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXRadioButton;
 
@@ -1027,74 +1024,74 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                 // 07.08.2001 - #87254# - frank.schoenheit@sun.com
                 static_cast<RadioButton*>(pNewWindow.get())->EnableRadioCheck( false );
             break;
-            case WINDOW_SCROLLBAR:
+            case WindowType::SCROLLBAR:
                 pNewWindow = VclPtr<ScrollBar>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXScrollBar;
             break;
-            case WINDOW_SCROLLBARBOX:
+            case WindowType::SCROLLBARBOX:
                 pNewWindow = VclPtr<ScrollBarBox>::Create( pParent, nWinBits );
             break;
-            case WINDOW_SPINBUTTON:
+            case WindowType::SPINBUTTON:
                 pNewWindow = VclPtr<SpinButton>::Create( pParent, nWinBits );
                 *ppNewComp = new ::toolkit::VCLXSpinButton;
             break;
-            case WINDOW_SPINFIELD:
+            case WindowType::SPINFIELD:
                 pNewWindow = VclPtr<SpinField>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXNumericField;
             break;
-            case WINDOW_SPLITTER:
+            case WindowType::SPLITTER:
                 pNewWindow = VclPtr<Splitter>::Create( pParent, nWinBits );
             break;
-            case WINDOW_SPLITWINDOW:
+            case WindowType::SPLITWINDOW:
                 pNewWindow = VclPtr<SplitWindow>::Create( pParent, nWinBits );
             break;
-            case WINDOW_STATUSBAR:
+            case WindowType::STATUSBAR:
                 pNewWindow = VclPtr<StatusBar>::Create( pParent, nWinBits );
             break;
-            case VCLWINDOW_SYSTEMCHILDWINDOW:
+            case WindowType::TOOLKIT_SYSTEMCHILDWINDOW:
                 pNewWindow = VclPtr<SystemChildWindow>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXSystemDependentWindow();
             break;
-            case WINDOW_TABCONTROL:
+            case WindowType::TABCONTROL:
                 pNewWindow = VclPtr<TabControl>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXMultiPage;
             break;
-            case WINDOW_TABDIALOG:
+            case WindowType::TABDIALOG:
                 pNewWindow = VclPtr<TabDialog>::Create( pParent, nWinBits );
             break;
-            case WINDOW_TABPAGE:
+            case WindowType::TABPAGE:
                 {
                     pNewWindow = VclPtr<TabPage>::Create( pParent, nWinBits );
                     *ppNewComp = new VCLXTabPage;
                 }
             break;
-            case WINDOW_TIMEBOX:
+            case WindowType::TIMEBOX:
                 pNewWindow = VclPtr<TimeBox>::Create( pParent, nWinBits );
             break;
-            case WINDOW_TIMEFIELD:
+            case WindowType::TIMEFIELD:
                 pNewWindow = VclPtr<TimeField>::Create( pParent, nWinBits );
                 static_cast<TimeField*>(pNewWindow.get())->EnableEmptyFieldValue( true );
                 *ppNewComp = new VCLXTimeField;
                 static_cast<VCLXFormattedSpinField*>(*ppNewComp)->SetFormatter( static_cast<FormatterBase*>(static_cast<TimeField*>(pNewWindow.get())) );
             break;
-            case WINDOW_TOOLBOX:
+            case WindowType::TOOLBOX:
                 pNewWindow = VclPtr<ToolBox>::Create( pParent, nWinBits );
                 *ppNewComp = new VCLXToolBox;
             break;
-            case WINDOW_TRISTATEBOX:
+            case WindowType::TRISTATEBOX:
                 pNewWindow = VclPtr<TriStateBox>::Create( pParent, nWinBits );
             break;
-            case WINDOW_WARNINGBOX:
+            case WindowType::WARNINGBOX:
                 pNewWindow = VclPtr<WarningBox>::Create( pParent, nWinBits, OUString() );
                 *ppNewComp = new VCLXMessageBox;
             break;
-            case WINDOW_WORKWINDOW:
-            case WINDOW_WINDOW:
-            case VCLWINDOW_FRAMEWINDOW:
-            case WINDOW_DOCKINGWINDOW:
+            case WindowType::WORKWINDOW:
+            case WindowType::WINDOW:
+            case WindowType::TOOLKIT_FRAMEWINDOW:
+            case WindowType::DOCKINGWINDOW:
                 if ( rDescriptor.Type == css::awt::WindowClass_TOP )
                 {
-                    if (nType == WINDOW_DOCKINGWINDOW )
+                    if (nType == WindowType::DOCKINGWINDOW )
                         pNewWindow = VclPtr<DockingWindow>::Create( pParent, nWinBits );
                     else
                     {
@@ -1163,11 +1160,11 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                             pNewWindow = VclPtr<WorkWindow>::Create( pParent, nWinBits );
                     }
 
-                    *ppNewComp = new VCLXTopWindow( pNewWindow->GetType() == WINDOW_WORKWINDOW );
+                    *ppNewComp = new VCLXTopWindow( pNewWindow->GetType() == WindowType::WORKWINDOW );
                 }
                 else if ( rDescriptor.Type == css::awt::WindowClass_CONTAINER )
                 {
-                    if (nType == WINDOW_DOCKINGWINDOW )
+                    if (nType == WindowType::DOCKINGWINDOW )
                         pNewWindow = VclPtr<DockingWindow>::Create( pParent, nWinBits );
                     else
                         pNewWindow = VclPtr<vcl::Window>::Create( pParent, nWinBits );
@@ -1175,14 +1172,14 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                 }
                 else
                 {
-                    if (nType == WINDOW_DOCKINGWINDOW )
+                    if (nType == WindowType::DOCKINGWINDOW )
                         pNewWindow = VclPtr<DockingWindow>::Create( pParent, nWinBits );
                     else
                         pNewWindow = VclPtr<vcl::Window>::Create( pParent, nWinBits );
                     *ppNewComp = new VCLXWindow;
                 }
             break;
-            case WINDOW_CONTROL:
+            case WindowType::CONTROL:
                 if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
                         "tabpagecontainer" ) )
                 {
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 12fd7822a413..272108a9f9c0 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1140,9 +1140,9 @@ void VCLXWindow::setBackground( sal_Int32 nColor )
         GetWindow()->SetControlBackground( aColor );
 
         WindowType eWinType = GetWindow()->GetType();
-        if ( ( eWinType == WINDOW_WINDOW ) ||
-             ( eWinType == WINDOW_WORKWINDOW ) ||
-             ( eWinType == WINDOW_FLOATINGWINDOW ) )
+        if ( ( eWinType == WindowType::WINDOW ) ||
+             ( eWinType == WindowType::WORKWINDOW ) ||
+             ( eWinType == WindowType::FLOATINGWINDOW ) )
         {
             GetWindow()->Invalidate();
         }
@@ -1487,9 +1487,9 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any&
             {
                 switch (eWinType)
                 {
-                    case WINDOW_OKBUTTON:
-                    case WINDOW_CANCELBUTTON:
-                    case WINDOW_HELPBUTTON:
+                    case WindowType::OKBUTTON:
+                    case WindowType::CANCELBUTTON:
+                    case WindowType::HELPBUTTON:
                         // Standard Button: overwrite only if not empty.
                         if (!aText.isEmpty())
                             pWindow->SetText( aText );
@@ -1571,13 +1571,13 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any&
                 switch ( eWinType )
                 {
                     // set dialog color for default
-                    case WINDOW_DIALOG:
-                    case WINDOW_MESSBOX:
-                    case WINDOW_INFOBOX:
-                    case WINDOW_WARNINGBOX:
-                    case WINDOW_ERRORBOX:
-                    case WINDOW_QUERYBOX:
-                    case WINDOW_TABPAGE:
+                    case WindowType::DIALOG:
+                    case WindowType::MESSBOX:
+                    case WindowType::INFOBOX:
+                    case WindowType::WARNINGBOX:
+                    case WindowType::ERRORBOX:
+                    case WindowType::QUERYBOX:
+                    case WindowType::TABPAGE:
                     {
                         Color aColor = pWindow->GetSettings().GetStyleSettings().GetDialogColor();
                         pWindow->SetBackground( aColor );
@@ -1585,11 +1585,11 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any&
                         break;
                     }
 
-                    case WINDOW_FIXEDTEXT:
-                    case WINDOW_CHECKBOX:
-                    case WINDOW_RADIOBUTTON:
-                    case WINDOW_GROUPBOX:
-                    case WINDOW_FIXEDLINE:
+                    case WindowType::FIXEDTEXT:
+                    case WindowType::CHECKBOX:
+                    case WindowType::RADIOBUTTON:
+                    case WindowType::GROUPBOX:
+                    case WindowType::FIXEDLINE:
                     {
                         // support transparency only for special controls
                         pWindow->SetBackground();
@@ -1622,11 +1622,11 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any&
                     switch ( eWinType )
                     {
                         // reset paint transparent mode
-                        case WINDOW_FIXEDTEXT:
-                        case WINDOW_CHECKBOX:
-                        case WINDOW_RADIOBUTTON:
-                        case WINDOW_GROUPBOX:
-                        case WINDOW_FIXEDLINE:
+                        case WindowType::FIXEDTEXT:
+                        case WindowType::CHECKBOX:
+                        case WindowType::RADIOBUTTON:
+                        case WindowType::GROUPBOX:
+                        case WindowType::FIXEDLINE:
                             pWindow->SetPaintTransparent( false );
                             break;
                         default:
@@ -1753,20 +1753,20 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any&
             sal_Int16 nAlign = PROPERTY_ALIGN_LEFT;
             switch ( eWinType )
             {
-                case WINDOW_COMBOBOX:
-                case WINDOW_BUTTON:
-                case WINDOW_PUSHBUTTON:
-                case WINDOW_OKBUTTON:
-                case WINDOW_CANCELBUTTON:
-                case WINDOW_HELPBUTTON:
+                case WindowType::COMBOBOX:
+                case WindowType::BUTTON:
+                case WindowType::PUSHBUTTON:
+                case WindowType::OKBUTTON:
+                case WindowType::CANCELBUTTON:
+                case WindowType::HELPBUTTON:
                     nAlign = PROPERTY_ALIGN_CENTER;
                     SAL_FALLTHROUGH;
-                case WINDOW_FIXEDTEXT:
-                case WINDOW_EDIT:
-                case WINDOW_MULTILINEEDIT:
-                case WINDOW_CHECKBOX:
-                case WINDOW_RADIOBUTTON:
-                case WINDOW_LISTBOX:
+                case WindowType::FIXEDTEXT:
+                case WindowType::EDIT:
+                case WindowType::MULTILINEEDIT:
+                case WindowType::CHECKBOX:
+                case WindowType::RADIOBUTTON:
+                case WindowType::LISTBOX:
                 {
                     WinBits nStyle = pWindow->GetStyle();
                     nStyle &= ~(WB_LEFT|WB_CENTER|WB_RIGHT);
@@ -1781,19 +1781,20 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any&
                     pWindow->SetStyle( nStyle );
                 }
                 break;
+                default: break;
             }
         }
         break;
         case BASEPROPERTY_MULTILINE:
         {
-            if  (  ( eWinType == WINDOW_FIXEDTEXT )
-                || ( eWinType == WINDOW_CHECKBOX )
-                || ( eWinType == WINDOW_RADIOBUTTON )
-                || ( eWinType == WINDOW_BUTTON )
-                || ( eWinType == WINDOW_PUSHBUTTON )
-                || ( eWinType == WINDOW_OKBUTTON )
-                || ( eWinType == WINDOW_CANCELBUTTON )
-                || ( eWinType == WINDOW_HELPBUTTON )
+            if  (  ( eWinType == WindowType::FIXEDTEXT )
+                || ( eWinType == WindowType::CHECKBOX )
+                || ( eWinType == WindowType::RADIOBUTTON )
+                || ( eWinType == WindowType::BUTTON )
+                || ( eWinType == WindowType::PUSHBUTTON )
+                || ( eWinType == WindowType::OKBUTTON )
+                || ( eWinType == WindowType::CANCELBUTTON )
+                || ( eWinType == WindowType::HELPBUTTON )
                 )
             {
                 WinBits nStyle = pWindow->GetStyle();
@@ -1809,24 +1810,20 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any&
         break;
         case BASEPROPERTY_ORIENTATION:
         {
-            switch ( eWinType )
+            if ( eWinType == WindowType::FIXEDLINE)
             {
-                case WINDOW_FIXEDLINE:
+                sal_Int32 nOrientation = 0;
+                if ( Value >>= nOrientation )
                 {
-                    sal_Int32 nOrientation = 0;
-                    if ( Value >>= nOrientation )
-                    {
-                        WinBits nStyle = pWindow->GetStyle();
-                        nStyle &= ~(WB_HORZ|WB_VERT);
-                        if ( nOrientation == 0 )
-                            nStyle |= WB_HORZ;
-                        else
-                            nStyle |= WB_VERT;
-
-                        pWindow->SetStyle( nStyle );
-                    }
+                    WinBits nStyle = pWindow->GetStyle();
+                    nStyle &= ~(WB_HORZ|WB_VERT);
+                    if ( nOrientation == 0 )
+                        nStyle |= WB_HORZ;
+                    else
+                        nStyle |= WB_VERT;
+
+                    pWindow->SetStyle( nStyle );
                 }
-                break;
             }
         }
         break;
@@ -2053,18 +2050,18 @@ css::uno::Any VCLXWindow::getProperty( const OUString& PropertyName )
             {
                 switch ( eWinType )
                 {
-                    case WINDOW_FIXEDTEXT:
-                    case WINDOW_EDIT:
-                    case WINDOW_MULTILINEEDIT:
-                    case WINDOW_CHECKBOX:
-                    case WINDOW_RADIOBUTTON:
-                    case WINDOW_LISTBOX:
-                    case WINDOW_COMBOBOX:
-                    case WINDOW_BUTTON:
-                    case WINDOW_PUSHBUTTON:
-                    case WINDOW_OKBUTTON:
-                    case WINDOW_CANCELBUTTON:
-                    case WINDOW_HELPBUTTON:
+                    case WindowType::FIXEDTEXT:
+                    case WindowType::EDIT:
+                    case WindowType::MULTILINEEDIT:
+                    case WindowType::CHECKBOX:
+                    case WindowType::RADIOBUTTON:
+                    case WindowType::LISTBOX:
+                    case WindowType::COMBOBOX:
+                    case WindowType::BUTTON:
+                    case WindowType::PUSHBUTTON:
+                    case WindowType::OKBUTTON:
+                    case WindowType::CANCELBUTTON:
+                    case WindowType::HELPBUTTON:
                     {
                         WinBits nStyle = GetWindow()->GetStyle();
                         if ( nStyle & WB_LEFT )
@@ -2075,19 +2072,20 @@ css::uno::Any VCLXWindow::getProperty( const OUString& PropertyName )
                             aProp <<= (sal_Int16) PROPERTY_ALIGN_RIGHT;
                     }
                     break;
+                    default: break;
                 }
             }
             break;
             case BASEPROPERTY_MULTILINE:
             {
-                if  (  ( eWinType == WINDOW_FIXEDTEXT )
-                    || ( eWinType == WINDOW_CHECKBOX )
-                    || ( eWinType == WINDOW_RADIOBUTTON )
-                    || ( eWinType == WINDOW_BUTTON )
-                    || ( eWinType == WINDOW_PUSHBUTTON )
-                    || ( eWinType == WINDOW_OKBUTTON )
-                    || ( eWinType == WINDOW_CANCELBUTTON )
-                    || ( eWinType == WINDOW_HELPBUTTON )
+                if  (  ( eWinType == WindowType::FIXEDTEXT )
+                    || ( eWinType == WindowType::CHECKBOX )
+                    || ( eWinType == WindowType::RADIOBUTTON )
+                    || ( eWinType == WindowType::BUTTON )
+                    || ( eWinType == WindowType::PUSHBUTTON )
+                    || ( eWinType == WindowType::OKBUTTON )
+                    || ( eWinType == WindowType::CANCELBUTTON )
+                    || ( eWinType == WindowType::HELPBUTTON )
                     )
                     aProp <<= ( GetWindow()->GetStyle() & WB_WORDBREAK ) != 0;
             }
@@ -2149,22 +2147,22 @@ css::awt::Size VCLXWindow::getMinimumSize(  )
         WindowType nWinType = GetWindow()->GetType();
         switch ( nWinType )
         {
-            case WINDOW_CONTROL:
+            case WindowType::CONTROL:
                 aSz.Width() = GetWindow()->GetTextWidth( GetWindow()->GetText() )+2*12;
                 aSz.Height() = GetWindow()->GetTextHeight()+2*6;
             break;
 
-            case WINDOW_PATTERNBOX:
-            case WINDOW_NUMERICBOX:
-            case WINDOW_METRICBOX:
-            case WINDOW_CURRENCYBOX:
-            case WINDOW_DATEBOX:
-            case WINDOW_TIMEBOX:
-            case WINDOW_LONGCURRENCYBOX:
+            case WindowType::PATTERNBOX:
+            case WindowType::NUMERICBOX:
+            case WindowType::METRICBOX:
+            case WindowType::CURRENCYBOX:
+            case WindowType::DATEBOX:
+            case WindowType::TIMEBOX:
+            case WindowType::LONGCURRENCYBOX:
                 aSz.Width() = GetWindow()->GetTextWidth( GetWindow()->GetText() )+2*2;
                 aSz.Height() = GetWindow()->GetTextHeight()+2*2;
             break;
-            case WINDOW_SCROLLBARBOX:
+            case WindowType::SCROLLBARBOX:
                 return VCLXScrollBar::implGetMinimumSize( GetWindow() );
             default:
                 aSz = GetWindow()->get_preferred_size();
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index e706418db73b..93c99d8150a8 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -38,7 +38,7 @@ void VCLXWindow::SetSystemParent_Impl( const css::uno::Any& rHandle )
 {
     // does only work for WorkWindows
     VclPtr<vcl::Window> pWindow = GetWindow();
-    if ( pWindow->GetType() != WINDOW_WORKWINDOW )
+    if ( pWindow->GetType() != WindowType::WORKWINDOW )
     {
         css::uno::RuntimeException aException;
         aException.Message = "not a work window";
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index e475b8ec655d..af6d16f34089 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -252,9 +252,9 @@ void VCLXGraphicControl::setProperty( const OUString& PropertyName, const css::u
         case BASEPROPERTY_IMAGEALIGN:
         {
             WindowType eType = GetWindow()->GetType();
-            if (  ( eType == WINDOW_PUSHBUTTON )
-               || ( eType == WINDOW_RADIOBUTTON )
-               || ( eType == WINDOW_CHECKBOX )
+            if (  ( eType == WindowType::PUSHBUTTON )
+               || ( eType == WindowType::RADIOBUTTON )
+               || ( eType == WindowType::CHECKBOX )
                )
             {
                 sal_Int16 nAlignment = sal_Int16();
@@ -266,9 +266,9 @@ void VCLXGraphicControl::setProperty( const OUString& PropertyName, const css::u
         case BASEPROPERTY_IMAGEPOSITION:
         {
             WindowType eType = GetWindow()->GetType();
-            if (  ( eType == WINDOW_PUSHBUTTON )
-               || ( eType == WINDOW_RADIOBUTTON )
-               || ( eType == WINDOW_CHECKBOX )
+            if (  ( eType == WindowType::PUSHBUTTON )
+               || ( eType == WindowType::RADIOBUTTON )
+               || ( eType == WindowType::CHECKBOX )
                )
             {
                 sal_Int16 nImagePosition = 2;
@@ -300,9 +300,9 @@ css::uno::Any VCLXGraphicControl::getProperty( const OUString& PropertyName )
         case BASEPROPERTY_IMAGEALIGN:
         {
             WindowType eType = GetWindow()->GetType();
-            if  (  ( eType == WINDOW_PUSHBUTTON )
-                || ( eType == WINDOW_RADIOBUTTON )
-                || ( eType == WINDOW_CHECKBOX )
+            if  (  ( eType == WindowType::PUSHBUTTON )
+                || ( eType == WindowType::RADIOBUTTON )
+                || ( eType == WindowType::CHECKBOX )
                 )
             {
                  aProp <<= ::toolkit::getCompatibleImageAlign(
@@ -313,9 +313,9 @@ css::uno::Any VCLXGraphicControl::getProperty( const OUString& PropertyName )
         case BASEPROPERTY_IMAGEPOSITION:
         {
             WindowType eType = GetWindow()->GetType();
-            if  (  ( eType == WINDOW_PUSHBUTTON )
-                || ( eType == WINDOW_RADIOBUTTON )
-                || ( eType == WINDOW_CHECKBOX )
+            if  (  ( eType == WindowType::PUSHBUTTON )
+                || ( eType == WindowType::RADIOBUTTON )
+                || ( eType == WindowType::CHECKBOX )
                 )
             {
                 aProp <<= ::toolkit::translateImagePosition(
@@ -512,7 +512,7 @@ void VCLXButton::setProperty( const OUString& PropertyName, const css::uno::Any&
             break;
             case BASEPROPERTY_STATE:
             {
-                if ( GetWindow()->GetType() == WINDOW_PUSHBUTTON )
+                if ( GetWindow()->GetType() == WindowType::PUSHBUTTON )
                 {
                     sal_Int16 n = sal_Int16();
                     if ( Value >>= n )
@@ -554,7 +554,7 @@ css::uno::Any VCLXButton::getProperty( const OUString& PropertyName )
             break;
             case BASEPROPERTY_STATE:
             {
-                if ( GetWindow()->GetType() == WINDOW_PUSHBUTTON )
+                if ( GetWindow()->GetType() == WindowType::PUSHBUTTON )
                 {
                      aProp <<= (sal_Int16)static_cast<PushButton*>(pButton.get())->GetState();
                 }
@@ -4754,7 +4754,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXDateField::Cre
     VclPtr< vcl::Window > pWindow = GetWindow();
     if ( pWindow )
     {
-        pWindow->SetType( WINDOW_DATEFIELD );
+        pWindow->SetType( WindowType::DATEFIELD );
     }
     return getAccessibleFactory().createAccessibleContext( this );
 }
@@ -5101,7 +5101,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXTimeField::Cre
     VclPtr< vcl::Window > pWindow = GetWindow();
     if ( pWindow )
     {
-        pWindow->SetType( WINDOW_TIMEFIELD );
+        pWindow->SetType( WindowType::TIMEFIELD );
     }
     return getAccessibleFactory().createAccessibleContext( this );
 }
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index d5a00ada8826..6b5ed794cf46 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -43,76 +43,76 @@ css::uno::Reference< css::awt::XWindowPeer > CreateXWindow( vcl::Window* pWindow
 {
     switch ( pWindow->GetType() )
     {
-        case WINDOW_IMAGEBUTTON:
-        case WINDOW_SPINBUTTON:
-        case WINDOW_MENUBUTTON:
-        case WINDOW_MOREBUTTON:
-        case WINDOW_PUSHBUTTON:
-        case WINDOW_HELPBUTTON:
-        case WINDOW_OKBUTTON:
-        case WINDOW_CANCELBUTTON:   return new VCLXButton;
-        case WINDOW_CHECKBOX:       return new VCLXCheckBox;
+        case WindowType::IMAGEBUTTON:
+        case WindowType::SPINBUTTON:
+        case WindowType::MENUBUTTON:
+        case WindowType::MOREBUTTON:
+        case WindowType::PUSHBUTTON:
+        case WindowType::HELPBUTTON:
+        case WindowType::OKBUTTON:
+        case WindowType::CANCELBUTTON:   return new VCLXButton;
+        case WindowType::CHECKBOX:       return new VCLXCheckBox;
         // #i95042#
         // A Window of type <MetricBox> is inherited from type <ComboBox>.
         // Thus, it does make more sense to return a <VCLXComboBox> instance
         // instead of only a <VCLXWindow> instance, especially regarding its
         // corresponding accessibility API.
-        case WINDOW_METRICBOX:
-        case WINDOW_COMBOBOX:       return new VCLXComboBox;
-        case WINDOW_SPINFIELD:
-        case WINDOW_NUMERICFIELD:
-        case WINDOW_CURRENCYFIELD:  return new VCLXNumericField;
-        case WINDOW_DATEFIELD:      return new VCLXDateField;
-        case WINDOW_MULTILINEEDIT:
-        case WINDOW_EDIT:           return new VCLXEdit;
-        case WINDOW_METRICFIELD:    return new VCLXSpinField;
-        case WINDOW_MESSBOX:
-        case WINDOW_INFOBOX:
-        case WINDOW_WARNINGBOX:
-        case WINDOW_QUERYBOX:
-        case WINDOW_ERRORBOX:       return new VCLXMessageBox;
-        case WINDOW_FIXEDIMAGE:     return new VCLXImageControl;
-        case WINDOW_FIXEDTEXT:      return new VCLXFixedText;
-        case WINDOW_MULTILISTBOX:
-        case WINDOW_LISTBOX:        return new VCLXListBox;
-        case WINDOW_LONGCURRENCYFIELD:  return new VCLXCurrencyField;
-        case WINDOW_DIALOG:
-        case WINDOW_MODALDIALOG:
-        case WINDOW_TABDIALOG:
-        case WINDOW_BUTTONDIALOG:
-        case WINDOW_MODELESSDIALOG: return new VCLXDialog;
-        case WINDOW_PATTERNFIELD:   return new VCLXPatternField;
-        case WINDOW_RADIOBUTTON:    return new VCLXRadioButton;
-        case WINDOW_SCROLLBAR:      return new VCLXScrollBar;
-        case WINDOW_TIMEFIELD:      return new VCLXTimeField;
-
-        case WINDOW_SYSWINDOW:
-        case WINDOW_WORKWINDOW:
-        case WINDOW_DOCKINGWINDOW:
-        case WINDOW_FLOATINGWINDOW:
-        case WINDOW_HELPTEXTWINDOW: return new VCLXTopWindow;
-
-        case WINDOW_WINDOW:
-        case WINDOW_TABPAGE:        return new VCLXContainer;
-
-        case WINDOW_TOOLBOX:        return new VCLXToolBox;
-        case WINDOW_TABCONTROL:     return new VCLXMultiPage;
-
-        // case WINDOW_FIXEDLINE:
-        // case WINDOW_FIXEDBITMAP:
-        // case WINDOW_DATEBOX:
-        // case WINDOW_GROUPBOX:
-        // case WINDOW_LONGCURRENCYBOX:
-        // case WINDOW_SPLITTER:
-        // case WINDOW_STATUSBAR:
-        // case WINDOW_TABCONTROL:
-        // case WINDOW_NUMERICBOX:
-        // case WINDOW_TRISTATEBOX:
-        // case WINDOW_TIMEBOX:
-        // case WINDOW_SPLITWINDOW:
-        // case WINDOW_SCROLLBARBOX:
-        // case WINDOW_PATTERNBOX:
-        // case WINDOW_CURRENCYBOX:
+        case WindowType::METRICBOX:
+        case WindowType::COMBOBOX:       return new VCLXComboBox;
+        case WindowType::SPINFIELD:
+        case WindowType::NUMERICFIELD:
+        case WindowType::CURRENCYFIELD:  return new VCLXNumericField;
+        case WindowType::DATEFIELD:      return new VCLXDateField;
+        case WindowType::MULTILINEEDIT:
+        case WindowType::EDIT:           return new VCLXEdit;
+        case WindowType::METRICFIELD:    return new VCLXSpinField;
+        case WindowType::MESSBOX:
+        case WindowType::INFOBOX:
+        case WindowType::WARNINGBOX:
+        case WindowType::QUERYBOX:
+        case WindowType::ERRORBOX:       return new VCLXMessageBox;
+        case WindowType::FIXEDIMAGE:     return new VCLXImageControl;
+        case WindowType::FIXEDTEXT:      return new VCLXFixedText;
+        case WindowType::MULTILISTBOX:
+        case WindowType::LISTBOX:        return new VCLXListBox;
+        case WindowType::LONGCURRENCYFIELD:  return new VCLXCurrencyField;
+        case WindowType::DIALOG:
+        case WindowType::MODALDIALOG:
+        case WindowType::TABDIALOG:
+        case WindowType::BUTTONDIALOG:
+        case WindowType::MODELESSDIALOG: return new VCLXDialog;
+        case WindowType::PATTERNFIELD:   return new VCLXPatternField;
+        case WindowType::RADIOBUTTON:    return new VCLXRadioButton;
+        case WindowType::SCROLLBAR:      return new VCLXScrollBar;
+        case WindowType::TIMEFIELD:      return new VCLXTimeField;
+
+        case WindowType::SYSWINDOW:
+        case WindowType::WORKWINDOW:
+        case WindowType::DOCKINGWINDOW:
+        case WindowType::FLOATINGWINDOW:
+        case WindowType::HELPTEXTWINDOW: return new VCLXTopWindow;
+
+        case WindowType::WINDOW:
+        case WindowType::TABPAGE:        return new VCLXContainer;
+
+        case WindowType::TOOLBOX:        return new VCLXToolBox;
+        case WindowType::TABCONTROL:     return new VCLXMultiPage;
+
+        // case WindowType::FIXEDLINE:
+        // case WindowType::FIXEDBITMAP:
+        // case WindowType::DATEBOX:
+        // case WindowType::GROUPBOX:
+        // case WindowType::LONGCURRENCYBOX:
+        // case WindowType::SPLITTER:
+        // case WindowType::STATUSBAR:
+        // case WindowType::TABCONTROL:
+        // case WindowType::NUMERICBOX:
+        // case WindowType::TRISTATEBOX:
+        // case WindowType::TIMEBOX:
+        // case WindowType::SPLITWINDOW:
+        // case WindowType::SCROLLBARBOX:
+        // case WindowType::PATTERNBOX:
+        // case WindowType::CURRENCYBOX:
         default:                    return new VCLXWindow( true );
     }
 }