changing graphics pen, brushes and fonts to be refcounted objects, having no subclasses

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

diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index 94d7d65a687cc83de170ed63d1e47f199fdd5112..c5006cf4fb73ba6963b8ffaf59419ddbde85bd35 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -38,14 +38,15 @@ public:
     // ------------
 
     // default
     // ------------
 
     // default

-    wxColour() { Init(); }
+    wxColour() { }

     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 

-    ~wxColour();
+    virtual ~wxColour();

 
     virtual bool FromString(const wxChar *str);
 
 
     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); }
 
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }


@@ -65,7 +66,8 @@ 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 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);

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