fixed a memory leak and an initialization problem

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

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index f7394528e158b630564951de36aeb6b5bda732de..6745891e57f70ab7af975b9f849018a8162aca2b 100644 (file)
--- a/src/os2/settings.cpp
+++ b/src/os2/settings.cpp
@@ -18,12 +18,60 @@
 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/gdicmn.h"
+#include "wx/module.h"
 #endif
 
 #include "wx/settings.h"
 #include "wx/window.h"
 #include "wx/os2/private.h"
 
+// the module which is used to clean up wxSystemSettings data (this is a
+// singleton class so it can't be done in the dtor)
+class wxSystemSettingsModule : public wxModule
+{
+    friend class wxSystemSettings;
+public:
+    virtual bool OnInit();
+    virtual void OnExit();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSystemSettingsModule)
+
+    static wxArrayString   sm_optionNames;
+    static wxArrayString   sm_optionValues;
+};
+
+// ----------------------------------------------------------------------------
+// global data
+// ----------------------------------------------------------------------------
+
+static wxFont *gs_fontDefault = NULL;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxSystemSettingsModule
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
+
+wxArrayString wxSystemSettingsModule::sm_optionNames;
+wxArrayString wxSystemSettingsModule::sm_optionValues;
+
+bool wxSystemSettingsModule::OnInit()
+{
+    return TRUE;
+}
+
+void wxSystemSettingsModule::OnExit()
+{
+    sm_optionNames.Clear();
+    sm_optionValues.Clear();
+    delete gs_fontDefault;
+}
+
 wxColour wxSystemSettings::GetSystemColour(
   int                               nIndex
 )
@@ -309,3 +357,15 @@ int wxSystemSettings::GetSystemMetric(int index)
     return 0;
 }
 
+bool wxSystemSettings::GetCapability(int index)
+{
+    switch (index)
+    {
+        case wxSYS_CAN_ICONIZE_FRAME:
+        case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
+            return TRUE; break;
+        default:
+            return FALSE;
+    }
+    return FALSE;
+}