Last part from weak ref patch for event sink disconnection

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

diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h
index feb49285500ffe697e131d1afaf4408e58bff6b8..ca1ebf05b960ccfce8fbdf4517d4689b5afe4fdc 100644 (file)
--- a/include/wx/generic/colour.h
+++ b/include/wx/generic/colour.h
@@ -20,20 +20,18 @@ class WXDLLEXPORT 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 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; }