Define WXBUILDING in Xcode projects.

[wxWidgets.git] / include / wx / gtk / colour.h

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 4c98208518e14add2e06a3f285170079e36521eb..98287139fdc461901c6bfa7c90b2eb9c065d4e48 100644 (file)
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -10,6 +10,10 @@
 #ifndef _WX_GTK_COLOUR_H_
 #define _WX_GTK_COLOUR_H_
 
 #ifndef _WX_GTK_COLOUR_H_
 #define _WX_GTK_COLOUR_H_
 

+#ifdef __WXGTK3__
+typedef struct _GdkRGBA GdkRGBA;
+#endif
+

 //-----------------------------------------------------------------------------
 // wxColour
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxColour
 //-----------------------------------------------------------------------------


@@ -19,18 +23,16 @@ class WXDLLIMPEXP_CORE wxColour : public wxColourBase
 public:
     // constructors
     // ------------
 public:
     // constructors
     // ------------

-
-    // default
-    wxColour() {}

     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
     wxColour(const GdkColor& gdkColor);
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
     wxColour(const GdkColor& gdkColor);

+#ifdef __WXGTK3__
+    wxColour(const GdkRGBA& gdkRGBA);
+#endif

 
     virtual ~wxColour();
 
 
     virtual ~wxColour();
 

-    bool IsOk() const { return m_refData != NULL; }
-
-    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 Red() const;
     unsigned char Green() const;


@@ -38,8 +40,12 @@ public:
     unsigned char Alpha() const;
 
     // Implementation part
     unsigned char Alpha() const;
 
     // Implementation part

+#ifdef __WXGTK3__
+    operator const GdkRGBA*() const;
+#else

     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;

+#endif

     const GdkColor *GetColor() const;
 
 protected:
     const GdkColor *GetColor() const;
 
 protected:


@@ -48,7 +54,6 @@ protected:
 
     virtual bool FromString(const wxString& str);
 
 
     virtual bool FromString(const wxString& str);
 

-private:

     DECLARE_DYNAMIC_CLASS(wxColour)
 };
 
     DECLARE_DYNAMIC_CLASS(wxColour)
 };