Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_tree2.c
Log Message:
Make tree nodes inherit from MVC as they were duplicating most of the fields.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- ewl_tree2.c 12 Mar 2007 11:58:48 -0000 1.63
+++ ewl_tree2.c 12 Mar 2007 22:23:02 -0000 1.64
@@ -818,8 +818,8 @@
node = ewl_tree2_node_new();
EWL_TREE2_NODE(node)->tree = EWL_WIDGET(tree);
EWL_TREE2_NODE(node)->row_num = i;
- EWL_TREE2_NODE(node)->model = curbranch->model;
- EWL_TREE2_NODE(node)->data = curbranch->data;
+ ewl_mvc_model_set(EWL_MVC(node), curbranch->model);
+ ewl_mvc_data_set(EWL_MVC(node), curbranch->data);
ewl_container_child_append(EWL_CONTAINER(parent), node);
if (!hidden) ewl_widget_show(node);
@@ -951,8 +951,8 @@
if (tree->type != EWL_TREE_SELECTION_TYPE_ROW)
DRETURN(DLEVEL_STABLE);
- ewl_mvc_handle_click(EWL_MVC(tree), node->model,
- node->data,
+ ewl_mvc_handle_click(EWL_MVC(tree), ewl_mvc_model_get(EWL_MVC(node)),
+ ewl_mvc_data_get(EWL_MVC(node)),
node->row_num, -1);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -978,9 +978,10 @@
column = ewl_container_child_index_get(EWL_CONTAINER(row), w);
- ewl_mvc_handle_click(EWL_MVC(node->tree), node->model,
- node->data, node->row_num,
- column);
+ ewl_mvc_handle_click(EWL_MVC(node->tree),
+ ewl_mvc_model_get(EWL_MVC(node)),
+ ewl_mvc_data_get(EWL_MVC(node)),
+ node->row_num, column);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1228,7 +1229,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("node", node, FALSE);
- if (!ewl_container_init(EWL_CONTAINER(node)))
+ if (!ewl_mvc_init(EWL_MVC(node)))
DRETURN_INT(FALSE, DLEVEL_STABLE);
ewl_widget_appearance_set(EWL_WIDGET(node), EWL_TREE2_NODE_TYPE);
@@ -1297,12 +1298,11 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("node", node, FALSE);
- DRETURN_INT((node->data ? TRUE : FALSE), DLEVEL_STABLE);
+ DRETURN_INT((ewl_mvc_data_get(EWL_MVC(node)) ? TRUE : FALSE),
DLEVEL_STABLE);
}
void
ewl_tree2_node_expand(Ewl_Tree2_Node *node)
-
{
Ewl_Widget *child;
Ecore_List *tmp;
@@ -1333,7 +1333,9 @@
IF_FREE_LIST(tmp);
- ewl_tree2_row_expand(EWL_TREE2(node->tree), node->data, node->row_num);
+ ewl_tree2_row_expand(EWL_TREE2(node->tree),
+ ewl_mvc_data_get(EWL_MVC(node)),
+ node->row_num);
node->expanded = EWL_TREE_NODE_EXPANDED;
ewl_check_checked_set(EWL_CHECK(node->handle), TRUE);
@@ -1373,7 +1375,8 @@
IF_FREE_LIST(tmp);
- ewl_tree2_row_collapse(EWL_TREE2(node->tree), node->data,
node->row_num);
+ ewl_tree2_row_collapse(EWL_TREE2(node->tree),
+ ewl_mvc_data_get(EWL_MVC(node)), node->row_num);
node->expanded = EWL_TREE_NODE_COLLAPSED;
ewl_check_checked_set(EWL_CHECK(node->handle), FALSE);
-------------------------------------------------------------------------
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
