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

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

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index 14760092270976b49c0bd87f85c192a5a854d0f6..4b359fb370dc6bcce0bbc01d68f0d3f3b5c5dd3d 100644 (file)
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,21 +17,13 @@
 // Colour
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxColour : public wxColourBase
+class WXDLLIMPEXP_CORE wxColour : public wxColourBase
 {
 public:
     // constructors
     // ------------
-
-    // default
-    wxColour() { Init(); }
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
-
-    // dtor
-    virtual ~wxColour();
-
-
     // accessors
     // ---------
 
@@ -53,11 +44,10 @@ public:
             && m_alpha == colour.m_alpha;
     }
 
-    bool operator != (const wxColour& colour) const { return !(*this == colour); }
+    bool operator!=(const wxColour& colour) const { return !(*this == colour); }
 
     WXCOLORREF GetPixel() const { return m_pixel; }
 
-
 public:
     WXCOLORREF m_pixel;
 
@@ -79,5 +69,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };
 
-#endif
-        // _WX_COLOUR_H_
+#endif // _WX_COLOUR_H_