State fix

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

diff --git a/src/osx/carbon/gdiobj.cpp b/src/osx/carbon/gdiobj.cpp
index f768d01beafe46221e127003152f3c121247f456..31ec9c8017614e5d9aaefb58be149e4230312dc8 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]);
 const wxFont* wxStockGDIMac::GetFont(Item item)
 {
     wxFont* font = static_cast<wxFont*>(ms_stockObject[item]);


@@ -61,31 +58,14 @@ const wxFont* wxStockGDIMac::GetFont(Item item)
     {
         switch (item)
         {
     {
         switch (item)
         {

-#if wxOSX_USE_COCOA_OR_CARBON

         case FONT_NORMAL:
             font = new wxFont;
         case FONT_NORMAL:
             font = new wxFont;

-#if wxOSX_USE_ATSU_TEXT
-            font->MacCreateFromThemeFont(kThemeSystemFont);
-#else
-            font->MacCreateFromUIFont(kCTFontSystemFontType);
-#endif
+            font->CreateSystemFont(wxOSX_SYSTEM_FONT_NORMAL);

             break;
         case FONT_SMALL:
             font = new wxFont;
             break;
         case FONT_SMALL:
             font = new wxFont;

-#if wxOSX_USE_ATSU_TEXT
-            font->MacCreateFromThemeFont(kThemeSmallSystemFont);
-#else
-            font->MacCreateFromUIFont(kCTFontSmallSystemFontType);
-#endif
-            break;
-#else
-        case FONT_NORMAL:
-            font = CreateNormalFont() ; 
-            break;
-        case FONT_SMALL:
-            font = CreateSmallFont(); 
+            font->CreateSystemFont(wxOSX_SYSTEM_FONT_SMALL);

             break;
             break;

-#endif

         default:
             font = const_cast<wxFont*>(super::GetFont(item));
             break;
         default:
             font = const_cast<wxFont*>(super::GetFont(item));
             break;