[gtkmm] Fix the --enable-warnings=fatal build with GTK+ 3.1.x.

[Murray Cumming <murrayc src gnome org>]

commit a03edaed9499b56593917a29e90fd5746a093505
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon May 9 10:28:58 2011 +0200

    Fix the --enable-warnings=fatal build with GTK+ 3.1.x.
    
    	* gtk/src/assistant.hg:
    	* gtk/src/menuitem.hg: Add some #undef GTK_DISABLE_DEPRECATED so we can build
    	with GTK+ 3.1.x.

 ChangeLog            |    9 +++++++++
 gtk/src/assistant.hg |    7 +++++++
 gtk/src/menuitem.hg  |    9 ++++++++-
 3 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 56649b2..e25a962 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-09  Murray Cumming  <murrayc murrayc-desktop>
+
+	reviewed by: <delete if not using a buddy>
+
+	* NEWS:
+	* configure.ac:
+	* gtk/src/assistant.hg:
+	* gtk/src/menuitem.hg:
+
 2011-05-02  Murray Cumming  <murrayc murrayc com>
 
 	EntryCompletion: signal_cursor_match_info(): Fix this.
diff --git a/gtk/src/assistant.hg b/gtk/src/assistant.hg
index 09818a7..433d36b 100644
--- a/gtk/src/assistant.hg
+++ b/gtk/src/assistant.hg
@@ -25,6 +25,10 @@
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/window_p.h)
 
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+
 namespace Gtk
 {
 
@@ -67,12 +71,15 @@ public:
   _WRAP_METHOD(AssistantPageType  get_page_type(const Widget& page) const, gtk_assistant_get_page_type)
   _WRAP_METHOD(void set_page_title(const Widget& page, const Glib::ustring& title), gtk_assistant_set_page_title)
   _WRAP_METHOD(Glib::ustring get_page_title(const Widget& page) const, gtk_assistant_get_page_title)
+
+  //TODO: Deprecate these in gtkmm 3.2:
   _WRAP_METHOD(void set_page_header_image(const Widget& page, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_assistant_set_page_header_image)
   _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_page_header_image(const Widget& page), gtk_assistant_get_page_header_image)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_page_header_image(const Widget& page) const, gtk_assistant_get_page_header_image, constversion)
   _WRAP_METHOD(void set_page_side_image(const Widget& page, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_assistant_set_page_side_image)
   _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_page_side_image(const Widget& page), gtk_assistant_get_page_side_image)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_page_side_image(const Widget& page) const, gtk_assistant_get_page_side_image, constversion)
+
   _WRAP_METHOD(void set_page_complete(const Widget& page, bool complete = true), gtk_assistant_set_page_complete)
   _WRAP_METHOD(bool get_page_complete(const Widget& page) const, gtk_assistant_get_page_complete)
   _WRAP_METHOD(void add_action_widget(Widget& child), gtk_assistant_add_action_widget)
diff --git a/gtk/src/menuitem.hg b/gtk/src/menuitem.hg
index fd974b9..1697266 100644
--- a/gtk/src/menuitem.hg
+++ b/gtk/src/menuitem.hg
@@ -25,6 +25,10 @@ _CONFIGINCLUDE(gtkmmconfig.h)
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/bin_p.h)
 
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+
 namespace Gtk
 {
 
@@ -69,8 +73,11 @@ public:
   _WRAP_METHOD(void activate(), gtk_menu_item_activate)
   _WRAP_METHOD(void toggle_size_request(int& requisition), gtk_menu_item_toggle_size_request)
   _WRAP_METHOD(void toggle_size_allocate(int allocation), gtk_menu_item_toggle_size_allocate)
+
+  //TODO: Deprecate these in gtkmm 3.2:
   _WRAP_METHOD(void set_right_justified(bool right_justified = true), gtk_menu_item_set_right_justified)
   _WRAP_METHOD(bool get_right_justified() const, gtk_menu_item_get_right_justified)
+
   _WRAP_METHOD(void set_accel_path(const Glib::ustring& accel_path), gtk_menu_item_set_accel_path)
   void unset_accel_path();
   _WRAP_METHOD(Glib::ustring get_accel_path() const, gtk_menu_item_get_accel_path)
@@ -78,7 +85,7 @@ public:
   _WRAP_METHOD(Glib::ustring get_label() const, gtk_menu_item_get_label)
   _WRAP_METHOD(void set_use_underline(bool setting = true), gtk_menu_item_set_use_underline)
   _WRAP_METHOD(bool get_use_underline() const, gtk_menu_item_get_use_underline)
-  
+
   _WRAP_METHOD(void set_reserve_indicator(bool reserve = true), gtk_menu_item_set_reserve_indicator)
   _WRAP_METHOD(bool get_reserve_indicator() const, gtk_menu_item_get_reserve_indicator)