From: John L. <jr...@us...> - 2008-03-26 05:01:39
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28499/wxLua/modules/wxbind/src Modified Files: wxcore_controls.cpp Log Message: Fix ungcobject() in Lua, compilation fix. Switch to using wxConvCurrent for lua2wx and wx2lua ifdefed using WXLUA_USE_WXSTR_CONVCURRENT Allow Continue to work in the wxLuaDebugTarget (thanks to andre arpin) Index: wxcore_controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_controls.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxcore_controls.cpp 29 Jan 2008 04:22:52 -0000 1.14 --- wxcore_controls.cpp 26 Mar 2008 05:01:31 -0000 1.15 *************** *** 7741,7744 **** --- 7741,7760 ---- } + static wxLuaArgType s_wxluatypeArray_wxLua_wxTextCtrl_ChangeValue[] = { &wxluatype_wxTextCtrl, &wxluatype_TSTRING, NULL }; + static int LUACALL wxLua_wxTextCtrl_ChangeValue(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextCtrl_ChangeValue[1] = {{ wxLua_wxTextCtrl_ChangeValue, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxTextCtrl_ChangeValue }}; + // virtual void ChangeValue(const wxString& value) + static int LUACALL wxLua_wxTextCtrl_ChangeValue(lua_State *L) + { + // const wxString value + const wxString value = wxlua_getwxStringtype(L, 2); + // get this + wxTextCtrl * self = (wxTextCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxTextCtrl); + // call ChangeValue + self->ChangeValue(value); + + return 0; + } + static wxLuaArgType s_wxluatypeArray_wxLua_wxTextCtrl_Clear[] = { &wxluatype_wxTextCtrl, NULL }; static int LUACALL wxLua_wxTextCtrl_Clear(lua_State *L); *************** *** 8582,8585 **** --- 8598,8602 ---- { "CanRedo", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextCtrl_CanRedo, 1, NULL }, { "CanUndo", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextCtrl_CanUndo, 1, NULL }, + { "ChangeValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextCtrl_ChangeValue, 1, NULL }, { "Clear", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextCtrl_Clear, 1, NULL }, { "Copy", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextCtrl_Copy, 1, NULL }, |