X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19193a2c85987b595932957e73013e7ea100f0e8..7ed24cb652413094e211940d7177d89e9fc805f5:/include/wx/os2/colour.h diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h index e706844681..e1d44c1c83 100644 --- a/include/wx/os2/colour.h +++ b/include/wx/os2/colour.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.h +// Name: wx/os2/colour.h // Purpose: wxColour class // Author: David Webster // Modified by: @@ -15,113 +15,60 @@ #include "wx/object.h" // Colour -class WXDLLEXPORT wxColour: public wxObject +class WXDLLIMPEXP_CORE wxColour: public wxColourBase { public: - // - // Ctors - // - - // - // Default - // - wxColour(); - - // - // from RGB - // - wxColour( unsigned char cRed - ,unsigned char cGreen - ,unsigned char cBlue - ); - - wxColour( unsigned long colRGB ) { Set(colRGB); } - - // - // Implicit conversion from the colour name - // - wxColour(const wxString& rColourName) { InitFromName(rColourName); } - wxColour(const char* zColourName) { InitFromName(zColourName); } - - // + // constructors + // ------------ + DEFINE_STD_WXCOLOUR_CONSTRUCTORS + // Copy ctors and assignment operators - // wxColour(const wxColour& rCol); wxColour(const wxColour* pCol); wxColour&operator = (const wxColour& rCol); - // // Dtor - // - ~wxColour(); - - // - // Set functions - // - void Set( unsigned char cRed - ,unsigned char cGreen - ,unsigned char cBlue - ); - void Set(unsigned long lColRGB) - { - // - // 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)lColRGB - ,(unsigned char)(lColRGB >> 8) - ,(unsigned char)(lColRGB >> 16) - ); - } - void Set(const wxString& rsColour) - { - InitFromName(rsColour); - } + virtual ~wxColour(); - // // Accessors - // - bool Ok(void) const {return m_bIsInit; } - - // - // Let's remove this inelegant function - // -#if WXWIN_COMPATIBILITY - void Get( unsigned char* pRed - ,unsigned char* pGreen - ,unsigned char* pBlue - ) const; -#endif + virtual bool IsOk(void) const { return m_bIsInit; } unsigned char Red(void) const { return m_cRed; } unsigned char Green(void) const { return m_cGreen; } unsigned char Blue(void) const { return m_cBlue; } - // // Comparison - // bool operator == (const wxColour& rColour) const { - return (m_cRed == rColour.m_cRed && - m_cGreen == rColour.m_cGreen && - m_cBlue == rColour.m_cBlue + return (m_bIsInit == rColour.m_bIsInit + && m_cRed == rColour.m_cRed + && m_cGreen == rColour.m_cGreen + && m_cBlue == rColour.m_cBlue ); } + bool operator != (const wxColour& rColour) const { return !(*this == rColour); } - void InitFromName(const wxString& rCol); WXCOLORREF GetPixel(void) const { return m_vPixel; }; + private: - bool m_bIsInit; - unsigned char m_cRed; - unsigned char m_cBlue; - unsigned char m_cGreen; + + // Helper function + void Init(); + + bool m_bIsInit; + unsigned char m_cRed; + unsigned char m_cBlue; + unsigned char m_cGreen; + + virtual void + InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); public: WXCOLORREF m_vPixel ; private: - DECLARE_DYNAMIC_CLASS(wxColour) + DECLARE_DYNAMIC_CLASS(wxColour) }; // end of class wxColour #endif