]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/gtk/colour.h
Fixed typos in comments (patch #1515724)
[wxWidgets.git] / include / wx / gtk / colour.h
index 7f0693dca00e0ed7d4d3c01f4344bb0a59896d63..26f002d077f14163c28b81731044c9028fc0795b 100644 (file)
@@ -40,6 +40,7 @@ public:
     // default
     wxColour() {}
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
+    wxColour(const GdkColor& gdkColor);
 
     ~wxColour();
 
@@ -55,13 +56,15 @@ public:
     // Implementation part
     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
 
 protected:
-    // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-
     virtual bool FromString(const wxChar *str);
     virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );