[cluttermm] InputDevice: Deprecate get_device_coords(), adding get_coords().

[Murray Cumming <murrayc src gnome org>]

commit 5417cbb079083cf63b9646fbe6517b67362e5a9a
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Apr 9 14:21:42 2014 +0200

    InputDevice: Deprecate get_device_coords(), adding get_coords().

 clutter/src/input-device.hg   |   18 +++++++++++++++++-
 codegen/m4/convert_clutter.m4 |    1 +
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/clutter/src/input-device.hg b/clutter/src/input-device.hg
index 3f2065c..e989a28 100644
--- a/clutter/src/input-device.hg
+++ b/clutter/src/input-device.hg
@@ -16,14 +16,23 @@
  */
 
 #include <glibmm/object.h>
+#include <cluttermm/types.h>
 
 _DEFS(cluttermm,clutter)
 _PINCLUDE(glibmm/private/object_p.h)
 
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS 1
+#m4 _POP()
+
+//TODO: Wrap this?
+typedef struct _ClutterEventSequence            ClutterEventSequence;
+
 namespace Clutter
 {
 
 _WRAP_ENUM(InputDeviceType, ClutterInputDeviceType)
+_WRAP_ENUM(ModifierType, ClutterModifierType)
 
 class Actor;
 class Stage;
@@ -38,9 +47,16 @@ protected:
 public:
 
   _WRAP_METHOD(int get_device_id() const, clutter_input_device_get_device_id)
+
+  //TODO: Wrap ClutterEventSequence? Where would the caller get it from?
+  //Make the sequence const?
+#m4 _CONVERSION(`Point&',`ClutterPoint*',`($3).gobj()')
+  _WRAP_METHOD(bool get_coords(ClutterEventSequence *sequence{?}, Point& point) const, 
clutter_input_device_get_coords)
+
+  _WRAP_METHOD(ModifierType get_modifier_state() const,  clutter_input_device_get_modifier_state)
   _WRAP_METHOD(InputDeviceType get_device_type() const, clutter_input_device_get_device_type)
   _WRAP_METHOD(Glib::ustring get_device_name() const, clutter_input_device_get_device_name)
-  _WRAP_METHOD(void get_device_coords(int &x, int &y) const, clutter_input_device_get_device_coords)
+  _WRAP_METHOD(void get_device_coords(int &x, int &y) const, clutter_input_device_get_device_coords, 
deprecated "Use get_coords() instead.")
   _WRAP_METHOD(Glib::RefPtr<Actor> get_pointer_actor(), clutter_input_device_get_pointer_actor, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Actor> get_pointer_actor() const, clutter_input_device_get_pointer_actor, 
refreturn, constversion)
   _WRAP_METHOD(Glib::RefPtr<Stage> get_pointer_stage(), clutter_input_device_get_pointer_stage, refreturn)
diff --git a/codegen/m4/convert_clutter.m4 b/codegen/m4/convert_clutter.m4
index 3025e6f..a1bf039 100644
--- a/codegen/m4/convert_clutter.m4
+++ b/codegen/m4/convert_clutter.m4
@@ -183,6 +183,7 @@ _CONV_ENUM(Clutter,Gravity)
 _CONV_ENUM(Clutter,InputDeviceType)
 _CONV_ENUM(Clutter,Interpolation)
 _CONV_ENUM(Clutter,LayoutFlags)
+_CONV_ENUM(Clutter,ModifierType)
 _CONV_ENUM(Clutter,OffscreenRedirect)
 _CONV_ENUM(Clutter,Orientation)
 _CONV_ENUM(Clutter,PackType)