removing event handlers on non-owned windows when the destroy event is sent

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

diff --git a/src/osx/carbon/gdiobj.cpp b/src/osx/carbon/gdiobj.cpp
index 76156134e021d06944aa8e76b287e675ec18293e..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:
@@ -19,7 +19,8 @@
 #endif
 
 #include "wx/link.h"
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
+#include "wx/font.h"
 
 // Linker will discard entire object file without this
 wxFORCE_LINK_THIS_MODULE(gdiobj)
@@ -59,11 +60,11 @@ const wxFont* wxStockGDIMac::GetFont(Item item)
         {
         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);
+            font->CreateSystemFont(wxOSX_SYSTEM_FONT_SMALL);
             break;
         default:
             font = const_cast<wxFont*>(super::GetFont(item));