Minimum is now GTK+ 2.4

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 863cb4663c644aa58d051dbbf1c8fdaa4f3e7ef6..4c98208518e14add2e06a3f285170079e36521eb 100644 (file)
--- 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;
     // Implementation part
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;

-#ifdef __WXGTK24__

     const GdkColor *GetColor() const;
     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
 
 protected:
     virtual void

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index fbdefc3b80685cae97ef6279c27eba964cdcdec2..b08a6b4ab4cb87be92c34394f78ab010868dcfbf 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -169,11 +169,7 @@ int wxColour::GetPixel() const
     return M_COLDATA->m_color.pixel;
 }
 
     return M_COLDATA->m_color.pixel;
 }
 

-#ifdef __WXGTK24__

 const GdkColor *wxColour::GetColor() const
 const GdkColor *wxColour::GetColor() const

-#else
-      GdkColor *wxColour::GetColor() const
-#endif

 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") );
 
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") );