X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17d61cbfb41f6ae6c37bf9af8556113552cf0649..11a2ce5ad289cb21b35cc21131b46f75dd4af060:/src/gtk/settings.cpp

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 69209c00d3..9aed45b5a9 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -156,6 +156,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:
+        case wxSYS_COLOUR_MENUBAR:
         case wxSYS_COLOUR_3DLIGHT:
             if (!g_systemBtnFaceColour)
             {
@@ -292,6 +293,17 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
 
         case wxSYS_COLOUR_APPWORKSPACE:
             return *wxWHITE;    // ?
+
+        case wxSYS_COLOUR_HOTLIGHT:
+        case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
+        case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
+        case wxSYS_COLOUR_MENUHILIGHT:
+            // TODO
+            return *wxBLACK;
+
+        case wxSYS_COLOUR_MAX:
+        default:
+            wxFAIL_MSG( _T("unknown system colour index") );
   }
 
   return *wxWHITE;
@@ -337,7 +349,9 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index )
         // VZ: is there any way to get the cursor size with GDK?
         case wxSYS_CURSOR_X:   return 16;
         case wxSYS_CURSOR_Y:   return 16;
-
+        // MBN: ditto for icons
+        case wxSYS_ICON_X:     return 32;
+        case wxSYS_ICON_Y:     return 32;
         default:               
             wxFAIL_MSG( wxT("wxSystemSettings::GetMetric not fully implemented") );
             return 0;