#4479: wx.ComboBox needs a SetFont method

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

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index 14760092270976b49c0bd87f85c192a5a854d0f6..223e1e0d98c99b069f4476f3f93233334698af5f 100644 (file)
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -18,21 +18,13 @@
 // Colour
 // ----------------------------------------------------------------------------
 
 // Colour
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxColour : public wxColourBase
+class WXDLLIMPEXP_CORE wxColour : public wxColourBase

 {
 public:
     // constructors
     // ------------
 {
 public:
     // constructors
     // ------------

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

     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 

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

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


@@ -53,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;
 


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

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