X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a789c01d261ce61fd7aeb46998cb1c366a18666a..69b5cec2b0993ce4cd56f2e50ab94e5ebd20069c:/include/wx/mac/colour.h diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h index a811708f72..25b6d3b726 100644 --- a/include/wx/mac/colour.h +++ b/include/wx/mac/colour.h @@ -1,18 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// // Name: colour.h // Purpose: wxColour class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COLOUR_H_ #define _WX_COLOUR_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "colour.h" #endif @@ -28,11 +28,17 @@ public: wxColour(); // from RGB wxColour( unsigned char red, unsigned char green, unsigned char blue ); - wxColour( unsigned long colRGB ) { Set(colRGB); } + wxColour( unsigned long colRGB ) + : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0) + { Set(colRGB); } // implicit conversion from the colour name - wxColour( const wxString &colourName ) { InitFromName(colourName); } - wxColour( const char *colourName ) { InitFromName(colourName); } + wxColour( const wxString &colourName ) + : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0) + { InitFromName(colourName); } + wxColour( const wxChar *colourName ) + : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0) + { InitFromName(colourName); } // copy ctors and assignment operators wxColour( const wxColour& col ); @@ -56,11 +62,6 @@ public: // 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 - unsigned char Red() const { return m_red; } unsigned char Green() const { return m_green; } unsigned char Blue() const { return m_blue; } @@ -68,15 +69,16 @@ public: // comparison bool operator == (const wxColour& colour) const { - return (m_red == colour.m_red && + 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) { return !(*this == colour); } + bool operator != (const wxColour& colour) const { return !(*this == colour); } void InitFromName(const wxString& col); - const WXCOLORREF GetPixel() const { return m_pixel; }; + const WXCOLORREF& GetPixel() const { return m_pixel; }; private: bool m_isInit; @@ -86,7 +88,7 @@ private: public: WXCOLORREF m_pixel ; - void Set( WXCOLORREF color ) { m_pixel = color ; m_red = m_pixel.red>>8 ;m_blue = m_pixel.blue>>8 ;m_green = m_pixel.green>>8 ;} + void Set( const WXCOLORREF* color ) ; private: DECLARE_DYNAMIC_CLASS(wxColour)