convert GETFOCUS constants to scoped enum

Change-Id: I7c324bb6358be28c119592850eb7607479279f09

11 files changed, 45 insertions, 44 deletions

diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index bcb6f062d42c..1b6cc55d96cc 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -60,6 +60,7 @@ enum class MouseEventModifiers;
 enum class MouseNotifyEvent;
 enum class ActivateModeFlags;
 enum class DialogControlFlags;
+enum class GetFocusFlags;
 
 namespace com { namespace sun { namespace star {
 
@@ -274,7 +275,7 @@ public:
     ControlPart         mnNativeBackground;
     sal_uInt16          mnWaitCount;
     sal_uInt16          mnPaintFlags;
-    sal_uInt16          mnGetFocusFlags;
+    GetFocusFlags       mnGetFocusFlags;
     sal_uInt16          mnParentClipMode;
     ActivateModeFlags   mnActivateMode;
     DialogControlFlags  mnDlgCtrlFlags;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 2ee5d5e13f65..9998c2292e03 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2264,7 +2264,7 @@ void RadioButton::ImplUncheckAllOther()
     }
 }
 
-void RadioButton::ImplCallClick( bool bGrabFocus, sal_uInt16 nFocusFlags )
+void RadioButton::ImplCallClick( bool bGrabFocus, GetFocusFlags nFocusFlags )
 {
     mbStateChanged = !mbChecked;
     mbChecked = true;
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 6ff15da2302e..e83ae507aa7d 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1901,7 +1901,7 @@ void Edit::GetFocus()
 
         SelectionOptions nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions();
         if ( !( GetStyle() & (WB_NOHIDESELECTION|WB_READONLY) )
-                && ( GetGetFocusFlags() & (GETFOCUS_INIT|GETFOCUS_TAB|GETFOCUS_CURSOR|GETFOCUS_MNEMONIC) ) )
+                && ( GetGetFocusFlags() & (GetFocusFlags::Init|GetFocusFlags::Tab|GetFocusFlags::Cursor|GetFocusFlags::Mnemonic) ) )
         {
             if ( nSelOptions & SelectionOptions::ShowFirst )
             {
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index fc3cad5cb4e6..76b9e391e6a4 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -646,7 +646,7 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId )
             sal_uInt16  n = 0;
             vcl::Window* pFirstChild = pPage->ImplGetDlgWindow( n, GetDlgWindowType::First );
             if ( pFirstChild )
-                pFirstChild->ImplControlFocus( GETFOCUS_INIT );
+                pFirstChild->ImplControlFocus( GetFocusFlags::Init );
             else
                 GrabFocus();
         }
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index a58c625cd442..f4250be4de59 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1084,7 +1084,7 @@ void Dialog::GrabFocusToFirstControl()
         pFocusControl = ImplGetDlgWindow( n, GetDlgWindowType::First );
     }
     if ( pFocusControl )
