[gtkmm] Build fixes are previous commit.



commit beba8b7366f62c2eee6dbbb3242d55bc338e7d40
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Sep 19 10:30:54 2011 +0200

    Build fixes are previous commit.
    
    	* gdk/src/device.hg:
    	* gdk/src/window.ccg:
    	* gdk/src/window.hg: Build fixes.

 ChangeLog          |    8 ++++++++
 gdk/src/device.hg  |    2 +-
 gdk/src/window.ccg |    8 ++++----
 gdk/src/window.hg  |    2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6528df4..e1081d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-09-19  Murray Cumming  <murrayc murrayc com>
 
+	Build fixes are previous commit.
+
+	* gdk/src/device.hg:
+	* gdk/src/window.ccg:
+	* gdk/src/window.hg: Build fixes.
+
+2011-09-19  Murray Cumming  <murrayc murrayc com>
+
 	Some minor GDK API additions.
 
 	* gdk/src/device.hg: Added get_n_keys() and list_slave_devices().
diff --git a/gdk/src/device.hg b/gdk/src/device.hg
index e331464..5ee2000 100644
--- a/gdk/src/device.hg
+++ b/gdk/src/device.hg
@@ -73,7 +73,7 @@ public:
 
 #m4 _CONVERSION(`GList*',`std::vector<Glib::RefPtr<Gdk::Device> >',`Glib::ListHandler<Glib::RefPtr<Gdk::Device> >::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
   _WRAP_METHOD(std::vector<Glib::RefPtr<Gdk::Device> > list_slave_devices(), gdk_device_list_slave_devices)
-  _WRAP_METHOD(std::vector<Glib::RefPtr<const Gdk::Device> > list_slave_devices() const, gdk_device_list_slave_devices, constversion)
+  //TODO:_WRAP_METHOD(std::vector<Glib::RefPtr<const Gdk::Device> > list_slave_devices() const, gdk_device_list_slave_devices, constversion)
 
   _WRAP_METHOD(int get_n_axes() const, gdk_device_get_n_axes)
  //TODO: A list of GdkAtom, which we should show as strings: _WRAP_METHOD(GList *  gdk_device_list_axes      () const, gdk_device_list_axes)
diff --git a/gdk/src/window.ccg b/gdk/src/window.ccg
index c0812c4..d309d8c 100644
--- a/gdk/src/window.ccg
+++ b/gdk/src/window.ccg
@@ -68,17 +68,17 @@ DragProtocol Window::get_drag_protocol(Glib::RefPtr<Window>& target) const
 {
   GdkWindow* window = 0;
   GdkDragProtocol result = gdk_window_get_drag_protocol(
-    const_cast<GdkWindow*>(gobj())
+    const_cast<GdkWindow*>(gobj()),
     &window);
     
   target = Glib::wrap(window, true /* take ref */);
-  return result;
+  return (DragProtocol)result;
 }
 
 DragProtocol Window::get_drag_protocol() const
 {
-  return gdk_window_get_drag_protocol(
-    const_cast<GdkWindow*>(gobj())
+  return (DragProtocol)gdk_window_get_drag_protocol(
+    const_cast<GdkWindow*>(gobj()),
     0);
 }
 
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index 772a886..ace2cca 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -249,7 +249,7 @@ public:
   _WRAP_METHOD(void unmaximize(), gdk_window_unmaximize)
   _WRAP_METHOD(void register_dnd(), gdk_window_register_dnd)
   
-  _WRAP_DOCS_ONLY(gdk_window_get_drag_protocol)
+  _WRAP_METHOD_DOCS_ONLY(gdk_window_get_drag_protocol)
   DragProtocol get_drag_protocol(Glib::RefPtr<Window>& target) const;
 
   //TODO: Documentation  



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]