Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / univ / settingsuniv.cpp

diff --git a/src/univ/settingsuniv.cpp b/src/univ/settingsuniv.cpp
index 24a352a73680c4bfefac3a01cdaea88234111f08..8d7ea622ca93fb18a0b47a5712971c37c0fb0577 100644 (file)
--- a/src/univ/settingsuniv.cpp
+++ b/src/univ/settingsuniv.cpp
@@ -72,10 +72,20 @@ wxColour wxSystemSettings::GetColour(wxSystemColour index)
         wxColourScheme::MAX /* wxSYS_COLOUR_INFOTEXT */,
         wxColourScheme::MAX /* wxSYS_COLOUR_INFOBK */,
         wxColourScheme::WINDOW /* wxSYS_COLOUR_LISTBOX */,
         wxColourScheme::MAX /* wxSYS_COLOUR_INFOTEXT */,
         wxColourScheme::MAX /* wxSYS_COLOUR_INFOBK */,
         wxColourScheme::WINDOW /* wxSYS_COLOUR_LISTBOX */,

+        wxColourScheme::MAX /* wxSYS_COLOUR_HOTLIGHT */,
+        wxColourScheme::TITLEBAR_ACTIVE_TEXT /* wxSYS_COLOUR_GRADIENTACTIVECAPTION */,
+        wxColourScheme::TITLEBAR_TEXT /* wxSYS_COLOUR_GRADIENTINACTIVECAPTION */,
+        wxColourScheme::MAX /* wxSYS_COLOUR_MENUHILIGHT */,
+        wxColourScheme::MAX /* wxSYS_COLOUR_MENUBAR */,
+        wxColourScheme::CONTROL_TEXT /* wxSYS_COLOUR_LISTBOXTEXT */,
+        wxColourScheme::HIGHLIGHT_TEXT /* wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT */

     };
 
     };
 

+    wxCOMPILE_TIME_ASSERT( WXSIZEOF(s_mapSysToThemeCol) == wxSYS_COLOUR_MAX,
+                           StdColDefsMismatch );
+

     wxCHECK_MSG( index < (int)WXSIZEOF(s_mapSysToThemeCol), wxNullColour,
     wxCHECK_MSG( index < (int)WXSIZEOF(s_mapSysToThemeCol), wxNullColour,

-                 _T("invalid wxSystemColour") );
+                 wxT("invalid wxSystemColour") );

 
     wxColourScheme::StdColour col = s_mapSysToThemeCol[index];
     if ( col == wxColourScheme::MAX )
 
     wxColourScheme::StdColour col = s_mapSysToThemeCol[index];
     if ( col == wxColourScheme::MAX )