X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e86d4e59c10a8110a5bcf714bca17a8eea65e8b8..d613be55db6d1100cf38e3c9f666f7ced4db6b65:/include/wx/gtk/colour.h diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 88ac82e688..410705fe65 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -19,19 +19,13 @@ class WXDLLIMPEXP_CORE wxColour : public wxColourBase public: // constructors // ------------ - - // default - wxColour() {} DEFINE_STD_WXCOLOUR_CONSTRUCTORS wxColour(const GdkColor& gdkColor); virtual ~wxColour(); - bool Ok() const { return IsOk(); } - 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; @@ -41,13 +35,7 @@ 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: virtual void