/////////////////////////////////////////////////////////////////////////////
-// 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
+// Copyright: (c) 1998 Robert Roebling
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+#ifndef _WX_GTK_COLOUR_H_
+#define _WX_GTK_COLOUR_H_
-#ifndef __GTKCOLOURH__
-#define __GTKCOLOURH__
-
-#ifdef __GNUG__
-#pragma interface
+#ifdef __WXGTK3__
+typedef struct _GdkRGBA GdkRGBA;
#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;
-
//-----------------------------------------------------------------------------
// 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);
+#ifdef __WXGTK3__
+ wxColour(const GdkRGBA& gdkRGBA);
+#endif
- // 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
+#ifdef __WXGTK3__
+ operator const GdkRGBA*() const;
+#else
+ void CalcPixel( GdkColormap *cmap );
+ int GetPixel() const;
+#endif
+ 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_