disable Darwin GCC precompiled headers by default also for wxBase

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index c2e6de24c236fbca3f7fa1a0df09ea6e31ba4a72..48925f342939f9bc11510704a7d7fc266c844262 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -456,7 +456,6 @@ void wxInitializeStockObjects ()
 #if defined(__WXMAC__)
     int sizeFont = 12;
 
 #if defined(__WXMAC__)
     int sizeFont = 12;
 

-    FontFamilyID fontId ;

     Str255 fontName ;
     SInt16 fontSize ;
     Style fontStyle ;
     Str255 fontName ;
     SInt16 fontSize ;
     Style fontStyle ;


@@ -466,7 +465,7 @@ void wxInitializeStockObjects ()
     p2cstrcpy( (char*) fontName , fontName ) ;
     wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName );
 #elif defined(__WXPM__)
     p2cstrcpy( (char*) fontName , fontName ) ;
     wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName );
 #elif defined(__WXPM__)

-  static const int sizeFont = 10;
+  static const int sizeFont = 12;

 #else
   wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
   static const int sizeFont = wxNORMAL_FONT->GetPointSize();
 #else
   wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
   static const int sizeFont = wxNORMAL_FONT->GetPointSize();


@@ -478,7 +477,7 @@ void wxInitializeStockObjects ()
   // as I can do to get something that looks halfway "wx" normal
   */
   wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD);
   // as I can do to get something that looks halfway "wx" normal
   */
   wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD);

-  wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
+  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__)
   wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
   wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
 #elif defined(__WXMAC__)