convert COMMAND_WHEEL constants to an enum

Change-Id: I413d821a984ab556bd19c52704c04de6d828f699

9 files changed, 15 insertions, 15 deletions

diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 74404365eb67..98f3dadf1d80 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -758,14 +758,14 @@ private:
         mfMagnifyDeltaSum += [pEvent magnification];
 
         mfLastMagnifyTime = [pEvent timestamp];
-// TODO: change to 0.1 when COMMAND_WHEEL_ZOOM handlers allow finer zooming control
+// TODO: change to 0.1 when CommandWheelMode::ZOOM handlers allow finer zooming control
         static const float fMagnifyFactor = 0.25*500; // steps are 500 times smaller for -magnification
         static const float fMinMagnifyStep = 15.0 / fMagnifyFactor;
         if( fabs(mfMagnifyDeltaSum) <= fMinMagnifyStep )
             return;
 
         // adapt NSEvent-sensitivity to application expectations
-        // TODO: rather make COMMAND_WHEEL_ZOOM handlers smarter
+        // TODO: rather make CommandWheelMode::ZOOM handlers smarter
         const float fDeltaZ = mfMagnifyDeltaSum * fMagnifyFactor;
         int nDeltaZ = FRound( fDeltaZ );
         if( !nDeltaZ )
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 228d3b6b0e88..5dea2fdf416d 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2500,7 +2500,7 @@ bool ImplListBox::Notify( NotifyEvent& rNEvt )
         if ( rCEvt.GetCommand() == COMMAND_WHEEL )
         {
             const CommandWheelData* pData = rCEvt.GetWheelData();
-            if( !pData->GetModifier() && ( pData->GetMode() == COMMAND_WHEEL_SCROLL ) )
+            if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) )
             {
                 nDone = HandleScrollCommand( rCEvt, mpHScrollBar, mpVScrollBar );
             }
@@ -2521,7 +2521,7 @@ bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt )
     if ( rCEvt.GetCommand() == COMMAND_WHEEL )
     {
         const CommandWheelData* pData = rCEvt.GetWheelData();
-        if( !pData->GetModifier() && ( pData->GetMode() == COMMAND_WHEEL_SCROLL ) )
+        if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) )
         {
             sal_uInt16 nKey = ( pData->GetDelta() < 0 ) ? KEY_DOWN : KEY_UP;
             KeyEvent aKeyEvent( 0, vcl::KeyCode( nKey ) );
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 8bbdbb9e14d7..97e6633a7dbf 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -563,7 +563,7 @@ bool SpinField::Notify( NotifyEvent& rNEvt )
                 )
             {
                 const CommandWheelData* pData = rNEvt.GetCommandEvent()->GetWheelData();
-                if ( pData->GetMode() == COMMAND_WHEEL_SCROLL )
+                if ( pData->GetMode() == CommandWheelMode::SCROLL )
                 {
                     if ( pData->GetDelta() < 0L )
                         Down();
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 9d4b1672cd83..590525fe3b4d 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1809,7 +1809,7 @@ bool VclScrolledWindow::Notify(NotifyEvent& rNEvt)
         if ( rCEvt.GetCommand() == COMMAND_WHEEL )
         {
             const CommandWheelData* pData = rCEvt.GetWheelData();
-            if( !pData->GetModifier() && ( pData->GetMode() == COMMAND_WHEEL_SCROLL ) )
+            if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) )
             {
                 nDone = HandleScrollCommand(rCEvt, m_pHScroll.get(), m_pVScroll.get());
             }
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index e3a7c13c7d7c..5b0ed083d23e 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -1185,7 +1185,7 @@ void MenuFloatingWindow::Command( const CommandEvent& rCEvt )
     if ( rCEvt.GetCommand() == COMMAND_WHEEL )
     {
         const CommandWheelData* pData = rCEvt.GetWheelData();
-        if( !pData->GetModifier() && ( pData->GetMode() == COMMAND_WHEEL_SCROLL ) )
+        if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) )
         {
 //          ImplCursorUpDown( pData->GetDelta() > 0L );
             ImplScroll( pData->GetDelta() > 0L );
diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index b205df61d1ef..d132469c63ed 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -86,7 +86,7 @@ void OpenGLWindow::Command( const CommandEvent& rCEvt )
     if(rCEvt.GetCommand() == COMMAND_WHEEL)
     {
         const CommandWheelData* pData = rCEvt.GetWheelData();
-        if(pData->GetMode() == COMMAND_WHEEL_SCROLL)
+        if(pData->GetMode() == CommandWheelMode::SCROLL)
         {
             long nDelta = pData->GetDelta();
             mpRenderer->scroll(nDelta);
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index c701e33befa0..227840fe0c61 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4396,7 +4396,7 @@ void ToolBox::Command( const CommandEvent& rCEvt )
         if ( (mnCurLine > 1) || (mnCurLine+mnVisLines-1 < mnCurLines) )
         {
             const CommandWheelData* pData = rCEvt.GetWheelData();
-            if ( pData->GetMode() == COMMAND_WHEEL_SCROLL )
+            if ( pData->GetMode() == CommandWheelMode::SCROLL )
             {
                 if ( (mnCurLine > 1) && (pData->GetDelta() > 0) )
                     ShowLine( false );
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index fec025132a36..5f6c8a66e32b 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -787,7 +787,7 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd,
             {
                 const CommandWheelData* pData = rCmd.GetWheelData();
 
-                if ( pData && (COMMAND_WHEEL_SCROLL == pData->GetMode()) )
+                if ( pData && (CommandWheelMode::SCROLL == pData->GetMode()) )
                 {
                     if (!pData->IsDeltaPixel())
                     {
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index a677af194432..be88ec3ec4bc 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1385,19 +1385,19 @@ static bool ImplHandleWheelEvent( vcl::Window* pWindow, const SalWheelMouseEvent
     if( aDogTag.IsDead() )
         return false;
 
-    sal_uInt16 nMode;
+    CommandWheelMode nMode;
     sal_uInt16 nCode = rEvt.mnCode;
     bool bHorz = rEvt.mbHorz;
     bool bPixel = rEvt.mbDeltaIsPixel;
     if ( scaleDirectly )
-        nMode = COMMAND_WHEEL_ZOOM_SCALE;
+        nMode = CommandWheelMode::ZOOM_SCALE;
     else if ( nCode & KEY_MOD1 )
-        nMode = COMMAND_WHEEL_ZOOM;
+        nMode = CommandWheelMode::ZOOM;
     else if ( nCode & KEY_MOD2 )
-        nMode = COMMAND_WHEEL_DATAZOOM;
+        nMode = CommandWheelMode::DATAZOOM;
     else
     {
-        nMode = COMMAND_WHEEL_SCROLL;
+        nMode = CommandWheelMode::SCROLL;
         // #i85450# interpret shift-wheel as horizontal wheel action
         if( (nCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3)) == KEY_SHIFT )
             bHorz = true;