implementing rollover and pressed image for bitmapbutton on osx_cocoa

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

diff --git a/src/osx/carbon/gdiobj.cpp b/src/osx/carbon/gdiobj.cpp
index 81fb05c4580768d4133fb08d8d7e364099802935..31ec9c8017614e5d9aaefb58be149e4230312dc8 100644 (file)
--- a/src/osx/carbon/gdiobj.cpp
+++ b/src/osx/carbon/gdiobj.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/mac/carbon/gdiobj.cpp
+// Name:        src/osx/carbon/gdiobj.cpp
 // Purpose:     wxGDIObject class
 // Author:      Stefan Csomor
 // Modified by:
@@ -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,23 +58,14 @@ const wxFont* wxStockGDIMac::GetFont(Item item)
     {
         switch (item)
         {
-#if wxOSX_USE_COCOA_OR_CARBON
         case FONT_NORMAL:
             font = new wxFont;
-            font->MacCreateFromThemeFont(kThemeSystemFont);
+            font->CreateSystemFont(wxOSX_SYSTEM_FONT_NORMAL);
             break;
         case FONT_SMALL:
             font = new wxFont;
-            font->MacCreateFromThemeFont(kThemeSmallSystemFont);
-            break;
-#else
-        case FONT_NORMAL:
-            font = CreateNormalFont() ; 
+            font->CreateSystemFont(wxOSX_SYSTEM_FONT_SMALL);
             break;
-        case FONT_SMALL:
-            font = CreateSmallFont(); 
-            break;
-#endif
         default:
             font = const_cast<wxFont*>(super::GetFont(item));
             break;