Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 25ef5e9d8252b0677cbc2e23a0e1fb66543b3203..d48d707cbe414b32a5d1b59fe3b204ace6a2c257 100644 (file)
--- 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
 // Name:        wx/gtk/colour.h
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -10,6 +9,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,39 +22,37 @@ 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

 
 

-    ~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 Red() const;
     unsigned char Green() const;
     unsigned char Blue() const;

+    unsigned char Alpha() const;

 
     // Implementation part
 
     // Implementation part

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

     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
     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
 #endif

+    const GdkColor *GetColor() const;

 
 protected:
 
 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)
 };
 
     DECLARE_DYNAMIC_CLASS(wxColour)
 };