Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/edvi
Dir : e17/proto/edvi/src/bin
Modified Files:
edvi_etk_test.c
Log Message:
[UNTESTED] Fix Etk usage to match new signal system.
Please test as I don't have dvilib2.
===================================================================
RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_etk_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- edvi_etk_test.c 30 Aug 2007 14:44:48 -0000 1.8
+++ edvi_etk_test.c 29 Sep 2007 17:54:06 -0000 1.9
@@ -7,8 +7,8 @@
#include "etk_dvi.h"
-static void _quit_cb(void *data);
-static void _change_page_cb (Etk_Object *object, Etk_Tree_Row *row,
Etk_Event_Mouse_Up *event, void *data);
+static Etk_Bool _quit_cb(void *data);
+static Etk_Bool _change_page_cb (Etk_Object *object, Etk_Tree_Row *row,
Etk_Event_Mouse_Up *event, void *data);
int
main (int argc, char *argv[])
@@ -50,8 +50,9 @@
window = etk_window_new ();
etk_window_title_set (ETK_WINDOW (window), "Etk Dvi Test Application");
- etk_signal_connect ("delete-event", ETK_OBJECT (window),
- ETK_CALLBACK(_quit_cb), NULL);
+ etk_signal_connect_by_code (ETK_WINDOW_DELETE_EVENT_SIGNAL,
+ ETK_OBJECT (window),
+ ETK_CALLBACK(_quit_cb), NULL);
hbox = etk_hbox_new (ETK_FALSE, 6);
etk_container_add (ETK_CONTAINER (window), hbox);
@@ -80,8 +81,8 @@
}
/* change page */
- etk_signal_connect ("row-clicked", ETK_OBJECT (list),
- ETK_CALLBACK(_change_page_cb), dvi);
+ etk_signal_connect_by_code (ETK_TREE_ROW_CLICKED_SIGNAL, ETK_OBJECT (list),
+ ETK_CALLBACK(_change_page_cb), dvi);
/* we attach and show */
etk_box_append (ETK_BOX (hbox), list, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -100,13 +101,14 @@
return EXIT_SUCCESS;
}
-static void
+static Etk_Bool
_quit_cb(void *data)
{
etk_main_quit ();
+ return ETK_TRUE;
}
-static void
+static Etk_Bool
_change_page_cb (Etk_Object *object, Etk_Tree_Row *row, Etk_Event_Mouse_Up
*event, void *data)
{
Etk_Tree *tree;
@@ -117,4 +119,5 @@
dvi = ETK_DVI (data);
row_number = *(int *)etk_tree_row_data_get (row);
etk_dvi_page_set (dvi, row_number);
+ return ETK_TRUE;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
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
