allow using CPPUNIT_ASSERT_EQUAL(int, wxFileOffset) too

[wxWidgets.git] / include / wx / univ / colschem.h

diff --git a/include/wx/univ/colschem.h b/include/wx/univ/colschem.h
index 7e3f5d7333887c012e8c8dc832b07de4433f0a45..f6a4ae30d07a5ecf7c3601d5368a97a9a29a4bc2 100644 (file)
--- a/include/wx/univ/colschem.h
+++ b/include/wx/univ/colschem.h
@@ -6,17 +6,13 @@
 // Created:     19.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_COLSCHEM_H_
 #define _WX_UNIV_COLSCHEM_H_
 
-#ifdef __GNUG__
-    #pragma interface "colschem.h"
-#endif
-
-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
 
 #include "wx/colour.h"
 #include "wx/checkbox.h"
@@ -25,7 +21,7 @@ class WXDLLEXPORT wxWindow;
 // wxColourScheme
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxColourScheme
+class WXDLLIMPEXP_CORE wxColourScheme
 {
 public:
     // the standard colours
@@ -58,6 +54,23 @@ public:
         SHADOW_IN,
         SHADOW_OUT,
 
+        // the titlebar background colours for the normal and focused states
+        TITLEBAR,
+        TITLEBAR_ACTIVE,
+
+        // the titlebar text colours
+        TITLEBAR_TEXT,
+        TITLEBAR_ACTIVE_TEXT,
+
+        // the default gauge fill colour
+        GAUGE,
+
+        // desktop background colour (only used by framebuffer ports)
+        DESKTOP,
+
+        // wxFrame's background colour
+        FRAME,
+
         MAX
     };
 
@@ -68,7 +81,7 @@ public:
     virtual wxColour GetBackground(wxWindow *win) const = 0;
 
     // virtual dtor for any base class
-    virtual ~wxColourScheme();
+    virtual ~wxColourScheme() {}
 };
 
 // some people just can't spell it correctly :-)