X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aea95b1c3a8ae221cc3aade5ce49a3cf848fd56a..f71b0c2d56b03b7823e661aacd05cf1a791e5c2f:/include/wx/msw/colour.h?ds=sidebyside

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index 1a14604305..223e1e0d98 100644
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -18,29 +18,22 @@
 // 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
     // ---------
 
-    bool Ok() 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 Blue() const { return m_blue; }
+    unsigned char Alpha() const { return m_alpha ; }
 
     // comparison
     bool operator==(const wxColour& colour) const
@@ -48,13 +41,13 @@ public:
         return m_isInit == colour.m_isInit
             && m_red == colour.m_red
             && m_green == colour.m_green
-            && m_blue == colour.m_blue;
+            && m_blue == colour.m_blue
+            && m_alpha == colour.m_alpha;
     }
 
-    bool operator != (const wxColour& colour) const { return !(*this == colour); }
-
-    WXCOLORREF GetPixel() const { return m_pixel; };
+    bool operator!=(const wxColour& colour) const { return !(*this == colour); }
 
+    WXCOLORREF GetPixel() const { return m_pixel; }
 
 public:
     WXCOLORREF m_pixel;
@@ -71,10 +64,10 @@ private:
     unsigned char m_red;
     unsigned char m_blue;
     unsigned char m_green;
+    unsigned char m_alpha;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };
 
-#endif
-        // _WX_COLOUR_H_
+#endif // _WX_COLOUR_H_