Menu
▾
▴
[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.i, 1.10, 1.11 wxluacan_bind.cpp, 1.38, 1.39 wxluacan_bind.h, 1.7, 1.8
|
From: John L. <jr...@us...> - 2009-10-01 04:21:11
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4255/wxLua/apps/wxluacan/src Modified Files: wxluacan.i wxluacan_bind.cpp wxluacan_bind.h Log Message: Removed %encapsulate and %noclassinfo tags for %classes in the bindings. No longer encapsulating non wxObjects in a wxObject class for deletion. We now provide delete functions for each class in the wxLuaBindClass structs to be called on the void* we get from Lua. Index: wxluacan_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxluacan_bind.h 25 Sep 2009 18:47:57 -0000 1.7 --- wxluacan_bind.h 1 Oct 2009 04:20:59 -0000 1.8 *************** *** 18,24 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 28 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 28 // --------------------------------------------------------------------------- --- 18,24 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 29 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 29 // --------------------------------------------------------------------------- *************** *** 60,67 **** - // --------------------------------------------------------------------------- - // Encapsulation Declarations - need to be public for other bindings. - // --------------------------------------------------------------------------- - #endif // __HOOK_WXLUA_wxluacan_H__ --- 60,63 ---- Index: wxluacan.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.i,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxluacan.i 31 May 2007 17:18:45 -0000 1.10 --- wxluacan.i 1 Oct 2009 04:20:58 -0000 1.11 *************** *** 5,9 **** %include "wx/gdicmn.h" ! %class %noclassinfo wxlCanObj, wxObject wxlCanObj( double x = 0, double y = 0 ) void SetPos( double x, double y ) --- 5,9 ---- %include "wx/gdicmn.h" ! %class wxlCanObj, wxObject wxlCanObj( double x = 0, double y = 0 ) void SetPos( double x, double y ) *************** *** 16,37 **** %endclass ! %class %noclassinfo wxlCanObjRect, wxlCanObj wxlCanObjRect( double x, double y, double w, double h ) %endclass ! %class %noclassinfo wxlCanObjCircle, wxlCanObj wxlCanObjCircle( double x, double y, double r ) %endclass ! %class %noclassinfo wxlCanObjScript, wxlCanObj wxlCanObjScript( double x, double y, const wxString& name ) %endclass ! %class %noclassinfo wxlCanObjAddScript, wxlCanObj wxlCanObjAddScript( double x, double y, const wxString& script ) void SetScript( const wxString& script ) %endclass ! %class %noclassinfo wxlCan, wxScrolledWindow wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) void AddObject( wxlCanObj *canobj ) --- 16,37 ---- %endclass ! %class wxlCanObjRect, wxlCanObj wxlCanObjRect( double x, double y, double w, double h ) %endclass ! %class wxlCanObjCircle, wxlCanObj wxlCanObjCircle( double x, double y, double r ) %endclass ! %class wxlCanObjScript, wxlCanObj wxlCanObjScript( double x, double y, const wxString& name ) %endclass ! %class wxlCanObjAddScript, wxlCanObj wxlCanObjAddScript( double x, double y, const wxString& script ) void SetScript( const wxString& script ) %endclass ! %class wxlCan, wxScrolledWindow wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) void AddObject( wxlCanObj *canobj ) *************** *** 44,48 **** %function wxlLuaCanCmd* GetCmdhMain() ! %class %noclassinfo wxlLuaCanCmd, wxCommandProcessor wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) void MoveObject( int index, double x, double y ) --- 44,48 ---- %function wxlLuaCanCmd* GetCmdhMain() ! %class wxlLuaCanCmd, wxCommandProcessor wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) void MoveObject( int index, double x, double y ) Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** wxluacan_bind.cpp 27 Sep 2009 03:13:50 -0000 1.38 --- wxluacan_bind.cpp 1 Oct 2009 04:20:59 -0000 1.39 *************** *** 169,172 **** --- 169,178 ---- + void wxLua_wxlCanObj_delete_function(void** p) + { + wxlCanObj* o = (wxlCanObj*)(*p); + delete o; + } + // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxlCanObj_methods[] = { *************** *** 220,223 **** --- 226,235 ---- + void wxLua_wxlCanObjRect_delete_function(void** p) + { + wxlCanObjRect* o = (wxlCanObjRect*)(*p); + delete o; + } + // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxlCanObjRect_methods[] = { *************** *** 258,261 **** --- 270,279 ---- + void wxLua_wxlCanObjCircle_delete_function(void** p) + { + wxlCanObjCircle* o = (wxlCanObjCircle*)(*p); + delete o; + } + // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxlCanObjCircle_methods[] = { *************** *** 296,299 **** --- 314,323 ---- + void wxLua_wxlCanObjScript_delete_function(void** p) + { + wxlCanObjScript* o = (wxlCanObjScript*)(*p); + delete o; + } + // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxlCanObjScript_methods[] = { *************** *** 350,353 **** --- 374,383 ---- + void wxLua_wxlCanObjAddScript_delete_function(void** p) + { + wxlCanObjAddScript* o = (wxlCanObjAddScript*)(*p); + delete o; + } + // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxlCanObjAddScript_methods[] = { *************** *** 435,438 **** --- 465,470 ---- // call constructor wxlCan* returns = new wxlCan(parent, id, *pos, *size); + // add to tracked window list, it will check validity + wxluaW_addtrackedwindow(L, returns); // push the constructed class pointer wxluaT_pushuserdatatype(L, returns, wxluatype_wxlCan); *************** *** 445,448 **** --- 477,486 ---- + void wxLua_wxlCan_delete_function(void** p) + { + wxlCan* o = (wxlCan*)(*p); + delete o; + } + // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxlCan_methods[] = { *************** *** 510,513 **** --- 548,557 ---- + void wxLua_wxlLuaCanCmd_delete_function(void** p) + { + wxlLuaCanCmd* o = (wxlLuaCanCmd*)(*p); + delete o; + } + // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxlLuaCanCmd_methods[] = { *************** *** 672,687 **** --- 716,738 ---- extern wxLuaBindMethod wxlCan_methods[]; extern int wxlCan_methodCount; + extern void wxLua_wxlCan_delete_function(void** p); extern wxLuaBindMethod wxlCanObj_methods[]; extern int wxlCanObj_methodCount; + extern void wxLua_wxlCanObj_delete_function(void** p); extern wxLuaBindMethod wxlCanObjAddScript_methods[]; extern int wxlCanObjAddScript_methodCount; + extern void wxLua_wxlCanObjAddScript_delete_function(void** p); extern wxLuaBindMethod wxlCanObjCircle_methods[]; extern int wxlCanObjCircle_methodCount; + extern void wxLua_wxlCanObjCircle_delete_function(void** p); extern wxLuaBindMethod wxlCanObjRect_methods[]; extern int wxlCanObjRect_methodCount; + extern void wxLua_wxlCanObjRect_delete_function(void** p); extern wxLuaBindMethod wxlCanObjScript_methods[]; extern int wxlCanObjScript_methodCount; + extern void wxLua_wxlCanObjScript_delete_function(void** p); extern wxLuaBindMethod wxlLuaCanCmd_methods[]; extern int wxlLuaCanCmd_methodCount; + extern void wxLua_wxlLuaCanCmd_delete_function(void** p); *************** *** 692,702 **** static wxLuaBindClass classList[] = { ! { wxluaclassname_wxlCan, wxlCan_methods, wxlCan_methodCount, NULL, &wxluatype_wxlCan, wxluabaseclassnames_wxlCan, wxluabaseclassbinds_wxlCan, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxlCanObj, wxlCanObj_methods, wxlCanObj_methodCount, NULL, &wxluatype_wxlCanObj, wxluabaseclassnames_wxlCanObj, wxluabaseclassbinds_wxlCanObj, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxlCanObjAddScript, wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &wxluatype_wxlCanObjAddScript, wxluabaseclassnames_wxlCanObjAddScript, wxluabaseclassbinds_wxlCanObjAddScript, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxlCanObjCircle, wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &wxluatype_wxlCanObjCircle, wxluabaseclassnames_wxlCanObjCircle, wxluabaseclassbinds_wxlCanObjCircle, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxlCanObjRect, wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &wxluatype_wxlCanObjRect, wxluabaseclassnames_wxlCanObjRect, wxluabaseclassbinds_wxlCanObjRect, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxlCanObjScript, wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &wxluatype_wxlCanObjScript, wxluabaseclassnames_wxlCanObjScript, wxluabaseclassbinds_wxlCanObjScript, NULL, NULL, NULL, 0, }, ! { wxluaclassname_wxlLuaCanCmd, wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &wxluatype_wxlLuaCanCmd, wxluabaseclassnames_wxlLuaCanCmd, wxluabaseclassbinds_wxlLuaCanCmd, NULL, NULL, NULL, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 743,753 ---- static wxLuaBindClass classList[] = { ! { wxluaclassname_wxlCan, wxlCan_methods, wxlCan_methodCount, CLASSINFO(wxlCan), &wxluatype_wxlCan, wxluabaseclassnames_wxlCan, wxluabaseclassbinds_wxlCan, NULL, NULL, NULL, 0, &wxLua_wxlCan_delete_function, }, ! { wxluaclassname_wxlCanObj, wxlCanObj_methods, wxlCanObj_methodCount, CLASSINFO(wxlCanObj), &wxluatype_wxlCanObj, wxluabaseclassnames_wxlCanObj, wxluabaseclassbinds_wxlCanObj, NULL, NULL, NULL, 0, &wxLua_wxlCanObj_delete_function, }, ! { wxluaclassname_wxlCanObjAddScript, wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, CLASSINFO(wxlCanObjAddScript), &wxluatype_wxlCanObjAddScript, wxluabaseclassnames_wxlCanObjAddScript, wxluabaseclassbinds_wxlCanObjAddScript, NULL, NULL, NULL, 0, &wxLua_wxlCanObjAddScript_delete_function, }, ! { wxluaclassname_wxlCanObjCircle, wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, CLASSINFO(wxlCanObjCircle), &wxluatype_wxlCanObjCircle, wxluabaseclassnames_wxlCanObjCircle, wxluabaseclassbinds_wxlCanObjCircle, NULL, NULL, NULL, 0, &wxLua_wxlCanObjCircle_delete_function, }, ! { wxluaclassname_wxlCanObjRect, wxlCanObjRect_methods, wxlCanObjRect_methodCount, CLASSINFO(wxlCanObjRect), &wxluatype_wxlCanObjRect, wxluabaseclassnames_wxlCanObjRect, wxluabaseclassbinds_wxlCanObjRect, NULL, NULL, NULL, 0, &wxLua_wxlCanObjRect_delete_function, }, ! { wxluaclassname_wxlCanObjScript, wxlCanObjScript_methods, wxlCanObjScript_methodCount, CLASSINFO(wxlCanObjScript), &wxluatype_wxlCanObjScript, wxluabaseclassnames_wxlCanObjScript, wxluabaseclassbinds_wxlCanObjScript, NULL, NULL, NULL, 0, &wxLua_wxlCanObjScript_delete_function, }, ! { wxluaclassname_wxlLuaCanCmd, wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, CLASSINFO(wxlLuaCanCmd), &wxluatype_wxlLuaCanCmd, wxluabaseclassnames_wxlLuaCanCmd, wxluabaseclassbinds_wxlLuaCanCmd, NULL, NULL, NULL, 0, &wxLua_wxlLuaCanCmd_delete_function, }, { 0, 0, 0, 0, 0, 0, 0 }, |
