Compilation fix.

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

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index c3854f50b8475c65eb0d48eab1ca42ae627dae79..7f25bc88f44e76f08984ec103f34ac814ac4a08e 100644 (file)
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -23,21 +23,12 @@ class WXDLLEXPORT wxColour : public wxColourBase
 public:
     // constructors
     // ------------
 public:
     // constructors
     // ------------

-
-    // default
-    wxColour() { Init(); }

     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 

-
-    // dtor
-    virtual ~wxColour();
-
-

     // accessors
     // ---------
 
     // accessors
     // ---------
 

-    bool Ok() const { return IsOk(); }
-    bool IsOk() const { return m_isInit; }
+    virtual bool IsOk() const { return m_isInit; }

 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }


@@ -54,11 +45,10 @@ public:
             && m_alpha == colour.m_alpha;
     }
 
             && 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; }
 
 
     WXCOLORREF GetPixel() const { return m_pixel; }
 

-

 public:
     WXCOLORREF m_pixel;
 
 public:
     WXCOLORREF m_pixel;
 


@@ -80,5 +70,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };
 
     DECLARE_DYNAMIC_CLASS(wxColour)
 };
 

-#endif
-        // _WX_COLOUR_H_
+#endif // _WX_COLOUR_H_