X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aea95b1c3a8ae221cc3aade5ce49a3cf848fd56a..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/gtk/colour.h?ds=sidebyside

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index f41c52410d..863cb4663c 100644
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -27,7 +27,7 @@ public:
 
     virtual ~wxColour();
 
-    bool Ok() const { return m_refData != NULL; }
+    bool IsOk() const { return m_refData != NULL; }
 
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }
@@ -35,6 +35,7 @@ public:
     unsigned char Red() const;
     unsigned char Green() const;
     unsigned char Blue() const;
+    unsigned char Alpha() const;
 
     // Implementation part
     void CalcPixel( GdkColormap *cmap );
@@ -51,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)