[gtkmm] Remove deprecated method and fix a wrong deprecation.

[Murray Cumming <murrayc src gnome org>]

commit 991a626b05ff351cccf24138a77715d075baca7c
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue May 18 10:23:03 2010 +0200

    Remove deprecated method and fix a wrong deprecation.
    
    	* gdk/gdkmm/general.h: Fix wrong merge (by me, weeks ago), which left
        the undeprecated functions marked as deprecated.
    	* gtk/src/ruler.hg: Remove deprecated method overload.

 ChangeLog           |    8 ++++++++
 gdk/gdkmm/general.h |   24 ------------------------
 gtk/src/ruler.hg    |    1 -
 gtk/src/toolbar.hg  |    2 --
 4 files changed, 8 insertions(+), 27 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a1de4c9..bfddd74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-05-18  Murray Cumming  <murrayc murrayc com>
 
+    Remove deprecated method and fix a wrong deprecation.
+
+	* gdk/gdkmm/general.h: Fix wrong merge (by me, weeks ago), which left
+    the undeprecated functions marked as deprecated.
+	* gtk/src/ruler.hg: Remove deprecated method overload.
+
+2010-05-18  Murray Cumming  <murrayc murrayc com>
+
     configure.ac: Remove check-news.
 
 	* configure.ac: Remove the check-news option, because it makes it harder
diff --git a/gdk/gdkmm/general.h b/gdk/gdkmm/general.h
index 3c75397..9e7a03a 100644
--- a/gdk/gdkmm/general.h
+++ b/gdk/gdkmm/general.h
@@ -37,75 +37,51 @@ void flush();
 namespace Cairo
 {
 
-#ifndef GDKMM_DISABLE_DEPRECATED
 /** Sets the specified Gdk::Color as the source color of the Cairo context.
  * @param @context The cairo context.
  * @param color The color to use as the source color. 
  *
- * @deprecated Use the overloaded function that takes a const RefPtr
- * reference.
- *
  * @newin{2,10}
  */
 void set_source_color(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Color& color);
-#endif
-
-#ifndef GDKMM_DISABLE_DEPRECATED
 /** Sets the given pixbuf as the source pattern for the Cairo context. The pattern has an extend mode of CAIRO_EXTEND_NONE and is aligned so that the origin of pixbuf is pixbuf_x, pixbuf_y.
  * @param @context The cairo context.
  * @param pixbuf A Gdk::Pixbuf
  * @param pixbuf_x X coordinate of location to place upper left corner of pixbuf.
  * @param pixbuf_y Y coordinate of location to place upper left corner of pixbuf.
  *
- * @deprecated Use the overloaded function that takes a const RefPtr
- * reference.
- *
  * @newin{2,10}
  */
 void set_source_pixbuf(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, double pixbuf_x, double pixbuf_y);
-#endif
 
-#ifndef GDKMM_DISABLE_DEPRECATED
 /** Sets the given pixbuf as the source pattern for the Cairo context. The pattern has an extend mode of CAIRO_EXTEND_NONE and is aligned so that the origin of pixbuf is pixmap_x, pixmap_y.
  * @param @context The cairo context.
  * @param pixmap A Gdk::Pixmap
  * @param pixmap_x X coordinate of location to place upper left corner of pixmap.
  * @param pixmap_y Y coordinate of location to place upper left corner of pixmap.
  *
- * @deprecated Use the overloaded function that takes a const RefPtr
- * reference.
  *
  * @newin{2,10}
  */
 void set_source_pixmap(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr<Gdk::Pixmap>& pixmap, double pixmap_x, double pixmap_y);
-#endif
 
-#ifndef GDKMM_DISABLE_DEPRECATED
 /** Adds the given rectangle to the current path of the context.
  *
  * @param context A cairo context.
  * @param rectangle A rectangle to add to the path of the context. 
  *
- * @deprecated Use add_rectangle_to_path() instead
- * reference.
- *
  * @newin{2,10}
  */
 void add_rectangle_to_path(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Rectangle& rectangle);
-#endif
 
-#ifndef GDKMM_DISABLE_DEPRECATED
 /** Adds the given region to the current path of the context.
  *
  * @param context A cairo context.
  * @param region A region to add to the path of the context. 
  *
- * @deprecated Use add_region_to_path() instead
- *
  * @newin{2,10}
  */
 void add_region_to_path(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Region& region);
-#endif
 
 } //namespace Cairo
 
diff --git a/gtk/src/ruler.hg b/gtk/src/ruler.hg
index 4960ffa..93d5dfc 100644
--- a/gtk/src/ruler.hg
+++ b/gtk/src/ruler.hg
@@ -59,7 +59,6 @@ public:
   _WRAP_METHOD(void set_metric(MetricType metric = PIXELS), gtk_ruler_set_metric)
 
   _WRAP_METHOD(MetricType get_metric() const, gtk_ruler_get_metric)
-  _WRAP_METHOD(MetricType get_metric(), gtk_ruler_get_metric, deprecated "Use the const version")
 
   /** sets the range of the ruler.
    * <i>upper</i> and <i>lower</i> arguments denote the extents of the Ruler.
diff --git a/gtk/src/toolbar.hg b/gtk/src/toolbar.hg
index 3fae5ed..0ae2835 100644
--- a/gtk/src/toolbar.hg
+++ b/gtk/src/toolbar.hg
@@ -122,8 +122,6 @@ public:
   _IGNORE_SIGNAL("focus_home_or_end")
 
   //Ignore deprecated GtkToolbarAPI:
-  //Normally we just deprecate it in gtkmm too,
-  //but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc.
   _IGNORE(gtk_toolbar_append_item, gtk_toolbar_prepend_item, gtk_toolbar_insert_item, gtk_toolbar_insert_stock
           gtk_toolbar_append_space, gtk_toolbar_prepend_space, gtk_toolbar_insert_space, gtk_toolbar_remove_space
           gtk_toolbar_append_element, gtk_toolbar_prepend_element, gtk_toolbar_insert_element,