Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto/epdf
Dir : e17/proto/epdf/src/bin
Modified Files:
Makefile.am epdf_ewl_test.c
Log Message:
* configure.in:
add bzip2 archive
* src/bin/Makefile.am:
* src/lib/Makefile.am:
* src/plugins/epsilon/Makefile.am:
* src/plugins/ewl/Makefile.am:
clean Makefile.am a bit
* src/bin/epdf_ewl_test.c: (_tree_fill), (tree_data_fetch),
(tree_data_count_get), (tree_data_expandable_get),
(tree_data_expansion_fetch), (main):
rename tree2 to tree
===================================================================
RCS file: /cvs/e/e17/proto/epdf/src/bin/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 6 Oct 2007 18:22:34 -0000 1.6
+++ Makefile.am 27 Jan 2008 05:47:55 -0000 1.7
@@ -9,41 +9,55 @@
EPDF_ETK_TEST = epdf_etk_test
endif
-INCLUDES = \
--I$(top_srcdir)/src/lib \
[EMAIL PROTECTED]@ @EPDF_CFLAGS@
-
bin_PROGRAMS = epdf_evas_test epdf_esmart_test $(EPDF_EWL_TEST)
$(EPDF_ETK_TEST)
-epdf_evas_test_SOURCES = \
- epdf_evas_test.c
+epdf_evas_test_SOURCES = \
+epdf_evas_test.c
-epdf_evas_test_LDADD = \
- $(top_builddir)/src/lib/libepdf.la \
- $(EPDF_LIBS) $(ECORE_EVAS_LIBS)
+epdf_evas_test_CPPFLAGS =\
+-I$(top_srcdir)/src/lib \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
-epdf_esmart_test_SOURCES = \
- epdf_esmart_test.c
+epdf_evas_test_LDADD = \
+$(top_builddir)/src/lib/libepdf.la \
+$(EPDF_LIBS) $(ECORE_EVAS_LIBS)
-epdf_esmart_test_LDADD = \
- $(top_builddir)/src/lib/libepdf.la \
- $(EPDF_LIBS) $(ECORE_EVAS_LIBS)
+epdf_esmart_test_SOURCES = \
+epdf_esmart_test.c
-epdf_ewl_test_SOURCES = \
- epdf_ewl_test.c
+epdf_esmart_test_CPPFLAGS =\
+-I$(top_srcdir)/src/lib \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
-epdf_ewl_test_CFLAGS = @EWL_CFLAGS@
+epdf_esmart_test_LDADD = \
+$(top_builddir)/src/lib/libepdf.la \
+$(EPDF_LIBS) $(ECORE_EVAS_LIBS)
-epdf_ewl_test_LDADD = \
- $(top_builddir)/src/lib/libepdf.la \
- $(EPDF_LIBS) \
- $(EWL_LIBS)
+epdf_ewl_test_SOURCES = \
+epdf_ewl_test.c
-epdf_etk_test_SOURCES = \
- epdf_etk_test.c
+epdf_ewl_test_CPPFLAGS =\
+-I$(top_srcdir)/src/lib \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
+
+epdf_ewl_test_LDADD = \
+$(top_builddir)/src/lib/libepdf.la \
+$(EPDF_LIBS) \
+$(EWL_LIBS)
-epdf_etk_test_CFLAGS = @ETK_CFLAGS@
+epdf_etk_test_SOURCES = \
+epdf_etk_test.c
-epdf_etk_test_LDADD = \
- $(top_builddir)/src/lib/libepdf.la \
- $(EPDF_LIBS)
+epdf_etk_test_CPPFLAGS = \
+-I$(top_srcdir)/src/lib \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
+
+epdf_etk_test_LDADD = \
+$(top_builddir)/src/lib/libepdf.la \
+$(EPDF_LIBS)
===================================================================
RCS file: /cvs/e/e17/proto/epdf/src/bin/epdf_ewl_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- epdf_ewl_test.c 25 Jul 2007 17:01:03 -0000 1.9
+++ epdf_ewl_test.c 27 Jan 2008 05:47:55 -0000 1.10
@@ -29,7 +29,7 @@
static void _change_page_cb (Ewl_Widget *widget, void *ev_data, void
*user_data);
void *
-_tree2_fill (Ewl_Widget *pdf, Ecore_List *items)
+_tree_fill (Ewl_Widget *pdf, Ecore_List *items)
{
Tree_Data *data;
Epdf_Index_Item *item;
@@ -64,7 +64,7 @@
c = epdf_index_item_children_get (item);
if (c) {
data->rows[i]->expandable = 1;
- data->rows[i]->subdata = _tree2_fill (pdf, c);
+ data->rows[i]->subdata = _tree_fill (pdf, c);
}
i++;
@@ -73,7 +73,7 @@
return data;
}
-static void *tree2_data_fetch(void *data, unsigned int row, unsigned int
column)
+static void *tree_data_fetch(void *data, unsigned int row, unsigned int column)
{
Tree_Data *d;
@@ -83,7 +83,7 @@
}
static int
-tree2_data_count_get (void *data)
+tree_data_count_get (void *data)
{
Tree_Data *d;
@@ -93,7 +93,7 @@
}
static int
-tree2_data_expandable_get(void *data, unsigned int row)
+tree_data_expandable_get(void *data, unsigned int row)
{
Tree_Data *d;
@@ -103,7 +103,7 @@
}
static void *
-tree2_data_expansion_fetch(void *data, unsigned int parent)
+tree_data_expansion_fetch(void *data, unsigned int parent)
{
Tree_Data *d;
@@ -184,23 +184,23 @@
void *data;
/* tree */
- tree = ewl_tree2_new ();
+ tree = ewl_tree_new ();
ewl_widget_name_set (tree, "tree");
/* ewl_object_fill_policy_set (EWL_OBJECT (tree), EWL_FLAG_FILL_VFILL); */
- ewl_tree2_headers_visible_set (EWL_TREE2 (tree), FALSE);
+ ewl_tree_headers_visible_set (EWL_TREE (tree), FALSE);
ewl_callback_append (tree, EWL_CALLBACK_VALUE_CHANGED,
_change_page_cb, pdf);
/* data */
- data = _tree2_fill (pdf, index);
+ data = _tree_fill (pdf, index);
epdf_index_delete (index);
/* model */
model = ewl_model_new ();
- ewl_model_data_fetch_set (model, tree2_data_fetch);
- ewl_model_data_count_set (model, tree2_data_count_get);
- ewl_model_data_expandable_set (model, tree2_data_expandable_get);
- ewl_model_expansion_data_fetch_set(model, tree2_data_expansion_fetch);
+ ewl_model_data_fetch_set (model, tree_data_fetch);
+ ewl_model_data_count_set (model, tree_data_count_get);
+ ewl_model_data_expandable_set (model, tree_data_expandable_get);
+ ewl_model_expansion_data_fetch_set(model, tree_data_expansion_fetch);
/* MVC */
ewl_mvc_data_set (EWL_MVC (tree), data);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
