X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4a05ccd8a7742ab3b791968352b6275dd829433..9a76510b8a38e5b76acc4b647684b87ec11efd0a:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 091dd48337..48925f3429 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -394,7 +394,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour) unsigned char g = (unsigned char)(xcolour.green >> 8); unsigned char b = (unsigned char)(xcolour.blue >> 8); #endif - + wxColour *col = new wxColour(r, g, b); Append(colour, col); @@ -456,7 +456,6 @@ void wxInitializeStockObjects () #if defined(__WXMAC__) int sizeFont = 12; - FontFamilyID fontId ; Str255 fontName ; SInt16 fontSize ; Style fontStyle ; @@ -477,8 +476,8 @@ void wxInitializeStockObjects () // Basic OS/2 has a fairly limited number of fonts and these are as good // as I can do to get something that looks halfway "wx" normal */ - wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL); /* System VIO */ - wxSMALL_FONT = new wxFont (sizeFont - 4, wxMODERN, wxNORMAL, wxNORMAL); /* System VIO */ + wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD); + wxSMALL_FONT = new wxFont (sizeFont - 4, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ #elif defined(__WXMAC__)