support metal appearance

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

diff --git a/src/univ/colschem.cpp b/src/univ/colschem.cpp
index 608fd3ea2d47ffc64f03f1fa639decd7ad5a4d0d..49975d709c2325d6f6e993cbd6dce54a18144af4 100644 (file)
--- a/src/univ/colschem.cpp
+++ b/src/univ/colschem.cpp
@@ -6,7 +6,7 @@
 // Created:     20.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     20.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "colschem.h"
 #endif
 
     #pragma implementation "colschem.h"
 #endif
 


@@ -34,6 +34,7 @@
 #include "wx/settings.h"
 
 #include "wx/univ/colschem.h"
 #include "wx/settings.h"
 
 #include "wx/univ/colschem.h"

+#include "wx/univ/theme.h"

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -47,8 +48,6 @@ wxColourScheme::~wxColourScheme()
 {
 }
 
 {
 }
 

-#ifdef wxHAS_SS_NATIVE
-

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


@@ -73,20 +72,20 @@ 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 < WXSIZEOF(s_mapSysToThemeCol), wxNullColour,
+    wxCHECK_MSG( index < (int)WXSIZEOF(s_mapSysToThemeCol), wxNullColour,

                  _T("invalid wxSystemColour") );
 
     wxColourScheme::StdColour col = s_mapSysToThemeCol[index];
                  _T("invalid wxSystemColour") );
 
     wxColourScheme::StdColour col = s_mapSysToThemeCol[index];


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

-#endif // wxHAS_SS_NATIVE
-