wxXmlNode::GetAttribute's pointer argument must not be NULL, check for it

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

diff --git a/src/univ/colschem.cpp b/src/univ/colschem.cpp
index 8e5dd4adee0277b1281360b10ad3d078a19fcc1f..1408cd83775a08f3f4bcd21f088a546f061f490d 100644 (file)
--- a/src/univ/colschem.cpp
+++ b/src/univ/colschem.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        univ/colschem.cpp
+// Name:        src/univ/colschem.cpp
 // Purpose:     (trivial) wxColourScheme implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "colschem.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -29,10 +25,10 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/settings.h"
+    #include "wx/gdicmn.h"
 #endif // WX_PRECOMP
 
-#include "wx/settings.h"
-
 #include "wx/univ/colschem.h"
 #include "wx/univ/theme.h"
 
@@ -69,20 +65,20 @@ wxColour wxSystemSettings::GetColour(wxSystemColour index)
         wxColourScheme::CONTROL_TEXT /* wxSYS_COLOUR_CAPTIONTEXT */,
         wxColourScheme::MAX /* wxSYS_COLOUR_ACTIVEBORDER */,
         wxColourScheme::MAX /* wxSYS_COLOUR_INACTIVEBORDER */,
-        wxColourScheme::MAX /* wxSYS_COLOUR_APPWORKSPACE */,
+        wxColourScheme::FRAME /* 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_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::CONTROL /* wxSYS_COLOUR_LISTBOX */,
+        wxColourScheme::WINDOW /* wxSYS_COLOUR_LISTBOX */,
     };
 
     wxCHECK_MSG( index < (int)WXSIZEOF(s_mapSysToThemeCol), wxNullColour,
@@ -97,4 +93,3 @@ wxColour wxSystemSettings::GetColour(wxSystemColour index)
 
     return wxTheme::Get()->GetColourScheme()->Get(col);
 }
-