Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/mvc
Modified Files:
ewl_mvc.c
Log Message:
- working on tree2 selections. the selection struct now contains a pointer
to the model along with the data.
- this breaks the api to set selections on the tree slightly
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/mvc/ewl_mvc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_mvc.c 18 Jan 2007 10:24:58 -0000 1.6
+++ ewl_mvc.c 22 Jan 2007 09:33:02 -0000 1.7
@@ -90,7 +90,7 @@
t = ewl_tree2_new();
m = EWL_MVC(t);
- ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 1, 2);
+ ewl_mvc_selected_set(m, NULL, ewl_mvc_data_get(m), 1, 2);
idx = ecore_list_goto_first(m->selected);
if (idx->sel.type != EWL_SELECTION_TYPE_INDEX)
@@ -119,10 +119,10 @@
t = ewl_tree2_new();
m = EWL_MVC(t);
- ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 6, 8);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 3, 0);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 9, 1);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 1, 2);
+ ewl_mvc_selected_set(m, NULL, ewl_mvc_data_get(m), 6, 8);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 3, 0);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 9, 1);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 1, 2);
idx = ewl_mvc_selected_get(m);
if (idx->sel.type != EWL_SELECTION_TYPE_INDEX)
@@ -150,7 +150,7 @@
t = ewl_tree2_new();
m = EWL_MVC(t);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
idx = ecore_list_goto_first(m->selected);
if (idx->sel.type != EWL_SELECTION_TYPE_INDEX)
@@ -179,7 +179,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
idx = ecore_list_goto_first(m->selected);
if (idx->sel.type != EWL_SELECTION_TYPE_RANGE)
@@ -214,11 +214,11 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 6, 8);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 3, 0);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 9, 1);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 1, 2);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_set(m, NULL, ewl_mvc_data_get(m), 6, 8);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 3, 0);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 9, 1);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
count = ewl_mvc_selected_count_get(m);
if (count != expected)
@@ -240,7 +240,7 @@
t = ewl_tree2_new();
m = EWL_MVC(t);
- ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 6, 8);
+ ewl_mvc_selected_set(m, NULL, ewl_mvc_data_get(m), 6, 8);
if (!ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 6, 8))
{
@@ -260,7 +260,7 @@
t = ewl_tree2_new();
m = EWL_MVC(t);
- ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 6, 8);
+ ewl_mvc_selected_set(m, NULL, ewl_mvc_data_get(m), 6, 8);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 7, 7))
{
@@ -281,7 +281,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
if (!ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 4, 5))
{
@@ -302,7 +302,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 1))
{
@@ -323,11 +323,11 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 6, 8);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 3, 0);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 9, 1);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 1, 2);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_set(m, NULL, ewl_mvc_data_get(m), 6, 8);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 3, 0);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 9, 1);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
ewl_mvc_selected_clear(m);
if (ewl_mvc_selected_count_get(m) != 0)
@@ -349,11 +349,11 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 6, 8);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 3, 0);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 9, 1);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 1, 2);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_set(m, NULL, ewl_mvc_data_get(m), 6, 8);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 3, 0);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 9, 1);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 9, 1);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 9, 1))
@@ -375,11 +375,11 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 6, 8);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 3, 0);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 9, 1);
- ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 1, 2);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_set(m, NULL, ewl_mvc_data_get(m), 6, 8);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 3, 0);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 9, 1);
+ ewl_mvc_selected_add(m, NULL, ewl_mvc_data_get(m), 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 10, 2);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 10, 2))
@@ -402,7 +402,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 1, 1, 2, 1);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 1, 1, 2, 1);
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 2, 1);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 2, 1))
@@ -437,7 +437,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 1, 1, 2, 1);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 1, 1, 2, 1);
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 1);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 1))
@@ -472,7 +472,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 1, 1, 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 1, 1, 1, 2);
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 1);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 1))
@@ -507,7 +507,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 1, 1, 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 1, 1, 1, 2);
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 2);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 2))
@@ -542,7 +542,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 2);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 2))
@@ -581,7 +581,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 6, 8);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 6, 8))
@@ -620,7 +620,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 4, 5);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 4, 5))
@@ -670,7 +670,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 4, 2);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 4, 2))
@@ -715,7 +715,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 3, 8);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 3, 8))
@@ -760,7 +760,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 5);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 5))
@@ -805,7 +805,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, NULL, ewl_mvc_data_get(m), 6, 8, 1, 2);
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 6, 3);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 6, 3))
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
