diff options
| author | mescalinum <mescalinum@users.sourceforge.net> | 2009-09-02 20:14:39 +0000 |
|---|---|---|
| committer | mescalinum <mescalinum@users.sourceforge.net> | 2009-09-02 20:14:39 +0000 |
| commit | 6fe5b4fd5d6f702fc864b8a48828379b06b43c66 (patch) | |
| tree | 199c1ed3b37ce2a965e9bdf6eff520ddc43db2f0 | |
| parent | a1ced8f4ec6edcd66b03dd8584e037d701ca95e6 (diff) | |
default return value for widgetbehavior.clickfn = 0
svn path=/trunk/externals/tclpd/; revision=12191
| -rw-r--r-- | tcl_widgetbehavior.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tcl_widgetbehavior.cxx b/tcl_widgetbehavior.cxx index e1f9a25..4715ba0 100644 --- a/tcl_widgetbehavior.cxx +++ b/tcl_widgetbehavior.cxx @@ -1,4 +1,5 @@ #include "tcl_extras.h" +#include <string.h> void tclpd_guiclass_getrect(t_gobj* z, t_glist* owner, int* xp1, int* yp1, int* xp2, int* yp2) { Tcl_Obj* av[5], *o, *theList = NULL; @@ -198,7 +199,7 @@ cleanup: } int tclpd_guiclass_click(t_gobj* z, t_glist* glist, int xpix, int ypix, int shift, int alt, int dbl, int doit) { - Tcl_Obj* av[9], *o; + Tcl_Obj* av[9], *o = NULL; int i = 0; t_tcl* x = (t_tcl*)z; av[0] = x->self; @@ -218,22 +219,26 @@ int tclpd_guiclass_click(t_gobj* z, t_glist* glist, int xpix, int ypix, int shif Tcl_IncrRefCount(av[7]); av[8] = Tcl_NewIntObj(doit); Tcl_IncrRefCount(av[8]); + fprintf(stderr, "C: puttan madonna"); int result = Tcl_EvalObjv(tcl_for_pd, 9, av, 0); + fprintf(stderr, "C: cristo pinocchio"); if(result != TCL_OK) { tclpd_interp_error(result); goto error; } o = Tcl_GetObjResult(tcl_for_pd); Tcl_IncrRefCount(o); - result = Tcl_GetIntFromObj(tcl_for_pd, o, &i); - Tcl_DecrRefCount(o); - if(result != TCL_OK) { - tclpd_interp_error(result); - goto error; + if(strlen(Tcl_GetStringFromObj(o, NULL)) > 0) { + result = Tcl_GetIntFromObj(tcl_for_pd, o, &i); + if(result != TCL_OK) { + tclpd_interp_error(result); + goto error; + } } goto cleanup; error: cleanup: + if(o) Tcl_DecrRefCount(o); Tcl_DecrRefCount(av[1]); Tcl_DecrRefCount(av[2]); Tcl_DecrRefCount(av[3]); |