fixed compilation in Unicode build

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

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index 55da0d4963455e60126a58af13f56ed96efc7206..1dc15fcfac546e0ce737d7610d8dd54c6ea079e5 100644 (file)
--- a/src/os2/settings.cpp
+++ b/src/os2/settings.cpp
@@ -18,14 +18,62 @@
 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/gdicmn.h"
 #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"
 
 #endif
 
 #include "wx/settings.h"
 #include "wx/window.h"
 #include "wx/os2/private.h"
 

-wxColour wxSystemSettings::GetSystemColour(
-  int                               nIndex
+// 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 wxSystemSettingsNative::GetColour(
+  wxSystemColour                    nIndex

 )
 {
     COLORREF                        vRef;
 )
 {
     COLORREF                        vRef;


@@ -44,7 +92,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 +103,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 +125,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 +136,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 +147,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );

-            return vCol;

             break;
 
         //
             break;
 
         //


@@ -118,7 +161,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 +171,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 +185,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,13 +197,14 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );

-            return vCol;

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

-} // end of wxSystemSettings::GetSystemColour
+} // end of wxSystemSettingsNative::GetColour

 
 

-wxFont wxSystemSettings::GetSystemFont(int index)
+wxFont wxSystemSettingsNative::GetFont(
+  wxSystemFont                      index
+)

 {
     // TODO
     switch (index)
 {
     // TODO
     switch (index)


@@ -187,12 +231,16 @@ wxFont wxSystemSettings::GetSystemFont(int index)
             break;
         }
     }
             break;
         }
     }

+    if(wxSWISS_FONT)
+         return *wxSWISS_FONT;

 
 

-    return wxFont();
+    return wxNullFont;

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

-int wxSystemSettings::GetSystemMetric(int index)
+int wxSystemSettingsNative::GetMetric(
+  wxSystemMetric                    index
+)

 {
     switch ( index)
     {
 {
     switch ( index)
     {


@@ -313,3 +361,20 @@ int wxSystemSettings::GetSystemMetric(int index)
     return 0;
 }
 
     return 0;
 }
 

+bool wxSystemSettingsNative::HasFeature(
+  wxSystemFeature                   index
+)
+{
+    switch (index)
+    {
+        case wxSYS_CAN_ICONIZE_FRAME:
+            return TRUE;
+
+        case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
+            return FALSE;
+
+        default:
+            return FALSE;
+    }
+    return FALSE;
+}