Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nicer default fonts for OS/2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-07-03 21:44:15 +00:00
parent 188b9f2e38
commit 482ee3976f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/gdicmn.cpp
View File

@@ -394,7 +394,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
unsigned char g = (unsigned char)(xcolour.green >> 8); unsigned char g = (unsigned char)(xcolour.green >> 8);
unsigned char b = (unsigned char)(xcolour.blue >> 8); unsigned char b = (unsigned char)(xcolour.blue >> 8);
#endif #endif
wxColour *col = new wxColour(r, g, b); wxColour *col = new wxColour(r, g, b);
Append(colour, col); Append(colour, col);
@@ -466,7 +466,7 @@ void wxInitializeStockObjects ()
p2cstrcpy( (char*) fontName , fontName ) ; p2cstrcpy( (char*) fontName , fontName ) ;
wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName ); wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName );
#elif defined(__WXPM__) #elif defined(__WXPM__)
static const int sizeFont = 12; static const int sizeFont = 10;
#else #else
wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
static const int sizeFont = wxNORMAL_FONT->GetPointSize(); 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 // 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 // as I can do to get something that looks halfway "wx" normal
*/ */
wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL); /* System VIO */ wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD);
wxSMALL_FONT = new wxFont (sizeFont - 4, wxMODERN, wxNORMAL, wxNORMAL); /* System VIO */ wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
#elif defined(__WXMAC__) #elif defined(__WXMAC__)