Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1560/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: speed up genwxbind.lua add wxLuaBinding::GetBindingName as a unique name to know if it's added Rename *AddToTrackedMemory -> AddTrackedObject since it only tracks wxObjects Rename wxLuaState::AddTrackedEventHandler to AddTrackedCallback and only accept wxLuaCallbacks Rename wxLuaState::AddTrackedDestroyEventHandler to AddTrackedWinDestroyCallback and only accept wxLuaWinDestroyCallbacks Make type evaluation for the bindings more strict Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** xml.cpp 12 Dec 2006 07:09:41 -0000 1.15 --- xml.cpp 14 Dec 2006 01:01:26 -0000 1.16 *************** *** 43,47 **** returns = new wxXmlNode(); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxXmlNode *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns); --- 43,47 ---- returns = new wxXmlNode(); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxXmlNode *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns); *************** *** 66,70 **** returns = new wxXmlNode(type, name, content); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxXmlNode *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns); --- 66,70 ---- returns = new wxXmlNode(type, name, content); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxXmlNode *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns); *************** *** 93,97 **** returns = new wxXmlNode(parent, type, name, content, props, next); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxXmlNode *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns); --- 93,97 ---- returns = new wxXmlNode(parent, type, name, content, props, next); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxXmlNode *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns); *************** *** 462,466 **** // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedMemory(self); return 0; } --- 462,466 ---- // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedObject(self); return 0; } *************** *** 472,476 **** // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); --- 472,476 ---- // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedObject(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); *************** *** 556,560 **** returns = new wxXmlProperty(name, value, next); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxXmlProperty *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns); --- 556,560 ---- returns = new wxXmlProperty(name, value, next); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxXmlProperty *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns); *************** *** 571,575 **** returns = new wxXmlProperty(); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxXmlProperty *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns); --- 571,575 ---- returns = new wxXmlProperty(); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxXmlProperty *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns); *************** *** 672,676 **** // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedMemory(self); return 0; } --- 672,676 ---- // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedObject(self); return 0; } *************** *** 682,686 **** // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); --- 682,686 ---- // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedObject(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); *************** *** 734,738 **** returns = new wxXmlDocument(); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxXmlDocument *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlDocument, returns); --- 734,738 ---- returns = new wxXmlDocument(); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxXmlDocument *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlDocument, returns); *************** *** 755,759 **** returns = new wxXmlDocument(filename, encoding); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxXmlDocument *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlDocument, returns); --- 755,759 ---- returns = new wxXmlDocument(filename, encoding); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxXmlDocument *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlDocument, returns); *************** *** 909,913 **** // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedMemory(self); return 0; } --- 909,913 ---- // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedObject(self); return 0; } *************** *** 919,923 **** // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); --- 919,923 ---- // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedObject(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); *************** *** 1007,1011 **** returns = new wxBitmap(self->LoadBitmap(name)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxBitmap *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); --- 1007,1011 ---- returns = new wxBitmap(self->LoadBitmap(name)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxBitmap *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); *************** *** 1150,1154 **** returns = new wxIcon(self->LoadIcon(name)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxIcon *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxIcon, returns); --- 1150,1154 ---- returns = new wxIcon(self->LoadIcon(name)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxIcon *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxIcon, returns); *************** *** 1253,1257 **** returns = new wxXmlResource(filemask, flags); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxXmlResource *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlResource, returns); --- 1253,1257 ---- returns = new wxXmlResource(filemask, flags); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxXmlResource *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlResource, returns); *************** *** 1286,1290 **** returns = new wxXmlResource(flags); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxXmlResource *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlResource, returns); --- 1286,1290 ---- returns = new wxXmlResource(flags); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxXmlResource *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXmlResource, returns); *************** *** 1534,1538 **** // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedMemory(self); return 0; } --- 1534,1538 ---- // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedObject(self); return 0; } *************** *** 1544,1548 **** // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); --- 1544,1548 ---- // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedObject(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** defsutil.cpp 12 Dec 2006 07:09:39 -0000 1.19 --- defsutil.cpp 14 Dec 2006 01:01:23 -0000 1.20 *************** *** 177,181 **** returns = new wxProcess(parent, nId); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxProcess *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxProcess, returns); --- 177,181 ---- returns = new wxProcess(parent, nId); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxProcess *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxProcess, returns); *************** *** 285,289 **** // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedMemory(self); return 0; } --- 285,289 ---- // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedObject(self); return 0; } *************** *** 295,299 **** // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); --- 295,299 ---- // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedObject(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); *************** *** 356,360 **** returns = new wxMouseState(); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxMouseState *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxMouseState, returns); --- 356,360 ---- returns = new wxMouseState(); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxMouseState *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxMouseState, returns); *************** *** 646,650 **** // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedMemory(self); return 0; } --- 646,650 ---- // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedObject(self); return 0; } *************** *** 656,660 **** // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); --- 656,660 ---- // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedObject(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); *************** *** 723,727 **** returns = new wxBusyCursor(cursor); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxBusyCursor *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxBusyCursor, returns); --- 723,727 ---- returns = new wxBusyCursor(cursor); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxBusyCursor *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxBusyCursor, returns); *************** *** 739,743 **** // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedMemory(self); return 0; } --- 739,743 ---- // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedObject(self); return 0; } *************** *** 749,753 **** // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); --- 749,753 ---- // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedObject(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); *************** *** 798,802 **** returns = new wxBusyInfo(message, parent); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxBusyInfo *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxBusyInfo, returns); --- 798,802 ---- returns = new wxBusyInfo(message, parent); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxBusyInfo *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxBusyInfo, returns); *************** *** 812,816 **** // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedMemory(self); return 0; } --- 812,816 ---- // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedObject(self); return 0; } *************** *** 822,826 **** // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); --- 822,826 ---- // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedObject(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxlua.cpp 12 Dec 2006 07:09:41 -0000 1.22 --- wxlua.cpp 14 Dec 2006 01:01:25 -0000 1.23 *************** *** 40,44 **** // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedMemory(self); return 0; } --- 40,44 ---- // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedObject(self); return 0; } *************** *** 50,54 **** // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); --- 50,54 ---- // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedObject(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); *************** *** 86,90 **** returns = new wxLuaObject(wxlState, 1); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxLuaObject, returns); --- 86,90 ---- returns = new wxLuaObject(wxlState, 1); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxLuaObject, returns); *************** *** 177,181 **** // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedMemory(self); return 0; } --- 177,181 ---- // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedObject(self); return 0; } *************** *** 187,191 **** // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); --- 187,191 ---- // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedObject(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); *************** *** 240,244 **** returns = new wxLuaPrintout(wxlState, title, pObject); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxLuaPrintout *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxLuaPrintout, returns); --- 240,244 ---- returns = new wxLuaPrintout(wxlState, title, pObject); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxLuaPrintout *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxLuaPrintout, returns); *************** *** 291,295 **** // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedMemory(self); return 0; } --- 291,295 ---- // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedObject(self); return 0; } *************** *** 301,305 **** // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); --- 301,305 ---- // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedObject(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); *************** *** 360,364 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxLuaHtmlWindow, returns); --- 360,364 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxLuaHtmlWindow, returns); *************** *** 472,476 **** // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedMemory(self); return 0; } --- 472,476 ---- // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedObject(self); return 0; } *************** *** 482,486 **** // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); --- 482,486 ---- // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedObject(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** image.cpp 12 Dec 2006 07:09:39 -0000 1.19 --- image.cpp 14 Dec 2006 01:01:24 -0000 1.20 *************** *** 48,52 **** returns = new wxImage(bitmap->ConvertToImage()); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 48,52 ---- returns = new wxImage(bitmap->ConvertToImage()); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 87,91 **** returns = new wxPalette(self->GetPalette()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxPalette *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxPalette, returns); --- 87,91 ---- returns = new wxPalette(self->GetPalette()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxPalette *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxPalette, returns); *************** *** 125,129 **** returns = new wxImage(self->GetSubImage(*rect)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 125,129 ---- returns = new wxImage(self->GetSubImage(*rect)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 180,184 **** returns = new wxImage(self->Rotate(angle, *rotationCentre, interpolating, offsetAfterRotation)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 180,184 ---- returns = new wxImage(self->Rotate(angle, *rotationCentre, interpolating, offsetAfterRotation)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 210,214 **** returns = new wxImage(self->Size(*size, *pos, red, green, blue)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 210,214 ---- returns = new wxImage(self->Size(*size, *pos, red, green, blue)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 295,299 **** returns = new wxImage(*image); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxImage *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 295,299 ---- returns = new wxImage(*image); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxImage *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 310,314 **** returns = new wxImage(); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxImage *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 310,314 ---- returns = new wxImage(); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxImage *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 333,337 **** returns = new wxImage(width, height, clear); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxImage *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 333,337 ---- returns = new wxImage(width, height, clear); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxImage *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 359,363 **** returns = new wxImage(width, height, data, static_data); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 359,363 ---- returns = new wxImage(width, height, data, static_data); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 380,384 **** returns = new wxImage(name, type); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxImage *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 380,384 ---- returns = new wxImage(name, type); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxImage *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 426,430 **** returns = new wxImage(self->ConvertToMono(r, g, b)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 426,430 ---- returns = new wxImage(self->ConvertToMono(r, g, b)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 444,448 **** returns = new wxImage(self->Copy()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 444,448 ---- returns = new wxImage(self->Copy()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 1045,1049 **** returns = new wxImage(self->Mirror(horizontally)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 1045,1049 ---- returns = new wxImage(self->Mirror(horizontally)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 1124,1128 **** returns = new wxImage(self->Rotate90(clockwise)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 1124,1128 ---- returns = new wxImage(self->Rotate90(clockwise)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 1199,1203 **** returns = new wxImage(self->Scale(width, height)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 1199,1203 ---- returns = new wxImage(self->Scale(width, height)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxImage *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 1401,1405 **** // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedMemory(self); return 0; } --- 1401,1405 ---- // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedObject(self); return 0; } *************** *** 1411,1415 **** // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); --- 1411,1415 ---- // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedObject(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); *************** *** 1722,1726 **** // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedMemory(self); return 0; } --- 1722,1726 ---- // remove from tracked memory list if (self != 0) ! wxlState.RemoveTrackedObject(self); return 0; } *************** *** 1732,1736 **** // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); --- 1732,1736 ---- // remove from tracked memory list if (self != 0) ! if (wxlState.RemoveTrackedObject(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); *************** *** 1794,1798 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxBMPHandler, returns); --- 1794,1798 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxBMPHandler, returns); *************** *** 1837,1841 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxICOHandler, returns); --- 1837,1841 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxICOHandler, returns); *************** *** 1880,1884 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxCURHandler, returns); --- 1880,1884 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxCURHandler, returns); *************** *** 1923,1927 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxANIHandler, returns); --- 1923,1927 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxANIHandler, returns); *************** *** 1966,1970 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxIFFHandler, returns); --- 1966,1970 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxIFFHandler, returns); *************** *** 2009,2013 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxGIFHandler, returns); --- 2009,2013 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxGIFHandler, returns); *************** *** 2052,2056 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxJPEGHandler, returns); --- 2052,2056 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxJPEGHandler, returns); *************** *** 2095,2099 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxPCXHandler, returns); --- 2095,2099 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxPCXHandler, returns); *************** *** 2138,2142 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxPNGHandler, returns); --- 2138,2142 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxPNGHandler, returns); *************** *** 2181,2185 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxPNMHandler, returns); --- 2181,2185 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxPNMHandler, returns); *************** *** 2224,2228 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxTIFFHandler, returns); --- 2224,2228 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxTIFFHandler, returns); *************** *** 2267,2271 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXPMHandler, returns); --- 2267,2271 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxXPMHandler, returns); *************** *** 2320,2324 **** returns = new wxBitmap(wxArtProvider::GetBitmap(id, client, *size)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxBitmap *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); --- 2320,2324 ---- returns = new wxBitmap(wxArtProvider::GetBitmap(id, client, *size)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxBitmap *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); *************** *** 2348,2352 **** returns = new wxIcon(wxArtProvider::GetIcon(id, client, *size)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxIcon *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxIcon, returns); --- 2348,2352 ---- returns = new wxIcon(wxArtProvider::GetIcon(id, client, *size)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxIcon *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxIcon, returns); *************** *** 2374,2378 **** returns = new wxSize(wxArtProvider::GetSizeHint(client, platform_dependent)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxSize *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxSize, returns); --- 2374,2378 ---- returns = new wxSize(wxArtProvider::GetSizeHint(client, platform_dependent)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxSize *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxSize, returns); Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mdi.cpp 12 Dec 2006 07:09:39 -0000 1.18 --- mdi.cpp 14 Dec 2006 01:01:25 -0000 1.19 *************** *** 88,92 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxMDIParentFrame, returns); --- 88,92 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxMDIParentFrame, returns); *************** *** 188,192 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxMDIParentFrame, returns); --- 188,192 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxMDIParentFrame, returns); *************** *** 422,426 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxMDIChildFrame, returns); --- 422,426 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxMDIChildFrame, returns); *************** *** 471,475 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxMDIChildFrame, returns); --- 471,475 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxMDIChildFrame, returns); *************** *** 573,577 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxDocChildFrame, returns); --- 573,577 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxDocChildFrame, returns); *************** *** 922,926 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns); --- 922,926 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxDocManager, returns); *************** *** 1435,1439 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxDocParentFrame, returns); --- 1435,1439 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxDocParentFrame, returns); *************** *** 1508,1512 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxDocTemplate, returns); --- 1508,1512 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxDocTemplate, returns); *************** *** 1962,1966 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxDocument, returns); --- 1962,1966 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxDocument, returns); *************** *** 2832,2836 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxCommandProcessor, returns); --- 2832,2836 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxCommandProcessor, returns); *************** *** 3355,3359 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxFileHistory, returns); --- 3355,3359 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxFileHistory, returns); Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** grid.cpp 12 Dec 2006 07:09:39 -0000 1.19 --- grid.cpp 14 Dec 2006 01:01:24 -0000 1.20 *************** *** 125,129 **** returns = new wxSize(self->GetBestSize(*grid, *attr, *dc, row, col)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxSize *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxSize, returns); --- 125,129 ---- returns = new wxSize(self->GetBestSize(*grid, *attr, *dc, row, col)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxSize *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxSize, returns); *************** *** 1207,1211 **** returns = new wxColour(self->GetTextColour()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); --- 1207,1211 ---- returns = new wxColour(self->GetTextColour()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); *************** *** 1225,1229 **** returns = new wxColour(self->GetBackgroundColour()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); --- 1225,1229 ---- returns = new wxColour(self->GetBackgroundColour()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); *************** *** 1261,1265 **** returns = new wxFont(self->GetFont()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxFont *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxFont, returns); --- 1261,1265 ---- returns = new wxFont(self->GetFont()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxFont *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxFont, returns); *************** *** 2610,2614 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxGridStringTable, returns); --- 2610,2614 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxGridStringTable, returns); *************** *** 3080,3084 **** returns = new wxColour(self->GetLabelBackgroundColour()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); --- 3080,3084 ---- returns = new wxColour(self->GetLabelBackgroundColour()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); *************** *** 3098,3102 **** returns = new wxColour(self->GetLabelTextColour()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); --- 3098,3102 ---- returns = new wxColour(self->GetLabelTextColour()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); *************** *** 3116,3120 **** returns = new wxColour(self->GetGridLineColour()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); --- 3116,3120 ---- returns = new wxColour(self->GetGridLineColour()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); *************** *** 3134,3138 **** returns = new wxColour(self->GetCellHighlightColour()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); --- 3134,3138 ---- returns = new wxColour(self->GetCellHighlightColour()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); *************** *** 3208,3212 **** returns = new wxColour(self->GetDefaultCellBackgroundColour()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); --- 3208,3212 ---- returns = new wxColour(self->GetDefaultCellBackgroundColour()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); *************** *** 3230,3234 **** returns = new wxColour(self->GetCellBackgroundColour(row, col)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); --- 3230,3234 ---- returns = new wxColour(self->GetCellBackgroundColour(row, col)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); *************** *** 3248,3252 **** returns = new wxColour(self->GetDefaultCellTextColour()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); --- 3248,3252 ---- returns = new wxColour(self->GetDefaultCellTextColour()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); *************** *** 3270,3274 **** returns = new wxColour(self->GetCellTextColour(row, col)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); --- 3270,3274 ---- returns = new wxColour(self->GetCellTextColour(row, col)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); *************** *** 3352,3356 **** returns = new wxColour(self->GetSelectionBackground()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); --- 3352,3356 ---- returns = new wxColour(self->GetSelectionBackground()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); *************** *** 3370,3374 **** returns = new wxColour(self->GetSelectionForeground()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); --- 3370,3374 ---- returns = new wxColour(self->GetSelectionForeground()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxColour *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxColour, returns); *************** *** 3420,3424 **** returns = new wxFont(self->GetLabelFont()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxFont *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxFont, returns); --- 3420,3424 ---- returns = new wxFont(self->GetLabelFont()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxFont *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxFont, returns); *************** *** 3452,3456 **** returns = new wxFont(self->GetDefaultCellFont()); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxFont *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxFont, returns); --- 3452,3456 ---- returns = new wxFont(self->GetDefaultCellFont()); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxFont *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxFont, returns); *************** *** 3474,3478 **** returns = new wxFont(self->GetCellFont(row, col)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxFont *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxFont, returns); --- 3474,3478 ---- returns = new wxFont(self->GetCellFont(row, col)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxFont *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxFont, returns); *************** *** 3540,3544 **** // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddToTrackedWindowList((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxGrid, returns); --- 3540,3544 ---- // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxGrid, returns); *************** *** 3562,3566 **** returns = new wxRect(self->CellToRect(row, col)); // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxRect *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxRect, returns); --- 3562,3566 ---- returns = new wxRect(self->CellToRect(row, col)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxRect *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxRect, retur... [truncated message content] |