X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0ed460c2e7802793d591c84f3cfdbff159c5549..b6e2eddeaf7e559589ce41ac41e88f9bd71c5a08:/include/wx/motif/colour.h diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h index 7059f61441..bc53874835 100644 --- a/include/wx/motif/colour.h +++ b/include/wx/motif/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 @@ -22,69 +22,71 @@ // Colour class WXDLLEXPORT wxColour : public wxObject { -DECLARE_DYNAMIC_CLASS(wxColour) + DECLARE_DYNAMIC_CLASS(wxColour) public: - // ctors + // ctors // default - wxColour(); + wxColour(); // from RGB - wxColour( unsigned char red, unsigned char green, unsigned char blue ); + wxColour( unsigned char red, unsigned char green, unsigned char blue ); + 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 char *colourName ) { InitFromName(colourName); } + // copy ctors and assignment operators - 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; } - unsigned char Red() const { return m_red; } - unsigned char Green() const { return m_green; } - unsigned char Blue() const { return m_blue; } - - int GetPixel() const { return m_pixel; }; - void SetPixel(int pixel) { m_pixel = pixel; m_isInit = TRUE; }; - - 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)); } - - // Allocate a colour, or nearest colour, using the given display. - // If realloc is TRUE, ignore the existing pixel, otherwise just return - // the existing one. - // Returns the allocated pixel. - - // TODO: can this handle mono displays? If not, we should have an extra - // flag to specify whether this should be black or white by default. - - int AllocColour(WXDisplay* display, bool realloc = FALSE); - - void InitFromName(const wxString& col); - + ~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; } + + int GetPixel() const { return m_pixel; }; + void SetPixel(int pixel) { m_pixel = pixel; m_isInit = TRUE; }; + + inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); } + + inline bool operator != (const wxColour& colour) const { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); } + + // Allocate a colour, or nearest colour, using the given display. + // If realloc is TRUE, ignore the existing pixel, otherwise just return + // the existing one. + // Returns the allocated pixel. + + // TODO: can this handle mono displays? If not, we should have an extra + // flag to specify whether this should be black or white by default. + + int AllocColour(WXDisplay* display, bool realloc = FALSE); + + void InitFromName(const wxString& col); + 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: - int m_pixel; + int m_pixel; }; #endif - // _WX_COLOUR_H_ +// _WX_COLOUR_H_