X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..616c0d1f3ac084bb92f0a75dc48812e8647f1b22:/include/wx/msw/colour.h?ds=sidebyside diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 3b5ae1eef2..223e1e0d98 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.h +// Name: wx/msw/colour.h // Purpose: wxColour class // Author: Julian Smart // Modified by: @@ -12,89 +12,62 @@ #ifndef _WX_COLOUR_H_ #define _WX_COLOUR_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "colour.h" -#endif #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 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 wxChar *colourName ) { InitFromName(colourName); } - - - // copy ctors and assignment operators - 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) - { - // 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; } - - // 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 - { - 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; }; + // constructors + // ------------ + DEFINE_STD_WXCOLOUR_CONSTRUCTORS + + // accessors + // --------- + + virtual 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; } + unsigned char Alpha() const { return m_alpha ; } + + // comparison + bool operator==(const wxColour& colour) const + { + return m_isInit == colour.m_isInit + && m_red == colour.m_red + && m_green == colour.m_green + && m_blue == colour.m_blue + && m_alpha == colour.m_alpha; + } + + bool operator!=(const wxColour& colour) const { return !(*this == colour); } + + WXCOLORREF GetPixel() const { return m_pixel; } public: - WXCOLORREF m_pixel; + WXCOLORREF m_pixel; -private: - bool m_isInit; - unsigned char m_red; - unsigned char m_blue; - unsigned char m_green; +protected: + // Helper function + void Init(); - // helper func - void InitFromName(const wxString& colourName); + virtual void + InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); + +private: + bool m_isInit; + unsigned char m_red; + unsigned char m_blue; + unsigned char m_green; + unsigned char m_alpha; private: - DECLARE_DYNAMIC_CLASS(wxColour) + DECLARE_DYNAMIC_CLASS(wxColour) }; -#endif - // _WX_COLOUR_H_ +#endif // _WX_COLOUR_H_