Rebake from clean wx tree.

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

diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index 4ae37558b6ddf2e37bd98637630da9106ba2c31d..aad798657dfb36e3ee286c56614c6c24f683cb4a 100644 (file)
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -33,22 +33,17 @@ class WXDLLIMPEXP_FWD_CORE wxColour;
 // wxColour
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxColour : public wxColourBase
+class WXDLLIMPEXP_CORE wxColour : public wxColourBase
 {
 public:
     // constructors
     // ------------
-
-    wxColour() {}
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     virtual ~wxColour();
 
-    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); }
 
     unsigned char Red() const;
     unsigned char Green() const;
@@ -61,9 +56,8 @@ public:
     WXColor *GetColor() const;
 
 protected:
-    // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
     virtual void
     InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
@@ -74,6 +68,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };
 
-#endif
-
-// _WX_COLOUR_H_
+#endif // _WX_COLOUR_H_