Tag: cws_src680_oj14 User: oj Date: 06/03/20 05:53:47 Modified: /dba/dbaccess/source/ui/app/ AppSwapWindow.cxx
Log: RESYNC: (1.6-1.8); FILE MERGED 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.6.4.2&r2=1.6.4.3 Delta lines: +15 -16 --------------------- --- AppSwapWindow.cxx 20 Mar 2006 07:48:07 -0000 1.6.4.2 +++ AppSwapWindow.cxx 20 Mar 2006 13:53:44 -0000 1.6.4.3 @@ -78,12 +78,13 @@ // class OApplicationSwapWindow DBG_NAME(OApplicationSwapWindow) //================================================================== -OApplicationSwapWindow::OApplicationSwapWindow(Window* _pParent,OAppBorderWindow* _pBorderWindow) : Control(_pParent,WB_DIALOGCONTROL ) +OApplicationSwapWindow::OApplicationSwapWindow(Window* _pParent,OAppBorderWindow* _pBorderWindow) : Window(_pParent,WB_DIALOGCONTROL ) ,m_aIconControl(this) ,m_pBorderWin(_pBorderWindow) ,m_eLastType(E_NONE) { DBG_CTOR(OApplicationSwapWindow,NULL); +// SetCompoundControl( TRUE ); ImplInitSettings( sal_True, sal_True, sal_True ); @@ -91,7 +92,7 @@ m_aIconControl.setControlActionListener(_pBorderWindow->getView()->getActionListener()); m_aIconControl.SetHelpId(HID_APP_SWAP_ICONCONTROL); m_aIconControl.Show(); - m_aIconControl.Enable(TRUE); + //m_aIconControl.Enable(TRUE); } // ----------------------------------------------------------------------------- OApplicationSwapWindow::~OApplicationSwapWindow() @@ -116,24 +117,22 @@ void OApplicationSwapWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - - if ( bFont ) + if( bFont ) { - Font aFont = rStyleSettings.GetAppFont(); - if ( IsControlFont() ) - aFont.Merge( GetControlFont() ); + Font aFont; + aFont = rStyleSettings.GetFieldFont(); + aFont.SetColor( rStyleSettings.GetWindowTextColor() ); SetPointFont( aFont ); } - if ( bFont || bForeground ) + if( bForeground || bFont ) { - Color aTextColor = rStyleSettings.GetButtonTextColor(); - if ( IsControlForeground() ) - aTextColor = GetControlForeground(); - SetTextColor( aTextColor ); + SetTextColor( rStyleSettings.GetFieldTextColor() ); + SetTextFillColor(); } - SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetWindowColor() ) ); + if( bBackground ) + SetBackground( rStyleSettings.GetFieldColor() ); } // ----------------------------------------------------------------------- void OApplicationSwapWindow::DataChanged( const DataChangedEvent& rDCEvt ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
