Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index 8eb61124f3dc14a0ea2ba4fd67f957b1e10eb8c2..3c18f7436814369fe357bae5a63f61dcef8378f0 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk1/colour.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        wx/gtk1/colour.h
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -36,20 +35,14 @@ class WXDLLIMPEXP_CORE wxColour : public wxColourBase
 public:
     // constructors
     // ------------
 public:
     // constructors
     // ------------

-
-    // default
-    wxColour() { }

     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     virtual ~wxColour();
 
     virtual bool FromString(const wxString& str);
 
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     virtual ~wxColour();
 
     virtual bool FromString(const wxString& str);
 

-    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;
 
     unsigned char Red() const;
     unsigned char Green() const;


@@ -63,8 +56,8 @@ public:
 
 protected:
     // ref counting code
 
 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);
 
     virtual void
     InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);