X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcdf8bc7ca806d8278c7cb6d09d5590378b67d8..f196316400fd247a760b2ef77d5064b4e10e5471:/include/wx/msw/colour.h diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 9e001f03e7..c3854f50b8 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -1,71 +1,84 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.h +// Name: wx/msw/colour.h // Purpose: wxColour class // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COLOUR_H_ #define _WX_COLOUR_H_ -#ifdef __GNUG__ -#pragma interface "colour.h" -#endif +#include "wx/object.h" +// ---------------------------------------------------------------------------- // Colour -class WXDLLEXPORT wxColour: public wxObject +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxColour : public wxColourBase { - DECLARE_DYNAMIC_CLASS(wxColour) public: - wxColour(void); - wxColour(const unsigned char r, const unsigned char g, const unsigned char b); - wxColour(unsigned long colRGB) { Set(colRGB); } - wxColour(const wxColour& col); - wxColour(const wxString& col); - ~wxColour(void) ; - wxColour& operator =(const wxColour& src) ; - wxColour& operator =(const wxString& src) ; - inline int Ok(void) const { return (m_isInit) ; } - - void Set(unsigned char r, unsigned char g, unsigned char b); - void Set(unsigned long colRGB) - { - // we don't need to know sizeof(long) here because we assume that the three - // least significant bytes contain the R, G and B values - Set((unsigned char)colRGB, - (unsigned char)(colRGB >> 8), - (unsigned char)(colRGB >> 16)); - } - - // Let's remove this inelegant function -#if WXWIN_COMPATIBILITY - void Get(unsigned char *r, unsigned char *g, unsigned char *b) const; -#endif + // constructors + // ------------ - inline unsigned char Red(void) const { return m_red; } - inline unsigned char Green(void) const { return m_green; } - inline unsigned char Blue(void) const { return m_blue; } + // default + wxColour() { Init(); } + DEFINE_STD_WXCOLOUR_CONSTRUCTORS - inline bool operator == (const wxColour& colour) { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); } - inline bool operator != (const wxColour& colour) { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); } + // dtor + virtual ~wxColour(); - WXCOLORREF GetPixel(void) const { return m_pixel; }; - private: - bool m_isInit; - unsigned char m_red; - unsigned char m_blue; - unsigned char m_green; - public: - WXCOLORREF m_pixel ; -}; + // accessors + // --------- + + bool Ok() const { return IsOk(); } + 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 + { + return m_isInit == colour.m_isInit + && m_red == colour.m_red + && m_green == colour.m_green + && m_blue == colour.m_blue + && m_alpha == colour.m_alpha; + } + + bool operator != (const wxColour& colour) const { return !(*this == colour); } -#define wxColor wxColour + WXCOLORREF GetPixel() const { return m_pixel; } + + +public: + WXCOLORREF m_pixel; + +protected: + // Helper function + void Init(); + + 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_ + // _WX_COLOUR_H_