X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f558e23ff5721fafa7d0a5a8d11150093d7d994..4f7222ca3632e40ad8f77947dba6bced63733655:/include/wx/gtk/colour.h?ds=sidebyside

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 26f002d077..98287139fd 100644
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -7,25 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKCOLOURH__
-#define __GTKCOLOURH__
+#ifndef _WX_GTK_COLOUR_H_
+#define _WX_GTK_COLOUR_H_
 
-#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;
+#ifdef __WXGTK3__
+typedef struct _GdkRGBA GdkRGBA;
+#endif
 
 //-----------------------------------------------------------------------------
 // wxColour
@@ -36,40 +23,38 @@ class WXDLLIMPEXP_CORE wxColour : public wxColourBase
 public:
     // constructors
     // ------------
-
-    // default
-    wxColour() {}
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
     wxColour(const GdkColor& gdkColor);
+#ifdef __WXGTK3__
+    wxColour(const GdkRGBA& gdkRGBA);
+#endif
 
-    ~wxColour();
-
-    bool Ok() const { return m_refData != NULL; }
+    virtual ~wxColour();
 
-    bool operator == ( const wxColour& col ) const;
-    bool operator != ( const wxColour& col ) const { return !(*this == col); }
+    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
+#ifdef __WXGTK3__
+    operator const GdkRGBA*() const;
+#else
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
-#ifdef __WXGTK24__
-    const GdkColor *GetColor() const;
-#else
-    // GDK functions from old gtk2 versions take non-const color parameters,
-    // too many uses to deal with individually
-    GdkColor *GetColor() const;
 #endif
+    const GdkColor *GetColor() const;
 
 protected:
-    virtual bool FromString(const wxChar *str);
-    virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
+    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_