Avoid clash with control container event handlers

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

diff --git a/src/univ/colschem.cpp b/src/univ/colschem.cpp
index 5d42746b147d5df4162efbd13a7cbb7f5e98cd44..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:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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,7 +65,7 @@ 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::CONTROL /* wxSYS_COLOUR_BTNFACE */,
@@ -97,4 +93,3 @@ wxColour wxSystemSettings::GetColour(wxSystemColour index)
 
     return wxTheme::Get()->GetColourScheme()->Get(col);
 }
-