Enlightenment CVS committal
Author : leviathan
Project : e17
Module : libs/etk-perl
Dir : e17/libs/etk-perl
Modified Files:
Etk.xs EtkSignals.c
Log Message:
fix the tree sorting, and fix signal names
===================================================================
RCS file: /cvs/e/e17/libs/etk-perl/Etk.xs,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- Etk.xs 23 Mar 2007 08:08:27 -0000 1.86
+++ Etk.xs 29 Jun 2007 19:23:49 -0000 1.87
@@ -280,8 +280,7 @@
}
int
-tree_compare_alpha_cb(Etk_Tree * tree, Etk_Tree_Row * row1, Etk_Tree_Row *row2,
- Etk_Tree_Col * col, void * data )
+tree_compare_alpha_cb(Etk_Tree_Col * col, Etk_Tree_Row * row1, Etk_Tree_Row
*row2, void * data )
{
dSP;
int ret, cmp;
@@ -290,7 +289,7 @@
ENTER;
SAVETMPS;
- if (! (tree && row1 && row2 && col) ) {
+ if (! (row1 && row2 && col) ) {
ret = 0;
} else {
@@ -313,8 +312,7 @@
}
int
-tree_compare_numeric_cb(Etk_Tree * tree, Etk_Tree_Row * row1, Etk_Tree_Row
*row2,
- Etk_Tree_Col * col, void * data )
+tree_compare_numeric_cb(Etk_Tree_Col * col, Etk_Tree_Row * row1, Etk_Tree_Row
*row2, void * data )
{
dSP;
int r1, r2, ret;
@@ -322,7 +320,7 @@
ENTER;
SAVETMPS;
- if (! (tree && row1 && row2 && col) ) {
+ if (! (row1 && row2 && col) ) {
ret = 0;
} else {
@@ -344,8 +342,7 @@
}
int
-tree_compare_cb( Etk_Tree * tree, Etk_Tree_Row * row1, Etk_Tree_Row *row2,
-Etk_Tree_Col * col, void * data )
+tree_compare_cb( Etk_Tree_Col * col, Etk_Tree_Row * row1, Etk_Tree_Row *row2,
void * data )
{
dSP;
Callback_Tree_Compare_Data *cbd;
@@ -358,10 +355,9 @@
cbd = data;
PUSHMARK(SP);
- XPUSHs(sv_2mortal(newSVObj(tree, getClass("Etk_Tree"))));
+ XPUSHs(sv_2mortal(newSVObj(col, getClass("Etk_Tree_Col"))));
XPUSHs(sv_2mortal(newSVObj(row1, getClass("Etk_Tree_Row"))));
XPUSHs(sv_2mortal(newSVObj(row2, getClass("Etk_Tree_Row"))));
- XPUSHs(sv_2mortal(newSVObj(col, getClass("Etk_Tree_Col"))));
XPUSHs(sv_2mortal(newSVsv(cbd->perl_data)));
PUTBACK;
@@ -1319,8 +1315,7 @@
IsChild=1
void
-etk_container_remove(container, widget)
- Etk_Container * container
+etk_container_remove(widget)
Etk_Widget * widget
ALIAS:
Remove=1
===================================================================
RCS file: /cvs/e/e17/libs/etk-perl/EtkSignals.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- EtkSignals.c 29 Jan 2007 13:55:44 -0000 1.7
+++ EtkSignals.c 29 Jun 2007 19:23:50 -0000 1.8
@@ -8,43 +8,44 @@
HV *event_hv;
SV *event_rv;
- if(!strcmp(cbd->signal_name, "mouse_up"))
+ if(!strcmp(cbd->signal_name, "mouse-up"))
{
Etk_Event_Mouse_Up *event = value;
event_rv = newSVEventMouseUp(event);
}
- else if(!strcmp(cbd->signal_name, "mouse_down"))
+ else if(!strcmp(cbd->signal_name, "mouse-down"))
{
Etk_Event_Mouse_Down *event = value;
event_rv = newSVEventMouseDown(event);
}
- else if(!strcmp(cbd->signal_name, "mouse_move"))
+ else if(!strcmp(cbd->signal_name, "mouse-move"))
{
Etk_Event_Mouse_Move *event = value;
event_rv = newSVEventMouseMove(event);
}
- else if(!strcmp(cbd->signal_name, "row_mouse_in") ||
- !strcmp(cbd->signal_name, "row_mouse_out")||
- !strcmp(cbd->signal_name, "row_selected")||
- !strcmp(cbd->signal_name, "row_unselected")||
- !strcmp(cbd->signal_name, "row_activated")||
- !strcmp(cbd->signal_name, "cell_value_changed")
+ else if(!strcmp(cbd->signal_name, "row-mouse-in") ||
+ !strcmp(cbd->signal_name, "row-mouse-out")||
+ !strcmp(cbd->signal_name, "row-selected")||
+ !strcmp(cbd->signal_name, "row-unselected")||
+ !strcmp(cbd->signal_name, "row-activated")||
+ !strcmp(cbd->signal_name, "cell-value-changed")
)
{
event_rv = newSVObj(value, getClass("Etk_Tree_Row"));
}
- else if(!strcmp(cbd->signal_name, "key_down"))
+ else if(!strcmp(cbd->signal_name, "key-down"))
{
Etk_Event_Key_Down *key_event = value;
event_rv = newSVEventKeyDown(key_event);
}
- else if(!strcmp(cbd->signal_name, "key_up"))
+ else if(!strcmp(cbd->signal_name, "key-up"))
{
Etk_Event_Key_Up *key_event = value;
event_rv = newSVEventKeyUp(key_event);
}
else
{
+ printf("*** warning: undefined signal event (%s) please add to
EtkSignals.c\n", cbd->signal_name);
event_rv = &PL_sv_undef;
}
@@ -56,7 +57,7 @@
void GetSignalEvent_POINTER_POINTER(Etk_Object * object, void * val1, void *
val2, Callback_Signal_Data * cbd, SV **obj, SV **event) {
- if(!strcmp(cbd->signal_name, "row_clicked"))
+ if(!strcmp(cbd->signal_name, "row-clicked"))
{
Etk_Tree_Row * row = val1;
Etk_Event_Mouse_Up *key_event = (Etk_Event_Mouse_Up *)val2;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
