X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..11c5b47d9454915aa790ded6cf03613b9e2df12c:/include/wx/gtk/colour.h diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index de243d30a7..788466d8e9 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -11,7 +11,7 @@ #ifndef __GTKCOLOURH__ #define __GTKCOLOURH__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -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)