X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..b04237742c51e022af8ca8fe8933437734f392a3:/include/wx/gtk/colour.h?ds=sidebyside diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index e399d074b2..410705fe65 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.h +// Name: wx/gtk/colour.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,90 +7,44 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKCOLOURH__ -#define __GTKCOLOURH__ - -#ifdef __GNUG__ -#pragma interface -#endif - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/gdiobj.h" -#include "wx/palette.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxDC; -class wxPaintDC; -class wxBitmap; -class wxWindow; - -class wxColour; +#ifndef _WX_GTK_COLOUR_H_ +#define _WX_GTK_COLOUR_H_ //----------------------------------------------------------------------------- // wxColour //----------------------------------------------------------------------------- -class wxColour: public wxGDIObject +class WXDLLIMPEXP_CORE wxColour : public wxColourBase { 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(colourName); } - - wxColour( const wxColour& col ) - : wxGDIObject() - { Ref(col); } - wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; } + // constructors + // ------------ + DEFINE_STD_WXCOLOUR_CONSTRUCTORS + wxColour(const GdkColor& gdkColor); - ~wxColour(); + virtual ~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)); - } + bool operator==(const wxColour& col) const; + bool operator!=(const wxColour& col) const { return !(*this == col); } unsigned char Red() const; unsigned char Green() const; unsigned char Blue() const; - + unsigned char Alpha() const; // Implementation part void CalcPixel( GdkColormap *cmap ); int GetPixel() const; - GdkColor *GetColor() const; + const GdkColor *GetColor() const; protected: - // ref counting code - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - - // Helper functions - void InitFromName(const wxString& colourName); + virtual void + InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); + + virtual bool FromString(const wxString& str); private: DECLARE_DYNAMIC_CLASS(wxColour) }; -#endif // __GTKCOLOURH__ +#endif // _WX_GTK_COLOUR_H_