Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetFont implementation moved to peer

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-07-03 15:50:10 +00:00
parent 29d916613c
commit ac99838a17
1 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/mac/carbon/window.cpp
View File

@@ -858,45 +858,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
void wxWindowMac::MacUpdateControlFont() void wxWindowMac::MacUpdateControlFont()
{ {
ControlFontStyleRec fontStyle; m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ;
wxFont myfont = GetFont();
if ( myfont.MacGetThemeFontID() != kThemeCurrentPortFont )
{
switch( myfont.MacGetThemeFontID() )
{
case kThemeSmallSystemFont : fontStyle.font = kControlFontSmallSystemFont ; break ;
case 109 /*mini font */ : fontStyle.font = -5 ; break ;
case kThemeSystemFont : fontStyle.font = kControlFontBigSystemFont ; break ;
default : fontStyle.font = kControlFontBigSystemFont ; break ;
}
fontStyle.flags = kControlUseFontMask ;
}
else
{
fontStyle.font = myfont.MacGetFontNum() ;
fontStyle.style = myfont.MacGetFontStyle() ;
fontStyle.size = myfont.MacGetFontSize() ;
fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ;
}
fontStyle.just = teJustLeft ;
fontStyle.flags |= kControlUseJustMask ;
if ( ( GetWindowStyle() & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
fontStyle.just = teJustCenter ;
else if ( ( GetWindowStyle() & wxALIGN_MASK ) & wxALIGN_RIGHT )
fontStyle.just = teJustRight ;
// we only should do this in case of a non-standard color, as otherwise 'disabled' controls
// won't get grayed out by the system anymore
if ( GetForegroundColour() != *wxBLACK )
{
fontStyle.foreColor = MAC_WXCOLORREF(GetForegroundColour().GetPixel() ) ;
fontStyle.flags |= kControlUseForeColorMask ;
}
::SetControlFontStyle( *m_peer , &fontStyle );
Refresh() ; Refresh() ;
} }