X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..05a09b0b9f9d93cd2a149efc0c1ccc0790cdc82c:/include/wx/gtk/colour.h diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 01b49c45aa..863cb4663c 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -27,7 +27,6 @@ public: virtual ~wxColour(); - bool Ok() const { return IsOk(); } bool IsOk() const { return m_refData != NULL; } bool operator == ( const wxColour& col ) const; @@ -53,7 +52,7 @@ protected: virtual void InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); - virtual bool FromString(const wxChar *str); + virtual bool FromString(const wxString& str); private: DECLARE_DYNAMIC_CLASS(wxColour)