removed some commented-out code

[wxWidgets.git] / src / os2 / gdiobj.cpp

diff --git a/src/os2/gdiobj.cpp b/src/os2/gdiobj.cpp
index af715606bc28110af9500fd3f35f38390a4beb47..0177d3c82de92a580f01bdc4df881f2b553e3fa7 100644 (file)
--- a/src/os2/gdiobj.cpp
+++ b/src/os2/gdiobj.cpp
@@ -1,18 +1,63 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gdiobj.cpp
+// Name:        src/os2/gdiobj.cpp

 // Purpose:     wxGDIObject class
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Purpose:     wxGDIObject class
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #include "wx/gdiobj.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #include "wx/gdiobj.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/font.h"
+    #include "wx/gdicmn.h"
+#endif
+

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

-// TODO: Nothing to do, unless you want to.
+class wxStockGDIPM: public wxStockGDI
+{
+public:
+    wxStockGDIPM();
+
+    virtual const wxFont* GetFont(Item item);
+
+private:
+    typedef wxStockGDI super;
+};
+
+static wxStockGDIPM gs_wxStockGDIPM_instance;
+
+wxStockGDIPM::wxStockGDIPM()
+{
+    // Override default instance
+    ms_instance = this;
+}
+
+const wxFont* wxStockGDIPM::GetFont(Item item)
+{
+    wxFont* font = wx_static_cast(wxFont*, ms_stockObject[item]);
+    if (font == NULL)
+    {
+        const int fontSize = 12;
+        switch (item)
+        {
+        case FONT_NORMAL:
+            font = new wxFont(fontSize, wxMODERN, wxNORMAL, wxBOLD);
+            break;
+        case FONT_SMALL:
+            font = new wxFont(fontSize - 4, wxSWISS, wxNORMAL, wxNORMAL);
+            break;
+        default:
+            font = wx_const_cast(wxFont*, super::GetFont(item));
+            break;
+        }
+        ms_stockObject[item] = font;
+    }
+    return font;
+}