X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c34e3c7930684745d6aaf4696fc18faa32463d0e..8bebc229c7aa9a57fdb4b4955bbe23cd1a44f54a:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 69ddd20986..3f99e2a1a8 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -79,7 +79,7 @@ template<> void wxStringWriteValue(wxString &s , const wxPoint &data ) s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ; } -WX_CUSTOM_TYPE_INFO(wxPoint, wxToStringConverter<wxPoint> , wxFromStringConverter<wxPoint>) +wxCUSTOM_TYPE_INFO(wxPoint, wxToStringConverter<wxPoint> , wxFromStringConverter<wxPoint>) template<> void wxStringReadValue(const wxString &s , wxSize &data ) { @@ -91,7 +91,7 @@ template<> void wxStringWriteValue(wxString &s , const wxSize &data ) s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ; } -WX_CUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<wxSize>) +wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<wxSize>) #endif @@ -508,7 +508,7 @@ void wxInitializeStockObjects () GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; sizeFont = fontSize ; - wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) ); + wxNORMAL_FONT = new wxFont (fontSize, wxMODERN, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) ); #elif defined(__WXPM__) static const int sizeFont = 12; #else @@ -526,7 +526,7 @@ void wxInitializeStockObjects () wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ #elif defined(__WXMAC__) - wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL); + wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; wxSMALL_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) );