From 221ed5767f7ef4d51b0bbef50ec9f53edfaa46f2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 28 Jan 2002 16:09:49 +0000
Subject: [PATCH] warning fixes in GetColor() for the newly added values

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/settings.cpp  | 12 ++++++++++++
 src/gtk1/settings.cpp | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 69209c00d3..5bcfff6c21 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;
diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 69209c00d3..5bcfff6c21 100644
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/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;