Applied patch [ 592363 ] Owner Draw Round 2 fixes

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 1aa1b5612022cd265fe42206d583e760f4246e12..c2e6de24c236fbca3f7fa1a0df09ea6e31ba4a72 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -61,6 +61,7 @@
 
 #ifdef __WXMAC__
 #include "wx/mac/private.h"
+#include "wx/mac/uma.h"
 #endif
 IMPLEMENT_CLASS(wxColourDatabase, wxList)
 IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
@@ -393,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);
 
@@ -465,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();
@@ -476,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__)