From: John L. <jr...@us...> - 2005-12-30 04:36:08
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11092/wxLua/bindings/wxwidgets Modified Files: override.hpp Log Message: use wxLuaState in addToTrackedMemory, now called wxLua_addToTrackedMemory better docs in wxlstate header rem out wxPrintf debug code fix error recreating wxLuaState, need to Destroy before calling UnRef Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** override.hpp 30 Nov 2005 04:46:16 -0000 1.6 --- override.hpp 30 Dec 2005 04:35:59 -0000 1.7 *************** *** 947,951 **** returns = new wxLuaObject(wxlState, 1); // add to tracked memory list ! addToTrackedMemoryList(L, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxLuaObject, returns); --- 947,951 ---- 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); *************** *** 1155,1159 **** returns = new wxGenericValidator(boolPtr->GetBoolPtr()); // add to tracked memory list ! addToTrackedMemoryList(L, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxGenericValidator, returns); --- 1155,1159 ---- returns = new wxGenericValidator(boolPtr->GetBoolPtr()); // add to tracked memory list ! wxLua_addToTrackedMemoryList(wxlState, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxGenericValidator, returns); *************** *** 1174,1178 **** returns = new wxGenericValidator(valPtr->GetStringPtr()); // add to tracked memory list ! addToTrackedMemoryList(L, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxGenericValidator, returns); --- 1174,1178 ---- returns = new wxGenericValidator(valPtr->GetStringPtr()); // add to tracked memory list ! wxLua_addToTrackedMemoryList(wxlState, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxGenericValidator, returns); *************** *** 1193,1197 **** returns = new wxGenericValidator(valPtr->GetIntPtr()); // add to tracked memory list ! addToTrackedMemoryList(L, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxGenericValidator, returns); --- 1193,1197 ---- returns = new wxGenericValidator(valPtr->GetIntPtr()); // add to tracked memory list ! wxLua_addToTrackedMemoryList(wxlState, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxGenericValidator, returns); *************** *** 1212,1216 **** returns = new wxGenericValidator(valPtr->GetArrayPtr()); // add to tracked memory list ! addToTrackedMemoryList(L, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxGenericValidator, returns); --- 1212,1216 ---- returns = new wxGenericValidator(valPtr->GetArrayPtr()); // add to tracked memory list ! wxLua_addToTrackedMemoryList(wxlState, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxGenericValidator, returns); *************** *** 1436,1440 **** returns = new wxBitmap(data, type, width, height, depth); // add to tracked memory list ! addToTrackedMemoryList(L, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns); --- 1436,1440 ---- returns = new wxBitmap(data, type, width, height, depth); // add to tracked memory list ! wxLua_addToTrackedMemoryList(wxlState, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns); *************** *** 1464,1468 **** returns = new wxImage(width, height, data, static_data); // add to tracked memory list ! addToTrackedMemoryList(L, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxImage, returns); --- 1464,1468 ---- 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); *************** *** 1484,1488 **** returns = new wxImage(bitmap->ConvertToImage()); // add to tracked memory list ! addToTrackedMemoryList(L, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxImage, returns); --- 1484,1488 ---- 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); *************** *** 1772,1776 **** returns = new wxTreeItemId(self->GetFirstChild(*item, cookie)); // add the new object to the tracked memory list ! addToTrackedMemoryList(L, returns); // push the result datatype wxlState.pushuserdatatype(s_wxluatag_wxTreeItemId, returns); --- 1772,1776 ---- returns = new wxTreeItemId(self->GetFirstChild(*item, cookie)); // add the new object to the tracked memory list ! wxLua_addToTrackedMemoryList(wxlState, returns); // push the result datatype wxlState.pushuserdatatype(s_wxluatag_wxTreeItemId, returns); *************** *** 1807,1811 **** returns = new wxTreeItemId(self->GetNextChild(*item, cookie)); // add the new object to the tracked memory list ! addToTrackedMemoryList(L, returns); // push the result datatype wxlState.pushuserdatatype(s_wxluatag_wxTreeItemId, returns); --- 1807,1811 ---- returns = new wxTreeItemId(self->GetNextChild(*item, cookie)); // add the new object to the tracked memory list ! wxLua_addToTrackedMemoryList(wxlState, returns); // push the result datatype wxlState.pushuserdatatype(s_wxluatag_wxTreeItemId, returns); *************** *** 1837,1841 **** returns = new wxTreeItemId(self->HitTest(*point, flags)); // add the new object to the tracked memory list ! addToTrackedMemoryList(L, returns); // push the result datatype --- 1837,1841 ---- returns = new wxTreeItemId(self->HitTest(*point, flags)); // add the new object to the tracked memory list ! wxLua_addToTrackedMemoryList(wxlState, returns); // push the result datatype *************** *** 2276,2280 **** if (returns != NULL) { ! addToTrackedMemoryList(L, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxAcceleratorTable, returns); --- 2276,2280 ---- if (returns != NULL) { ! wxLua_addToTrackedMemoryList(wxlState, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxAcceleratorTable, returns); *************** *** 2855,2859 **** *returns = *self; // add to tracked memory list ! addToTrackedMemoryList(L, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxPrintData, returns); --- 2855,2859 ---- *returns = *self; // add to tracked memory list ! wxLua_addToTrackedMemoryList(wxlState, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxPrintData, returns); *************** *** 2873,2877 **** *returns = *self; // add to tracked memory list ! addToTrackedMemoryList(L, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxPageSetupDialogData, returns); --- 2873,2877 ---- *returns = *self; // add to tracked memory list ! wxLua_addToTrackedMemoryList(wxlState, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxPageSetupDialogData, returns); *************** *** 3203,3207 **** self->GetPaneProperties(*returns, alignment); // ! addToTrackedMemoryList(L, returns); wxlState.pushuserdatatype(s_cbLuaCommonPaneProperties, returns); // return the number of parameters --- 3203,3207 ---- self->GetPaneProperties(*returns, alignment); // ! wxLua_addToTrackedMemoryList(wxlState, returns); wxlState.pushuserdatatype(s_cbLuaCommonPaneProperties, returns); // return the number of parameters *************** *** 3393,3397 **** self->GetPreferredDim(*givenDim, *prefDim); // return the number of parameters ! addToTrackedMemoryList(L, prefDim); wxlState.pushuserdatatype(s_wxluatag_wxSize, prefDim); return 1; --- 3393,3397 ---- self->GetPreferredDim(*givenDim, *prefDim); // return the number of parameters ! wxLua_addToTrackedMemoryList(wxlState, prefDim); wxlState.pushuserdatatype(s_wxluatag_wxSize, prefDim); return 1; *************** *** 3618,3622 **** returns = new wxBitmap(sizeArray); // add to tracked memory list ! addToTrackedMemoryList(L, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns); --- 3618,3622 ---- returns = new wxBitmap(sizeArray); // add to tracked memory list ! wxLua_addToTrackedMemoryList(wxlState, returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns); *************** *** 3869,3881 **** returns = self->GetTimes(dtAccess, dtMod, dtCreate); // add to tracked memory list ! addToTrackedMemoryList(L, dtAccess); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxDateTime, dtAccess); // add to tracked memory list ! addToTrackedMemoryList(L, dtMod); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxDateTime, dtMod); // add to tracked memory list ! addToTrackedMemoryList(L, dtCreate); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxDateTime, dtCreate); --- 3869,3881 ---- returns = self->GetTimes(dtAccess, dtMod, dtCreate); // add to tracked memory list ! wxLua_addToTrackedMemoryList(wxlState, dtAccess); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxDateTime, dtAccess); // add to tracked memory list ! wxLua_addToTrackedMemoryList(wxlState, dtMod); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxDateTime, dtMod); // add to tracked memory list ! wxLua_addToTrackedMemoryList(wxlState, dtCreate); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxDateTime, dtCreate); |