[gtkmm] Fix the build with the latest GTK+ from git master.

[Murray Cumming <murrayc src gnome org>]

commit 004c53e5b3a2bf97e46444036792671fa213ec0d
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jan 4 01:28:11 2011 +0100

    Fix the build with the latest GTK+ from git master.
    
    * gdk/src/device.hg: Added warp().
    * gdk/src/display.[hg|ccg]: Removed pointer_ungrab(),
    keyboard_ungrab(), pointer_is_grabbed(), device_is_grabbed(), get_pointer(),
    get_window_at_pointer(), warp_pointer, set_pointer_hooks(),
    unset_pointer_hooks(), set_device_hooks(), unset_device_hooks().
    
    Some of these Display methods are now in Device instead, which will be shown
    in the deprecation comments in gtkmm 2.24, when we make the changes there.

 ChangeLog           |   13 ++++++++++
 gdk/src/device.hg   |    2 +
 gdk/src/display.ccg |   47 ------------------------------------
 gdk/src/display.hg  |   66 +++++---------------------------------------------
 4 files changed, 22 insertions(+), 106 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c335ce2..a1182b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-04  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build with the latest GTK+ from git master.
+
+	* gdk/src/device.hg: Added warp().
+	* gdk/src/display.[hg|ccg]: Removed pointer_ungrab(), 
+	keyboard_ungrab(), pointer_is_grabbed(), device_is_grabbed(), get_pointer(), 
+	get_window_at_pointer(), warp_pointer, set_pointer_hooks(), 
+	unset_pointer_hooks(), set_device_hooks(), unset_device_hooks().
+
+	Some of these Display methods are now in Device instead, which will be shown 
+	in the deprecation comments in gtkmm 2.24, when we make the changes there.
+
 2010-12-28  Krzesimir Nowak  <qdlacz gmail com>
 
 	Added new methods to Gdk::Device.
diff --git a/gdk/src/device.hg b/gdk/src/device.hg
index 432854c..37fb5fc 100644
--- a/gdk/src/device.hg
+++ b/gdk/src/device.hg
@@ -82,9 +82,11 @@ public:
   _WRAP_METHOD(GrabStatus grab(const Glib::RefPtr<Window>& window, GrabOwnership grab_ownership, bool owner_events, EventMask event_mask, const Glib::RefPtr<Cursor>& cursor, guint32 time_), gdk_device_grab)
 
   _WRAP_METHOD(void ungrab(guint32 time_), gdk_device_ungrab)
+  _WRAP_METHOD(void warp(const Glib::RefPtr<Screen>&, int x, int y), gdk_device_warp)
 
   // TODO: docs.
   void get_position(int& x, int& y) const;
+  
   // TODO: docs.
   void get_position(Glib::RefPtr<Screen>& screen, int& x, int& y) const;
   _IGNORE(gdk_device_get_position)
diff --git a/gdk/src/display.ccg b/gdk/src/display.ccg
index cbda674..0f83a33 100644
--- a/gdk/src/display.ccg
+++ b/gdk/src/display.ccg
@@ -41,53 +41,6 @@ void Display::selection_send_notify(GdkNativeWindow requestor, Glib::ustring& se
   gdk_selection_send_notify_for_display(gobj(), requestor, Gdk::AtomString::to_c_type(selection), Gdk::AtomString::to_c_type(target), Gdk::AtomString::to_c_type(property), time_);
 }
 
-void Display::get_pointer(Glib::RefPtr<Screen>& screen, int& x, int& y, ModifierType& mask)
-{
-  GdkScreen* cScreen = 0;
-  GdkModifierType cMask = (GdkModifierType)mask;
-  gdk_display_get_pointer(gobj(), &cScreen, &x, &y, &cMask);
-  screen = Glib::wrap(cScreen);
-  mask = (ModifierType)cMask;
-}
-
-void Display::get_pointer(int& x, int& y, ModifierType& mask)
-{
-  GdkModifierType cMask = (GdkModifierType)mask;
-  gdk_display_get_pointer(gobj(), 0, &x, &y, &cMask);
-  mask = (ModifierType)cMask;
-}
-
-
-Glib::RefPtr<Window> Display::get_window_at_pointer()
-{
-
-  Glib::RefPtr<Window> retvalue = Glib::wrap(gdk_display_get_window_at_pointer(gobj(), 0, 0));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
-}
-
-Glib::RefPtr<const Window> Display::get_window_at_pointer() const
-{
-
-  Glib::RefPtr<const Window> retvalue = Glib::wrap(gdk_display_get_window_at_pointer(const_cast<GdkDisplay*>(gobj()), 0, 0));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
-}
-
-GdkDisplayPointerHooks*  Display::unset_pointer_hooks()
-{
-  return gdk_display_set_pointer_hooks(gobj(), 0 /* See GDK docs */);
-}
-
-GdkDisplayDeviceHooks*  Display::unset_device_hooks()
-{
-  return gdk_display_set_device_hooks(gobj(), 0 /* See GDK docs */);
-}
-
 void Display::store_clipboard(const Glib::RefPtr<Gdk::Window>& clipboard_window, guint32 time_)
 {
   gdk_display_store_clipboard(gobj(), clipboard_window->gobj(), time_, 0 /* see the C docs */, 0);
diff --git a/gdk/src/display.hg b/gdk/src/display.hg
index 1d9a250..cda95b0 100644
--- a/gdk/src/display.hg
+++ b/gdk/src/display.hg
@@ -61,10 +61,9 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Screen> get_default_screen(), gdk_display_get_default_screen, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Screen> get_default_screen() const, gdk_display_get_default_screen, refreturn, constversion)
 
