X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/gtk/colour.h

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 07121726d6..d48d707cbe 100644
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/colour.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -10,6 +9,10 @@
 #ifndef _WX_GTK_COLOUR_H_
 #define _WX_GTK_COLOUR_H_
 
+#ifdef __WXGTK3__
+typedef struct _GdkRGBA GdkRGBA;
+#endif
+
 //-----------------------------------------------------------------------------
 // wxColour
 //-----------------------------------------------------------------------------
@@ -19,11 +22,11 @@ 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
 
     virtual ~wxColour();
 
@@ -36,8 +39,12 @@ public:
     unsigned char Alpha() const;
 
     // Implementation part
+#ifdef __WXGTK3__
+    operator const GdkRGBA*() const;
+#else
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
+#endif
     const GdkColor *GetColor() const;
 
 protected:
@@ -46,7 +53,6 @@ protected:
 
     virtual bool FromString(const wxString& str);
 
-private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };