X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6f0a4b367c6d68d9fea84817f5a982163665f37..edea62818b7808c11e2c536b52941809f338f2fb:/include/wx/msw/colour.h diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 3f0c568c4a..d9bcb9319d 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.h +// Name: wx/msw/colour.h // Purpose: wxColour class // Author: Julian Smart // Modified by: @@ -12,83 +12,102 @@ #ifndef _WX_COLOUR_H_ #define _WX_COLOUR_H_ -#ifdef __GNUG__ -#pragma interface "colour.h" +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #pragma interface "colour.h" #endif + #include "wx/object.h" +// ---------------------------------------------------------------------------- // Colour -class WXDLLEXPORT wxColour: public wxObject +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxColour : public wxObject { public: - // ctors + // constructors + // ------------ + // default - wxColour(); - // from RGB - wxColour( unsigned char red, unsigned char green, unsigned char blue ); - wxColour( unsigned long colRGB ) { Set(colRGB); } + wxColour() { Init(); } + + // from separate RGB + wxColour( unsigned char red, unsigned char green, unsigned char blue ) + { Set(red, green, blue); } + + // from packed RGB + wxColour( unsigned long colRGB ) { Set(colRGB); } // implicit conversion from the colour name - wxColour( const wxString &colourName ) { InitFromName(colourName); } - wxColour( const char *colourName ) { InitFromName(colourName); } + wxColour(const wxString &colourName) { InitFromName(colourName); } + wxColour(const wxChar *colourName) { InitFromName(colourName); } // copy ctors and assignment operators - wxColour( const wxColour& col ); -/* wxColour( const wxColour* col ); */ - wxColour& operator = ( const wxColour& col ); + wxColour(const wxColour& col); + wxColour& operator=( const wxColour& col); // dtor - ~wxColour(); - - // Set() functions - void Set( unsigned char red, unsigned char green, unsigned char blue ); - 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)); - } - - // accessors - bool Ok() const {return m_isInit; } - - // Let's remove this inelegant function -#if WXWIN_COMPATIBILITY - void Get(unsigned char *r, unsigned char *g, unsigned char *b) const; -#endif + ~wxColour(); + + + // other methods + // ------------- - unsigned char Red() const { return m_red; } - unsigned char Green() const { return m_green; } - unsigned char Blue() const { return m_blue; } + // to have the matching Create also for this class + void Create( unsigned char red, unsigned char green, unsigned char blue ) + { Set(red, green, blue); } - // comparison - bool operator == (const wxColour& colour) const - { - return (m_red == colour.m_red && - m_green == colour.m_green && - m_blue == colour.m_blue); - } - bool operator != (const wxColour& colour) const { return !(*this == colour); } + // Set() functions + void Set(unsigned char red, unsigned char green, unsigned char blue); + 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)); + } - WXCOLORREF GetPixel() const { return m_pixel; }; + // accessors + // --------- + + bool Ok() 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; } + + // 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; + } + + bool operator != (const wxColour& colour) const { return !(*this == colour); } + + WXCOLORREF GetPixel() const { return m_pixel; }; + + void InitFromName(const wxString& colourName); public: - WXCOLORREF m_pixel; + WXCOLORREF m_pixel; -private: - bool m_isInit; - unsigned char m_red; - unsigned char m_blue; - unsigned char m_green; +protected: + // Helper function + void Init(); - // helper func - void InitFromName(const wxString& colourName); +private: + bool m_isInit; + unsigned char m_red; + unsigned char m_blue; + unsigned char m_green; private: - DECLARE_DYNAMIC_CLASS(wxColour) + DECLARE_DYNAMIC_CLASS(wxColour) }; #endif