X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..2952b4b9e438896370163a0a7026ad446062b8e6:/include/wx/x11/colour.h diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h index 17cc3d1345..622b55e014 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.h +// Name: wx/x11/colour.h // Purpose: wxColour class // Author: Julian Smart, Robert Roebling // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart, Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COLOUR_H_ @@ -36,10 +36,16 @@ class WXDLLIMPEXP_CORE wxColour; class WXDLLEXPORT wxColour: public wxGDIObject { public: + // constructors + // ------------ + + // default wxColour() { } - // Construct from RGB + // from separate RGB wxColour( unsigned char red, unsigned char green, unsigned char blue ); + + // from packed RGB wxColour( unsigned long colRGB ) { Set(colRGB); } // Implicit conversion from the colour name @@ -52,9 +58,6 @@ public: // Get colour from name or wxNullColour static wxColour CreateByName(const wxString& name); - wxColour( const wxColour& col ) { Ref(col); } - wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; } - ~wxColour(); bool Ok() const { return m_refData != NULL; } @@ -97,4 +100,3 @@ private: #endif // _WX_COLOUR_H_ -