X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..707c4418929f09dfd8f5fb0f0d5aec3bb0775bd8:/include/wx/gtk/colour.h diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 0ae6594930..788466d8e9 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -40,7 +40,7 @@ class wxColour: public wxGDIObject { public: wxColour() { } - + // Construct from RGB wxColour( unsigned char red, unsigned char green, unsigned char blue ); wxColour( unsigned long colRGB ) { Set(colRGB); } @@ -61,7 +61,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); } @@ -80,18 +80,21 @@ public: unsigned char Blue() const; + // Get colour from name or wxNullColour + static wxColour CreateByName(const wxString& name); + // Implementation part void CalcPixel( GdkColormap *cmap ); int GetPixel() const; GdkColor *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)