From d0bfeea606b56b976d93a90808a1f29dcc8f87ae Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 12 Sep 2003 06:13:19 +0000 Subject: [PATCH] fixing normal font for mac, unicode corrections git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/gdicmn.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index b72b94f86d..3f99e2a1a8 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -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 ) ); -- 2.45.2