Fixed OpenWatcom (strange) scope related crash.

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

diff --git a/src/mac/classic/gdiobj.cpp b/src/mac/classic/gdiobj.cpp
index 1f65f6f86b1849db469cbdd6a63bc8aab59f7499..9b74779924c31da498b57262c8a3a4942210dac1 100644 (file)
--- a/src/mac/classic/gdiobj.cpp
+++ b/src/mac/classic/gdiobj.cpp
@@ -10,7 +10,53 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/gdiobj.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/gdiobj.h"

+#include "wx/gdicmn.h"
+#include "wx/mac/private.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 

-// TODO: Nothing to do, unless you want to.
+class wxStockGDIMac: public wxStockGDI
+{
+public:
+    wxStockGDIMac();
+
+    virtual const wxFont* GetFont(Item item);
+
+private:
+    typedef wxStockGDI super;
+};
+
+static wxStockGDIMac gs_wxStockGDIMac_instance;
+
+wxStockGDIMac::wxStockGDIMac()
+{
+    // Override default instance
+    ms_instance = this;
+}
+
+const wxFont* wxStockGDIMac::GetFont(Item item)
+{
+    wxFont* font = wx_static_cast(wxFont*, ms_stockObject[item]);
+    if (font == NULL)
+    {
+        Str255 fontName;
+        SInt16 fontSize;
+        Style fontStyle;
+        switch (item)
+        {
+        case FONT_NORMAL:
+            GetThemeFont(kThemeSystemFont, GetApplicationScript(), fontName, &fontSize, &fontStyle);
+            font = new wxFont(fontSize, wxMODERN, wxNORMAL, wxNORMAL, false, wxMacMakeStringFromPascal(fontName));
+            break;
+        case FONT_SMALL:
+            GetThemeFont(kThemeSmallSystemFont, GetApplicationScript(), fontName, &fontSize, &fontStyle);
+            font = new wxFont(fontSize, wxSWISS, wxNORMAL, wxNORMAL, false, wxMacMakeStringFromPascal(fontName));
+            break;
+        default:
+            font = wx_const_cast(wxFont*, super::GetFont(item));
+            break;
+        }
+        ms_stockObject[item] = font;
+    }
+    return font;
+}