fixed compilation warnings with GTK+ 2.0

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

diff --git a/src/motif/settings.cpp b/src/motif/settings.cpp
index 357fe42c8fba3c6554997d120359a5a5e7aae829..7cef3207ffd803a325755682fd8a653f00a4e1f3 100644 (file)
--- a/src/motif/settings.cpp
+++ b/src/motif/settings.cpp
@@ -18,37 +18,103 @@
 #endif
 
 #include "wx/settings.h"
+#include "wx/gdicmn.h"
 
-wxColour wxSystemSettings::GetSystemColour(int index)
+wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 {
-    // TODO
-    return wxColour();
+  switch (index)
+  {
+    case wxSYS_COLOUR_WINDOW:
+    {
+        return *wxWHITE;
+    }
+    case wxSYS_COLOUR_SCROLLBAR:
+      //    case wxSYS_COLOUR_DESKTOP:          // Same as wxSYS_COLOUR_BACKGROUND
+    case wxSYS_COLOUR_BACKGROUND:
+    case wxSYS_COLOUR_ACTIVECAPTION:
+    case wxSYS_COLOUR_INACTIVECAPTION:
+    case wxSYS_COLOUR_MENU:
+    case wxSYS_COLOUR_WINDOWFRAME:
+    case wxSYS_COLOUR_ACTIVEBORDER:
+    case wxSYS_COLOUR_INACTIVEBORDER:
+    case wxSYS_COLOUR_BTNFACE:
+      //    case wxSYS_COLOUR_3DFACE:           // Same as wxSYS_COLOUR_BTNFACE
+    case wxSYS_COLOUR_GRAYTEXT:
+    {
+        return wxColour("LIGHT GREY");
+    }
+    case wxSYS_COLOUR_BTNSHADOW:
+      //    case wxSYS_COLOUR_3DSHADOW:         // Same as wxSYS_COLOUR_BTNSHADOW
+    {
+        return wxColour("GREY");
+    }
+    case wxSYS_COLOUR_3DDKSHADOW:
+    {
+        return *wxBLACK;
+    }
+    case wxSYS_COLOUR_HIGHLIGHT:
+    {
+        return *wxBLUE;
+    }
+    case wxSYS_COLOUR_BTNHIGHLIGHT:
+    case wxSYS_COLOUR_LISTBOX:
+       //    case wxSYS_COLOUR_3DHIGHLIGHT:      // Same as wxSYS_COLOUR_BTNHIGHLIGHT
+    {
+        return *wxWHITE;
+    }
+    case wxSYS_COLOUR_3DLIGHT:
+    {
+        return wxColour("LIGHT GREY");
+    }
+    case wxSYS_COLOUR_MENUTEXT:
+    case wxSYS_COLOUR_WINDOWTEXT:
+    case wxSYS_COLOUR_CAPTIONTEXT:
+    case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
+    case wxSYS_COLOUR_BTNTEXT:
+    case wxSYS_COLOUR_INFOTEXT:
+    {
+        return *wxBLACK;
+    }
+    case wxSYS_COLOUR_HIGHLIGHTTEXT:
+    {
+        return *wxWHITE;
+    }
+    case wxSYS_COLOUR_INFOBK:
+    case wxSYS_COLOUR_APPWORKSPACE:
+    {
+        return wxColour("LIGHT GREY");
+    }
+
+    case wxSYS_COLOUR_HOTLIGHT:
+    case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
+    case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
+    case wxSYS_COLOUR_MENUHILIGHT:
+    case wxSYS_COLOUR_MENUBAR:
+        // TODO
+        return wxColour("LIGHT GREY");
+
+    default:
+    case wxSYS_COLOUR_MAX:
+        wxFAIL_MSG( _T("unknown colour") );
+  }
+  return *wxWHITE;
 }
 
-wxFont wxSystemSettings::GetSystemFont(int index)
+wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 {
-    // TODO
     switch (index)
     {
-        case wxSYS_DEVICE_DEFAULT_FONT:
-        {
-            break;
-        }
-        case wxSYS_DEFAULT_PALETTE:
-        {
-            break;
-        }
         case wxSYS_SYSTEM_FIXED_FONT:
         {
+            return wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, FALSE);
             break;
         }
+        case wxSYS_DEVICE_DEFAULT_FONT:
         case wxSYS_SYSTEM_FONT:
-        {
-            break;
-        }
-        default:
         case wxSYS_DEFAULT_GUI_FONT:
+        default:
         {
+            return wxFont(12, wxSWISS, wxNORMAL, wxNORMAL, FALSE);
             break;
         }
     }
@@ -57,124 +123,135 @@ wxFont wxSystemSettings::GetSystemFont(int index)
 }
 
 // Get a system metric, e.g. scrollbar size
-int wxSystemSettings::GetSystemMetric(int index)
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
 {
        switch ( index)
        {
         case wxSYS_MOUSE_BUTTONS:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_BORDER_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_BORDER_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_CURSOR_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_CURSOR_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_DCLICK_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_DCLICK_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_DRAG_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_DRAG_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_EDGE_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_EDGE_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_HSCROLL_ARROW_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_HSCROLL_ARROW_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_HTHUMB_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_ICON_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_ICON_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_ICONSPACING_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_ICONSPACING_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_WINDOWMIN_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_WINDOWMIN_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_SCREEN_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_SCREEN_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_FRAMESIZE_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_FRAMESIZE_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_SMALLICON_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_SMALLICON_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_HSCROLL_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_VSCROLL_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_VSCROLL_ARROW_X:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_VSCROLL_ARROW_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_VTHUMB_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_CAPTION_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_MENU_Y:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_NETWORK_PRESENT:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_PENWINDOWS_PRESENT:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_SHOW_SOUNDS:
             // TODO
-                       return 0;
+            return 0;
         case wxSYS_SWAP_BUTTONS:
             // TODO
-                       return 0;
-               default:
-                       return 0;
-       }
-       return 0;
+            return 0;
+        default:
+            return 0;
+    }
 }
 
+bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
+{
+    switch (index)
+    {
+        case wxSYS_CAN_ICONIZE_FRAME: 
+        case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
+            return TRUE;
+            
+        default:
+            return FALSE;
+    }
+}