fixed a (harmless) BoundsChecker warning

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

diff --git a/src/univ/colschem.cpp b/src/univ/colschem.cpp
index 56ee6601536fad8b825cba01533b14199ef42b02..3339b53c2114aa98a7898e5d0d6677a0865b3925 100644 (file)
--- a/src/univ/colschem.cpp
+++ b/src/univ/colschem.cpp
@@ -48,8 +48,6 @@ wxColourScheme::~wxColourScheme()
 {
 }
 
 {
 }
 

-#ifdef wxHAS_SS_NATIVE
-

 // ----------------------------------------------------------------------------
 // wxSystemSettings
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxSystemSettings
 // ----------------------------------------------------------------------------


@@ -74,17 +72,17 @@ wxColour wxSystemSettings::GetColour(wxSystemColour index)
         wxColourScheme::MAX /* wxSYS_COLOUR_APPWORKSPACE */,
         wxColourScheme::HIGHLIGHT /* wxSYS_COLOUR_HIGHLIGHT */,
         wxColourScheme::HIGHLIGHT_TEXT /* wxSYS_COLOUR_HIGHLIGHTTEXT */,
         wxColourScheme::MAX /* wxSYS_COLOUR_APPWORKSPACE */,
         wxColourScheme::HIGHLIGHT /* wxSYS_COLOUR_HIGHLIGHT */,
         wxColourScheme::HIGHLIGHT_TEXT /* wxSYS_COLOUR_HIGHLIGHTTEXT */,

-        wxColourScheme::SCROLLBAR /* wxSYS_COLOUR_BTNFACE */,
+        wxColourScheme::CONTROL /* wxSYS_COLOUR_BTNFACE */,

         wxColourScheme::SHADOW_DARK /* wxSYS_COLOUR_BTNSHADOW */,
         wxColourScheme::CONTROL_TEXT_DISABLED /* wxSYS_COLOUR_GRAYTEXT */,
         wxColourScheme::CONTROL_TEXT /* wxSYS_COLOUR_BTNTEXT */,
         wxColourScheme::MAX /* wxSYS_COLOUR_INACTIVECAPTIONTEXT */,
         wxColourScheme::SHADOW_HIGHLIGHT /* wxSYS_COLOUR_BTNHIGHLIGHT */,
         wxColourScheme::SHADOW_DARK /* wxSYS_COLOUR_BTNSHADOW */,
         wxColourScheme::CONTROL_TEXT_DISABLED /* wxSYS_COLOUR_GRAYTEXT */,
         wxColourScheme::CONTROL_TEXT /* wxSYS_COLOUR_BTNTEXT */,
         wxColourScheme::MAX /* wxSYS_COLOUR_INACTIVECAPTIONTEXT */,
         wxColourScheme::SHADOW_HIGHLIGHT /* wxSYS_COLOUR_BTNHIGHLIGHT */,

-        wxColourScheme::SHADOW_IN /* wxSYS_COLOUR_3DDKSHADOW */,
+        wxColourScheme::SHADOW_DARK /* wxSYS_COLOUR_3DDKSHADOW */,

         wxColourScheme::SHADOW_OUT /* wxSYS_COLOUR_3DLIGHT */,
         wxColourScheme::MAX /* wxSYS_COLOUR_INFOTEXT */,
         wxColourScheme::MAX /* wxSYS_COLOUR_INFOBK */,
         wxColourScheme::SHADOW_OUT /* wxSYS_COLOUR_3DLIGHT */,
         wxColourScheme::MAX /* wxSYS_COLOUR_INFOTEXT */,
         wxColourScheme::MAX /* wxSYS_COLOUR_INFOBK */,

-        wxColourScheme::CONTROL /* wxSYS_COLOUR_LISTBOX */,
+        wxColourScheme::WINDOW /* wxSYS_COLOUR_LISTBOX */,

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


@@ -100,5 +98,3 @@ wxColour wxSystemSettings::GetColour(wxSystemColour index)
     return wxTheme::Get()->GetColourScheme()->Get(col);
 }
 
     return wxTheme::Get()->GetColourScheme()->Get(col);
 }
 

-#endif // wxHAS_SS_NATIVE
-