Return valid pointers from wxDateTime::ParseXXX() with non-wxString strings.

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

diff --git a/include/wx/univ/colschem.h b/include/wx/univ/colschem.h
index 446daa08852d9d3cff66cb944105e0a977e86c4d..f6a4ae30d07a5ecf7c3601d5368a97a9a29a4bc2 100644 (file)
--- a/include/wx/univ/colschem.h
+++ b/include/wx/univ/colschem.h
@@ -12,7 +12,7 @@
 #ifndef _WX_UNIV_COLSCHEM_H_
 #define _WX_UNIV_COLSCHEM_H_
 
 #ifndef _WX_UNIV_COLSCHEM_H_
 #define _WX_UNIV_COLSCHEM_H_
 

-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 #include "wx/colour.h"
 #include "wx/checkbox.h"
 
 #include "wx/colour.h"
 #include "wx/checkbox.h"


@@ -21,7 +21,7 @@ class WXDLLEXPORT wxWindow;
 // wxColourScheme
 // ----------------------------------------------------------------------------
 
 // wxColourScheme
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxColourScheme
+class WXDLLIMPEXP_CORE wxColourScheme

 {
 public:
     // the standard colours
 {
 public:
     // the standard colours


@@ -53,21 +53,24 @@ public:
         SHADOW_HIGHLIGHT,
         SHADOW_IN,
         SHADOW_OUT,
         SHADOW_HIGHLIGHT,
         SHADOW_IN,
         SHADOW_OUT,

-        
+

         // the titlebar background colours for the normal and focused states
         TITLEBAR,
         TITLEBAR_ACTIVE,
         // the titlebar background colours for the normal and focused states
         TITLEBAR,
         TITLEBAR_ACTIVE,

-        
+

         // the titlebar text colours
         TITLEBAR_TEXT,
         TITLEBAR_ACTIVE_TEXT,
         // the titlebar text colours
         TITLEBAR_TEXT,
         TITLEBAR_ACTIVE_TEXT,

-        
+

         // the default gauge fill colour
         GAUGE,
 
         // desktop background colour (only used by framebuffer ports)
         DESKTOP,
 
         // the default gauge fill colour
         GAUGE,
 
         // desktop background colour (only used by framebuffer ports)
         DESKTOP,
 

+        // wxFrame's background colour
+        FRAME,
+

         MAX
     };
 
         MAX
     };
 


@@ -78,7 +81,7 @@ public:
     virtual wxColour GetBackground(wxWindow *win) const = 0;
 
     // virtual dtor for any base class
     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 :-)
 };
 
 // some people just can't spell it correctly :-)