diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-10-27 15:16:35 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-10-27 15:16:35 +0000 |
| commit | 1948bd02a388e8c371bc04c018e1429e972817e4 (patch) | |
| tree | 221ed318f03e6bf7432391282c2cc69593741016 /vcl | |
| parent | 4a86b25ebcf7f7c20abc6da20710ba6d686cf168 (diff) | |
INTEGRATION: CWS os36 (1.91.16); FILE MERGED
2004/10/08 17:18:27 os 1.91.16.2: RESYNC: (1.91-1.92); FILE MERGED
2004/09/01 13:41:43 os 1.91.16.1: #i32102# the flag POPUPMENU_NOMOUSEUPCLOSE should be checked together with EVENT_MOUSEBUTTONUP not ~DOWN
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/winproc.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index e8d36d131592..91d81edb8b3a 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: winproc.cxx,v $ * - * $Revision: 1.92 $ + * $Revision: 1.93 $ * - * last change: $Author: obo $ $Date: 2004-09-09 16:23:36 $ + * last change: $Author: pjunck $ $Date: 2004-10-27 16:16:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -317,7 +317,7 @@ static BOOL ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, if ( nPopupFlags & FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE ) { if ( (nPopupFlags & FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE) && - (nSVEvent == EVENT_MOUSEBUTTONDOWN) ) + (nSVEvent == EVENT_MOUSEBUTTONUP) ) return TRUE; pLastLevelFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL ); if ( nPopupFlags & FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK ) |