Renamed HasChildren() to IsContainer(), added GetParent() to wxDataViewModel

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

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index f41c52410df9798046de818191c8a750dca78e7d..88ac82e6882359572f53bdee086d50ac3ca55e54 100644 (file)
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -27,7 +27,8 @@ public:
 
     virtual ~wxColour();
 
 
     virtual ~wxColour();
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }
 
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }


@@ -35,6 +36,7 @@ public:
     unsigned char Red() const;
     unsigned char Green() const;
     unsigned char Blue() const;
     unsigned char Red() const;
     unsigned char Green() const;
     unsigned char Blue() const;

+    unsigned char Alpha() const;

 
     // Implementation part
     void CalcPixel( GdkColormap *cmap );
 
     // Implementation part
     void CalcPixel( GdkColormap *cmap );


@@ -51,7 +53,7 @@ protected:
     virtual void
     InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 
     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)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)