-  _WRAP_METHOD(void pointer_ungrab(guint32 timestamp), gdk_display_pointer_ungrab)
-  _WRAP_METHOD(void keyboard_ungrab(guint32 timestamp), gdk_display_keyboard_ungrab)
-  _WRAP_METHOD(bool pointer_is_grabbed() const, gdk_display_pointer_is_grabbed)
-  _WRAP_METHOD(bool device_is_grabbed(const Glib::RefPtr<Device>& device) const, gdk_display_device_is_grabbed)
+  _IGNORE(gdk_display_pointer_ungrab, gdk_display_keyboard_ungrab,
+    gdk_display_pointer_is_grabbed, gdk_display_device_is_grabbed) //deprecated
+
   _WRAP_METHOD(void beep(), gdk_display_beep)
   _WRAP_METHOD(void sync(), gdk_display_sync)
   _WRAP_METHOD(void	close(), gdk_display_close)
@@ -92,61 +91,10 @@ public:
 
   _WRAP_METHOD(static Glib::RefPtr<Display> get_default(), gdk_display_get_default, refreturn)
 
-  /** Gets the current location of the pointer and the current modifier
-   * mask for a given display.
-   *
-   * @param screen location to store the screen that the cursor is on.
-   * @param x location to store root window X coordinate of pointer.
-   * @param y location to store root window Y coordinate of pointer.
-   * @param mask location to store current modifier mask.
-   *
-   **/
-  void get_pointer(Glib::RefPtr<Screen>& screen, int& x, int& y, ModifierType& mask);
-
-  _IGNORE(gdk_display_get_core_pointer) //deprecated
-
-  // In fact, any one of these gdk_display_get_pointer() args can be NULL, but we don't need so many overloads.
-  /**
-   * Gets the current location of the pointer and the current modifier
-   * mask for a given display.
-   *
-   * @param x location to store root window X coordinate of pointer.
-   * @param y location to store root window Y coordinate of pointer.
-   * @param mask location to store current modifier mask.
-   *
-   **/
-  void get_pointer(int& x, int& y, ModifierType& mask);
-  _IGNORE(gdk_display_get_pointer)
-
-  _WRAP_METHOD(Glib::RefPtr<Window> get_window_at_pointer(int& win_x, int& win_y), gdk_display_get_window_at_pointer, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Window> get_window_at_pointer(int& win_x, int& win_y) const, gdk_display_get_window_at_pointer, refreturn, constversion)
-
-  /** Obtains the window underneath the mouse pointer. Returns a null RefPtr if the window
-   * under the mouse pointer is not known to GDK (for example, belongs to
-   * another application).
-   * @result The window underneath the mouse pointer.
-   */
-  Glib::RefPtr<Window> get_window_at_pointer();
-
-  /** Obtains the window underneath the mouse pointer. Returns a null RefPtr if the window
-   * under the mouse pointer is not known to GDK (for example, belongs to
-   * another application).
-   * @result The window underneath the mouse pointer.
-   */
-  Glib::RefPtr<const Window> get_window_at_pointer() const;
-
-
-  _WRAP_METHOD(void warp_pointer(const Glib::RefPtr<Screen>& screen, int x, int y), gdk_display_warp_pointer)
-
-  //TODO: Wrap this array parameter as a vector?
-  _WRAP_METHOD(GdkDisplayPointerHooks* set_pointer_hooks(const GdkDisplayPointerHooks* new_hooks), gdk_display_set_pointer_hooks)
-  //TODO: Documentation.
-  GdkDisplayPointerHooks* unset_pointer_hooks();
-
-  //TODO: Wrap this array parameter as a vector?
-  _WRAP_METHOD(GdkDisplayDeviceHooks* set_device_hooks(const GdkDisplayDeviceHooks *new_hooks), gdk_display_set_device_hooks)
-  //TODO: Documentation.
-  GdkDisplayDeviceHooks* unset_device_hooks();
+ 
+  
+  _IGNORE(gdk_display_get_pointer, gdk_display_get_core_pointer,
+    gdk_display_get_window_at_pointer, gdk_display_warp_pointer) //deprecated
 
   _WRAP_METHOD(static Glib::RefPtr<Display> open_default_libgtk_only(), gdk_display_open_default_libgtk_only, refreturn)