Merge in from trunk r68626 - r68683

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

diff --git a/include/wx/univ/colschem.h b/include/wx/univ/colschem.h
index e7d24d226508fd7a97515063505692d0bfc9abf9..f6a4ae30d07a5ecf7c3601d5368a97a9a29a4bc2 100644 (file)
--- a/include/wx/univ/colschem.h
+++ b/include/wx/univ/colschem.h
@@ -12,11 +12,7 @@
 #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
@@ -57,21 +53,24 @@ public:
         SHADOW_HIGHLIGHT,
         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
     };
 
@@ -82,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 :-)