[Wxlua-commit] wxLua/modules/wxbind/src wxadv_adv.cpp, 1.1, 1.2 wxadv_grid.cpp, 1.1, 1.2 wxaui_aui.cpp, 1.1, 1.2 wxbase_base.cpp, 1.1, 1.2 wxbase_config.cpp, 1.1, 1.2 wxbase_data.cpp, 1.1, 1.2 wxbase_datetime.cpp, 1.1, 1.2 wxbase_file.cpp, 1.1, 1.2 wxcore_clipdrag.cpp, 1.1, 1.2 wxcore_controls.cpp, 1.1, 1.2 wxcore_core.cpp, 1.1, 1.2 wxcore_defsutils.cpp, 1.1, 1.2 wxcore_dialogs.cpp, 1.1, 1.2 wxcore_event.cpp, 1.1, 1.2 wxcore_gdi.cpp, 1.1, 1.2 wxcore_geometry.cpp, 1.1, 1.2 wxcore_help.cpp, 1.1, 1.2 wxcore_image.cpp, 1.1, 1.2 wxcore_mdi.cpp, 1.1, 1.2 wxcore_menutool.cpp, 1.1, 1.2 wxcore_picker.cpp, 1.1, 1.2 wxcore_print.cpp, 1.1, 1.2 wxcore_sizer.cpp, 1.1, 1.2 wxcore_windows.cpp, 1.1, 1.2 wxhtml_html.cpp, 1.1, 1.2 wxmedia_media.cpp, 1.1, 1.2 wxnet_net.cpp, 1.1, 1.2 wxstc_stc.cpp, 1.1, 1.2 wxxml_xml.cpp, 1.1, 1.2 wxxrc_xrc.cpp, 1.1, 1.2

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12109/wxLua/modules/wxbind/src

Modified Files:
	wxadv_adv.cpp wxadv_grid.cpp wxaui_aui.cpp wxbase_base.cpp 
	wxbase_config.cpp wxbase_data.cpp wxbase_datetime.cpp 
	wxbase_file.cpp wxcore_clipdrag.cpp wxcore_controls.cpp 
	wxcore_core.cpp wxcore_defsutils.cpp wxcore_dialogs.cpp 
	wxcore_event.cpp wxcore_gdi.cpp wxcore_geometry.cpp 
	wxcore_help.cpp wxcore_image.cpp wxcore_mdi.cpp 
	wxcore_menutool.cpp wxcore_picker.cpp wxcore_print.cpp 
	wxcore_sizer.cpp wxcore_windows.cpp wxhtml_html.cpp 
	wxmedia_media.cpp wxnet_net.cpp wxstc_stc.cpp wxxml_xml.cpp 
	wxxrc_xrc.cpp 
Log Message:
Add parameter to wxLuaState::RemoveTrackedObject to select how we untrack it
Fixes removing derived methods for the %ungc binding tag


