From 25c5c36231901b9fa8d3e6df68a0046e0189f495 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 5 Nov 2007 18:46:43 +0000 Subject: [PATCH] Minimum is now GTK+ 2.4 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/colour.h | 6 ------ src/gtk/colour.cpp | 4 ---- 2 files changed, 10 deletions(-) diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 863cb4663c..4c98208518 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -40,13 +40,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 diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index fbdefc3b80..b08a6b4ab4 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -169,11 +169,7 @@ int wxColour::GetPixel() const return M_COLDATA->m_color.pixel; } -#ifdef __WXGTK24__ const GdkColor *wxColour::GetColor() const -#else - GdkColor *wxColour::GetColor() const -#endif { wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") ); -- 2.45.2