Copied from src/msw/gsocket.c revision 1.61

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index ac407e93d92b0a9b2b55ad5f679ac307fb01d856..5af91e126a5f65d44cbaa0cd534c35ce7a8039f0 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -217,8 +217,6 @@ bool wxRect::Intersects(const wxRect& rect) const
 // wxColourDatabase
 // ============================================================================
 
-WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap );
-
 // ----------------------------------------------------------------------------
 // wxColourDatabase ctor/dtor
 // ----------------------------------------------------------------------------
@@ -531,6 +529,7 @@ void wxInitializeStockObjects ()
 #endif
 */
 #if defined(__WXMAC__)
+    // retrieve size of system font for all stock fonts
     int sizeFont = 12;
 
     Str255 fontName ;
@@ -539,7 +538,12 @@ void wxInitializeStockObjects ()
 
        GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
        sizeFont = fontSize ;
+#if __WXMAC_CLASSIC__
     wxNORMAL_FONT = new wxFont (fontSize, wxMODERN, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) );
+#else
+    wxNORMAL_FONT = new wxFont () ;
+    wxNORMAL_FONT->MacCreateThemeFont( kThemeSystemFont );
+#endif
 #elif defined(__WXPM__)
   static const int sizeFont = 12;
 #else
@@ -559,8 +563,13 @@ void wxInitializeStockObjects ()
 #elif defined(__WXMAC__)
     wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
     wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
+#if __WXMAC_CLASSIC__
        GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
     wxSMALL_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) );
+#else
+    wxSMALL_FONT = new wxFont () ;
+    wxSMALL_FONT->MacCreateThemeFont( kThemeSmallSystemFont );
+#endif
 #else
   wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL);
   wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);