User: obo Date: 2007-06-12 05:33:04+0000 Modified: dba/dbaccess/source/ui/app/AppSwapWindow.cxx
Log: INTEGRATION: CWS dba23ui (1.10.58); FILE MERGED 2006/12/21 08:31:59 fs 1.10.58.1: #i72799# enhanced mnemonics handling, now also for the task pane File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppSwapWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppSwapWindow.cxx?r1=1.10&r2=1.11 Delta lines: +8 -18 -------------------- --- AppSwapWindow.cxx 2006-09-17 06:55:16+0000 1.10 +++ AppSwapWindow.cxx 2007-06-12 05:33:01+0000 1.11 @@ -81,10 +81,11 @@ // class OApplicationSwapWindow DBG_NAME(OApplicationSwapWindow) //================================================================== -OApplicationSwapWindow::OApplicationSwapWindow(Window* _pParent,OAppBorderWindow* _pBorderWindow) : Window(_pParent,WB_DIALOGCONTROL ) +OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWindow& _rBorderWindow ) + :Window(_pParent,WB_DIALOGCONTROL ) ,m_aIconControl(this) ,m_eLastType(E_NONE) - ,m_pBorderWin(_pBorderWindow) + ,m_rBorderWin( _rBorderWindow ) { DBG_CTOR(OApplicationSwapWindow,NULL); // SetCompoundControl( TRUE ); @@ -92,7 +93,7 @@ ImplInitSettings( sal_True, sal_True, sal_True ); m_aIconControl.SetClickHdl(LINK(this, OApplicationSwapWindow, OnContainerSelectHdl)); - m_aIconControl.setControlActionListener(_pBorderWindow->getView()->getActionListener()); + m_aIconControl.setControlActionListener( m_rBorderWin.getView()->getActionListener()); m_aIconControl.SetHelpId(HID_APP_SWAP_ICONCONTROL); m_aIconControl.Show(); //m_aIconControl.Enable(TRUE); @@ -161,20 +162,9 @@ } // ----------------------------------------------------------------------------- -void OApplicationSwapWindow::createIconAutoMnemonics() +void OApplicationSwapWindow::createIconAutoMnemonics( MnemonicGenerator& _rMnemonics ) { - // we need to share our "mnemonic space" with the menu of the window we live in - MnemonicGenerator aMnemonicGenerator; - SystemWindow* pSystemWindow = GetSystemWindow(); - MenuBar* pMenu = pSystemWindow ? pSystemWindow->GetMenuBar() : NULL; - if ( pMenu ) - { - USHORT nMenuItems = pMenu->GetItemCount(); - for ( USHORT i = 0; i < nMenuItems; ++i ) - aMnemonicGenerator.RegisterMnemonic( pMenu->GetItemText( pMenu->GetItemId( i ) ) ); - } - - m_aIconControl.CreateAutoMnemonics( aMnemonicGenerator ); + m_aIconControl.CreateAutoMnemonics( _rMnemonics ); } // ----------------------------------------------------------------------------- @@ -184,7 +174,7 @@ if ( rKeyCode.GetModifier() == KEY_MOD2 ) return m_aIconControl.DoKeyInput( _rEvent ); - // not intercepted + // not handled return false; } @@ -206,7 +196,7 @@ if ( m_eLastType != eType && eType != E_NONE ) { - if ( m_pBorderWin->getView()->getElementNotification()->onContainerSelect(eType) ) + if ( m_rBorderWin.getView()->getElementNotification()->onContainerSelect(eType) ) m_eLastType = eType; else { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
