From: David Webster Date: Wed, 3 Jul 2002 21:44:15 +0000 (+0000) Subject: Nicer default fonts for OS/2 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/482ee3976f3008e44bd6352b990c8b7a99669754 Nicer default fonts for OS/2 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 091dd48337..c2e6de24c2 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); @@ -466,7 +466,7 @@ void wxInitializeStockObjects () p2cstrcpy( (char*) fontName , fontName ) ; wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName ); #elif defined(__WXPM__) - static const int sizeFont = 12; + static const int sizeFont = 10; #else wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); static const int sizeFont = wxNORMAL_FONT->GetPointSize(); @@ -477,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 - 2, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ #elif defined(__WXMAC__)