X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b64e79868d4d32c3541bbd049d3f9f94c8edbfe..3351164d4cf8adbb22a62141a3753ad60bdd0604:/src/common/fontcmn.cpp diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index c876d04f74..c27bb8d92b 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -70,43 +70,43 @@ bool wxFontBase::operator!=(const wxFont& font) const wxString wxFontBase::GetFamilyString() const { - wxCHECK_MSG( Ok(), T("wxDEFAULT"), T("invalid font") ); + wxCHECK_MSG( Ok(), wxT("wxDEFAULT"), wxT("invalid font") ); switch ( GetFamily() ) { - case wxDECORATIVE: return T("wxDECORATIVE"); - case wxROMAN: return T("wxROMAN"); - case wxSCRIPT: return T("wxSCRIPT"); - case wxSWISS: return T("wxSWISS"); - case wxMODERN: return T("wxMODERN"); - case wxTELETYPE: return T("wxTELETYPE"); - default: return T("wxDEFAULT"); + case wxDECORATIVE: return wxT("wxDECORATIVE"); + case wxROMAN: return wxT("wxROMAN"); + case wxSCRIPT: return wxT("wxSCRIPT"); + case wxSWISS: return wxT("wxSWISS"); + case wxMODERN: return wxT("wxMODERN"); + case wxTELETYPE: return wxT("wxTELETYPE"); + default: return wxT("wxDEFAULT"); } } wxString wxFontBase::GetStyleString() const { - wxCHECK_MSG( Ok(), T("wxDEFAULT"), T("invalid font") ); + wxCHECK_MSG( Ok(), wxT("wxDEFAULT"), wxT("invalid font") ); switch ( GetStyle() ) { - case wxNORMAL: return T("wxNORMAL"); - case wxSLANT: return T("wxSLANT"); - case wxITALIC: return T("wxITALIC"); - default: return T("wxDEFAULT"); + case wxNORMAL: return wxT("wxNORMAL"); + case wxSLANT: return wxT("wxSLANT"); + case wxITALIC: return wxT("wxITALIC"); + default: return wxT("wxDEFAULT"); } } wxString wxFontBase::GetWeightString() const { - wxCHECK_MSG( Ok(), T("wxDEFAULT"), T("invalid font") ); + wxCHECK_MSG( Ok(), wxT("wxDEFAULT"), wxT("invalid font") ); switch ( GetWeight() ) { - case wxNORMAL: return T("wxNORMAL"); - case wxBOLD: return T("wxBOLD"); - case wxLIGHT: return T("wxLIGHT"); - default: return T("wxDEFAULT"); + case wxNORMAL: return wxT("wxNORMAL"); + case wxBOLD: return wxT("wxBOLD"); + case wxLIGHT: return wxT("wxLIGHT"); + default: return wxT("wxDEFAULT"); } }