X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb3db09022512bcbb6c6c41dd6859ab9245186a1..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/gtk/colour.h diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 7f0693dca0..4c98208518 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -7,25 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKCOLOURH__ -#define __GTKCOLOURH__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/gdiobj.h" -#include "wx/palette.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDC; -class WXDLLIMPEXP_CORE wxPaintDC; -class WXDLLIMPEXP_CORE wxBitmap; -class WXDLLIMPEXP_CORE wxWindow; - -class WXDLLIMPEXP_CORE wxColour; +#ifndef _WX_GTK_COLOUR_H_ +#define _WX_GTK_COLOUR_H_ //----------------------------------------------------------------------------- // wxColour @@ -40,10 +23,11 @@ public: // default wxColour() {} DEFINE_STD_WXCOLOUR_CONSTRUCTORS + wxColour(const GdkColor& gdkColor); - ~wxColour(); + virtual ~wxColour(); - bool Ok() const { return m_refData != NULL; } + bool IsOk() const { return m_refData != NULL; } bool operator == ( const wxColour& col ) const; bool operator != ( const wxColour& col ) const { return !(*this == col); } @@ -51,22 +35,21 @@ public: 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; + virtual void + InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); - virtual bool FromString(const wxChar *str); - virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue ); + virtual bool FromString(const wxString& str); private: DECLARE_DYNAMIC_CLASS(wxColour) }; -#endif // __GTKCOLOURH__ +#endif // _WX_GTK_COLOUR_H_