fix Normalize() test by using dummy working directory allowing the test to work even...

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

diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index 502886f31fe19cc89417f5262b4910ebb43b405c..101055920a921206700644142c927e2d13a960a7 100644 (file)
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -42,9 +42,10 @@ public:
     wxColour() {}
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     wxColour() {}
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 

-    ~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); }


@@ -64,8 +65,10 @@ protected:
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 

+    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 wxChar *str);

-    virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );

 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)