As per wx-dev, split the sort arrow options out to a separate parameter.

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

diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index 94d7d65a687cc83de170ed63d1e47f199fdd5112..cf91604445bc8aff4e90a8b91f382b52c6dd9364 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -38,10 +38,10 @@ public:
     // ------------
 
     // default
-    wxColour() { Init(); }
+    wxColour() { }
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
-    ~wxColour();
+    virtual ~wxColour();
 
     virtual bool FromString(const wxChar *str);
 
@@ -65,7 +65,8 @@ protected:
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
-    virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)