X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99fd0d71f7512aae82da848879258399c0caa9ad..cdb105516c7934613e22c4ae2b0936ea77ad17ca:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 1aa1b56120..d0deba6056 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -61,6 +61,7 @@ #ifdef __WXMAC__ #include "wx/mac/private.h" +#include "wx/mac/uma.h" #endif IMPLEMENT_CLASS(wxColourDatabase, wxList) IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList) @@ -393,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); @@ -476,8 +477,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__)