X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2b9ae5f7fdabc38a9814b5a1a8d16932a610024..b02dd12239c8a59b9a545d9fcb04974f8ad02c6b:/include/wx/msw/colour.h diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index c2e259ef45..223e1e0d98 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -18,25 +18,17 @@ // 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; } @@ -53,10 +45,9 @@ public: && 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; @@ -79,5 +70,4 @@ private: DECLARE_DYNAMIC_CLASS(wxColour) }; -#endif - // _WX_COLOUR_H_ +#endif // _WX_COLOUR_H_