X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edc536d358374987326d93adb1012b6eda9435a0..96c2a0dd74ac90a17cf820f0e24064e831a09e4d:/include/wx/motif/colour.h?ds=inline diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h index fc51b2d519..3f628a90d6 100644 --- a/include/wx/motif/colour.h +++ b/include/wx/motif/colour.h @@ -16,7 +16,7 @@ #include "wx/string.h" // Colour -class WXDLLEXPORT wxColour : public wxObject +class WXDLLEXPORT wxColour : public wxColourBase { DECLARE_DYNAMIC_CLASS(wxColour) public: @@ -24,53 +24,31 @@ public: // ------------ // default - wxColour(); - - // 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() { Init(); } + DEFINE_STD_WXCOLOUR_CONSTRUCTORS // copy ctors and assignment operators 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)); - } + virtual ~wxColour(); + // accessors - bool Ok() const {return m_isInit; } + bool Ok() const { return IsOk(); } + bool IsOk() 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; }; + WXPixel GetPixel() const { return m_pixel; }; + void SetPixel(WXPixel 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)); } - // Get colour from name or wxNullColour - static wxColour CreateByName(const wxString& name); - // Allocate a colour, or nearest colour, using the given display. // If realloc is true, ignore the existing pixel, otherwise just return // the existing one. @@ -79,14 +57,15 @@ public: // 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); + WXPixel AllocColour(WXDisplay* display, bool realloc = false); protected: // Helper function void Init(); + virtual void + InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); + private: bool m_isInit; unsigned char m_red; @@ -94,7 +73,7 @@ private: unsigned char m_green; public: - int m_pixel; + WXPixel m_pixel; }; #endif