added new project file having the new files

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

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index c47c24d5c4f8096e5ce23def836306fb3418e6b0..7983add4ee62cb342a436146a14a53d7a9bbfca9 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"
 
 #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
 )
 wxColour wxSystemSettings::GetSystemColour(
   int                               nIndex
 )


@@ -44,7 +91,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );

-            return vCol;

             break;
 
         case wxSYS_COLOUR_WINDOWFRAME:
             break;
 
         case wxSYS_COLOUR_WINDOWFRAME:


@@ -56,7 +102,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );

-            return vCol;

             break;
 
         case wxSYS_COLOUR_MENUTEXT:
             break;
 
         case wxSYS_COLOUR_MENUTEXT:


@@ -79,7 +124,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );

-            return vCol;

             break;
 
         case wxSYS_COLOUR_BTNSHADOW:
             break;
 
         case wxSYS_COLOUR_BTNSHADOW:


@@ -91,7 +135,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );

-            return vCol;

             break;
 
         case wxSYS_COLOUR_BTNHIGHLIGHT:
             break;
 
         case wxSYS_COLOUR_BTNHIGHLIGHT:


@@ -103,7 +146,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );

-            return vCol;

             break;
 
         //
             break;
 
         //


@@ -118,7 +160,7 @@ wxColour wxSystemSettings::GetSystemColour(
         case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
         case wxSYS_COLOUR_BTNTEXT:
         case wxSYS_COLOUR_INFOTEXT:
         case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
         case wxSYS_COLOUR_BTNTEXT:
         case wxSYS_COLOUR_INFOTEXT:

-            return(*wxBLACK);
+            vCol = (*wxBLACK);

             break;
 
         //
             break;
 
         //


@@ -128,7 +170,7 @@ wxColour wxSystemSettings::GetSystemColour(
         case wxSYS_COLOUR_ACTIVECAPTION:
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_HIGHLIGHT:
         case wxSYS_COLOUR_ACTIVECAPTION:
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_HIGHLIGHT:

-            return(*wxBLUE);
+            vCol = (*wxBLUE);

             break;
 
         case wxSYS_COLOUR_SCROLLBAR:
             break;
 
         case wxSYS_COLOUR_SCROLLBAR:


@@ -142,7 +184,7 @@ wxColour wxSystemSettings::GetSystemColour(
         case wxSYS_COLOUR_3DDKSHADOW:
         case wxSYS_COLOUR_3DLIGHT:
         case wxSYS_COLOUR_INFOBK:
         case wxSYS_COLOUR_3DDKSHADOW:
         case wxSYS_COLOUR_3DLIGHT:
         case wxSYS_COLOUR_INFOBK:

-            return(*wxLIGHT_GREY);
+            vCol = (*wxLIGHT_GREY);

             break;
 
         default:
             break;
 
         default:


@@ -154,7 +196,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );

-            return vCol;

             break;
     }
     return(vCol);
             break;
     }
     return(vCol);


@@ -187,8 +228,10 @@ wxFont wxSystemSettings::GetSystemFont(int index)
             break;
         }
     }
             break;
         }
     }

+    if(wxSWISS_FONT)
+         return *wxSWISS_FONT;

 
 

-    return *wxSWISS_FONT;
+    return wxNullFont;

 }
 
 // Get a system metric, e.g. scrollbar size
 }
 
 // Get a system metric, e.g. scrollbar size