Mercurial > hg > toolkit / file diff

--- a/ui/gtk/tree.h	Tue Jan 24 18:46:47 2017 +0100
+++ b/ui/gtk/tree.h	Fri Nov 10 17:17:14 2017 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2014 Olaf Wintermann. All rights reserved.
+ * Copyright 2017 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,11 +37,12 @@
 extern "C" {
 #endif
 
-typedef struct UiTableView {
-    GtkWidget           *widget;
-    UiListPtr           *list;
-    UiModelInfo         *modelinfo;
-} UiTableView;
+typedef struct UiListView {
+    UiContext   *ctx;
+    GtkWidget   *widget;
+    UiVar       *var;
+    UiModelInfo *modelinfo;
+} UiListView;
 
 typedef struct UiTreeEventData {
     UiObject    *obj;
@@ -52,10 +53,12 @@
     
 void* ui_strmodel_getvalue(void *elm, int column);
 
-UIWIDGET ui_listview_var(UiObject *obj, UiListPtr *list, ui_model_getvalue_f getvalue, ui_callback f, void *udata);
-UIWIDGET ui_table_var(UiObject *obj, UiListPtr *list, UiModelInfo *modelinfo);
+UIWIDGET ui_listview_var(UiObject *obj, UiVar *var, ui_model_getvalue_f getvalue, ui_callback f, void *udata);
+UIWIDGET ui_table_var(UiObject *obj, UiVar *var, UiModelInfo *modelinfo);
 
-void ui_listview_update(UiEvent *event, UiTableView *view);
+void ui_listview_update(UiList *list, int i);
+void ui_listview_destroy(GtkWidget *w, UiListView *v);
+
 void ui_listview_activate_event(
         GtkTreeView *tree_view,
         GtkTreePath *path,
@@ -69,10 +72,10 @@
         UiTreeEventData *event);
 int ui_tree_path_list_index(GtkTreePath *path);
 
-UIWIDGET ui_combobox_var(UiObject *obj, UiListPtr *list, ui_model_getvalue_f getvalue, ui_callback f, void *udata);
+UIWIDGET ui_combobox_var(UiObject *obj, UiVar *var, ui_model_getvalue_f getvalue, ui_callback f, void *udata);
 GtkWidget* ui_create_combobox(UiObject *obj, UiListModel *model, ui_callback f, void *udata);
 void ui_combobox_change_event(GtkComboBox *widget, UiEventData *e);
-void ui_combobox_update(UiEvent *event, void *combobox);
+void ui_combobox_modelupdate(UiList *list, int i);
         
 #ifdef	__cplusplus
 }