Tries to fix wxListBox focus problems.

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

diff --git a/src/motif/settings.cpp b/src/motif/settings.cpp
index 9bfe3411ca7646c8e03645f49d4098792f3a54c4..b75b68efc92fbc451f76d1b094bdf59688695eb1 100644 (file)
--- a/src/motif/settings.cpp
+++ b/src/motif/settings.cpp
@@ -24,13 +24,16 @@ wxColour wxSystemSettings::GetSystemColour(int index)
 {
   switch (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_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_WINDOW:

     case wxSYS_COLOUR_WINDOWFRAME:
     case wxSYS_COLOUR_ACTIVEBORDER:
     case wxSYS_COLOUR_INACTIVEBORDER:
     case wxSYS_COLOUR_WINDOWFRAME:
     case wxSYS_COLOUR_ACTIVEBORDER:
     case wxSYS_COLOUR_INACTIVEBORDER:


@@ -50,7 +53,11 @@ wxColour wxSystemSettings::GetSystemColour(int index)
         return *wxBLACK;
     }
     case wxSYS_COLOUR_HIGHLIGHT:
         return *wxBLACK;
     }
     case wxSYS_COLOUR_HIGHLIGHT:

+    {
+        return *wxBLUE;
+    }

     case wxSYS_COLOUR_BTNHIGHLIGHT:
     case wxSYS_COLOUR_BTNHIGHLIGHT:

+       case wxSYS_COLOUR_LISTBOX:

       //    case wxSYS_COLOUR_3DHIGHLIGHT:      // Same as wxSYS_COLOUR_BTNHIGHLIGHT
     {
         return *wxWHITE;
       //    case wxSYS_COLOUR_3DHIGHLIGHT:      // Same as wxSYS_COLOUR_BTNHIGHLIGHT
     {
         return *wxWHITE;


@@ -65,16 +72,17 @@ wxColour wxSystemSettings::GetSystemColour(int index)
     case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
     case wxSYS_COLOUR_INFOTEXT:
     {
     case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
     case wxSYS_COLOUR_INFOTEXT:
     {

-      return *wxBLACK;
+        return *wxBLACK;

     }
     case wxSYS_COLOUR_HIGHLIGHTTEXT:
     {
     }
     case wxSYS_COLOUR_HIGHLIGHTTEXT:
     {

-      return *wxWHITE;
+        return *wxWHITE;

     }
     case wxSYS_COLOUR_INFOBK:
     case wxSYS_COLOUR_APPWORKSPACE:
     {
     }
     case wxSYS_COLOUR_INFOBK:
     case wxSYS_COLOUR_APPWORKSPACE:
     {

-      return *wxWHITE;
+        return wxColour("LIGHT GREY");
+       //      return *wxWHITE;

     }
   }
   return *wxWHITE;
     }
   }
   return *wxWHITE;


@@ -221,6 +229,16 @@ int wxSystemSettings::GetSystemMetric(int index)
                default:
                        return 0;
        }
                default:
                        return 0;
        }

-       return 0;

 }
 
 }
 

+bool wxSystemSettings::GetCapability(int index)
+{
+    switch (index)
+    {
+        case wxSYS_CAN_ICONIZE_FRAME: 
+        case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
+            return TRUE; break;
+        default:
+            return FALSE;
+    }
+}