[gtkmm] IconView: change IconViewDropPosition to IconView::DropPosition.



commit 34387545911bd7cd9f52e309207affb5d0a7fea7
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 27 21:24:04 2017 +0200

    IconView: change IconViewDropPosition to IconView::DropPosition.

 gtk/src/iconview.ccg    |    8 ++++----
 gtk/src/iconview.hg     |   14 +++++++-------
 tools/m4/convert_gtk.m4 |    2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/gtk/src/iconview.ccg b/gtk/src/iconview.ccg
index 9f33975..36750cf 100644
--- a/gtk/src/iconview.ccg
+++ b/gtk/src/iconview.ccg
@@ -126,7 +126,7 @@ bool IconView::get_cursor(CellRenderer*& cell) const
   return result;
 }
 
-void IconView::get_drag_dest_item(TreeModel::Path& path, IconViewDropPosition& pos) const
+void IconView::get_drag_dest_item(TreeModel::Path& path, DropPosition& pos) const
 {
   GtkTreePath* cpath = nullptr;
   gtk_icon_view_get_drag_dest_item(const_cast<GtkIconView*>(gobj()), &cpath, 
(GtkIconViewDropPosition*)(&pos));
@@ -142,13 +142,13 @@ void IconView::get_drag_dest_item(TreeModel::Path& path) const
     path = Gtk::TreeModel::Path(cpath, true /* make_a_copy */);
 }
 
-void IconView::get_drag_dest_item(IconViewDropPosition& pos) const
+void IconView::get_drag_dest_item(DropPosition& pos) const
 {
    gtk_icon_view_get_drag_dest_item(const_cast<GtkIconView*>(gobj()), nullptr, 
(GtkIconViewDropPosition*)(&pos));
 }
 
 
-bool IconView::get_dest_item_at_pos(int drag_x, int drag_y, TreeModel::Path& path, IconViewDropPosition& 
pos) const
+bool IconView::get_dest_item_at_pos(int drag_x, int drag_y, TreeModel::Path& path, DropPosition& pos) const
 {
   GtkTreePath* cpath = nullptr;
   const bool result = gtk_icon_view_get_dest_item_at_pos(const_cast<GtkIconView*>(gobj()), drag_x, drag_y, 
&cpath, (GtkIconViewDropPosition*)(&pos));
@@ -168,7 +168,7 @@ bool IconView::get_dest_item_at_pos(int drag_x, int drag_y, TreeModel::Path& pat
   return result;
 }
 
-bool IconView::get_dest_item_at_pos(int drag_x, int drag_y, IconViewDropPosition& pos) const
+bool IconView::get_dest_item_at_pos(int drag_x, int drag_y, DropPosition& pos) const
 {
   return gtk_icon_view_get_dest_item_at_pos(const_cast<GtkIconView*>(gobj()), drag_x, drag_y, nullptr, 
(GtkIconViewDropPosition*)(&pos));
 }
diff --git a/gtk/src/iconview.hg b/gtk/src/iconview.hg
index b5f07ea..7852fc4 100644
--- a/gtk/src/iconview.hg
+++ b/gtk/src/iconview.hg
@@ -33,8 +33,6 @@ _PINCLUDE(gtkmm/private/container_p.h)
 namespace Gtk
 {
 
-_WRAP_ENUM(IconViewDropPosition, GtkIconViewDropPosition)
-
 /** The IconView provides an alternative view of a list model.
  * It displays the model as a grid of icons with labels.
  * Like the TreeView, it allows the user to select one or multiple items
@@ -53,7 +51,9 @@ class IconView
   _CLASS_GTKOBJECT(IconView, GtkIconView, GTK_ICON_VIEW, Gtk::Container, GtkContainer)
   _IMPLEMENTS_INTERFACE(CellLayout)
   _IMPLEMENTS_INTERFACE(Scrollable)
+
 public:
+  _WRAP_ENUM(DropPosition, GtkIconViewDropPosition)
 
   _CTOR_DEFAULT()
   _WRAP_CTOR(IconView(const Glib::RefPtr<TreeModel>& model), gtk_icon_view_new_with_model)
@@ -267,7 +267,7 @@ public:
 
 
 /* These are useful to implement your own custom stuff. */
-  _WRAP_METHOD(void set_drag_dest_item(const TreeModel::Path& path, IconViewDropPosition pos), 
gtk_icon_view_set_drag_dest_item)
+  _WRAP_METHOD(void set_drag_dest_item(const TreeModel::Path& path, DropPosition pos), 
gtk_icon_view_set_drag_dest_item)
 
   /** Gets information about the item that is highlighted for feedback.
    *
@@ -276,7 +276,7 @@ public:
    *
    * @newin{2,10}
    */
-  void get_drag_dest_item(TreeModel::Path& path, IconViewDropPosition& pos) const;
+  void get_drag_dest_item(TreeModel::Path& path, DropPosition& pos) const;
 
   /** Gets information about the item that is highlighted for feedback.
    *
@@ -292,7 +292,7 @@ public:
    *
    * @newin{2,10}
    */
-  void get_drag_dest_item(IconViewDropPosition& pos) const;
+  void get_drag_dest_item(DropPosition& pos) const;
   _IGNORE(gtk_icon_view_get_drag_dest_item)
 
   /** Determines the destination item for a given position.
@@ -305,7 +305,7 @@ public:
    *
    * @newin{2,10}
    */
-  bool get_dest_item_at_pos(int drag_x, int drag_y, TreeModel::Path& path, IconViewDropPosition& pos) const;
+  bool get_dest_item_at_pos(int drag_x, int drag_y, TreeModel::Path& path, DropPosition& pos) const;
 
   /** Determines the destination item for a given position.
    *
@@ -327,7 +327,7 @@ public:
    *
    * @newin{2,10}
    */
-  bool get_dest_item_at_pos(int drag_x, int drag_y, IconViewDropPosition& pos) const;
+  bool get_dest_item_at_pos(int drag_x, int drag_y, DropPosition& pos) const;
   _IGNORE(gtk_icon_view_get_dest_item_at_pos)
 
 #m4 
_CONVERSION(`cairo_surface_t*',`Cairo::RefPtr<Cairo::Surface>',`Cairo::make_refptr_for_instance<Cairo::Surface>(new
 Cairo::Surface($3, false /* take reference */))')
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index 0b6d6c3..deb9e5b 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -135,7 +135,7 @@ _CONV_ENUM(Gtk,IconThemeError)
 _CONV_ENUM(Gtk,FileChooserConfirmation)
 _CONV_ENUM(Gtk,SensitivityType)
 _CONV_INCLASS_ENUM(Gtk,Assistant,PageType)
-_CONV_ENUM(Gtk,IconViewDropPosition)
+_CONV_INCLASS_ENUM(Gtk,IconView,DropPosition)
 _CONV_ENUM(Gtk,RecentFilterFlags)
 _CONV_ENUM(Gtk,RecentManagerError)
 _CONV_ENUM(Gtk,RecentSortType)


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