[gtkmm] ToolPalette: Added drag methods.



commit 9f99b98f2b5a0b03dfae27c0d49091fb9934ad2c
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Dec 21 12:32:19 2009 +0100

    ToolPalette: Added drag methods.
    
    * tools/m4/convert_gtk.m4:
    * gtk/src/toolpalette.hg: Added get_drag_item(), get_drag_target_item(),
    and get_drag_target_group().

 ChangeLog               |    8 ++++++++
 gtk/src/toolpalette.hg  |    8 +++++---
 tools/m4/convert_gtk.m4 |    1 +
 3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 96dd435..61c76f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-21  Murray Cumming  <murrayc murrayc com>
+
+	ToolPalette: Added drag methods.
+
+	* tools/m4/convert_gtk.m4:
+	* gtk/src/toolpalette.hg: Added get_drag_item(), get_drag_target_item(), 
+	and get_drag_target_group().
+
 2009-12-17  Krzesimir Nowak  <qdlacz gmail com>
 
 	* gtk/gtkmm/border.h: Created separate header file for Gtk::Border.
diff --git a/gtk/src/toolpalette.hg b/gtk/src/toolpalette.hg
index a7860a5..a0adc8e 100644
--- a/gtk/src/toolpalette.hg
+++ b/gtk/src/toolpalette.hg
@@ -59,7 +59,7 @@ public:
 
   _WRAP_METHOD(ToolItem* get_drop_item(int x, int y), gtk_tool_palette_get_drop_item)
   _WRAP_METHOD(Widget* get_drop_group(int x, int y), gtk_tool_palette_get_drop_group)
-  //_WRAP_METHOD(Widget* get_drag_item(const SelectionData& selection), gtk_tool_palette_get_drag_item )
+  _WRAP_METHOD(Widget* get_drag_item(const SelectionData& selection), gtk_tool_palette_get_drag_item )
 
   _WRAP_METHOD(void set_drag_source(ToolPaletteDragTargets targets), gtk_tool_palette_set_drag_source)
   _WRAP_METHOD(void add_drag_dest(Gtk::Widget& widget, DestDefaults flags, ToolPaletteDragTargets targets, Gdk::DragAction actions), gtk_tool_palette_add_drag_dest)
@@ -69,8 +69,10 @@ public:
   _WRAP_METHOD(Adjustment* get_vadjustment (), gtk_tool_palette_get_vadjustment)
   _WRAP_METHOD(const Adjustment* get_vadjustment () const, gtk_tool_palette_get_vadjustment, constversion)
 
-  //_WRAP_METHOD(static const TargetEntry* get_drag_target_item(), gtk_tool_palette_get_drag_target_item)
-  //_WRAP_METHOD(static const TargetEntry* get_drag_target_group(), gtk_tool_palette_get_drag_target_group)
+
+#m4 _CONVERSION(`const GtkTargetEntry*',`TargetEntry',`TargetEntry(*$3)')
+  _WRAP_METHOD(static TargetEntry get_drag_target_item(), gtk_tool_palette_get_drag_target_item)
+  _WRAP_METHOD(static TargetEntry get_drag_target_group(), gtk_tool_palette_get_drag_target_group)
   
   //TODO: Ignore this? It's in many widgets and seems internals.
   //Ignore action signal: _WRAP_SIGNAL(void set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment), "set-scroll-adjustments")
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index ff02505..27193a7 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -451,6 +451,7 @@ _CONVERSION(`const Glib::RefPtr<Clipboard>&',`GtkClipboard*',__CONVERT_REFPTR_TO
 #_CONVERSION(`GtkClipboard*',`Gtk::Clipboard&',`Glib::wrap($3, true)')
 
 _CONVERSION(`SelectionData',`GtkSelectionData*', `($3).gobj()')
+_CONVERSION(`const SelectionData&',`const GtkSelectionData*', __FR2P)
 _CONVERSION(`const SelectionData&',`GtkSelectionData*', __FCR2P)
 _CONVERSION(`SelectionData&',`GtkSelectionData*', __FR2P)
 #_CONVERSION(`GtkSelectionData*',`SelectionData', `Gtk::SelectionData(($3), true)')



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