[gdlmm] Use vector as container



commit 49c68a9c8428d22da4fd489dd28634108dc0559e
Author: Fabien Parent <parent f gmail com>
Date:   Mon Sep 5 21:00:51 2011 +0200

    Use vector as container

 gdl/src/dock.hg       |    5 ++++-
 gdl/src/docklayout.hg |    6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/gdl/src/dock.hg b/gdl/src/dock.hg
index fa616e2..6637f05 100644
--- a/gdl/src/dock.hg
+++ b/gdl/src/dock.hg
@@ -23,6 +23,8 @@ _PINCLUDE(gdlmm/private/dockobject_p.h)
 #include "dockitem.h"
 #include "dockplaceholder.h"
 
+#include <vector>
+
 typedef _GdlDockItem GdlDockItem;
 
 
@@ -47,7 +49,8 @@ public:
   
   _WRAP_METHOD(DockPlaceholder* get_placeholder_by_name(const Glib::ustring& name) const, gdl_dock_get_placeholder_by_name)
   
-  _WRAP_METHOD(Glib::ListHandle<DockItem*> get_named_items() const, gdl_dock_get_named_items)
+#m4 _CONVERSION(`GList*',`std::vector<DockItem*>',`Glib::ListHandler<DockItem*>::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
+  _WRAP_METHOD(std::vector<DockItem*> get_named_items() const, gdl_dock_get_named_items)
   
   Dock* get_toplevel() const;
   
diff --git a/gdl/src/docklayout.hg b/gdl/src/docklayout.hg
index a272c20..33f3cfa 100644
--- a/gdl/src/docklayout.hg
+++ b/gdl/src/docklayout.hg
@@ -21,6 +21,7 @@ _PINCLUDE(glibmm/private/object_p.h)
 
 #include <glibmm/object.h>
 #include <string>
+#include <vector>
 
 #include "dock.h"
 #include "dockmaster.h"
@@ -47,8 +48,9 @@ public:
   _WRAP_METHOD(void save_layout(const Glib::ustring& name), gdl_dock_layout_save_layout)
   
   _WRAP_METHOD(void delete_layout(const Glib::ustring& name), gdl_dock_layout_delete_layout)
-  
-  _WRAP_METHOD(Glib::ListHandle<Glib::ustring> get_layouts(bool include_default), gdl_dock_layout_get_layouts)
+
+#m4 _CONVERSION(`GList*',`std::vector<Glib::ustring>',`Glib::ListHandler<Glib::ustring>::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
+  _WRAP_METHOD(std::vector<Glib::ustring> get_layouts(bool include_default), gdl_dock_layout_get_layouts)
   
   _WRAP_METHOD(void run_manager(), gdl_dock_layout_run_manager)
   



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