diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 15:22:40 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 15:22:40 +0000 |
| commit | b6abdfa524e36f3ce41bd2ff050845f74097cad3 (patch) | |
| tree | 9ecb828f129b861ef8d88d7e4ddefce103d539be /vcl/source | |
| parent | db582137748933e9eb454e7db84dcd22f7dea83b (diff) | |
INTEGRATION: CWS aquavcl04 (1.155.36); FILE MERGED
2007/12/03 10:33:56 pl 1.155.36.4: RESYNC: (1.156-1.157); FILE MERGED
2007/11/16 06:24:47 pl 1.155.36.3: RESYNC: (1.155-1.156); FILE MERGED
2007/10/19 14:42:29 pl 1.155.36.2: #i79131# no more KEY_CONTROLMOD
2007/10/16 15:50:34 pl 1.155.36.1: #i78832# set clipregion for native highlighting to prevent theming from overpainting
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/menu.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 2dbca1421a33..a47fa08ef82f 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -4,9 +4,9 @@ * * $RCSfile: menu.cxx,v $ * - * $Revision: 1.157 $ + * $Revision: 1.158 $ * - * last change: $Author: ihi $ $Date: 2007-11-26 15:14:44 $ + * last change: $Author: ihi $ $Date: 2008-01-14 16:22:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -4545,7 +4545,6 @@ void MenuFloatingWindow::HighlightItem( USHORT nPos, BOOL bHighlight ) CTRL_STATE_ENABLED, ImplControlValue(), OUString() ); - Pop(); if( bHighlight && IsNativeControlSupported( CTRL_MENU_POPUP, PART_MENU_ITEM ) ) { @@ -4561,6 +4560,7 @@ void MenuFloatingWindow::HighlightItem( USHORT nPos, BOOL bHighlight ) } else bDrawItemRect = bHighlight; + Pop(); } if( bDrawItemRect ) { @@ -4860,7 +4860,7 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent ) else { // Bei ungueltigen Tasten Beepen, aber nicht bei HELP und F-Tasten - if ( !rKEvent.GetKeyCode().IsControlMod() && ( nCode != KEY_HELP ) && ( rKEvent.GetKeyCode().GetGroup() != KEYGROUP_FKEYS ) ) + if ( ( nCode != KEY_HELP ) && ( rKEvent.GetKeyCode().GetGroup() != KEYGROUP_FKEYS ) ) Sound::Beep(); FloatingWindow::KeyInput( rKEvent ); } @@ -5595,7 +5595,7 @@ BOOL MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, BOOL bFromMenu } } - if ( !bDone && ( bFromMenu || rKEvent.GetKeyCode().IsControlMod() ) ) + if ( !bDone && bFromMenu ) { xub_Unicode nCharCode = rKEvent.GetCharCode(); if ( nCharCode ) |