diff options
| author | Stephan Schäfer <ssa@openoffice.org> | 2002-02-28 17:31:33 +0000 |
|---|---|---|
| committer | Stephan Schäfer <ssa@openoffice.org> | 2002-02-28 17:31:33 +0000 |
| commit | 4dac95ae479af794044f6ed984f13dd829fa3008 (patch) | |
| tree | 34e0d191402c31f8c7aa307f81b35b485e009ac0 | |
| parent | 5d69af40f200403ce56af1898f40406740d1f1d2 (diff) | |
#96972# improved hotkey handling for toolbar cycling
| -rw-r--r-- | vcl/source/window/syswin.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 4fb4630cf27e..13bf443663e3 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: syswin.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: ssa $ $Date: 2002-02-22 09:09:23 $ + * last change: $Author: ssa $ $Date: 2002-02-28 18:31:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -145,7 +145,7 @@ SystemWindow::SystemWindow( WindowType nType ) : long SystemWindow::Notify( NotifyEvent& rNEvt ) { - // Abfangen von KeyEvents fuer Menu-Steuerung + // capture KeyEvents for menu handling if ( rNEvt.GetType() == EVENT_KEYINPUT ) { MenuBar* pMBar = mpMenuBar; @@ -166,9 +166,17 @@ long SystemWindow::Notify( NotifyEvent& rNEvt ) long SystemWindow::PreNotify( NotifyEvent& rNEvt ) { + // capture KeyEvents for taskpane cycling if ( rNEvt.GetType() == EVENT_KEYINPUT ) { - if( mpTaskPaneList && mpTaskPaneList->HandleKeyEvent( *rNEvt.GetKeyEvent() ) ) + TaskPaneList *pTList = mpTaskPaneList; + if( !pTList && ( GetType() == WINDOW_FLOATINGWINDOW ) ) + { + SystemWindow* pW = (SystemWindow*)ImplGetFrameWindow()->ImplGetWindow(); + if ( pW ) + pTList = pW->mpTaskPaneList; + } + if( pTList && pTList->HandleKeyEvent( *rNEvt.GetKeyEvent() ) ) return TRUE; } return Window::PreNotify( rNEvt ); |