-        pFocusControl->ImplControlFocus( GETFOCUS_INIT );
+        pFocusControl->ImplControlFocus( GetFocusFlags::Init );
 }
 
 void Dialog::GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index ece10d9c145f..5cd07062cfa5 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -474,9 +474,9 @@ vcl::Window* ImplFindAccelWindow( vcl::Window* pParent, sal_uInt16& rIndex, sal_
 
 namespace vcl {
 
-void Window::ImplControlFocus( sal_uInt16 nFlags )
+void Window::ImplControlFocus( GetFocusFlags nFlags )
 {
-    if ( nFlags & GETFOCUS_MNEMONIC )
+    if ( nFlags & GetFocusFlags::Mnemonic )
     {
         if ( GetType() == WINDOW_RADIOBUTTON )
         {
@@ -488,7 +488,7 @@ void Window::ImplControlFocus( sal_uInt16 nFlags )
         else
         {
             ImplGrabFocus( nFlags );
-            if ( nFlags & GETFOCUS_UNIQUEMNEMONIC )
+            if ( nFlags & GetFocusFlags::UniqueMnemonic )
             {
                 if ( GetType() == WINDOW_CHECKBOX )
                     static_cast<CheckBox*>(this)->ImplCheck();
@@ -543,7 +543,7 @@ namespace
 
             if (isSuitableDestination(pWindow))
             {
-                pWindow->ImplControlFocus( GETFOCUS_CURSOR | GETFOCUS_FORWARD );
+                pWindow->ImplControlFocus( GetFocusFlags::Cursor | GetFocusFlags::Forward );
                 return true;
             }
         }
@@ -554,7 +554,7 @@ namespace
 
             if (isSuitableDestination(pWindow))
             {
-                pWindow->ImplControlFocus( GETFOCUS_CURSOR | GETFOCUS_FORWARD );
+                pWindow->ImplControlFocus( GetFocusFlags::Cursor | GetFocusFlags::Forward );
                 return true;
             }
         }
@@ -642,18 +642,18 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
         if ( bKeyInput && !pButtonWindow && (nDlgCtrlFlags & DialogControlFlags::Return) )
         {
             GetDlgWindowType nType;
-            sal_uInt16  nGetFocusFlags = GETFOCUS_TAB;
+            GetFocusFlags    nGetFocusFlags = GetFocusFlags::Tab;
             sal_uInt16  nNewIndex;
             sal_uInt16  iStart;
             if ( aKeyCode.IsShift() )
             {
                 nType = GetDlgWindowType::Prev;
-                nGetFocusFlags |= GETFOCUS_BACKWARD;
+                nGetFocusFlags |= GetFocusFlags::Backward;
             }
             else
             {
                 nType = GetDlgWindowType::Next;
-                nGetFocusFlags |= GETFOCUS_FORWARD;
+                nGetFocusFlags |= GetFocusFlags::Forward;
             }
             iStart = i;
             pTempWindow = ImplGetDlgWindow( i, nType, nFormStart, nFormEnd, &nNewIndex );
@@ -665,12 +665,12 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
                     if ( nType == GetDlgWindowType::Prev )
                     {
                         if ( nNewIndex > iStart )
-                            nGetFocusFlags |= GETFOCUS_AROUND;
+                            nGetFocusFlags |= GetFocusFlags::Around;
                     }
                     else
                     {
                         if ( nNewIndex < iStart )
-                            nGetFocusFlags |= GETFOCUS_AROUND;
+                            nGetFocusFlags |= GetFocusFlags::Around;
                     }
                     pTempWindow->ImplControlFocus( nGetFocusFlags );
                     return true;
@@ -690,11 +690,11 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
                 NotifyEvent aNEvt1( MouseNotifyEvent::LOSEFOCUS, pSWindow );
                 if ( !ImplCallPreNotify( aNEvt1 ) )
                     pSWindow->CompatLoseFocus();
-                pSWindow->mpWindowImpl->mnGetFocusFlags = nGetFocusFlags | GETFOCUS_AROUND;
+                pSWindow->mpWindowImpl->mnGetFocusFlags = nGetFocusFlags | GetFocusFlags::Around;
                 NotifyEvent aNEvt2( MouseNotifyEvent::GETFOCUS, pSWindow );
                 if ( !ImplCallPreNotify( aNEvt2 ) )
                     pSWindow->CompatGetFocus();
-                pSWindow->mpWindowImpl->mnGetFocusFlags = 0;
+                pSWindow->mpWindowImpl->mnGetFocusFlags = GetFocusFlags::NONE;
                 return true;
             }
         }
@@ -732,7 +732,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
             if ( !aKeyCode.IsMod2() )
             {
                 GetDlgWindowType nType;
-                sal_uInt16  nGetFocusFlags = GETFOCUS_TAB;
+                GetFocusFlags    nGetFocusFlags = GetFocusFlags::Tab;
                 sal_uInt16  nNewIndex;
                 bool        bFormular = false;
 
@@ -807,12 +807,12 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
                         if ( aKeyCode.IsShift() )
                         {
                             nType = GetDlgWindowType::Prev;
-                            nGetFocusFlags |= GETFOCUS_BACKWARD;
+                            nGetFocusFlags |= GetFocusFlags::Backward;
                         }
                         else
                         {
                             nType = GetDlgWindowType::Next;
-                            nGetFocusFlags |= GETFOCUS_FORWARD;
+                            nGetFocusFlags |= GetFocusFlags::Forward;
                         }
                         vcl::Window* pWindow = ImplGetDlgWindow( i, nType, nFormStart, nFormEnd, &nNewIndex );
                         // if this is the same window, simulate a Get/LoseFocus,
@@ -822,11 +822,11 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
                             NotifyEvent aNEvt1( MouseNotifyEvent::LOSEFOCUS, pSWindow );
                             if ( !ImplCallPreNotify( aNEvt1 ) )
                                 pSWindow->CompatLoseFocus();
-                            pSWindow->mpWindowImpl->mnGetFocusFlags = nGetFocusFlags | GETFOCUS_AROUND;
+                            pSWindow->mpWindowImpl->mnGetFocusFlags = nGetFocusFlags | GetFocusFlags::Around;
                             NotifyEvent aNEvt2( MouseNotifyEvent::GETFOCUS, pSWindow );
                             if ( !ImplCallPreNotify( aNEvt2 ) )
                                 pSWindow->CompatGetFocus();
-                            pSWindow->mpWindowImpl->mnGetFocusFlags = 0;
+                            pSWindow->mpWindowImpl->mnGetFocusFlags = GetFocusFlags::NONE;
                             return true;
                         }
                         else if ( pWindow )
@@ -835,12 +835,12 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
                             if ( nType == GetDlgWindowType::Prev )
                             {
                                 if ( nNewIndex > i )
-                                    nGetFocusFlags |= GETFOCUS_AROUND;
+                                    nGetFocusFlags |= GetFocusFlags::Around;
                             }
                             else
                             {
                                 if ( nNewIndex < i )
-                                    nGetFocusFlags |= GETFOCUS_AROUND;
+                                    nGetFocusFlags |= GetFocusFlags::Around;
                             }
                             pWindow->ImplControlFocus( nGetFocusFlags );
                             return true;
@@ -868,7 +868,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
                         if (isSuitableDestination(pWindow))
                         {
                             if ( pWindow != pSWindow )
-                                pWindow->ImplControlFocus( GETFOCUS_CURSOR | GETFOCUS_BACKWARD );
+                                pWindow->ImplControlFocus( GetFocusFlags::Cursor | GetFocusFlags::Backward );
                             return true;
                         }
 
@@ -898,7 +898,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
 
                     if (isSuitableDestination(pWindow))
                     {
-                        pWindow->ImplControlFocus( GETFOCUS_CURSOR | GETFOCUS_BACKWARD );
+                        pWindow->ImplControlFocus( GetFocusFlags::Cursor | GetFocusFlags::Backward );
                         return true;
                     }
 
@@ -914,9 +914,9 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
                 pSWindow = ::ImplFindAccelWindow( this, i, c, nFormStart, nFormEnd );
                 if ( pSWindow )
                 {
-                    sal_uInt16 nGetFocusFlags = GETFOCUS_MNEMONIC;
+                    GetFocusFlags nGetFocusFlags = GetFocusFlags::Mnemonic;
                     if ( pSWindow == ::ImplFindAccelWindow( this, i, c, nFormStart, nFormEnd ) )
-                        nGetFocusFlags |= GETFOCUS_UNIQUEMNEMONIC;
+                        nGetFocusFlags |= GetFocusFlags::UniqueMnemonic;
                     pSWindow->ImplControlFocus( nGetFocusFlags );
                     return true;
                 }
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 1167ac4ef2d7..9114ac093ab1 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -195,7 +195,7 @@ static bool IsWindowFocused(const WindowImpl& rWinImpl)
     return false;
 }
 
-void Window::ImplGrabFocus( sal_uInt16 nFlags )
+void Window::ImplGrabFocus( GetFocusFlags nFlags )
 {
     // #143570# no focus for destructing windows
     if( !mpWindowImpl || mpWindowImpl->mbInDispose )
@@ -381,7 +381,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
                 if( pOldFocusWindow &&
                     ! aOldFocusDel.IsDead() &&
                     ( pOldFocusWindow->GetDialogControlFlags() & DialogControlFlags::FloatWinPopupModeEndCancel ) )
-                    mpWindowImpl->mnGetFocusFlags |= GETFOCUS_FLOATWIN_POPUPMODEEND_CANCEL;
+                    mpWindowImpl->mnGetFocusFlags |= GetFocusFlags::FloatWinPopupModeEndCancel;
                 NotifyEvent aNEvt( MouseNotifyEvent::GETFOCUS, this );
                 if ( !ImplCallPreNotify( aNEvt ) && !aDogTag.IsDead() )
                     CompatGetFocus();
@@ -389,7 +389,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
                     ImplCallActivateListeners( (pOldFocusWindow && ! aOldFocusDel.IsDead()) ? pOldFocusWindow : NULL );
                 if( !aDogTag.IsDead() )
                 {
-                    mpWindowImpl->mnGetFocusFlags = 0;
+                    mpWindowImpl->mnGetFocusFlags = GetFocusFlags::NONE;
                     mpWindowImpl->mbInFocusHdl = false;
                 }
             }
@@ -399,7 +399,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
     }
 }
 
-void Window::ImplGrabFocusToDocument( sal_uInt16 nFlags )
+void Window::ImplGrabFocusToDocument( GetFocusFlags nFlags )
 {
     vcl::Window *pWin = this;
     while( pWin )
diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx
index 46aa4e117121..9b4767e59430 100644
--- a/vcl/source/window/taskpanelist.cxx
+++ b/vcl/source/window/taskpanelist.cxx
@@ -80,7 +80,7 @@ static void ImplTaskPaneListGrabFocus( vcl::Window *pWindow, bool bForward )
     // that can deal with the focus
     if( pWindow->ImplIsFloatingWindow() && pWindow->GetWindow( GetWindowType::FirstChild ) )
         pWindow = pWindow->GetWindow( GetWindowType::FirstChild );
-    pWindow->ImplGrabFocus( GETFOCUS_F6 | (bForward ? GETFOCUS_FORWARD : GETFOCUS_BACKWARD));
+    pWindow->ImplGrabFocus( GetFocusFlags::F6 | (bForward ? GetFocusFlags::Forward : GetFocusFlags::Backward));
 }
 
 TaskPaneList::TaskPaneList()
@@ -178,7 +178,7 @@ bool TaskPaneList::HandleKeyEvent(const KeyEvent& rKeyEvent)
                 // Ctrl-F6 goes directly to the document
                 if( !pWin->IsDialog() && aKeyCode.IsMod1() && !aKeyCode.IsShift() )
                 {
-                    pWin->ImplGrabFocusToDocument( GETFOCUS_F6 );
+                    pWin->ImplGrabFocusToDocument( GetFocusFlags::F6 );
                     return true;
                 }
 
@@ -204,7 +204,7 @@ bool TaskPaneList::HandleKeyEvent(const KeyEvent& rKeyEvent)
 
                     // we did not find another taskpane, so
                     // put focus back into document
-                    pWin->ImplGrabFocusToDocument( GETFOCUS_F6 | (bForward ? GETFOCUS_FORWARD : GETFOCUS_BACKWARD));
+                    pWin->ImplGrabFocusToDocument( GetFocusFlags::F6 | (bForward ? GetFocusFlags::Forward : GetFocusFlags::Backward));
                 }
 
                 return true;
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 59bf3473775b..53ef7fa7494f 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4379,7 +4379,7 @@ bool ToolBox::Notify( NotifyEvent& rNEvt )
                 ImplChangeHighlight( ImplGetItem( mnLastFocusItemId ) );
                 mnLastFocusItemId = 0;
             }
