more MS-DOS stuff in generic wxFileDialog

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

diff --git a/src/univ/colschem.cpp b/src/univ/colschem.cpp
index 608fd3ea2d47ffc64f03f1fa639decd7ad5a4d0d..8e5dd4adee0277b1281360b10ad3d078a19fcc1f 100644 (file)
--- a/src/univ/colschem.cpp
+++ b/src/univ/colschem.cpp
@@ -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
 // ----------------------------------------------------------------------------


@@ -86,7 +85,7 @@ wxColour wxSystemSettings::GetColour(wxSystemColour index)
         wxColourScheme::CONTROL /* wxSYS_COLOUR_LISTBOX */,
     };
 
         wxColourScheme::CONTROL /* 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
-