X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b0f84db4a3988a17c380824e5b7183a18f89622..02a1dfbae942c883d8651e34dcfbc5153aabc56e:/src/msw/settings.cpp

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index b2788d0aae..5cf3b79700 100644
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -33,6 +33,10 @@
 
 #include "wx/msw/private.h"
 
+#ifndef SPI_GETFLATMENU
+#define SPI_GETFLATMENU                     0x1022
+#endif
+
 #include "wx/module.h"
 #include "wx/fontutil.h"
 
@@ -156,7 +160,17 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         {
             // 5.1 is Windows XP
             useDefault = FALSE;
-        }
+ 			// Determine if we are using flat menus, only then allow wxSYS_COLOUR_MENUBAR
+			if ( index == wxSYS_COLOUR_MENUBAR )
+			{
+				BOOL isFlat ;
+				if ( SystemParametersInfo( SPI_GETFLATMENU , 0 ,&isFlat, 0 ) )
+				{
+					if ( !isFlat )
+						index = wxSYS_COLOUR_MENU ;
+				}
+			}
+       }
 #else
         useDefault = TRUE;
 #endif // __WIN32__
@@ -333,7 +347,8 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
     // TODO: probably use wxUniv themes functionality
     return 0;
 #else // !__WXMICROWIN__
-    wxCHECK_MSG( index < WXSIZEOF(gs_metricsMap), 0, _T("invalid metric") );
+    wxCHECK_MSG( index > 0 && (size_t)index < WXSIZEOF(gs_metricsMap), 0,
+                 _T("invalid metric") );
 
     int indexMSW = gs_metricsMap[index];
     if ( indexMSW == -1 )