X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40989e46b86777dd211faeb3e5d2366cdcc6d8cd..6041f69ca7bbb7c39e4ba64e407bc3ac39e3687f:/include/wx/msw/colour.h diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 4b40ce3fda..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 - ~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; @@ -63,17 +56,18 @@ protected: // Helper function void Init(); - virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue); + virtual void + InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); private: bool m_isInit; 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_