X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/253293c10326afa0226932eab4753d188e1e22e2..28978e0c5af8ec9a6ee0ab82456567cbfca221f7:/src/gtk/settings.cpp?ds=inline

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 85b2c7c312..eab86263f5 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -14,7 +14,7 @@
 
 #include "wx/settings.h"
 #include "wx/debug.h"
-
+#include "wx/module.h"
 #include "wx/cmndata.h"
 
 #include <gdk/gdk.h>
@@ -73,18 +73,34 @@ wxColour *g_systemBtnTextColour       = (wxColour *) NULL;
 
 wxFont *g_systemFont = (wxFont *) NULL;
 
-void wxSystemSettings::Done()
+// ----------------------------------------------------------------------------
+// wxSystemSettingsModule
+// ----------------------------------------------------------------------------
+
+class wxSystemSettingsModule : public wxModule
 {
-//    delete g_systemWinColour;
-    delete g_systemBtnFaceColour;
-    delete g_systemBtnShadowColour;
-    delete g_systemBtnHighlightColour;
-    delete g_systemHighlightColour;
-    delete g_systemHighlightTextColour;
-    delete g_systemListBoxColour;
-    delete g_systemFont;
-    delete g_systemBtnTextColour;
-}
+public:
+    bool OnInit() { return TRUE; }
+    void OnExit()
+    {
+        //delete g_systemWinColour;
+        delete g_systemBtnFaceColour;
+        delete g_systemBtnShadowColour;
+        delete g_systemBtnHighlightColour;
+        delete g_systemHighlightColour;
+        delete g_systemHighlightTextColour;
+        delete g_systemListBoxColour;
+        delete g_systemFont;
+        delete g_systemBtnTextColour;
+    }
+    DECLARE_DYNAMIC_CLASS(wxSystemSettingsModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
+
+// ----------------------------------------------------------------------------
+// wxSystemSettings implementation
+// ----------------------------------------------------------------------------
 
 // kind of widget to use in GetColourFromGTKWidget
 enum wxGtkWidgetType
@@ -101,7 +117,7 @@ enum wxGtkColourType
     wxGTK_BASE
 };
 
-// wxSystemSettings::GetSystemColour() helper: get the colours from a GTK+
+// wxSystemSettings::GetColour() helper: get the colours from a GTK+
 // widget style, return true if we did get them, false to use defaults
 static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
                                    wxGtkWidgetType type = wxGTK_BUTTON,
@@ -166,7 +182,7 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
     return ok;
 }
 
-wxColour wxSystemSettings::GetSystemColour( int index )
+wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
 {
     switch (index)
     {
@@ -207,7 +223,7 @@ wxColour wxSystemSettings::GetSystemColour( int index )
         //case wxSYS_COLOUR_3DSHADOW:
             if (!g_systemBtnShadowColour)
             {
-                wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE));
+                wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE));
                 g_systemBtnShadowColour =
                    new wxColour((unsigned char) (faceColour.Red() * 0.666),
                                 (unsigned char) (faceColour.Green() * 0.666),
@@ -299,7 +315,7 @@ wxColour wxSystemSettings::GetSystemColour( int index )
         case wxSYS_COLOUR_HIGHLIGHTTEXT:
             if (!g_systemHighlightTextColour)
             {
-                wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
+                wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT);
                 if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
                     g_systemHighlightTextColour = new wxColour(*wxBLACK);
                 else
@@ -315,7 +331,7 @@ wxColour wxSystemSettings::GetSystemColour( int index )
   return *wxWHITE;
 }
 
-wxFont wxSystemSettings::GetSystemFont( int index )
+wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
 {
     switch (index)
     {
@@ -350,12 +366,13 @@ wxFont wxSystemSettings::GetSystemFont( int index )
             }
             return *g_systemFont;
         }
-    }
 
-    return wxNullFont;
+        default:
+            return wxNullFont;
+    }
 }
 
-int wxSystemSettings::GetSystemMetric( int index )
+int wxSystemSettingsNative::GetMetric( wxSystemMetric index )
 {
     switch (index)
     {
@@ -363,21 +380,22 @@ int wxSystemSettings::GetSystemMetric( int index )
         case wxSYS_SCREEN_Y:   return gdk_screen_height();
         case wxSYS_HSCROLL_Y:  return 15;
         case wxSYS_VSCROLL_X:  return 15;
+        default:               
+            wxFAIL_MSG( wxT("wxSystemSettings::GetMetric not fully implemented") );
+            return 0;
     }
-
-    wxCHECK_MSG( index, 0, wxT("wxSystemSettings::GetSystemMetric not fully implemented") );
-
-    return 0;
 }
 
-bool wxSystemSettings::GetCapability(int index)
+bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
 {
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME: 
-            return FALSE; break;
+            return FALSE; 
+            break;
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
-            return TRUE; break;
+            return TRUE; 
+            break;
         default:
             return FALSE;
     }