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 c09dfe5ef1f1db265bf5ac8dd7756d1d8f46c298..cf91604445bc8aff4e90a8b91f382b52c6dd9364 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -41,7 +41,7 @@ public:
     wxColour() { }
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     wxColour() { }
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 

-    ~wxColour();
+    virtual ~wxColour();

 
     virtual bool FromString(const wxChar *str);
 
 
     virtual bool FromString(const wxChar *str);
 


@@ -65,7 +65,8 @@ protected:
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     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)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)