Mercurial > hg > toolkit / file diff

--- a/ui/gtk/model.h	Thu May 15 20:06:28 2014 +0200
+++ b/ui/gtk/model.h	Thu May 15 21:48:53 2014 +0200
@@ -31,6 +31,7 @@
 
 #include "../ui/toolkit.h"
 #include "../common/context.h"
+#include "../ui/tree.h"
 
 #ifdef	__cplusplus
 extern "C" {
@@ -42,12 +43,12 @@
  * UiList to GtkTreeModel wrapper
  */
 struct UiListModel {
-    GObject    object;
-    UiListPtr  *list;
-    GType      *columntypes;
-    void*      (*getvalue)(void*, int);
-    int        numcolumns;
-    int        stamp;
+    GObject     object;
+    UiModelInfo *info;
+    UiListPtr   *list;
+    GType       *columntypes;
+    int         numcolumns;
+    int         stamp;
 };
 
 /*
@@ -58,7 +59,7 @@
 /*
  * Creates a UiListModel for a given UiList
  */
-UiListModel* ui_list_model_new(UiListPtr *list, ui_model_getvalue_f getvalue);
+UiListModel* ui_list_model_new(UiListPtr *list, UiModelInfo *info);
 
 
 // interface functions