removed unneeded makefiles

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

diff --git a/src/x11/settings.cpp b/src/x11/settings.cpp
index 5d64ffcd062217664379ee7b1e067cc4aecd3687..188217ba890ac0f37dbcfc3dd3806a24e3db2427 100644 (file)
--- a/src/x11/settings.cpp
+++ b/src/x11/settings.cpp
@@ -13,80 +13,27 @@
 // per-user file, which can be edited using a Windows-control-panel clone.
 // Also they should be documented better. Some are very MS Windows-ish.
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "settings.h"
 #endif
 
 #include "wx/settings.h"
 #include "wx/gdicmn.h"
+#include "wx/x11/private.h"
 
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 {
-  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:
+    switch (index)
     {
-        return wxColour("LIGHT GREY");
-       //      return *wxWHITE;
+        case wxSYS_COLOUR_APPWORKSPACE:
+            return wxColour( 0xc0c0c0 );
+            
+        default:
+            break;
     }
-  }
-  return *wxWHITE;
+    
+    // Overridden mostly by wxSystemSettings::GetColour in wxUniversal
+    return *wxWHITE;
 }
 
 wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
@@ -177,11 +124,11 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
             // TODO
             return 0;
         case wxSYS_SCREEN_X:
-            // TODO
-            return 0;
+            return DisplayWidth( wxGlobalDisplay(), 0 );
+            
         case wxSYS_SCREEN_Y:
-            // TODO
-            return 0;
+            return DisplayHeight( wxGlobalDisplay(), 0 );
+            
         case wxSYS_FRAMESIZE_X:
             // TODO
             return 0;