diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 15:23:42 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 15:23:42 +0000 |
| commit | 10fe07bfa5afccd39f6d50e991d0662e385ef05a (patch) | |
| tree | 16800dc26f5bac9fb63ea44e02b3df6dc200ad36 /vcl | |
| parent | 4e511d5d06e842f74101c73bf4a6e82aedb17595 (diff) | |
INTEGRATION: CWS aquavcl04 (1.118.2); FILE MERGED
2007/12/03 10:34:00 pl 1.118.2.2: RESYNC: (1.118-1.119); FILE MERGED
2007/10/19 14:42:29 pl 1.118.2.1: #i79131# no more KEY_CONTROLMOD
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/winproc.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 787569d0fe82..2c3ecb2ccbdd 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -653,7 +653,7 @@ long ImplHandleMouseEvent( Window* pWindow, USHORT nSVEvent, BOOL bMouseLeave, ::com::sun::star::awt::MouseEvent aMouseEvent( static_cast < ::com::sun::star::uno::XInterface * > ( 0 ), #ifdef MACOSX - nCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD5), + nCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3), #else nCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2), #endif @@ -1083,11 +1083,7 @@ static long ImplHandleKey( Window* pWindow, USHORT nSVEvent, { #ifdef DBG_UTIL // #105224# use Ctrl-Alt-Shift-D, Ctrl-Shift-D must be useable by app - #ifdef MACOSX - if ( aKeyCode.IsShift() && aKeyCode.IsMod1() && (aKeyCode.IsMod2() || aKeyCode.IsMod5()) && (aKeyCode.GetCode() == KEY_D) ) - #else - if ( aKeyCode.IsShift() && aKeyCode.IsMod1() && aKeyCode.IsMod2() && (aKeyCode.GetCode() == KEY_D) ) - #endif + if ( aKeyCode.IsShift() && aKeyCode.IsMod1() && (aKeyCode.IsMod2() || aKeyCode.IsMod3()) && (aKeyCode.GetCode() == KEY_D) ) { DBGGUI_START(); return 1; @@ -2100,7 +2096,7 @@ inline long ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent pEvent->mnX, pEvent->mnY, pEvent->mnTime, #ifdef MACOSX - pEvent->mnButton | (pEvent->mnCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD5)), + pEvent->mnButton | (pEvent->mnCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3)), #else pEvent->mnButton | (pEvent->mnCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2)), #endif @@ -2115,7 +2111,7 @@ inline long ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent ) pEvent->mnX, pEvent->mnY, pEvent->mnTime, #ifdef MACOSX - pEvent->mnButton | (pEvent->mnCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD5)), + pEvent->mnButton | (pEvent->mnCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3)), #else pEvent->mnButton | (pEvent->mnCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2)), #endif @@ -2178,7 +2174,7 @@ static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent ) if ( pTrackWin ) pWindow = pTrackWin; #ifdef MACOSX - USHORT nOldCode = pWindow->ImplGetWindowImpl()->mpFrameData->mnMouseCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD5); + USHORT nOldCode = pWindow->ImplGetWindowImpl()->mpFrameData->mnMouseCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3); #else USHORT nOldCode = pWindow->ImplGetWindowImpl()->mpFrameData->mnMouseCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2); #endif @@ -2186,7 +2182,7 @@ static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent ) if ( nOldCode != nNewCode ) { #ifdef MACOSX - nNewCode |= pWindow->ImplGetWindowImpl()->mpFrameData->mnMouseCode & ~(KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD5); + nNewCode |= pWindow->ImplGetWindowImpl()->mpFrameData->mnMouseCode & ~(KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3); #else nNewCode |= pWindow->ImplGetWindowImpl()->mpFrameData->mnMouseCode & ~(KEY_SHIFT | KEY_MOD1 | KEY_MOD2); #endif |