-            else if( (GetGetFocusFlags() & (GETFOCUS_BACKWARD|GETFOCUS_TAB) ) == (GETFOCUS_BACKWARD|GETFOCUS_TAB))
+            else if( (GetGetFocusFlags() & (GetFocusFlags::Backward|GetFocusFlags::Tab) ) == (GetFocusFlags::Backward|GetFocusFlags::Tab))
                 // Shift-TAB was pressed in the parent
                 ImplChangeHighlightUpDn( false );
             else
@@ -4993,7 +4993,7 @@ bool ToolBox::ImplActivateItem( vcl::KeyCode aKeyCode )
         {
             ImplHideFocus();
             mbChangingHighlight = true;  // avoid focus change due to loss of focus
-            pToolItem->mpWindow->ImplControlFocus( GETFOCUS_TAB );
+            pToolItem->mpWindow->ImplControlFocus( GetFocusFlags::Tab );
             mbChangingHighlight = false;
         }
         else
@@ -5249,7 +5249,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
                 vcl::Window *pFocusWindow = Application::GetFocusWindow();
                 ImplHideFocus();
                 mbChangingHighlight = true;  // avoid focus change due to loss of focus
-                pItem->mpWindow->ImplControlFocus( GETFOCUS_TAB );
+                pItem->mpWindow->ImplControlFocus( GetFocusFlags::Tab );
                 mbChangingHighlight = false;
                 if( pFocusWindow != Application::GetFocusWindow() )
                     Application::GetFocusWindow()->KeyInput( rKEvt );
