diff options
| author | Herbert Duerr [hdu] <duerr@sun.com> | 2010-08-19 14:31:35 +0200 |
|---|---|---|
| committer | Herbert Duerr [hdu] <duerr@sun.com> | 2010-08-19 14:31:35 +0200 |
| commit | c15af8f23f4ad4dfc353b78387bbb7d98fbe0d56 (patch) | |
| tree | 7046180c847edde3f1450967b58346aec4a96990 | |
| parent | 86a7d417019e39f7703a7878d91e322e14e8e65a (diff) | |
| parent | 7c84033b76922b3c843314354f8dc1bab364ed7d (diff) | |
fast-forward merging of heads
| -rw-r--r-- | vcl/source/window/seleng.cxx | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index d4ee01c26d61..322b2937b5c9 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -218,8 +218,15 @@ BOOL SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) Point aPos = rMEvt.GetPosPixel(); aLastMove = rMEvt; - pWin->CaptureMouse(); - nFlags |= SELENG_IN_SEL; + if( !rMEvt.IsRight() ) + { + pWin->CaptureMouse(); + nFlags |= SELENG_IN_SEL; + } + else + { + nModifier = 0; + } switch ( nModifier ) { @@ -327,7 +334,7 @@ BOOL SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) |* *************************************************************************/ -BOOL SelectionEngine::SelMouseButtonUp( const MouseEvent& /* rMEvt */ ) +BOOL SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt ) { aWTimer.Stop(); //DbgOut("Up"); @@ -336,7 +343,11 @@ BOOL SelectionEngine::SelMouseButtonUp( const MouseEvent& /* rMEvt */ ) nFlags &= ~(SELENG_CMDEVT | SELENG_WAIT_UPEVT | SELENG_IN_SEL); return FALSE; } - pWin->ReleaseMouse(); + + if( !rMEvt.IsRight() ) + { + pWin->ReleaseMouse(); + } if( (nFlags & SELENG_WAIT_UPEVT) && !(nFlags & SELENG_CMDEVT) && eSelMode != SINGLE_SELECTION) |