diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-04-17 07:03:36 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-17 07:03:36 +0000 |
| commit | 6b80972b760ad72f7800b5835c18ec209ef94afb (patch) | |
| tree | de4ed258256613fe931f2864cf25a6e1ecd50c26 /vcl | |
| parent | 6e6c202c2a524eeed75f9beb4fe479ad95ffb50b (diff) | |
INTEGRATION: CWS startcenterfix02 (1.59.8); FILE MERGED
2008/04/12 12:10:45 pl 1.59.8.1: #i88200# joining key and menu handling changes from aquavcl07
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/aqua/source/window/salframe.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index b63973fd11a6..ef0332cb193b 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salframe.cxx,v $ - * $Revision: 1.61 $ + * $Revision: 1.62 $ * * This file is part of OpenOffice.org. * @@ -929,11 +929,11 @@ XubString AquaSalFrame::GetKeyName( USHORT nKeyCode ) if( (nKeyCode & KEY_SHIFT) != 0 ) aResult.append( sal_Unicode( 0x21e7 ) ); if( (nKeyCode & KEY_MOD1) != 0 ) - aResult.append( sal_Unicode( 0x2303 ) ); + aResult.append( sal_Unicode( 0x2318 ) ); // we do not really handle Alt (see below) // we map it to MOD3, whichis actually Command if( (nKeyCode & (KEY_MOD2|KEY_MOD3)) != 0 ) - aResult.append( sal_Unicode( 0x2318 ) ); + aResult.append( sal_Unicode( 0x2303 ) ); aResult.append( it->second ); } @@ -1268,9 +1268,11 @@ SalPointerState AquaSalFrame::GetPointerState() if( nState & shiftKey ) state.mnState |= KEY_SHIFT; if( nState & controlKey ) - state.mnState |= KEY_MOD1; + state.mnState |= KEY_MOD3; if( nState & optionKey ) state.mnState |= KEY_MOD2; + if( nState & cmdKey ) + state.mnState |= KEY_MOD1; return state; } |