test whether pointer is non-NULL before using it, not after, in wxAnimation::Load...

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

diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index 8f1b3a631f58a31cd3723cf7fc4f00d71626dc31..101055920a921206700644142c927e2d13a960a7 100644 (file)
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -42,11 +42,10 @@ public:
     wxColour() {}
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
-    ~wxColour();
+    virtual ~wxColour();
 
-    virtual bool FromString(const wxChar *str);
-
-    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); }
@@ -66,7 +65,10 @@ protected:
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
-    virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+
+    virtual bool FromString(const wxChar *str);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)