linking fixes

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

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index 55da0d4963455e60126a58af13f56ed96efc7206..b2c3b1c7f3fb4a4af8aecf4f017fab589dc9d66a 100644 (file)
--- a/src/os2/settings.cpp
+++ b/src/os2/settings.cpp
@@ -24,6 +24,53 @@
 #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
 )
@@ -44,7 +91,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
-            return vCol;
             break;
 
         case wxSYS_COLOUR_WINDOWFRAME:
@@ -56,7 +102,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
-            return vCol;
             break;
 
         case wxSYS_COLOUR_MENUTEXT:
@@ -79,7 +124,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
-            return vCol;
             break;
 
         case wxSYS_COLOUR_BTNSHADOW:
@@ -91,7 +135,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
-            return vCol;
             break;
 
         case wxSYS_COLOUR_BTNHIGHLIGHT:
@@ -103,7 +146,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
-            return vCol;
             break;
 
         //
@@ -118,7 +160,7 @@ wxColour wxSystemSettings::GetSystemColour(
         case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
         case wxSYS_COLOUR_BTNTEXT:
         case wxSYS_COLOUR_INFOTEXT:
-            return(*wxBLACK);
+            vCol = (*wxBLACK);
             break;
 
         //
@@ -128,7 +170,7 @@ wxColour wxSystemSettings::GetSystemColour(
         case wxSYS_COLOUR_ACTIVECAPTION:
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_HIGHLIGHT:
-            return(*wxBLUE);
+            vCol = (*wxBLUE);
             break;
 
         case wxSYS_COLOUR_SCROLLBAR:
@@ -142,7 +184,7 @@ wxColour wxSystemSettings::GetSystemColour(
         case wxSYS_COLOUR_3DDKSHADOW:
         case wxSYS_COLOUR_3DLIGHT:
         case wxSYS_COLOUR_INFOBK:
-            return(*wxLIGHT_GREY);
+            vCol = (*wxLIGHT_GREY);
             break;
 
         default:
@@ -154,7 +196,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
-            return vCol;
             break;
     }
     return(vCol);
@@ -187,8 +228,10 @@ wxFont wxSystemSettings::GetSystemFont(int index)
             break;
         }
     }
+    if(wxSWISS_FONT)
+         return *wxSWISS_FONT;
 
-    return wxFont();
+    return wxNullFont;
 }
 
 // Get a system metric, e.g. scrollbar size
@@ -313,3 +356,66 @@ int wxSystemSettings::GetSystemMetric(int index)
     return 0;
 }
 
+// Option functions (arbitrary name/value mapping)
+void wxSystemSettings::SetOption(
+  const wxString&                   rsName
+, const wxString&                   rsValue
+)
+{
+    int                             nIdx = wxSystemSettingsModule::sm_optionNames.Index( rsName
+                                                                                        ,FALSE
+                                                                                       );
+
+    if (nIdx == wxNOT_FOUND)
+    {
+        wxSystemSettingsModule::sm_optionNames.Add(rsName);
+        wxSystemSettingsModule::sm_optionValues.Add(rsValue);
+    }
+    else
+    {
+        wxSystemSettingsModule::sm_optionNames[nIdx] = rsName;
+        wxSystemSettingsModule::sm_optionValues[nIdx] = rsValue;
+    }
+}
+
+void wxSystemSettings::SetOption(
+  const wxString&                   rsName
+, int                               nValue
+)
+{
+    wxString                        sValStr;
+
+    sValStr.Printf(wxT("%d"), nValue);
+    SetOption( rsName
+              ,sValStr
+             );
+} // end of
+
+wxString wxSystemSettings::GetOption(
+  const wxString&                   rsName
+)
+{
+    int                             nIdx = wxSystemSettingsModule::sm_optionNames.Index( rsName
+                                                                                        ,FALSE
+                                                                                       );
+
+    if (nIdx == wxNOT_FOUND)
+        return wxEmptyString;
+    else
+        return wxSystemSettingsModule::sm_optionValues[nIdx];
+} // end of
+
+int wxSystemSettings::GetOptionInt(
+  const wxString&                   rsName
+)
+{
+    return wxAtoi(GetOption(rsName));
+} // end of
+
+bool wxSystemSettings::HasOption(
+  const wxString&                   rsName
+)
+{
+    return (wxSystemSettingsModule::sm_optionNames.Index(rsName, FALSE) != wxNOT_FOUND);
+} // end of wxSystemSettings::HasOption
+