X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..6842d18650b487249b4ae29d0d7e17231b24cde8:/src/common/fontcmn.cpp diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index e50a844a60..8a5e31d4dd 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -17,6 +17,10 @@ // headers // ---------------------------------------------------------------------------- +#ifdef __GNUG__ + #pragma implementation "fontbase.h" +#endif + // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -38,6 +42,7 @@ wxFontEncoding wxFontBase::ms_encodingDefault = wxFONTENCODING_SYSTEM; +/* static */ wxFont *wxFontBase::New(int size, int family, int style, @@ -70,43 +75,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"); } }