Convert WHEELMODE to scoped enum

Change-Id: Ia65f88b94c6c1151546f3e2d592b6a02ac49aaa4

2 files changed, 32 insertions, 27 deletions

diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 2c0bc7f586a5..60355ee5b817 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -40,7 +40,7 @@ ImplWheelWindow::ImplWheelWindow( vcl::Window* pParent ) :
             FloatingWindow  ( pParent, 0 ),
             mnRepaintTime   ( 1UL ),
             mnTimeout       ( DEF_TIMEOUT ),
-            mnWheelMode     ( WHEELMODE_NONE ),
+            mnWheelMode     ( WheelMode::NONE ),
             mnActDist       ( 0UL ),
             mnActDeltaX     ( 0L ),
             mnActDeltaY     ( 0L )
@@ -67,11 +67,11 @@ ImplWheelWindow::ImplWheelWindow( vcl::Window* pParent ) :
 
     // set wheel mode
     if( bHorz && bVert )
-        ImplSetWheelMode( WHEELMODE_VH );
+        ImplSetWheelMode( WheelMode::VH );
     else if( bHorz )
-        ImplSetWheelMode( WHEELMODE_H );
+        ImplSetWheelMode( WheelMode::H );
     else
-        ImplSetWheelMode( WHEELMODE_V );
+        ImplSetWheelMode( WheelMode::V );
 
     // init timer
     mpTimer = new Timer("WheelWindowTimer");
@@ -126,13 +126,13 @@ void ImplWheelWindow::ImplCreateImageList()
             ( ResId( SV_RESID_BITMAP_SCROLLBMP, *pResMgr ), 6, nullptr );
 }
 
-void ImplWheelWindow::ImplSetWheelMode( sal_uLong nWheelMode )
+void ImplWheelWindow::ImplSetWheelMode( WheelMode nWheelMode )
 {
     if( nWheelMode != mnWheelMode )
     {
         mnWheelMode = nWheelMode;
 
-        if( WHEELMODE_NONE == mnWheelMode )
+        if( WheelMode::NONE == mnWheelMode )
         {
             if( IsVisible() )
                 Hide();
@@ -153,22 +153,22 @@ void ImplWheelWindow::ImplDrawWheel(vcl::RenderContext& rRenderContext)
 
     switch (mnWheelMode)
     {
-        case WHEELMODE_VH:
+        case WheelMode::VH:
             nId = 1;
         break;
-        case WHEELMODE_V:
+        case WheelMode::V:
             nId = 2;
         break;
-        case WHEELMODE_H:
+        case WheelMode::H:
             nId = 3;
         break;
-        case WHEELMODE_SCROLL_VH:
+        case WheelMode::ScrollVH:
             nId = 4;
         break;
-        case WHEELMODE_SCROLL_V:
+        case WheelMode::ScrollV:
             nId = 5;
         break;
-        case WHEELMODE_SCROLL_H:
+        case WheelMode::ScrollH:
             nId = 6;
         break;
         default:
@@ -344,11 +344,11 @@ void ImplWheelWindow::MouseMove( const MouseEvent& rMEvt )
     SetPointer( eActStyle );
 
     if( bHorz && bVert )
-        ImplSetWheelMode( bOuter ? WHEELMODE_SCROLL_VH : WHEELMODE_VH );
+        ImplSetWheelMode( bOuter ? WheelMode::ScrollVH : WheelMode::VH );
     else if( bHorz )
-        ImplSetWheelMode( bOuter ? WHEELMODE_SCROLL_H : WHEELMODE_H );
+        ImplSetWheelMode( bOuter ? WheelMode::ScrollH : WheelMode::H );
     else
-        ImplSetWheelMode( bOuter ? WHEELMODE_SCROLL_V : WHEELMODE_V );
+        ImplSetWheelMode( bOuter ? WheelMode::ScrollV : WheelMode::V );
 }
 
 void ImplWheelWindow::MouseButtonUp( const MouseEvent& rMEvt )
diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx
index e9edae3a2f69..dc438cb3ffdc 100644
--- a/vcl/source/window/scrwnd.hxx
+++ b/vcl/source/window/scrwnd.hxx
@@ -24,16 +24,21 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/image.hxx>
 
-#define WHEELMODE_NONE      0x00000000UL
-#define WHEELMODE_VH        0x00000001UL
-#define WHEELMODE_V         0x00000002UL
-#define WHEELMODE_H         0x00000004UL
-#define WHEELMODE_SCROLL_VH 0x00000008UL
-#define WHEELMODE_SCROLL_V  0x00000010UL
-#define WHEELMODE_SCROLL_H  0x00000020UL
-
 class Timer;
 
+enum class WheelMode {
+    NONE      = 0x0000,
+    VH        = 0x0001,
+    V         = 0x0002,
+    H         = 0x0004,
+    ScrollVH  = 0x0008,
+    ScrollV   = 0x0010,
+    ScrollH   = 0x0020
+};
+namespace o3tl {
+    template<> struct typed_flags<WheelMode> : is_typed_flags<WheelMode, 0x003f> {};
+}
+
 class ImplWheelWindow : public FloatingWindow
 {
 private:
@@ -44,9 +49,9 @@ private:
     Timer*              mpTimer;
     sal_uInt64          mnRepaintTime;
     sal_uInt64          mnTimeout;
-    sal_uLong               mnWheelMode;
-    sal_uLong               mnMaxWidth;
-    sal_uLong               mnActDist;
+    WheelMode           mnWheelMode;
+    sal_uLong           mnMaxWidth;
+    sal_uLong           mnActDist;
     long                mnActDeltaX;
     long                mnActDeltaY;
 
@@ -72,7 +77,7 @@ public:
     virtual void        dispose() override;
 
     void                ImplStop();
-    void                ImplSetWheelMode( sal_uLong nWheelMode );
+    void                ImplSetWheelMode( WheelMode nWheelMode );
 };
 
 #endif // INCLUDED_VCL_SOURCE_WINDOW_SCRWND_HXX