X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..5aa67d6619d7758bd66375ef75b698ae49f3418b:/include/wx/mac/carbon/colour.h diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h index 158e631d64..bc015e9ecd 100644 --- a/include/wx/mac/carbon/colour.h +++ b/include/wx/mac/carbon/colour.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.h +// Name: wx/mac/carbon/colour.h // Purpose: wxColour class // Author: Stefan Csomor // Modified by: @@ -12,10 +12,6 @@ #ifndef _WX_COLOUR_H_ #define _WX_COLOUR_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "colour.h" -#endif - #include "wx/object.h" #include "wx/string.h" @@ -23,58 +19,58 @@ class WXDLLEXPORT wxColour: public wxObject { public: - // ctors + // constructors + // ------------ + // default - wxColour() { Init(); } - // from RGB - wxColour( unsigned char red, unsigned char green, unsigned char blue ) - { Set(red, green, blue); } - wxColour( unsigned long colRGB ) - { Set(colRGB); } + wxColour() { Init(); } - // implicit conversion from the colour name - wxColour( const wxString &colourName ) - { InitFromName(colourName); } - wxColour( const wxChar *colourName ) - { InitFromName(colourName); } + // 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); } - // copy ctors and assignment operators - wxColour( const wxColour& col ); - wxColour( const wxColour* col ); - wxColour& operator = ( const wxColour& col ); + // implicit conversion from the colour name + wxColour( const wxString &colourName ) + { InitFromName(colourName); } + wxColour( const wxChar *colourName ) + { InitFromName(colourName); } // 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; } - - 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); } - - const WXCOLORREF& GetPixel() const { return m_pixel; }; + ~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; } + + 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); } + + const WXCOLORREF& GetPixel() const { return m_pixel; }; void InitFromName(const wxString& col); @@ -84,17 +80,17 @@ protected : void Init(); private: - bool m_isInit; - unsigned char m_red; - unsigned char m_blue; - unsigned char m_green; + bool m_isInit; + unsigned char m_red; + unsigned char m_blue; + unsigned char m_green; public: - WXCOLORREF m_pixel ; - void Set( const WXCOLORREF* color ) ; + WXCOLORREF m_pixel ; + void Set( const WXCOLORREF* color ) ; private: - DECLARE_DYNAMIC_CLASS(wxColour) + DECLARE_DYNAMIC_CLASS(wxColour) }; #endif