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

fix a couple of harmless warnings during wxOSX build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-18 22:54:21 +00:00
parent 4868bfb17e
commit c22ace4dff
9 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osx/carbon/font.cpp
View File

@@ -784,7 +784,7 @@ void * wxFont::MacGetATSUStyle() const
#if WXWIN_COMPATIBILITY_2_8
wxUint32 wxFont::MacGetATSUFontID() const
{
wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
wxCHECK_MSG( M_FONTDATA != NULL, 0, wxT("invalid font") );
// cast away constness otherwise lazy font resolution is not possible
const_cast<wxFont *>(this)->RealizeResource();
@@ -794,7 +794,7 @@ wxUint32 wxFont::MacGetATSUFontID() const
wxUint32 wxFont::MacGetATSUAdditionalQDStyles() const
{
wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
wxCHECK_MSG( M_FONTDATA != NULL, 0, wxT("invalid font") );
// cast away constness otherwise lazy font resolution is not possible
const_cast<wxFont *>(this)->RealizeResource();
@@ -1303,4 +1303,4 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_)
encoding_ = wxFont::GetDefaultEncoding();
m_encoding = encoding_;
// not reflected in native descriptors
}
}