Index: wxnet_net.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_net.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxnet_net.cpp	16 Jul 2007 19:35:23 -0000	1.1
--- wxnet_net.cpp	22 Jul 2007 04:38:29 -0000	1.2
***************
*** 787,791 ****
      wxSocketClient * self = (wxSocketClient *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketClient);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 787,791 ----
      wxSocketClient * self = (wxSocketClient *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketClient);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 922,926 ****
      wxSocketServer * self = (wxSocketServer *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketServer);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 922,926 ----
      wxSocketServer * self = (wxSocketServer *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketServer);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1044,1048 ****
      wxSocketEvent * self = (wxSocketEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1044,1048 ----
      wxSocketEvent * self = (wxSocketEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1316,1320 ****
      wxIPaddress * self = (wxIPaddress *)wxlState.GetUserDataType(1, s_wxluatag_wxIPaddress);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1316,1320 ----
      wxIPaddress * self = (wxIPaddress *)wxlState.GetUserDataType(1, s_wxluatag_wxIPaddress);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1427,1431 ****
      wxIPV4address * self = (wxIPV4address *)wxlState.GetUserDataType(1, s_wxluatag_wxIPV4address);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1427,1431 ----
      wxIPV4address * self = (wxIPV4address *)wxlState.GetUserDataType(1, s_wxluatag_wxIPV4address);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1660,1664 ****
      wxProtocol * self = (wxProtocol *)wxlState.GetUserDataType(1, s_wxluatag_wxProtocol);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1660,1664 ----
      wxProtocol * self = (wxProtocol *)wxlState.GetUserDataType(1, s_wxluatag_wxProtocol);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1767,1771 ****
      wxHTTP * self = (wxHTTP *)wxlState.GetUserDataType(1, s_wxluatag_wxHTTP);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1767,1771 ----
      wxHTTP * self = (wxHTTP *)wxlState.GetUserDataType(1, s_wxluatag_wxHTTP);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 2201,2205 ****
      wxFTP * self = (wxFTP *)wxlState.GetUserDataType(1, s_wxluatag_wxFTP);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 2201,2205 ----
      wxFTP * self = (wxFTP *)wxlState.GetUserDataType(1, s_wxluatag_wxFTP);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 2718,2722 ****
      wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 2718,2722 ----
      wxURI * self = (wxURI *)wxlState.GetUserDataType(1, s_wxluatag_wxURI);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 3023,3027 ****
      wxURL * self = (wxURL *)wxlState.GetUserDataType(1, s_wxluatag_wxURL);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 3023,3027 ----
      wxURL * self = (wxURL *)wxlState.GetUserDataType(1, s_wxluatag_wxURL);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);

Index: wxstc_stc.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_stc.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxstc_stc.cpp	16 Jul 2007 19:35:23 -0000	1.1
--- wxstc_stc.cpp	22 Jul 2007 04:38:29 -0000	1.2
***************
*** 9335,9339 ****
      wxStyledTextEvent * self = (wxStyledTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 9335,9339 ----
      wxStyledTextEvent * self = (wxStyledTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);

Index: wxxrc_xrc.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_xrc.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxxrc_xrc.cpp	16 Jul 2007 19:35:24 -0000	1.1
--- wxxrc_xrc.cpp	22 Jul 2007 04:38:29 -0000	1.2
***************
*** 480,484 ****
      // wxXmlResource res
      wxXmlResource * res = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
!     if (wxlState.IsTrackedObject(res)) wxlState.RemoveTrackedObject(res, false);
      // call Set
      returns = (wxXmlResource *)wxXmlResource::Set(res);
--- 480,484 ----
      // wxXmlResource res
      wxXmlResource * res = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
!     if (wxlState.IsTrackedObject(res)) wxlState.RemoveTrackedObject(res, wxLuaState::UNDELETE);
      // call Set
      returns = (wxXmlResource *)wxXmlResource::Set(res);
***************
*** 552,556 ****
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 552,556 ----
      wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);

Index: wxcore_core.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_core.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_core.cpp	16 Jul 2007 19:35:18 -0000	1.1
--- wxcore_core.cpp	22 Jul 2007 04:38:29 -0000	1.2
***************
*** 43,47 ****
      wxLogGui * self = (wxLogGui *)wxlState.GetUserDataType(1, s_wxluatag_wxLogGui);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 43,47 ----
      wxLogGui * self = (wxLogGui *)wxlState.GetUserDataType(1, s_wxluatag_wxLogGui);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 101,105 ****
      wxLogTextCtrl * self = (wxLogTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxLogTextCtrl);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 101,105 ----
      wxLogTextCtrl * self = (wxLogTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxLogTextCtrl);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 208,212 ****
      wxLogWindow * self = (wxLogWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxLogWindow);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 208,212 ----
      wxLogWindow * self = (wxLogWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxLogWindow);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 693,697 ****
      wxTextValidator * self = (wxTextValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxTextValidator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 693,697 ----
      wxTextValidator * self = (wxTextValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxTextValidator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 777,781 ****
      wxGenericValidator * self = (wxGenericValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericValidator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 777,781 ----
      wxGenericValidator * self = (wxGenericValidator *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericValidator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);

Index: wxcore_clipdrag.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_clipdrag.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_clipdrag.cpp	16 Jul 2007 19:35:18 -0000	1.1
--- wxcore_clipdrag.cpp	22 Jul 2007 04:38:29 -0000	1.2
***************
*** 46,50 ****
      // wxDataObject data
      wxDataObject * data = (wxDataObject *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObject);
!     if (wxlState.IsTrackedObject(data)) wxlState.RemoveTrackedObject(data, false);
      // get this
      wxClipboard * self = (wxClipboard *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboard);
--- 46,50 ----
      // wxDataObject data
      wxDataObject * data = (wxDataObject *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObject);
!     if (wxlState.IsTrackedObject(data)) wxlState.RemoveTrackedObject(data, wxLuaState::UNDELETE);
      // get this
      wxClipboard * self = (wxClipboard *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboard);
***************
*** 221,225 ****
      // wxDataObject data
      wxDataObject * data = (wxDataObject *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObject);
!     if (wxlState.IsTrackedObject(data)) wxlState.RemoveTrackedObject(data, false);
      // get this
      wxClipboard * self = (wxClipboard *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboard);
--- 221,225 ----
      // wxDataObject data
      wxDataObject * data = (wxDataObject *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObject);
!     if (wxlState.IsTrackedObject(data)) wxlState.RemoveTrackedObject(data, wxLuaState::UNDELETE);
      // get this
      wxClipboard * self = (wxClipboard *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboard);
***************
*** 312,316 ****
      wxClipboardTextEvent * self = (wxClipboardTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboardTextEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 312,316 ----
      wxClipboardTextEvent * self = (wxClipboardTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxClipboardTextEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 447,451 ****
      wxDataFormat * self = (wxDataFormat *)wxlState.GetUserDataType(1, s_wxluatag_wxDataFormat);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 447,451 ----
      wxDataFormat * self = (wxDataFormat *)wxlState.GetUserDataType(1, s_wxluatag_wxDataFormat);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 899,903 ****
      wxDataObjectSimple * self = (wxDataObjectSimple *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectSimple);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 899,903 ----
      wxDataObjectSimple * self = (wxDataObjectSimple *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectSimple);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 972,976 ****
      // wxDataObjectSimple dataObject
      wxDataObjectSimple * dataObject = (wxDataObjectSimple *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObjectSimple);
!     if (wxlState.IsTrackedObject(dataObject)) wxlState.RemoveTrackedObject(dataObject, false);
      // get this
      wxDataObjectComposite * self = (wxDataObjectComposite *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectComposite);
--- 972,976 ----
      // wxDataObjectSimple dataObject
      wxDataObjectSimple * dataObject = (wxDataObjectSimple *)wxlState.GetUserDataType(2, s_wxluatag_wxDataObjectSimple);
!     if (wxlState.IsTrackedObject(dataObject)) wxlState.RemoveTrackedObject(dataObject, wxLuaState::UNDELETE);
      // get this
      wxDataObjectComposite * self = (wxDataObjectComposite *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectComposite);
***************
*** 1014,1018 ****
      wxDataObjectComposite * self = (wxDataObjectComposite *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectComposite);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1014,1018 ----
      wxDataObjectComposite * self = (wxDataObjectComposite *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectComposite);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1120,1124 ****
      wxFileDataObject * self = (wxFileDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxFileDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1120,1124 ----
      wxFileDataObject * self = (wxFileDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxFileDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1237,1241 ****
      wxTextDataObject * self = (wxTextDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxTextDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1237,1241 ----
      wxTextDataObject * self = (wxTextDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxTextDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1344,1348 ****
      wxBitmapDataObject * self = (wxBitmapDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1344,1348 ----
      wxBitmapDataObject * self = (wxBitmapDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1453,1457 ****
      wxURLDataObject * self = (wxURLDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxURLDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1453,1457 ----
      wxURLDataObject * self = (wxURLDataObject *)wxlState.GetUserDataType(1, s_wxluatag_wxURLDataObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1643,1647 ****
      wxDropSource * self = (wxDropSource *)wxlState.GetUserDataType(1, s_wxluatag_wxDropSource);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1643,1647 ----
      wxDropSource * self = (wxDropSource *)wxlState.GetUserDataType(1, s_wxluatag_wxDropSource);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1936,1940 ****
      wxDropFilesEvent * self = (wxDropFilesEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxDropFilesEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1936,1940 ----
      wxDropFilesEvent * self = (wxDropFilesEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxDropFilesEvent);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 2048,2052 ****
      wxMetafile * self = (wxMetafile *)wxlState.GetUserDataType(1, s_wxluatag_wxMetafile);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 2048,2052 ----
      wxMetafile * self = (wxMetafile *)wxlState.GetUserDataType(1, s_wxluatag_wxMetafile);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 2140,2144 ****
      wxMetafileDC * self = (wxMetafileDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMetafileDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 2140,2144 ----
      wxMetafileDC * self = (wxMetafileDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMetafileDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);

Index: wxcore_help.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_help.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_help.cpp	16 Jul 2007 19:35:19 -0000	1.1
--- wxcore_help.cpp	22 Jul 2007 04:38:29 -0000	1.2
***************
*** 81,85 ****
      wxContextHelp * self = (wxContextHelp *)wxlState.GetUserDataType(1, s_wxluatag_wxContextHelp);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 81,85 ----
      wxContextHelp * self = (wxContextHelp *)wxlState.GetUserDataType(1, s_wxluatag_wxContextHelp);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 279,283 ****
      // wxHelpProvider helpProvider
      wxHelpProvider * helpProvider = (wxHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpProvider);
!     if (wxlState.IsTrackedObject(helpProvider)) wxlState.RemoveTrackedObject(helpProvider, false);
      // call Set
      returns = (wxHelpProvider *)wxHelpProvider::Set(helpProvider);
--- 279,283 ----
      // wxHelpProvider helpProvider
      wxHelpProvider * helpProvider = (wxHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpProvider);
!     if (wxlState.IsTrackedObject(helpProvider)) wxlState.RemoveTrackedObject(helpProvider, wxLuaState::UNDELETE);
      // call Set
      returns = (wxHelpProvider *)wxHelpProvider::Set(helpProvider);
***************
*** 345,349 ****
      wxHelpProvider * self = (wxHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpProvider);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 345,349 ----
      wxHelpProvider * self = (wxHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpProvider);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 395,399 ****
      wxSimpleHelpProvider * self = (wxSimpleHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHelpProvider);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 395,399 ----
      wxSimpleHelpProvider * self = (wxSimpleHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxSimpleHelpProvider);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 488,492 ****
      wxHelpControllerHelpProvider * self = (wxHelpControllerHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpControllerHelpProvider);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 488,492 ----
      wxHelpControllerHelpProvider * self = (wxHelpControllerHelpProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpControllerHelpProvider);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 878,882 ****
      wxHelpControllerBase * self = (wxHelpControllerBase *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpControllerBase);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 878,882 ----
      wxHelpControllerBase * self = (wxHelpControllerBase *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpControllerBase);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 971,975 ****
      wxHelpController * self = (wxHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 971,975 ----
      wxHelpController * self = (wxHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1029,1033 ****
      wxWinHelpController * self = (wxWinHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxWinHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1029,1033 ----
      wxWinHelpController * self = (wxWinHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxWinHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1087,1091 ****
      wxBestHelpController * self = (wxBestHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxBestHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1087,1091 ----
      wxBestHelpController * self = (wxBestHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxBestHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1152,1156 ****
      wxExtHelpController * self = (wxExtHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxExtHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1152,1156 ----
      wxExtHelpController * self = (wxExtHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxExtHelpController);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);

Index: wxcore_gdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_gdi.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_gdi.cpp	16 Jul 2007 19:35:19 -0000	1.1
--- wxcore_gdi.cpp	22 Jul 2007 04:38:29 -0000	1.2
***************
*** 144,148 ****
      wxPoint * self = (wxPoint *)wxlState.GetUserDataType(1, s_wxluatag_wxPoint);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 144,148 ----
      wxPoint * self = (wxPoint *)wxlState.GetUserDataType(1, s_wxluatag_wxPoint);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 835,839 ****
      wxSize * self = (wxSize *)wxlState.GetUserDataType(1, s_wxluatag_wxSize);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 835,839 ----
      wxSize * self = (wxSize *)wxlState.GetUserDataType(1, s_wxluatag_wxSize);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 1973,1977 ****
      wxRect * self = (wxRect *)wxlState.GetUserDataType(1, s_wxluatag_wxRect);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 1973,1977 ----
      wxRect * self = (wxRect *)wxlState.GetUserDataType(1, s_wxluatag_wxRect);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 2353,2357 ****
      wxGDIObject * self = (wxGDIObject *)wxlState.GetUserDataType(1, s_wxluatag_wxGDIObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 2353,2357 ----
      wxGDIObject * self = (wxGDIObject *)wxlState.GetUserDataType(1, s_wxluatag_wxGDIObject);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 3072,3076 ****
      wxRegion * self = (wxRegion *)wxlState.GetUserDataType(1, s_wxluatag_wxRegion);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 3072,3076 ----
      wxRegion * self = (wxRegion *)wxlState.GetUserDataType(1, s_wxluatag_wxRegion);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 3611,3615 ****
      wxRegionIterator * self = (wxRegionIterator *)wxlState.GetUserDataType(1, s_wxluatag_wxRegionIterator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 3611,3615 ----
      wxRegionIterator * self = (wxRegionIterator *)wxlState.GetUserDataType(1, s_wxluatag_wxRegionIterator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 4207,4211 ****
      wxFont * self = (wxFont *)wxlState.GetUserDataType(1, s_wxluatag_wxFont);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 4207,4211 ----
      wxFont * self = (wxFont *)wxlState.GetUserDataType(1, s_wxluatag_wxFont);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 4873,4877 ****
      wxNativeFontInfo * self = (wxNativeFontInfo *)wxlState.GetUserDataType(1, s_wxluatag_wxNativeFontInfo);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 4873,4877 ----
      wxNativeFontInfo * self = (wxNativeFontInfo *)wxlState.GetUserDataType(1, s_wxluatag_wxNativeFontInfo);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 5190,5194 ****
      wxFontEnumerator * self = (wxFontEnumerator *)wxlState.GetUserDataType(1, s_wxluatag_wxFontEnumerator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 5190,5194 ----
      wxFontEnumerator * self = (wxFontEnumerator *)wxlState.GetUserDataType(1, s_wxluatag_wxFontEnumerator);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 5960,5964 ****
      wxColour * self = (wxColour *)wxlState.GetUserDataType(1, s_wxluatag_wxColour);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 5960,5964 ----
      wxColour * self = (wxColour *)wxlState.GetUserDataType(1, s_wxluatag_wxColour);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 6294,6298 ****
      wxColourDatabase * self = (wxColourDatabase *)wxlState.GetUserDataType(1, s_wxluatag_wxColourDatabase);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 6294,6298 ----
      wxColourDatabase * self = (wxColourDatabase *)wxlState.GetUserDataType(1, s_wxluatag_wxColourDatabase);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 6629,6633 ****
      wxPen * self = (wxPen *)wxlState.GetUserDataType(1, s_wxluatag_wxPen);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 6629,6633 ----
      wxPen * self = (wxPen *)wxlState.GetUserDataType(1, s_wxluatag_wxPen);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 7144,7148 ****
      wxBrush * self = (wxBrush *)wxlState.GetUserDataType(1, s_wxluatag_wxBrush);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 7144,7148 ----
      wxBrush * self = (wxBrush *)wxlState.GetUserDataType(1, s_wxluatag_wxBrush);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 7776,7780 ****
      wxPalette * self = (wxPalette *)wxlState.GetUserDataType(1, s_wxluatag_wxPalette);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 7776,7780 ----
      wxPalette * self = (wxPalette *)wxlState.GetUserDataType(1, s_wxluatag_wxPalette);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 8048,8052 ****
      wxIcon * self = (wxIcon *)wxlState.GetUserDataType(1, s_wxluatag_wxIcon);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 8048,8052 ----
      wxIcon * self = (wxIcon *)wxlState.GetUserDataType(1, s_wxluatag_wxIcon);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 8274,8278 ****
      wxIconBundle * self = (wxIconBundle *)wxlState.GetUserDataType(1, s_wxluatag_wxIconBundle);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 8274,8278 ----
      wxIconBundle * self = (wxIconBundle *)wxlState.GetUserDataType(1, s_wxluatag_wxIconBundle);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 8802,8806 ****
      // wxMask mask
      wxMask * mask = (wxMask *)wxlState.GetUserDataType(2, s_wxluatag_wxMask);
!     if (wxlState.IsTrackedObject(mask)) wxlState.RemoveTrackedObject(mask, false);
      // get this
      wxBitmap * self = (wxBitmap *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmap);
--- 8802,8806 ----
      // wxMask mask
      wxMask * mask = (wxMask *)wxlState.GetUserDataType(2, s_wxluatag_wxMask);
!     if (wxlState.IsTrackedObject(mask)) wxlState.RemoveTrackedObject(mask, wxLuaState::UNDELETE);
      // get this
      wxBitmap * self = (wxBitmap *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmap);
***************
*** 8858,8862 ****
      wxBitmap * self = (wxBitmap *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmap);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 8858,8862 ----
      wxBitmap * self = (wxBitmap *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmap);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 9270,9274 ****
      wxCursor * self = (wxCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxCursor);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 9270,9274 ----
      wxCursor * self = (wxCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxCursor);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 9539,9543 ****
      wxMask * self = (wxMask *)wxlState.GetUserDataType(1, s_wxluatag_wxMask);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 9539,9543 ----
      wxMask * self = (wxMask *)wxlState.GetUserDataType(1, s_wxluatag_wxMask);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 10062,10066 ****
      wxImageList * self = (wxImageList *)wxlState.GetUserDataType(1, s_wxluatag_wxImageList);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 10062,10066 ----
      wxImageList * self = (wxImageList *)wxlState.GetUserDataType(1, s_wxluatag_wxImageList);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 11986,11990 ****
      wxDC * self = (wxDC *)wxlState.GetUserDataType(1, s_wxluatag_wxDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 11986,11990 ----
      wxDC * self = (wxDC *)wxlState.GetUserDataType(1, s_wxluatag_wxDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 12314,12318 ****
      wxMemoryDC * self = (wxMemoryDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMemoryDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 12314,12318 ----
      wxMemoryDC * self = (wxMemoryDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMemoryDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 12380,12384 ****
      wxWindowDC * self = (wxWindowDC *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 12380,12384 ----
      wxWindowDC * self = (wxWindowDC *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 12441,12445 ****
      wxClientDC * self = (wxClientDC *)wxlState.GetUserDataType(1, s_wxluatag_wxClientDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 12441,12445 ----
      wxClientDC * self = (wxClientDC *)wxlState.GetUserDataType(1, s_wxluatag_wxClientDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 12502,12506 ****
      wxPaintDC * self = (wxPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxPaintDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 12502,12506 ----
      wxPaintDC * self = (wxPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxPaintDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 12619,12623 ****
      wxScreenDC * self = (wxScreenDC *)wxlState.GetUserDataType(1, s_wxluatag_wxScreenDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 12619,12623 ----
      wxScreenDC * self = (wxScreenDC *)wxlState.GetUserDataType(1, s_wxluatag_wxScreenDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 12758,12762 ****
      wxBufferedDC * self = (wxBufferedDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 12758,12762 ----
      wxBufferedDC * self = (wxBufferedDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 12937,12941 ****
      wxBufferedPaintDC * self = (wxBufferedPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedPaintDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 12937,12941 ----
      wxBufferedPaintDC * self = (wxBufferedPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxBufferedPaintDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 13059,13063 ****
      wxAutoBufferedPaintDC * self = (wxAutoBufferedPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxAutoBufferedPaintDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 13059,13063 ----
      wxAutoBufferedPaintDC * self = (wxAutoBufferedPaintDC *)wxlState.GetUserDataType(1, s_wxluatag_wxAutoBufferedPaintDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 13120,13124 ****
      wxMirrorDC * self = (wxMirrorDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMirrorDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 13120,13124 ----
      wxMirrorDC * self = (wxMirrorDC *)wxlState.GetUserDataType(1, s_wxluatag_wxMirrorDC);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 13183,13187 ****
      wxDCClipper * self = (wxDCClipper *)wxlState.GetUserDataType(1, s_wxluatag_wxDCClipper);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 13183,13187 ----
      wxDCClipper * self = (wxDCClipper *)wxlState.GetUserDataType(1, s_wxluatag_wxDCClipper);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 13643,13647 ****
      wxCaret * self = (wxCaret *)wxlState.GetUserDataType(1, s_wxluatag_wxCaret);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 13643,13647 ----
      wxCaret * self = (wxCaret *)wxlState.GetUserDataType(1, s_wxluatag_wxCaret);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 13879,13883 ****
      wxCaretSuspend * self = (wxCaretSuspend *)wxlState.GetUserDataType(1, s_wxluatag_wxCaretSuspend);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 13879,13883 ----
      wxCaretSuspend * self = (wxCaretSuspend *)wxlState.GetUserDataType(1, s_wxluatag_wxCaretSuspend);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 14034,14038 ****
      wxVideoMode * self = (wxVideoMode *)wxlState.GetUserDataType(1, s_wxluatag_wxVideoMode);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self))
      {
          lua_pushnil(L);
--- 14034,14038 ----
      wxVideoMode * self = (wxVideoMode *)wxlState.GetUserDataType(1, s_wxluatag_wxVideoMode);
      // if removed from tracked mem list, reset the tag so that gc() is not called on this object.
!     if ((self != NULL) && wxlState.RemoveTrackedObject(self, wxLuaState::DELETE_OBJECT|wxLuaState::CLEAR_LUA_TRACKED|wxLuaState::CLEAR_DERIVED_METHODS))
      {
          lua_pushnil(L);
***************
*** 14336,14340 ****
      wxArrayVideoModes *...
 
[truncated message content]