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

Add some wxCHECK_MSG's

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-01-21 06:53:42 +00:00
parent 4aab34290a
commit 68585e1770
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/font.cpp
View File

@@ -1020,6 +1020,8 @@ int wxFont::GetPointSize() const
wxSize wxFont::GetPixelSize() const wxSize wxFont::GetPixelSize() const
{ {
wxCHECK_MSG( Ok(), wxDefaultSize, wxT("invalid font") );
return M_FONTDATA->GetPixelSize(); return M_FONTDATA->GetPixelSize();
} }
@@ -1074,12 +1076,14 @@ wxFontEncoding wxFont::GetEncoding() const
const wxNativeFontInfo *wxFont::GetNativeFontInfo() const const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
{ {
return M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo()) return Ok() && M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo())
: NULL; : NULL;
} }
wxString wxFont::GetNativeFontInfoDesc() const wxString wxFont::GetNativeFontInfoDesc() const
{ {
wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
// be sure we have an HFONT associated... // be sure we have an HFONT associated...
wxConstCast(this, wxFont)->RealizeResource(); wxConstCast(this, wxFont)->RealizeResource();
return wxFontBase::GetNativeFontInfoDesc(); return wxFontBase::GetNativeFontInfoDesc();
@@ -1087,6 +1091,8 @@ wxString wxFont::GetNativeFontInfoDesc() const
wxString wxFont::GetNativeFontInfoUserDesc() const wxString wxFont::GetNativeFontInfoUserDesc() const
{ {
wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
// be sure we have an HFONT associated... // be sure we have an HFONT associated...
wxConstCast(this, wxFont)->RealizeResource(); wxConstCast(this, wxFont)->RealizeResource();
return wxFontBase::GetNativeFontInfoUserDesc(); return wxFontBase::GetNativeFontInfoUserDesc();