Applied patch [ 1845819 ] wxMSW Top level window freeze fix for trunk

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

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index f41c52410df9798046de818191c8a750dca78e7d..4c98208518e14add2e06a3f285170079e36521eb 100644 (file)
--- 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,23 +35,18 @@ public:
     unsigned char Red() const;
     unsigned char Green() const;
     unsigned char Blue() const;
+    unsigned char Alpha() const;
 
     // Implementation part
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
-#ifdef __WXGTK24__
     const GdkColor *GetColor() const;
-#else
-    // GDK functions from old gtk2 versions take non-const color parameters,
-    // too many uses to deal with individually
-    GdkColor *GetColor() const;
-#endif
 
 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)