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

return updated wxFONT*_* values

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-03-16 14:49:46 +00:00
parent 6e19eb9c4b
commit 70f70818c2
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/common/fontcmn.cpp
View File

@@ -320,7 +320,7 @@ bool wxFontBase::operator==(const wxFont& font) const
// have different ref datas but still describe the same font // have different ref datas but still describe the same font
return IsSameAs(font) || return IsSameAs(font) ||
( (
Ok() == font.Ok() && IsOk() == font.IsOk() &&
GetPointSize() == font.GetPointSize() && GetPointSize() == font.GetPointSize() &&
// in wxGTK1 GetPixelSize() calls GetInternalFont() which uses // in wxGTK1 GetPixelSize() calls GetInternalFont() which uses
// operator==() resulting in infinite recursion so we can't use it // operator==() resulting in infinite recursion so we can't use it
@@ -339,43 +339,43 @@ bool wxFontBase::operator==(const wxFont& font) const
wxString wxFontBase::GetFamilyString() const wxString wxFontBase::GetFamilyString() const
{ {
wxCHECK_MSG( Ok(), wxT("wxDEFAULT"), wxT("invalid font") ); wxCHECK_MSG( IsOk(), "wxFONTFAMILY_DEFAULT", "invalid font" );
switch ( GetFamily() ) switch ( GetFamily() )
{ {
case wxDECORATIVE: return wxT("wxDECORATIVE"); case wxFONTFAMILY_DECORATIVE: return "wxFONTFAMILY_DECORATIVE";
case wxROMAN: return wxT("wxROMAN"); case wxFONTFAMILY_ROMAN: return "wxFONTFAMILY_ROMAN";
case wxSCRIPT: return wxT("wxSCRIPT"); case wxFONTFAMILY_SCRIPT: return "wxFONTFAMILY_SCRIPT";
case wxSWISS: return wxT("wxSWISS"); case wxFONTFAMILY_SWISS: return "wxFONTFAMILY_SWISS";
case wxMODERN: return wxT("wxMODERN"); case wxFONTFAMILY_MODERN: return "wxFONTFAMILY_MODERN";
case wxTELETYPE: return wxT("wxTELETYPE"); case wxFONTFAMILY_TELETYPE: return "wxFONTFAMILY_TELETYPE";
default: return wxT("wxDEFAULT"); default: return "wxFONTFAMILY_DEFAULT";
} }
} }
wxString wxFontBase::GetStyleString() const wxString wxFontBase::GetStyleString() const
{ {
wxCHECK_MSG( Ok(), wxT("wxDEFAULT"), wxT("invalid font") ); wxCHECK_MSG( IsOk(), "wxFONTSTYLE_DEFAULT", "invalid font" );
switch ( GetStyle() ) switch ( GetStyle() )
{ {
case wxNORMAL: return wxT("wxNORMAL"); case wxFONTSTYLE_NORMAL: return "wxFONTSTYLE_NORMAL";
case wxSLANT: return wxT("wxSLANT"); case wxFONTSTYLE_SLANT: return "wxFONTSTYLE_SLANT";
case wxITALIC: return wxT("wxITALIC"); case wxFONTSTYLE_ITALIC: return "wxFONTSTYLE_ITALIC";
default: return wxT("wxDEFAULT"); default: return "wxFONTSTYLE_DEFAULT";
} }
} }
wxString wxFontBase::GetWeightString() const wxString wxFontBase::GetWeightString() const
{ {
wxCHECK_MSG( Ok(), wxT("wxDEFAULT"), wxT("invalid font") ); wxCHECK_MSG( IsOk(), "wxFONTWEIGHT_DEFAULT", "invalid font" );
switch ( GetWeight() ) switch ( GetWeight() )
{ {
case wxNORMAL: return wxT("wxNORMAL"); case wxFONTWEIGHT_NORMAL: return "wxFONTWEIGHT_NORMAL";
case wxBOLD: return wxT("wxBOLD"); case wxFONTWEIGHT_BOLD: return "wxFONTWEIGHT_BOLD";
case wxLIGHT: return wxT("wxLIGHT"); case wxFONTWEIGHT_LIGHT: return "wxFONTWEIGHT_LIGHT";
default: return wxT("wxDEFAULT"); default: return "wxFONTWEIGHT_DEFAULT";
} }
} }
@@ -384,7 +384,7 @@ bool wxFontBase::SetFaceName(const wxString& facename)
#if wxUSE_FONTENUM #if wxUSE_FONTENUM
if (!wxFontEnumerator::IsValidFacename(facename)) if (!wxFontEnumerator::IsValidFacename(facename))
{ {
UnRef(); // make Ok() return false UnRef(); // make IsOk() return false
return false; return false;
} }
#else // !wxUSE_FONTENUM #else // !wxUSE_FONTENUM