diff options
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/layout.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/menufloatingwindow.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/openglwin.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/window2.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 10 |
6 files changed, 10 insertions, 10 deletions
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; |