making ref counting behavior consistent, activating QD variante for polygon region...

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

diff --git a/src/mac/carbon/gdiobj.cpp b/src/mac/carbon/gdiobj.cpp
index 436c1b612dd67925899f968bc933595e0f541e55..76156134e021d06944aa8e76b287e675ec18293e 100644 (file)
--- a/src/mac/carbon/gdiobj.cpp
+++ b/src/mac/carbon/gdiobj.cpp
@@ -15,11 +15,15 @@
 
 #ifndef WX_PRECOMP
     #include "wx/gdicmn.h"
+    #include "wx/module.h"
 #endif
 
-#include "wx/module.h"
+#include "wx/link.h"
 #include "wx/mac/private.h"
 
+// Linker will discard entire object file without this
+wxFORCE_LINK_THIS_MODULE(gdiobj)
+
 class wxStockGDIMac: public wxStockGDI, public wxModule
 {
 public:
@@ -55,11 +59,11 @@ const wxFont* wxStockGDIMac::GetFont(Item item)
         {
         case FONT_NORMAL:
             font = new wxFont;
-            font->MacCreateThemeFont(kThemeSystemFont);
+            font->MacCreateFromThemeFont(kThemeSystemFont);
             break;
         case FONT_SMALL:
             font = new wxFont;
-            font->MacCreateThemeFont(kThemeSmallSystemFont);
+            font->MacCreateFromThemeFont(kThemeSmallSystemFont);
             break;
         default:
             font = const_cast<wxFont*>(super::GetFont(item));