X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..8c9f8f91cd62335261ee29762747218f28d129de:/include/wx/gtk/colour.h diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 8757d2c00b..788466d8e9 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -2,17 +2,16 @@ // Name: colour.h // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __GTKCOLOURH__ #define __GTKCOLOURH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -20,6 +19,7 @@ #include "wx/object.h" #include "wx/string.h" #include "wx/gdiobj.h" +#include "wx/palette.h" //----------------------------------------------------------------------------- // classes @@ -38,39 +38,66 @@ class wxColour; class wxColour: public wxGDIObject { - DECLARE_DYNAMIC_CLASS(wxColour) - - public: - - wxColour(void); - wxColour( char red, char green, char blue ); - wxColour( const wxString &colourName ); - wxColour( const wxColour& col ); - wxColour( const wxColour* col ); - ~wxColour(void); - wxColour& operator = ( const wxColour& col ); - wxColour& operator = ( const wxString& colourName ); - bool operator == ( const wxColour& col ); - bool operator != ( const wxColour& col ); - void Set( const unsigned char red, const unsigned char green, const unsigned char blue ); - unsigned char Red(void) const; - unsigned char Green(void) const; - unsigned char Blue(void) const; - bool Ok(void) const; - - private: - public: - - friend wxDC; - friend wxPaintDC; - friend wxBitmap; - friend wxWindow; - +public: + wxColour() { } + + // Construct from RGB + wxColour( unsigned char red, unsigned char green, unsigned char blue ); + wxColour( unsigned long colRGB ) { Set(colRGB); } + + // Implicit conversion from the colour name + wxColour( const wxString &colourName ) { InitFromName(colourName); } + wxColour( const char *colourName ) { InitFromName( wxString::FromAscii(colourName) ); } +#if wxUSE_UNICODE + wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); } +#endif + + + wxColour( const wxColour& col ) + : wxGDIObject() + { 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); } + + void Set( unsigned char red, unsigned char green, unsigned char blue ); + void Set( unsigned long colRGB ) + { + // We don't need to know sizeof(long) here because we assume that the three + // least significant bytes contain the R, G and B values + Set((unsigned char)colRGB, + (unsigned char)(colRGB >> 8), + (unsigned char)(colRGB >> 16)); + } + + unsigned char Red() const; + unsigned char Green() const; + unsigned char Blue() const; + + + // Get colour from name or wxNullColour + static wxColour CreateByName(const wxString& name); + + // Implementation part void CalcPixel( GdkColormap *cmap ); - int GetPixel(void); - GdkColor *GetColor(void); - - // no data :-) + 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; + + +private: + DECLARE_DYNAMIC_CLASS(wxColour) }; - + #endif // __GTKCOLOURH__