diff options
| author | Stephan Schäfer <ssa@openoffice.org> | 2002-03-04 16:09:33 +0000 |
|---|---|---|
| committer | Stephan Schäfer <ssa@openoffice.org> | 2002-03-04 16:09:33 +0000 |
| commit | 1874ecc464bb780e0fa7a4a7eb943f2ca0dd9718 (patch) | |
| tree | fe8415e73be060e1dabbd677fbdbd4a76f188432 /vcl/source/window/floatwin.cxx | |
| parent | 60ed7e358dbc7b3defe587e918370914ad3dc79f (diff) | |
#96983# restore last active toolbox item on getfocus
Diffstat (limited to 'vcl/source/window/floatwin.cxx')
| -rw-r--r-- | vcl/source/window/floatwin.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 885e12d6b411..564db67cdd93 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: floatwin.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: pl $ $Date: 2002-01-15 18:51:12 $ + * last change: $Author: ssa $ $Date: 2002-03-04 17:07:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -227,6 +227,11 @@ void FloatingWindow::ImplLoadRes( const ResId& rResId ) FloatingWindow::~FloatingWindow() { + if( mbPopupModeCanceled ) + // indicates that ESC key was pressed + // will be handled in Window::ImplGrabFocus() + SetDialogControlFlags( GetDialogControlFlags() | WINDOW_DLGCTRL_FLOATWIN_POPUPMODEEND_CANCEL ); + if ( IsInPopupMode() ) EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL | FLOATWIN_POPUPMODEEND_DONTCALLHDL ); |