X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/564a150b1f7c63a060c1b205a7cd50035031cd4b..11c5b47d9454915aa790ded6cf03613b9e2df12c:/include/wx/x11/colour.h?ds=sidebyside diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h index 30481cba51..357d8657d3 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -37,11 +37,11 @@ class wxColour; // wxColour //----------------------------------------------------------------------------- -class wxColour: public wxGDIObject +class WXDLLEXPORT wxColour: public wxGDIObject { public: wxColour() { } - + // Construct from RGB wxColour( unsigned char red, unsigned char green, unsigned char blue ); wxColour( unsigned long colRGB ) { Set(colRGB); } @@ -62,7 +62,7 @@ public: ~wxColour(); bool Ok() const { return m_refData != NULL; } - + bool operator == ( const wxColour& col ) const; bool operator != ( const wxColour& col ) const { return !(*this == col); } @@ -81,18 +81,18 @@ public: unsigned char Blue() const; // Implementation part - + void CalcPixel( WXColormap cmap ); unsigned long GetPixel() const; WXColor *GetColor() const; + void InitFromName(const wxString& colourName); + protected: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - - // Helper functions - void InitFromName(const wxString& colourName); + private: DECLARE_DYNAMIC_CLASS(wxColour)