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

compilation fixes after making wxFontRefData private (added wxFont::GetMacXXX())

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-09-25 23:10:35 +00:00
parent 978f48c648
commit fcb35beb94
13 changed files with 109 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mac/carbon/listbox.cpp
View File

@@ -105,13 +105,12 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
ClipRect( drawRect );
EraseRect( drawRect );
wxFontRefData * font = (wxFontRefData*) list->GetFont().GetRefData() ;
if ( font )
const wxFont& font = list->GetFont();
if ( font.Ok() )
{
::TextFont( font->m_macFontNum ) ;
::TextSize( short(font->m_macFontSize) ) ;
::TextFace( font->m_macFontStyle ) ;
::TextFont( font.GetMacFontNum() ) ;
::TextSize( font.GetMacFontSize() ) ;
::TextFace( font.GetMacFontStyle() ) ;
}
else
{
@@ -604,13 +603,11 @@ wxSize wxListBox::DoGetBestSize() const
{
wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ;
wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
if ( font )
if ( m_font.Ok() )
{
::TextFont( font->m_macFontNum ) ;
::TextSize( short(font->m_macFontSize) ) ;
::TextFace( font->m_macFontStyle ) ;
::TextFont( m_font.GetMacFontNum() ) ;
::TextSize( m_font.GetMacFontSize() ) ;
::TextFace( m_font.GetMacFontStyle() ) ;
}
else
{