X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4a81a2e96b5a349ee9430b91d36e7e8a21d7976..a516284f67e1910fc6dc5364b289340332d0d35f:/include/wx/gtk/colour.h diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index da8e9ee208..410705fe65 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -1,84 +1,50 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.h +// Name: wx/gtk/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__ -#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: - // ctors - // default - wxColour(); - // from RGB - wxColour( char red, char green, char blue ); - // implicit conversion from the colour name - wxColour( const wxString &colourName ) { InitFromName(colourName); } - wxColour( const char *colourName ) { InitFromName(colourName); } + // constructors + // ------------ + DEFINE_STD_WXCOLOUR_CONSTRUCTORS + wxColour(const GdkColor& gdkColor); - // copy ctors and assignment operators - wxColour( const wxColour& col ); - wxColour( const wxColour* col ); - wxColour& operator = ( const wxColour& col ); + virtual ~wxColour(); - // dtor - ~wxColour(); + bool operator==(const wxColour& col) const; + bool operator!=(const wxColour& col) const { return !(*this == col); } - // comparison - bool operator == ( const wxColour& col ); - bool operator != ( const wxColour& col ); - - // accessors - void Set( unsigned char red, unsigned char green, unsigned char blue ); - unsigned char Red() const; - unsigned char Green() const; - unsigned char Blue() const; - bool Ok() const; + unsigned char Red() const; + unsigned char Green() const; + unsigned char Blue() const; + unsigned char Alpha() const; - // implementation - void CalcPixel( GdkColormap *cmap ); - int GetPixel() const; - GdkColor *GetColor() const; + // Implementation part + void CalcPixel( GdkColormap *cmap ); + int GetPixel() const; + const GdkColor *GetColor() const; protected: - // 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) + DECLARE_DYNAMIC_CLASS(wxColour) }; -#endif // __GTKCOLOURH__ +#endif // _WX_GTK_COLOUR_H_