another DMC build fix (http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/93155)

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

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 01b49c45aafcbb58361c0d1f97d52ccdd54e3930..863cb4663c644aa58d051dbbf1c8fdaa4f3e7ef6 100644 (file)
--- 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)