Add wxHAS_3STATE_CHECKBOX symbol.

[wxWidgets.git] / include / wx / generic / colour.h

diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h
index 28627daa0a0c372aea30da30f8a5a394c6a3fadb..edaf6a19e3ce83e154d9802448e4ee25234d5945 100644 (file)
--- a/include/wx/generic/colour.h
+++ b/include/wx/generic/colour.h
@@ -15,26 +15,23 @@
 #include "wx/object.h"
 
 // Colour
 #include "wx/object.h"
 
 // Colour

-class WXDLLEXPORT wxColour: public wxColourBase
+class WXDLLIMPEXP_CORE wxColour: public wxColourBase

 {
 public:
     // constructors
     // ------------
 {
 public:
     // constructors
     // ------------

-
-    // default
-    wxColour();

     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators

-    wxColour(const wxColour& col);
-    wxColour& operator=(const wxColour& col);
+    wxColour(const wxColour& col)
+    {
+        *this = col;
+    }

 
 

-    // dtor
-    virtual ~wxColour();
+    wxColour& operator=(const wxColour& col);

 
     // accessors
 
     // accessors

-    bool Ok() const { return IsOk(); }
-    bool IsOk() const { return m_isInit; }
+    virtual bool IsOk() const { return m_isInit; }

 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }