From: John L. <jr...@us...> - 2011-05-11 02:29:58
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory vz-cvs-4.sog:/tmp/cvs-serv9777/modules/wxbind/src Modified Files: wxcore_image.cpp Log Message: Use .PHONY in bindings Makefile to always have it run. Don't return *this in wxImageHistogram::iterator++ Index: wxcore_image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_image.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxcore_image.cpp 1 Oct 2009 04:21:01 -0000 1.20 --- wxcore_image.cpp 11 May 2011 02:29:56 -0000 1.21 *************** *** 2300,2304 **** static int LUACALL wxLua_wxImageHistogram_iterator_op_inc(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxImageHistogram_iterator_op_inc[1] = {{ wxLua_wxImageHistogram_iterator_op_inc, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxImageHistogram_iterator_op_inc }}; ! // %operator wxImageHistogram::iterator& operator++() static int LUACALL wxLua_wxImageHistogram_iterator_op_inc(lua_State *L) { --- 2300,2304 ---- static int LUACALL wxLua_wxImageHistogram_iterator_op_inc(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxImageHistogram_iterator_op_inc[1] = {{ wxLua_wxImageHistogram_iterator_op_inc, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxImageHistogram_iterator_op_inc }}; ! // %operator void operator++() // it's best if we don't return the iterator static int LUACALL wxLua_wxImageHistogram_iterator_op_inc(lua_State *L) { *************** *** 2306,2314 **** wxImageHistogram::iterator * self = (wxImageHistogram::iterator *)wxluaT_getuserdatatype(L, 1, wxluatype_wxImageHistogram_iterator); // call op_inc ! wxImageHistogram::iterator* returns = &((*self)++); ! // push the result datatype ! wxluaT_pushuserdatatype(L, returns, wxluatype_wxImageHistogram_iterator); ! return 1; } --- 2306,2312 ---- wxImageHistogram::iterator * self = (wxImageHistogram::iterator *)wxluaT_getuserdatatype(L, 1, wxluatype_wxImageHistogram_iterator); // call op_inc ! (*self)++; ! return 0; } |