summaryrefslogtreecommitdiff
path: root/vcl/source/window/winproc.cxx
diff options
context:
space:
mode:
authorStephan Schäfer <ssa@openoffice.org>2002-12-12 13:51:05 +0000
committerStephan Schäfer <ssa@openoffice.org>2002-12-12 13:51:05 +0000
commit1b9847c34ad8fcb266ea4555399be6111ce33fb9 (patch)
treee36c8c78f9d35def67b437d751e6e7352ee8a28b /vcl/source/window/winproc.cxx
parent5cb0f86d36a1f138fdc2b289e16da4d289087d0d (diff)
#106235# contextmenu opens only on Shift-F10, without any additional modifiers
Diffstat (limited to 'vcl/source/window/winproc.cxx')
-rw-r--r--vcl/source/window/winproc.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index a676e21c66be..c43dfbf474e8 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: winproc.cxx,v $
*
- * $Revision: 1.74 $
+ * $Revision: 1.75 $
*
- * last change: $Author: ssa $ $Date: 2002-11-28 13:25:56 $
+ * last change: $Author: ssa $ $Date: 2002-12-12 14:51:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1168,7 +1168,7 @@ static long ImplHandleKey( Window* pWindow, USHORT nSVEvent,
}
// ContextMenu
- if ( (nCode == KEY_CONTEXTMENU) || ((nCode == KEY_F10) && aKeyCode.IsShift()) )
+ if ( (nCode == KEY_CONTEXTMENU) || ((nCode == KEY_F10) && aKeyCode.IsShift() && !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) )
nRet = !ImplCallCommand( pChild, COMMAND_CONTEXTMENU, NULL, FALSE );
else if ( ( (nCode == KEY_F2) && aKeyCode.IsShift() ) || ( (nCode == KEY_F1) && aKeyCode.IsMod1() ) ||
// #101999# no active help when focus in toolbox, simulate BallonHelp instead