wxXML load/save improvements: added ability to not ignore whitespace and specify...

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

diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h
index a5707e3039b852eba0842dfaac60d9b0b96f61ab..1f4f4ed5c1a9790410d80b60c04cb647996fbbae 100644 (file)
--- a/include/wx/generic/colour.h
+++ b/include/wx/generic/colour.h
@@ -30,7 +30,7 @@ public:
     wxColour& operator=(const wxColour& col);
 
     // dtor
-    ~wxColour();
+    virtual ~wxColour();
 
     // accessors
     bool Ok() const { return m_isInit; }
@@ -57,12 +57,8 @@ protected:
     // Helper function
     void Init();
 
-    virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue)
-    {
-        InitWith(red, green, blue, wxALPHA_OPAQUE);
-    }
-
-    virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha);
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 
 private:
     bool m_isInit;