fixing normal font for mac, unicode corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
7658b9eb37
commit
d0bfeea606
@ -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 ) );
|
||||
|
Loading…
Reference in New Issue
Block a user