fix for assert when setting tooltip for a readonly combo

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

diff --git a/src/motif/settings.cpp b/src/motif/settings.cpp
index 1c639007d86841d21af17eea2314c559ff4b9575..62e04d0be8e28a7c0299b178630829b13b97da38 100644 (file)
--- a/src/motif/settings.cpp
+++ b/src/motif/settings.cpp
@@ -24,13 +24,16 @@ wxColour wxSystemSettings::GetSystemColour(int 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_WINDOW:
     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 *wxBLUE;
+    }
     case wxSYS_COLOUR_BTNHIGHLIGHT:
+       case wxSYS_COLOUR_LISTBOX:
       //    case wxSYS_COLOUR_3DHIGHLIGHT:      // Same as wxSYS_COLOUR_BTNHIGHLIGHT
     {
         return *wxWHITE;
@@ -65,11 +72,11 @@ wxColour wxSystemSettings::GetSystemColour(int index)
     case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
     case wxSYS_COLOUR_INFOTEXT:
     {
-      return *wxBLACK;
+        return *wxBLACK;
     }
     case wxSYS_COLOUR_HIGHLIGHTTEXT:
     {
-      return *wxWHITE;
+        return *wxWHITE;
     }
     case wxSYS_COLOUR_INFOBK:
     case wxSYS_COLOUR_APPWORKSPACE:
@@ -222,6 +229,5 @@ int wxSystemSettings::GetSystemMetric(int index)
                default:
                        return 0;
        }
-       return 0;
 }