X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f177c8e7309c8cf3ece1563870d135cc8f0e6a1..419430a0c006cd6830c2c8a768ba850531ec6a18:/include/wx/msw/colour.h diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 7546b611c3..83c00940ff 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -12,7 +12,7 @@ #ifndef _WX_COLOUR_H_ #define _WX_COLOUR_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "colour.h" #endif #include "wx/object.h" @@ -30,17 +30,20 @@ public: // implicit conversion from the colour name wxColour( const wxString &colourName ) { InitFromName(colourName); } - wxColour( const char *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 ); // dtor ~wxColour(); + // to have the matching Create also for this class + void Create( unsigned char red, unsigned char green, unsigned char blue ) + { Set( red , green , blue ) ; } + // Set() functions void Set( unsigned char red, unsigned char green, unsigned char blue ); void Set(unsigned long colRGB) @@ -55,22 +58,19 @@ 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; } // comparison - bool operator == (const wxColour& colour) const + bool operator==(const wxColour& colour) const { - return (m_red == colour.m_red && - m_green == colour.m_green && - m_blue == colour.m_blue); + 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; };