Merge in from trunk r68626 - r68683

[wxWidgets.git] / src / osx / carbon / gdiobj.cpp

diff --git a/src/osx/carbon/gdiobj.cpp b/src/osx/carbon/gdiobj.cpp
index 9dcae80012b43086d69c9270a738e79061278624..4a7a3db35278664085b0c3b0e1a623cf5e28a969 100644 (file)
--- a/src/osx/carbon/gdiobj.cpp
+++ b/src/osx/carbon/gdiobj.cpp
@@ -51,9 +51,6 @@ void wxStockGDIMac::OnExit()
 {
 }
 
-extern wxFont* CreateNormalFont();
-extern wxFont* CreateSmallFont();
-
 const wxFont* wxStockGDIMac::GetFont(Item item)
 {
     wxFont* font = static_cast<wxFont*>(ms_stockObject[item]);
@@ -61,31 +58,12 @@ const wxFont* wxStockGDIMac::GetFont(Item item)
     {
         switch (item)
         {
-#if wxOSX_USE_COCOA_OR_CARBON
-        case FONT_NORMAL:
-            font = new wxFont;
-#if wxOSX_USE_CARBON
-            font->MacCreateFromThemeFont(kThemeSystemFont);
-#else
-            font->MacCreateFromUIFont(kCTFontSystemFontType);
-#endif
-            break;
-        case FONT_SMALL:
-            font = new wxFont;
-#if wxOSX_USE_CARBON
-            font->MacCreateFromThemeFont(kThemeSmallSystemFont);
-#else
-            font->MacCreateFromUIFont(kCTFontSmallSystemFontType);
-#endif
-            break;
-#else
         case FONT_NORMAL:
-            font = CreateNormalFont() ; 
+            font = new wxFont(wxOSX_SYSTEM_FONT_NORMAL);
             break;
         case FONT_SMALL:
-            font = CreateSmallFont(); 
+            font = new wxFont(wxOSX_SYSTEM_FONT_SMALL);
             break;
-#endif
         default:
             font = const_cast<wxFont*>(super::GetFont(item));
             break;