@@ -5275,7 +5275,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
         sal_uInt16 n = 0;
         vcl::Window *pFocusControl = pParent->ImplGetDlgWindow( n, GetDlgWindowType::First );
         if ( pFocusControl && pFocusControl != this )
-            pFocusControl->ImplControlFocus( GETFOCUS_INIT );
+            pFocusControl->ImplControlFocus( GetFocusFlags::Init );
     }
 
     mnKeyModifier = 0;
@@ -5354,7 +5354,7 @@ sal_uInt16 ToolBox::ImplFindItemPos( const ImplToolItem* pItem, const std::vecto
 void ToolBox::ChangeHighlight( sal_uInt16 nPos )
 {
     if ( nPos < GetItemCount() ) {
-        ImplGrabFocus( 0 );
+        ImplGrabFocus( GetFocusFlags::NONE );
         ImplChangeHighlight ( ImplGetItem ( GetItemId ( (sal_uInt16) nPos ) ), false );
     }
 }
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index c93e6c0f6ea6..a26e42e259f7 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -643,7 +643,7 @@ WindowImpl::WindowImpl( WindowType nType )
     mnExtendedStyle                     = 0;                         // extended style (init in ImplInitWindow)
     mnPrevExtendedStyle                 = 0;                         // prevstyle (set in SetExtendedStyle)
     mnType                              = nType;                     // type
-    mnGetFocusFlags                     = 0;                         // Flags fuer GetFocus()-Aufruf
+    mnGetFocusFlags                     = GetFocusFlags::NONE;       // Flags fuer GetFocus()-Aufruf
     mnWaitCount                         = 0;                         // Wait-Count (>1 == Warte-MousePointer)
     mnPaintFlags                        = 0;                         // Flags for ImplCallPaint
     mnParentClipMode                    = 0;                         // Flags for Parent-ClipChildren-Mode
@@ -3127,7 +3127,7 @@ void Window::SetUpdateMode( bool bUpdate )
 
 void Window::GrabFocus()
 {
-    ImplGrabFocus( 0 );
+    ImplGrabFocus( GetFocusFlags::NONE );
 }
 
 bool Window::HasFocus() const
@@ -3137,7 +3137,7 @@ bool Window::HasFocus() const
 
 void Window::GrabFocusToDocument()
 {
-    ImplGrabFocusToDocument(0);
+    ImplGrabFocusToDocument(GetFocusFlags::NONE);
 }
 
 void Window::SetFakeFocus( bool bFocus )
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 99fd9ce19e09..7b2974ebcdad 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1330,7 +1330,7 @@ bool Window::IsActive() const
     return mpWindowImpl->mbActive;
 }
 
-sal_uInt16 Window::GetGetFocusFlags() const
+GetFocusFlags Window::GetGetFocusFlags() const
 {
     return mpWindowImpl->mnGetFocusFlags;
 }