[gtkmm] Avoid some more deprecation warnings with the recent GTK+.

[Murray Cumming <murrayc src gnome org>]

commit 6bee8ec5d316d291334d120c2cdb6eee60dce0a8
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Oct 26 14:08:19 2011 +0200

    Avoid some more deprecation warnings with the recent GTK+.
    
    	* gdk/src/window.hg: Deprecate get_pointer().
    	* gtk/gtkmm/treeview_private.cc: Include glibmm.h first.
    	* gtk/src/assistant.hg: Fix the formatting of the deprecation comments.

 ChangeLog                     |    8 ++++++++
 demos/gtk-demo/demowindow.cc  |    1 +
 gdk/src/window.hg             |    7 ++++++-
 gtk/gtkmm/treeview_private.cc |    2 +-
 gtk/src/assistant.hg          |   19 ++++++-------------
 5 files changed, 22 insertions(+), 15 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2fd4758..7911e52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-10-26  Murray Cumming  <murrayc murrayc com>
 
+	Avoid some more deprecation warnings with the recent GTK+.
+
+	* gdk/src/window.hg: Deprecate get_pointer().
+	* gtk/gtkmm/treeview_private.cc: Include glibmm.h first.
+	* gtk/src/assistant.hg: Fix the formatting of the deprecation comments.
+
+2011-10-26  Murray Cumming  <murrayc murrayc com>
+
 	Deprecate HandleBox and TearOffMenuItem.
 
 	* gtk/src/handlebox.hg:
diff --git a/demos/gtk-demo/demowindow.cc b/demos/gtk-demo/demowindow.cc
index fe0f0e3..6763ad2 100644
--- a/demos/gtk-demo/demowindow.cc
+++ b/demos/gtk-demo/demowindow.cc
@@ -25,6 +25,7 @@
 #include <gtkmm/cellrenderertext.h>
 #include <gtkmm/treeviewcolumn.h>
 #include <gtkmm/box.h>
+#include <glibmm/convert.h>
 #include "demowindow.h"
 #include "textwidget.h"
 #include "demos.h"
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index ace2cca..0dd31cb 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -32,6 +32,11 @@ _CONFIGINCLUDE(gdkmmconfig.h)
 _DEFS(gdkmm,gdk)
 _PINCLUDE(glibmm/private/object_p.h)
 
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GDK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS 1
+#m4 _POP()
+
 namespace Gdk
 {
 
@@ -192,7 +197,7 @@ public:
   _IGNORE(gdk_window_get_deskrelative_origin)
   _WRAP_METHOD(void get_root_origin(int& x, int& y) const, gdk_window_get_root_origin)
   _WRAP_METHOD(void get_frame_extents(Rectangle& rect), gdk_window_get_frame_extents)
-  _WRAP_METHOD(Glib::RefPtr<Window> get_pointer(int& x, int& y, ModifierType& mask), gdk_window_get_pointer, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<Window> get_pointer(int& x, int& y, ModifierType& mask), gdk_window_get_pointer, refreturn, deprecated "Use get_device_position() instead")
   _WRAP_METHOD(Glib::RefPtr<Window> get_parent(), gdk_window_get_parent, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Window> get_parent() const, gdk_window_get_parent, refreturn, constversion)
   _WRAP_METHOD(Glib::RefPtr<Window> get_toplevel(), gdk_window_get_toplevel, refreturn)
diff --git a/gtk/gtkmm/treeview_private.cc b/gtk/gtkmm/treeview_private.cc
index 0002431..f9aac13 100644
--- a/gtk/gtkmm/treeview_private.cc
+++ b/gtk/gtkmm/treeview_private.cc
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <gtkmm/treeview_private.h>
 #include <glibmm.h>
+#include <gtkmm/treeview_private.h>
 
 
 namespace Gtk
diff --git a/gtk/src/assistant.hg b/gtk/src/assistant.hg
index f3e0455..f9a6a21 100644
--- a/gtk/src/assistant.hg
+++ b/gtk/src/assistant.hg
@@ -74,19 +74,12 @@ public:
   _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, deprecated "A header is no longer shown;
- *     add your header decoration to the page content instead.")
-  _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_page_header_image(const Widget& page), gtk_assistant_get_page_header_image, deprecated "A header is no longer shown;
- *     add your header decoration to the page content instead.")
-  _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_page_header_image(const Widget& page) const, gtk_assistant_get_page_header_image, constversion, deprecated "A header is no longer shown;
- *     add your header decoration to the page content instead.")
-  _WRAP_METHOD(void set_page_side_image(const Widget& page, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_assistant_set_page_side_image, deprecated "Sidebar images are not
- *     shown anymore..")
-  _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_page_side_image(const Widget& page), gtk_assistant_get_page_side_image, deprecated "Sidebar images are not
- *     shown anymore..")
-  _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_page_side_image(const Widget& page) const, gtk_assistant_get_page_side_image, constversion, deprecated "Sidebar images are not
- *     shown anymore..")
+  _WRAP_METHOD(void set_page_header_image(const Widget& page, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_assistant_set_page_header_image, deprecated "A header is no longer shown. Add your header decoration to the page content instead.")
+  _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_page_header_image(const Widget& page), gtk_assistant_get_page_header_image, deprecated "A header is no longer shown. Add your header decoration to the page content instead.")
+  _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_page_header_image(const Widget& page) const, gtk_assistant_get_page_header_image, constversion, deprecated "A header is no longer shown. Aadd your header decoration to the page content instead.")
+  _WRAP_METHOD(void set_page_side_image(const Widget& page, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_assistant_set_page_side_image, deprecated "Sidebar images are not shown anymore..")
+  _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_page_side_image(const Widget& page), gtk_assistant_get_page_side_image, deprecated "Sidebar images are not shown anymore..")
+  _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_page_side_image(const Widget& page) const, gtk_assistant_get_page_side_image, constversion, deprecated "Sidebar images are not shown anymore.")
 
   _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)