Applied patch [ 866387 ] wxGenericDirCtrl does not accept multiple wildcards

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

diff --git a/src/x11/settings.cpp b/src/x11/settings.cpp
index d27621f7c45bea38b80bd79b676f5b979e76c0c9..188217ba890ac0f37dbcfc3dd3806a24e3db2427 100644 (file)
--- a/src/x11/settings.cpp
+++ b/src/x11/settings.cpp
@@ -13,17 +13,26 @@
 // 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)
 {
-    // Overridden by wxSystemSettings::GetColour in wxUniversal
-    // to do the Right Thing
+    switch (index)
+    {
+        case wxSYS_COLOUR_APPWORKSPACE:
+            return wxColour( 0xc0c0c0 );
+            
+        default:
+            break;
+    }
+    
+    // Overridden mostly by wxSystemSettings::GetColour in wxUniversal
     return *wxWHITE;
 }
 
@@ -115,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;