X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edf6a063410b3fa401c913153a64f81d700fbda4..2a92d7e50f86b99d47dfeee34c2f5a3ce58c238e:/include/wx/x11/colour.h diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h index b915ac4022..357d8657d3 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -12,7 +12,7 @@ #ifndef _WX_COLOUR_H_ #define _WX_COLOUR_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "colour.h" #endif @@ -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); } @@ -53,13 +53,16 @@ public: wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); } #endif + // 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; } - + bool operator == ( const wxColour& col ) const; bool operator != ( const wxColour& col ) const { return !(*this == col); } @@ -78,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)