diff options
| author | Noel Grandin <noel@peralex.com> | 2016-04-13 09:45:32 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-04-13 10:51:44 +0000 |
| commit | 32102b9aa75a296b99f3fdaf370bd83bfd629f4e (patch) | |
| tree | d652320f91db8f4af58b56d9d63457ec7fe455e1 /vcl | |
| parent | 9cda847a0bec307a909b927e0928cdbb0b00fc81 (diff) | |
remove Windows95 MouseWheel support
since we no longer support Windows95
Change-Id: I6b2fe5fdb2cde3c69fc0d18bcaac25afccbffc16
Reviewed-on: https://gerrit.libreoffice.org/24049
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/win/saldata.hxx | 1 | ||||
| -rw-r--r-- | vcl/win/window/salframe.cxx | 36 |
2 files changed, 0 insertions, 37 deletions
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index 66b8a7fd7179..c9215144be4d 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -135,7 +135,6 @@ struct SalShlData HINSTANCE mhInst; // Instance of SAL-DLL UINT mnWheelScrollLines; // WheelScrollLines UINT mnWheelScrollChars; // WheelScrollChars - UINT mnWheelMsgId; // Wheel-Message-Id fuer W95 BOOL mbWXP; // Windows XP BOOL mbWVista; // Windows Vista BOOL mbW7; // Windows 7 diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 7a6f5c68cab5..ad2693e2594a 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -880,8 +880,6 @@ WinSalFrame::WinSalFrame() // get data, when making 1st frame if ( !pSalData->mpFirstFrame ) { - if ( !aSalShlData.mnWheelMsgId ) - aSalShlData.mnWheelMsgId = RegisterWindowMessage( MSH_MOUSEWHEEL ); if ( !aSalShlData.mnWheelScrollLines ) aSalShlData.mnWheelScrollLines = ImplSalGetWheelScrollLines(); if ( !aSalShlData.mnWheelScrollChars ) @@ -5892,40 +5890,6 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP break; } - // catch WheelMouse-Message - if ( rDef && (nMsg == aSalShlData.mnWheelMsgId) && aSalShlData.mnWheelMsgId ) - { - // protect against recursion, in case the message is returned - // by IE or the external window - if ( !bInWheelMsg ) - { - bInWheelMsg++; - // First dispatch the message; and then give the SystemWindow a turn - WORD nKeyState = 0; - if ( GetKeyState( VK_SHIFT ) & 0x8000 ) - nKeyState |= MK_SHIFT; - if ( GetKeyState( VK_CONTROL ) & 0x8000 ) - nKeyState |= MK_CONTROL; - // Mutex handling is inside from this call - rDef = !ImplHandleWheelMsg( hWnd, - WM_MOUSEWHEEL, - MAKEWPARAM( nKeyState, (WORD)wParam ), - lParam ); - if ( rDef ) - { - HWND hWheelWnd = ::GetFocus(); - if ( hWheelWnd && (hWheelWnd != hWnd) ) - { - nRet = SendMessageW( hWheelWnd, nMsg, wParam, lParam ); - rDef = FALSE; - } - else - rDef = ImplSalWheelMousePos( hWnd, nMsg, wParam, lParam, nRet ); - } - bInWheelMsg--; - } - } - if( bCheckTimers ) { SalData* pSalData = GetSalData(); |