[Wxlua-commit] wxLua/bindings/wxwidgets wx_datatypes.lua, 1.103, 1.104 wxadv_adv.i, 1.6, 1.7 wxadv_grid.i, 1.4, 1.5 wxadv_override.hpp, 1.8, 1.9 wxadv_rules.lua, 1.6, 1.7 wxaui_aui.i, 1.4, 1.5 wxbase_base.i, 1.5, 1.6 wxbase_config.i, 1.2, 1.3 wxbase_data.i, 1.4, 1.5 wxbase_datetime.i, 1.3, 1.4 wxbase_file.i, 1.6, 1.7 wxbase_override.hpp, 1.19, 1.20 wxbase_rules.lua, 1.9, 1.10 wxcore_clipdrag.i, 1.4, 1.5 wxcore_controls.i, 1.9, 1.10 wxcore_core.i, 1.3, 1.4 wxcore_defsutils.i, 1.5, 1.6 wxcore_dialogs.i, 1.2, 1.3 wxcore_event.i, 1.4, 1.5 wxcore_gdi.i, 1.8, 1.9 wxcore_geometry.i, 1.3, 1.4 wxcore_help.i, 1.1, 1.2 wxcore_image.i, 1.5, 1.6 wxcore_menutool.i, 1.4, 1.5 wxcore_override.hpp, 1.20, 1.21 wxcore_rules.lua, 1.6, 1.7 wxcore_sizer.i, 1.2, 1.3 wxcore_windows.i, 1.6, 1.7 wxhtml_html.i, 1.3, 1.4 wxrichtext_richtext.i, 1.1, 1.2 wxxml_override.hpp, 1.10, 1.11 wxxml_xml.i, 1.3, 1.4 wxxrc_xrc.i, 1.1, 1.2

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4255/wxLua/bindings/wxwidgets

Modified Files:
	wx_datatypes.lua wxadv_adv.i wxadv_grid.i wxadv_override.hpp 
	wxadv_rules.lua wxaui_aui.i wxbase_base.i wxbase_config.i 
	wxbase_data.i wxbase_datetime.i wxbase_file.i 
	wxbase_override.hpp wxbase_rules.lua wxcore_clipdrag.i 
	wxcore_controls.i wxcore_core.i wxcore_defsutils.i 
	wxcore_dialogs.i wxcore_event.i wxcore_gdi.i wxcore_geometry.i 
	wxcore_help.i wxcore_image.i wxcore_menutool.i 
	wxcore_override.hpp wxcore_rules.lua wxcore_sizer.i 
	wxcore_windows.i wxhtml_html.i wxrichtext_richtext.i 
	wxxml_override.hpp wxxml_xml.i wxxrc_xrc.i 
Log Message:
Removed %encapsulate and %noclassinfo tags for %classes in the bindings.
No longer encapsulating non wxObjects in a wxObject class for deletion.
We now provide delete functions for each class in the wxLuaBindClass
structs to be called on the void* we get from Lua.


Index: wxcore_event.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_event.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxcore_event.i	4 Dec 2008 05:12:38 -0000	1.4
--- wxcore_event.i	1 Oct 2009 04:21:00 -0000	1.5
***************
*** 84,88 ****
  %include "wx/event.h"
  
! %class %delete %noclassinfo %encapsulate wxPropagationDisabler
      // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxPropagationDisabler(wxEvent& event)
--- 84,88 ----
  %include "wx/event.h"
  
! %class %delete wxPropagationDisabler
      // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxPropagationDisabler(wxEvent& event)
***************
*** 95,99 ****
  %include "wx/event.h"
  
! %class %delete %noclassinfo %encapsulate wxPropagateOnce
      // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxPropagateOnce(wxEvent& event)
--- 95,99 ----
  %include "wx/event.h"
  
! %class %delete wxPropagateOnce
      // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxPropagateOnce(wxEvent& event)
***************
*** 215,219 ****
  //%include "wx/dialup.h"
  
! //%class %delete %noclassinfo wxDialUpEvent, wxCommandEvent
  //    %define_event wxEVT_DIALUP_CONNECTED      // EVT_DIALUP_CONNECTED(func)
  //    %define_event wxEVT_DIALUP_DISCONNECTED   // EVT_DIALUP_DISCONNECTED(func)
--- 215,219 ----
  //%include "wx/dialup.h"
  
! //%class %delete wxDialUpEvent, wxCommandEvent
  //    %define_event wxEVT_DIALUP_CONNECTED      // EVT_DIALUP_CONNECTED(func)
  //    %define_event wxEVT_DIALUP_DISCONNECTED   // EVT_DIALUP_DISCONNECTED(func)

Index: wxcore_gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_gdi.i,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wxcore_gdi.i	25 Sep 2009 18:47:57 -0000	1.8
--- wxcore_gdi.i	1 Oct 2009 04:21:01 -0000	1.9
***************
*** 17,21 ****
  %define wxDefaultCoord
  
! %class %delete %noclassinfo %encapsulate wxPoint
      %define_object wxDefaultPosition
  
--- 17,21 ----
  %define wxDefaultCoord
  
! %class %delete wxPoint
      %define_object wxDefaultPosition
  
***************
*** 58,62 ****
  // wxRealPoint - Used nowhere in wxWidgets
  
! //%class %delete %noclassinfo %encapsulate wxRealPoint
  //    wxRealPoint(double xx = 0, double yy = 0)
  //
--- 58,62 ----
  // wxRealPoint - Used nowhere in wxWidgets
  
! //%class %delete wxRealPoint
  //    wxRealPoint(double xx = 0, double yy = 0)
  //
***************
*** 68,72 ****
  // wxSize
  
! %class %delete %noclassinfo %encapsulate wxSize
      %define_object wxDefaultSize
  
--- 68,72 ----
  // wxSize
  
! %class %delete wxSize
      %define_object wxDefaultSize
  
***************
*** 110,114 ****
  // wxRect
  
! %class %delete %noclassinfo %encapsulate wxRect
      wxRect(int x = 0, int y = 0, int w = 0, int h = 0)
      wxRect(const wxRect& rect)
--- 110,114 ----
  // wxRect
  
! %class %delete wxRect
      wxRect(int x = 0, int y = 0, int w = 0, int h = 0)
      wxRect(const wxRect& rect)
***************
*** 388,392 ****
  %include "wx/fontutil.h"
  
! %class %delete %noclassinfo %encapsulate wxNativeFontInfo
      wxNativeFontInfo()
      wxNativeFontInfo(const wxNativeFontInfo& info)
--- 388,392 ----
  %include "wx/fontutil.h"
  
! %class %delete wxNativeFontInfo
      wxNativeFontInfo()
      wxNativeFontInfo(const wxNativeFontInfo& info)
***************
*** 439,443 ****
  %include "wx/fontenum.h"
  
! %class %delete %noclassinfo %encapsulate wxFontEnumerator
      wxFontEnumerator()
  
--- 439,443 ----
  %include "wx/fontenum.h"
  
! %class %delete wxFontEnumerator
      wxFontEnumerator()
  
***************
*** 462,466 ****
  %if wxLUA_USE_wxFontList
  
! %class %noclassinfo wxFontList
      %define_pointer wxTheFontList
  
--- 462,466 ----
  %if wxLUA_USE_wxFontList
  
! %class wxFontList
      %define_pointer wxTheFontList
  
***************
*** 484,488 ****
  %include "wx/fontmap.h"
  
! %class %noclassinfo wxFontMapper
      // No constructor, use static Get() function
  
--- 484,488 ----
  %include "wx/fontmap.h"
  
! %class wxFontMapper
      // No constructor, use static Get() function
  
***************
*** 568,572 ****
  // wxColourDatabase
  
! %class %delete %noclassinfo %encapsulate wxColourDatabase
      wxColourDatabase()
  
--- 568,572 ----
  // wxColourDatabase
  
! %class %delete wxColourDatabase
      wxColourDatabase()
  
***************
*** 658,662 ****
  %if wxLUA_USE_wxPenList
  
! %class %noclassinfo wxPenList //, wxList - it's not really derived from a wxList
      %define_pointer wxThePenList
  
--- 658,662 ----
  %if wxLUA_USE_wxPenList
  
! %class wxPenList //, wxList - it's not really derived from a wxList
      %define_pointer wxThePenList
  
***************
*** 714,718 ****
  %if wxLUA_USE_wxBrushList
  
! %class %noclassinfo wxBrushList //, wxList - it's not really derived from it
      %define_pointer wxTheBrushList
  
--- 714,718 ----
  %if wxLUA_USE_wxBrushList
  
! %class wxBrushList //, wxList - it's not really derived from it
      %define_pointer wxTheBrushList
  
***************
*** 776,780 ****
  %endenum
  
! %class %noclassinfo %encapsulate wxStockGDI
      //wxStockGDI() use instance to get the implemented wxStockGDI
  
--- 776,780 ----
  %endenum
  
! %class wxStockGDI
      //wxStockGDI() use instance to get the implemented wxStockGDI
  
***************
*** 855,859 ****
  %include "wx/iconbndl.h"
  
! %class %delete %noclassinfo %encapsulate wxIconBundle
      wxIconBundle()
      wxIconBundle( const wxString& file, long type )
--- 855,859 ----
  %include "wx/iconbndl.h"
  
! %class %delete wxIconBundle
      wxIconBundle()
      wxIconBundle( const wxString& file, long type )
***************
*** 878,886 ****
  %include "wx/bitmap.h"
  
! //%win %class %delete %noclassinfo wxBitmapHandler   // are these even necessary?
  //%endclass
! //%win %class %delete %noclassinfo wxGDIImageHandler
  //%endclass
! //%wxchkver_2_6&%win %class %noclassinfo wxGDIImageHandlerList, wxList
  //%endclass
  
--- 878,886 ----
  %include "wx/bitmap.h"
  
! //%win %class %delete wxBitmapHandler   // are these even necessary?
  //%endclass
! //%win %class %delete wxGDIImageHandler
  //%endclass
! //%wxchkver_2_6&%win %class wxGDIImageHandlerList, wxList
  //%endclass
  
***************
*** 1394,1398 ****
  %include "wx/dc.h"
  
! %class %delete %noclassinfo %encapsulate wxDCClipper
      wxDCClipper(wxDC& dc, const wxRect& r)
      //wxDCClipper(wxDC& dc, const wxRegion& r)
--- 1394,1398 ----
  %include "wx/dc.h"
  
! %class %delete wxDCClipper
      wxDCClipper(wxDC& dc, const wxRect& r)
      //wxDCClipper(wxDC& dc, const wxRegion& r)
***************
*** 1409,1413 ****
  %include "wx/caret.h"
  
! %class %delete %noclassinfo %encapsulate wxCaret
      wxCaret()
      wxCaret(wxWindow* window, const wxSize& size)
--- 1409,1413 ----
  %include "wx/caret.h"
  
! %class %delete wxCaret
      wxCaret()
      wxCaret(wxWindow* window, const wxSize& size)
***************
*** 1446,1450 ****
  %include "wx/caret.h"
  
! %class %delete %noclassinfo %encapsulate wxCaretSuspend
      // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxCaretSuspend(wxWindow *win = NULL)
--- 1446,1450 ----
  %include "wx/caret.h"
  
! %class %delete wxCaretSuspend
      // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxCaretSuspend(wxWindow *win = NULL)
***************
*** 1460,1464 ****
  %include "wx/display.h"
  
! %class %delete %noclassinfo %encapsulate wxVideoMode
      %define_object wxDefaultVideoMode
  
--- 1460,1464 ----
  %include "wx/display.h"
  
! %class %delete wxVideoMode
      %define_object wxDefaultVideoMode
  
***************
*** 1477,1481 ****
  // wxArrayVideoModes
  
! %class %delete %noclassinfo %encapsulate wxArrayVideoModes
      wxArrayVideoModes()
      wxArrayVideoModes(const wxArrayVideoModes& array)
--- 1477,1481 ----
  // wxArrayVideoModes
  
! %class %delete wxArrayVideoModes
      wxArrayVideoModes()
      wxArrayVideoModes(const wxArrayVideoModes& array)
***************
*** 1500,1504 ****
  // wxDisplay
  
! %class %delete %noclassinfo %encapsulate wxDisplay
      wxDisplay(size_t index = 0)
  
--- 1500,1504 ----
  // wxDisplay
  
! %class %delete wxDisplay
      wxDisplay(size_t index = 0)
  
***************
*** 1578,1582 ****
  %endenum
  
! %struct %delete %encapsulate wxSplitterRenderParams
      // the only way to initialize this struct is by using this ctor
      wxSplitterRenderParams(wxCoord widthSash_, wxCoord border_, bool isSens_)
--- 1578,1582 ----
  %endenum
  
! %struct %delete wxSplitterRenderParams
      // the only way to initialize this struct is by using this ctor
      wxSplitterRenderParams(wxCoord widthSash_, wxCoord border_, bool isSens_)
***************
*** 1589,1593 ****
  
  // extra optional parameters for DrawHeaderButton
! %struct %delete %encapsulate wxHeaderButtonParams
      wxHeaderButtonParams()
  
--- 1589,1593 ----
  
  // extra optional parameters for DrawHeaderButton
! %struct %delete wxHeaderButtonParams
      wxHeaderButtonParams()
  
***************
*** 1618,1622 ****
  
  // wxRendererNative interface version
! %struct %delete %encapsulate wxRendererVersion
      wxRendererVersion(int version_, int age_)
  
--- 1618,1622 ----
  
  // wxRendererNative interface version
! %struct %delete wxRendererVersion
      wxRendererVersion(int version_, int age_)
  
***************
*** 1629,1633 ****
  
  
! %class %delete %noclassinfo %encapsulate wxRendererNative
      // pseudo constructors
      // -------------------
--- 1629,1633 ----
  
  
! %class %delete wxRendererNative
      // pseudo constructors
      // -------------------

Index: wxcore_help.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_help.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_help.i	16 Jul 2007 19:34:25 -0000	1.1
--- wxcore_help.i	1 Oct 2009 04:21:01 -0000	1.2
***************
*** 47,51 ****
  // wxHelpProvider
  
! %class %delete %noclassinfo %encapsulate wxHelpProvider
      // No constructor see wxSimpleHelpProvider
  
--- 47,51 ----
  // wxHelpProvider
  
! %class %delete wxHelpProvider
      // No constructor see wxSimpleHelpProvider
  
***************
*** 66,70 ****
  // wxSimpleHelpProvider
  
! %class %delete %noclassinfo %encapsulate wxSimpleHelpProvider, wxHelpProvider
      wxSimpleHelpProvider()
  
--- 66,70 ----
  // wxSimpleHelpProvider
  
! %class %delete wxSimpleHelpProvider, wxHelpProvider
      wxSimpleHelpProvider()
  
***************
*** 74,78 ****
  // wxHelpControllerHelpProvider
  
! %class %delete %noclassinfo %encapsulate wxHelpControllerHelpProvider, wxSimpleHelpProvider
      wxHelpControllerHelpProvider(wxHelpController* hc = NULL)
  
--- 74,78 ----
  // wxHelpControllerHelpProvider
  
! %class %delete wxHelpControllerHelpProvider, wxSimpleHelpProvider
      wxHelpControllerHelpProvider(wxHelpController* hc = NULL)
  

Index: wxbase_file.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_file.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxbase_file.i	20 May 2009 04:43:41 -0000	1.6
--- wxbase_file.i	1 Oct 2009 04:21:00 -0000	1.7
***************
*** 92,96 ****
  
  
! %class %noclassinfo wxStandardPaths // we ignore wxStandardPathsBase
      // No constructor - use static Get() function
  
--- 92,96 ----
  
  
! %class wxStandardPaths // we ignore wxStandardPathsBase
      // No constructor - use static Get() function
  
***************
*** 127,131 ****
  %include "wx/filefn.h"
  
! %class %delete %encapsulate %noclassinfo wxPathList, wxArrayString
      wxPathList()
      //wxPathList(const wxArrayString &arr)
--- 127,131 ----
  %include "wx/filefn.h"
  
! %class %delete wxPathList, wxArrayString
      wxPathList()
      //wxPathList(const wxArrayString &arr)
***************
*** 184,188 ****
  %endenum
  
! %class %delete %noclassinfo %encapsulate wxFileName
      wxFileName()
      wxFileName(const wxFileName& filename)
--- 184,188 ----
  %endenum
  
! %class %delete wxFileName
      wxFileName()
      wxFileName(const wxFileName& filename)
***************
*** 369,373 ****
  %define wxS_DEFAULT
  
! %class %delete %noclassinfo %encapsulate wxFile
      wxFile()
      wxFile(const wxString& filename, wxFile::OpenMode mode = wxFile::read)
--- 369,373 ----
  %define wxS_DEFAULT
  
! %class %delete wxFile
      wxFile()
      wxFile(const wxString& filename, wxFile::OpenMode mode = wxFile::read)
***************
*** 407,411 ****
  %include "wx/file.h"
  
! %class %delete %noclassinfo %encapsulate wxTempFile
      wxTempFile()
      // associates the temp file with the file to be replaced and opens it
--- 407,411 ----
  %include "wx/file.h"
  
! %class %delete wxTempFile
      wxTempFile()
      // associates the temp file with the file to be replaced and opens it
***************
*** 450,454 ****
  %define wxDIR_DEFAULT
  
! %class %delete %noclassinfo %encapsulate wxDir
      wxDir()
      wxDir(const wxString& dir)
--- 450,454 ----
  %define wxDIR_DEFAULT
  
! %class %delete wxDir
      wxDir()
      wxDir(const wxString& dir)
***************
*** 491,495 ****
  %include "wx/mimetype.h"
  
! %class %delete %noclassinfo %encapsulate wxFileTypeInfo
      //  the ... parameters form a NULL terminated list of extensions
      //wxFileTypeInfo(const wxChar *mimeType, const wxChar *openCmd, const wxChar *printCmd, const wxChar *desc, ...)
--- 491,495 ----
  %include "wx/mimetype.h"
  
! %class %delete wxFileTypeInfo
      //  the ... parameters form a NULL terminated list of extensions
      //wxFileTypeInfo(const wxChar *mimeType, const wxChar *openCmd, const wxChar *printCmd, const wxChar *desc, ...)
***************
*** 521,525 ****
  %include "wx/iconloc.h"
  
! %class %delete %noclassinfo %encapsulate wxIconLocation
      // ctor takes the name of the file where the icon is
      !%msw wxIconLocation(const wxString& filename = "")
--- 521,525 ----
  %include "wx/iconloc.h"
  
! %class %delete wxIconLocation
      // ctor takes the name of the file where the icon is
      !%msw wxIconLocation(const wxString& filename = "")
***************
*** 541,545 ****
  //  wxFileType::MessageParameters
  
! %class %delete %noclassinfo %encapsulate wxFileType::MessageParameters
      //wxFileType::MessageParameters()
      wxFileType::MessageParameters(const wxString& filename, const wxString& mimetype = "")
--- 541,545 ----
  //  wxFileType::MessageParameters
  
! %class %delete wxFileType::MessageParameters
      //wxFileType::MessageParameters()
      wxFileType::MessageParameters(const wxString& filename, const wxString& mimetype = "")
***************
*** 556,560 ****
  //  wxFileType
  
! %class %delete %noclassinfo %encapsulate wxFileType
      wxFileType(const wxFileTypeInfo& ftInfo)
  
--- 556,560 ----
  //  wxFileType
  
! %class %delete wxFileType
      wxFileType(const wxFileTypeInfo& ftInfo)
  
***************
*** 610,614 ****
  //  wxMimeTypesManager
  
! %class %noclassinfo %encapsulate wxMimeTypesManager
      %define_pointer wxTheMimeTypesManager
  
--- 610,614 ----
  //  wxMimeTypesManager
  
! %class wxMimeTypesManager
      %define_pointer wxTheMimeTypesManager
  
***************
*** 687,691 ****
  //  wxStreamBase
  
! %class %noclassinfo wxStreamBase
      // wxStreamBase() this is only a base class
  
--- 687,691 ----
  //  wxStreamBase
  
! %class wxStreamBase
      // wxStreamBase() this is only a base class
  
***************
*** 701,705 ****
  //  wxInputStream
  
! %class %noclassinfo %encapsulate wxInputStream, wxStreamBase
      // wxInputStream() this is only a base class
  
--- 701,705 ----
  //  wxInputStream
  
! %class wxInputStream, wxStreamBase
      // wxInputStream() this is only a base class
  
***************
*** 728,732 ****
  //  wxOutputStream
  
! %class %noclassinfo %encapsulate wxOutputStream, wxStreamBase
      // wxOutputStream() this is only a base class
  
--- 728,732 ----
  //  wxOutputStream
  
! %class wxOutputStream, wxStreamBase
      // wxOutputStream() this is only a base class
  
***************
*** 749,753 ****
  %include "wx/wfstream.h"
  
! %class %delete %noclassinfo %encapsulate wxFileInputStream, wxInputStream
      wxFileInputStream(const wxString& fileName)
      wxFileInputStream(wxFile& file)
--- 749,753 ----
  %include "wx/wfstream.h"
  
! %class %delete wxFileInputStream, wxInputStream
      wxFileInputStream(const wxString& fileName)
      wxFileInputStream(wxFile& file)
***************
*** 760,764 ****
  //  wxFileOutputStream
  
! %class %delete %noclassinfo %encapsulate wxFileOutputStream, wxOutputStream
      wxFileOutputStream(const wxString& fileName)
      wxFileOutputStream(wxFile& file)
--- 760,764 ----
  //  wxFileOutputStream
  
! %class %delete wxFileOutputStream, wxOutputStream
      wxFileOutputStream(const wxString& fileName)
      wxFileOutputStream(wxFile& file)
***************
*** 773,777 ****
  %include "wx/mstream.h"
  
! %class %delete %noclassinfo %encapsulate wxMemoryInputStream, wxInputStream
      wxMemoryInputStream(const char *data, size_t length)
      //wxMemoryInputStream(const wxMemoryOutputStream& stream)
--- 773,777 ----
  %include "wx/mstream.h"
  
! %class %delete wxMemoryInputStream, wxInputStream
      wxMemoryInputStream(const char *data, size_t length)
      //wxMemoryInputStream(const wxMemoryOutputStream& stream)
***************
*** 784,788 ****
  //%include "wx/mstream.h"
  
! //%class %delete %noclassinfo %encapsulate wxMemoryInputStream, wxInputStream
  //    wxMemoryOutputStream(void *data, size_t length)
  //    wxMemoryInputStream(const wxMemoryOutputStream& stream)
--- 784,788 ----
  //%include "wx/mstream.h"
  
! //%class %delete wxMemoryInputStream, wxInputStream
  //    wxMemoryOutputStream(void *data, size_t length)
  //    wxMemoryInputStream(const wxMemoryOutputStream& stream)
***************
*** 794,798 ****
  %include "wx/datstrm.h"
  
! %class %delete %noclassinfo %encapsulate wxDataInputStream
      // wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvAuto());
      wxDataInputStream(wxInputStream& s)
--- 794,798 ----
  %include "wx/datstrm.h"
  
! %class %delete wxDataInputStream
      // wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvAuto());
      wxDataInputStream(wxInputStream& s)
***************
*** 837,841 ****
  %include "wx/datstrm.h"
  
! %class %delete %noclassinfo %encapsulate wxDataOutputStream
      // wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvAuto());
      wxDataOutputStream(wxOutputStream& s);
--- 837,841 ----
  %include "wx/datstrm.h"
  
! %class %delete wxDataOutputStream
      // wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvAuto());
      wxDataOutputStream(wxOutputStream& s);

Index: wxcore_core.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_core.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxcore_core.i	29 Jan 2008 00:49:11 -0000	1.3
--- wxcore_core.i	1 Oct 2009 04:21:00 -0000	1.4
***************
*** 20,24 ****
  %if wxUSE_LOGGUI
  
! %class %delete %noclassinfo %encapsulate wxLogGui, wxLog
      wxLogGui()
  %endclass
--- 20,24 ----
  %if wxUSE_LOGGUI
  
! %class %delete wxLogGui, wxLog
      wxLogGui()
  %endclass
***************
*** 31,35 ****
  %if wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL
  
! %class %delete %noclassinfo %encapsulate wxLogTextCtrl, wxLog
      wxLogTextCtrl(wxTextCtrl* textCtrl);
  
--- 31,35 ----
  %if wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL
  
! %class %delete wxLogTextCtrl, wxLog
      wxLogTextCtrl(wxTextCtrl* textCtrl);
  
***************
*** 43,47 ****
  %if wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW
  
! %class %delete %noclassinfo %encapsulate wxLogWindow, wxLogPassThrough
      wxLogWindow(wxWindow *pParent, const wxString& szTitle, bool bShow = true, bool bPassToOld = true);
  
--- 43,47 ----
  %if wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW
  
! %class %delete wxLogWindow, wxLogPassThrough
      wxLogWindow(wxWindow *pParent, const wxString& szTitle, bool bShow = true, bool bPassToOld = true);
  
***************
*** 171,175 ****
  %endenum
  
! %class %noclassinfo wxSystemSettings
      //wxSystemSettings() // No constructor, all members static
  
--- 171,175 ----
  %endenum
  
! %class wxSystemSettings
      //wxSystemSettings() // No constructor, all members static
  
***************
*** 287,291 ****
  %include "wx/fs_mem.h"
  
! %class %noclassinfo %delete wxMemoryFSHandler, wxFileSystemHandler
      wxMemoryFSHandler()
  
--- 287,291 ----
  %include "wx/fs_mem.h"
  
! %class %delete wxMemoryFSHandler, wxFileSystemHandler
      wxMemoryFSHandler()
  

Index: wxrichtext_richtext.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxrichtext_richtext.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxrichtext_richtext.i	16 Jul 2007 19:34:26 -0000	1.1
--- wxrichtext_richtext.i	1 Oct 2009 04:21:01 -0000	1.2
***************
*** 152,156 ****
  
  
! %class %delete %noclassinfo %encapsulate wxRichTextRange
      //#define wxRICHTEXT_ALL  wxRichTextRange(-2, -2) // FIXME
      //#define wxRICHTEXT_NONE  wxRichTextRange(-1, -1) // FIXME
--- 152,156 ----
  
  
! %class %delete wxRichTextRange
      //#define wxRICHTEXT_ALL  wxRichTextRange(-2, -2) // FIXME
      //#define wxRICHTEXT_NONE  wxRichTextRange(-1, -1) // FIXME
***************
*** 205,209 ****
  
  
! %class %delete %noclassinfo %encapsulate wxTextAttrEx, wxTextAttr
      wxTextAttrEx(const wxTextAttrEx& attr);
      wxTextAttrEx(const wxTextAttr& attr)
--- 205,209 ----
  
  
! %class %delete wxTextAttrEx, wxTextAttr
      wxTextAttrEx(const wxTextAttrEx& attr);
      wxTextAttrEx(const wxTextAttr& attr)
***************
*** 294,298 ****
  
  
! %class %delete %noclassinfo %encapsulate wxRichTextAttr
      wxRichTextAttr(const wxTextAttrEx& attr);
      wxRichTextAttr(const wxRichTextAttr& attr);
--- 294,298 ----
  
  
! %class %delete wxRichTextAttr
      wxRichTextAttr(const wxTextAttrEx& attr);
      wxRichTextAttr(const wxRichTextAttr& attr);
***************
*** 848,852 ****
   */
  
! %class %delete %encapsulate %noclassinfo wxRichTextLine
      wxRichTextLine(wxRichTextParagraph* parent);
      wxRichTextLine(const wxRichTextLine& obj)
--- 848,852 ----
   */
  
! %class %delete wxRichTextLine
      wxRichTextLine(wxRichTextParagraph* parent);
      wxRichTextLine(const wxRichTextLine& obj)
***************
*** 1632,1636 ****
   */
  
! %class %delete %noclassinfo wxRichTextRenderer, wxObject
      //wxRichTextRenderer() {}
  
--- 1632,1636 ----
   */
  
! %class %delete wxRichTextRenderer, wxObject
      //wxRichTextRenderer() {}
  
***************
*** 1652,1656 ****
   */
  
! %class %delete %noclassinfo wxRichTextStdRenderer, wxRichTextRenderer
      wxRichTextStdRenderer() {}
  
--- 1652,1656 ----
   */
  
! %class %delete wxRichTextStdRenderer, wxRichTextRenderer
      wxRichTextStdRenderer() {}
  

Index: wxcore_menutool.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_menutool.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxcore_menutool.i	1 Apr 2008 04:19:42 -0000	1.4
--- wxcore_menutool.i	1 Oct 2009 04:21:01 -0000	1.5
***************
*** 168,172 ****
  // wxMenuItemList
  
! %class %noclassinfo wxMenuItemList, wxList
      // no constructor, you only get this back from wxMenu::GetMenuItems
  
--- 168,172 ----
  // wxMenuItemList
  
! %class wxMenuItemList, wxList
      // no constructor, you only get this back from wxMenu::GetMenuItems
  
***************
*** 212,216 ****
  %define wxTB_HORZ_TEXT
  
! %class %noclassinfo wxToolBarBase, wxControl
      // no constructors base class
  
--- 212,216 ----
  %define wxTB_HORZ_TEXT
  
! %class wxToolBarBase, wxControl
      // no constructors base class
  
***************
*** 341,348 ****
  
  // ---------------------------------------------------------------------------
! // wxToolBarTool
  
! %class %noclassinfo wxToolBarTool, wxToolBarToolBase
! %endclass
  
  %endif //wxLUA_USE_wxToolbar
--- 341,348 ----
  
  // ---------------------------------------------------------------------------
! // wxToolBarTool - This class doesn't exist!
  
! //%class wxToolBarTool, wxToolBarToolBase
! //%endclass
  
  %endif //wxLUA_USE_wxToolbar
***************
*** 389,393 ****
  %endenum
  
! %class %delete %noclassinfo %encapsulate wxAcceleratorEntry
      wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0, wxMenuItem *item = NULL)
      wxAcceleratorEntry(const wxAcceleratorEntry& entry)
--- 389,393 ----
  %endenum
  
! %class %delete wxAcceleratorEntry
      wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0, wxMenuItem *item = NULL)
      wxAcceleratorEntry(const wxAcceleratorEntry& entry)

Index: wxbase_datetime.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_datetime.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxbase_datetime.i	22 Oct 2008 05:31:45 -0000	1.3
--- wxbase_datetime.i	1 Oct 2009 04:21:00 -0000	1.4
***************
*** 134,138 ****
  %typedef unsigned short wxDateTime::wxDateTime_t
  
! %class %delete %noclassinfo %encapsulate wxDateTime
      %define_object wxDefaultDateTime
  
--- 134,138 ----
  %typedef unsigned short wxDateTime::wxDateTime_t
  
! %class %delete wxDateTime
      %define_object wxDefaultDateTime
  
***************
*** 211,215 ****
  // wxDateTimeArray
  
! %class %delete %noclassinfo %encapsulate wxDateTimeArray
      wxDateTimeArray()
      wxDateTimeArray(const wxDateTimeArray& array)
--- 211,215 ----
  // wxDateTimeArray
  
! %class %delete wxDateTimeArray
      wxDateTimeArray()
      wxDateTimeArray(const wxDateTimeArray& array)
***************
*** 237,241 ****
  %include "wx/datetime.h"
  
! %class %delete %noclassinfo %encapsulate wxTimeSpan
      wxTimeSpan()
      wxTimeSpan(long hours, long minutes = 0, long seconds = 0, long milliseconds = 0)
--- 237,241 ----
  %include "wx/datetime.h"
  
! %class %delete wxTimeSpan
      wxTimeSpan()
      wxTimeSpan(long hours, long minutes = 0, long seconds = 0, long milliseconds = 0)
***************
*** 282,286 ****
  %include "wx/datetime.h"
  
! %class %delete %noclassinfo %encapsulate wxDateSpan
      wxDateSpan(int years = 0, int months = 0, int weeks = 0, int days = 0)
  
--- 282,286 ----
  %include "wx/datetime.h"
  
! %class %delete wxDateSpan
      wxDateSpan(int years = 0, int months = 0, int weeks = 0, int days = 0)
  
***************
*** 318,322 ****
  %if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME
  
! %class %noclassinfo %encapsulate wxDateTimeHolidayAuthority
      // no constructor since this class has pure virtual functions
  
--- 318,322 ----
  %if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME
  
! %class wxDateTimeHolidayAuthority
      // no constructor since this class has pure virtual functions
  
***************
*** 331,335 ****
  // wxDateTimeWorkDays
  
! %class %delete %noclassinfo %encapsulate wxDateTimeWorkDays, wxDateTimeHolidayAuthority
      wxDateTimeWorkDays()
  %endclass
--- 331,335 ----
  // wxDateTimeWorkDays
  
! %class %delete wxDateTimeWorkDays, wxDateTimeHolidayAuthority
      wxDateTimeWorkDays()
  %endclass
***************
*** 345,349 ****
  %include "wx/stopwatch.h"
  
! %class %delete %noclassinfo %encapsulate wxStopWatch
      wxStopWatch() // ctor starts the stop watch
  
--- 345,349 ----
  %include "wx/stopwatch.h"
  
! %class %delete wxStopWatch
      wxStopWatch() // ctor starts the stop watch
  
***************
*** 752,756 ****
  %endif %wxchkver_2_8
  
! %struct %delete %encapsulate wxLanguageInfo
      wxLanguageInfo() // you must set all the values by hand
  
--- 752,756 ----
  %endif %wxchkver_2_8
  
! %struct %delete wxLanguageInfo
      wxLanguageInfo() // you must set all the values by hand
  
***************
*** 762,766 ****
  
  
! %class %delete %noclassinfo %encapsulate wxLocale
  
      // call Init() if you use this ctor
--- 762,766 ----
  
  
! %class %delete wxLocale
  
      // call Init() if you use this ctor

Index: wxcore_defsutils.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_defsutils.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxcore_defsutils.i	5 Dec 2008 04:31:30 -0000	1.5
--- wxcore_defsutils.i	1 Oct 2009 04:21:00 -0000	1.6
***************
*** 71,75 ****
  %endenum
  
! %class %delete %encapsulate wxProcess, wxEvtHandler
      wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY)
      //wxProcess(int flags)
--- 71,75 ----
  %endenum
  
! %class %delete wxProcess, wxEvtHandler
      wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY)
      //wxProcess(int flags)
***************
*** 194,198 ****
  %if %wxchkver_2_8
  // This is in wxWidgets 2.6 docs, but it's only in >=2.7
! %class %delete %noclassinfo %encapsulate wxMouseState
      wxMouseState()
  
--- 194,198 ----
  %if %wxchkver_2_8
  // This is in wxWidgets 2.6 docs, but it's only in >=2.7
! %class %delete wxMouseState
      wxMouseState()
  
***************
*** 500,504 ****
  %include "wx/utils.h"
  
! %class %delete %noclassinfo %encapsulate wxBusyCursor
      // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR)
--- 500,504 ----
  %include "wx/utils.h"
  
! %class %delete wxBusyCursor
      // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR)
***************
*** 510,514 ****
  // delete() this anyway which is just as easy as wxBegin/EndBusyCursor
  
! //%class %delete %noclassinfo %encapsulate wxBusyCursorSuspender
      // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
  //    wxBusyCursorSuspender()
--- 510,514 ----
  // delete() this anyway which is just as easy as wxBegin/EndBusyCursor
  
! //%class %delete wxBusyCursorSuspender
      // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
  //    wxBusyCursorSuspender()
***************
*** 525,529 ****
  %include "wx/busyinfo.h"
  
! %class %delete %noclassinfo wxBusyInfo, wxObject
      // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxBusyInfo(const wxString& message, wxWindow *parent = NULL)
--- 525,529 ----
  %include "wx/busyinfo.h"
  
! %class %delete wxBusyInfo, wxObject
      // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxBusyInfo(const wxString& message, wxWindow *parent = NULL)

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** wx_datatypes.lua	25 Sep 2009 18:47:57 -0000	1.103
--- wx_datatypes.lua	1 Oct 2009 04:21:00 -0000	1.104
***************
*** 173,177 ****
    },
    wxAboutDialogInfo = {
-     ["%encapsulate"] = true,
      Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog",
      IsNumber = false,
--- 173,176 ----
***************
*** 180,184 ****
    },
    wxAcceleratorEntry = {
[...1134 lines suppressed...]
-     ["%encapsulate"] = true,
      IsNumber = false,
      Name = "wxWindowUpdateLocker",
--- 4915,4918 ----
***************
*** 5132,5136 ****
    },
    wxXmlNode = {
-     ["%encapsulate"] = true,
      Condition = "wxLUA_USE_wxXML && wxUSE_XML",
      IsNumber = false,
--- 4984,4987 ----
***************
*** 5145,5149 ****
    },
    wxXmlProperty = {
-     ["%encapsulate"] = true,
      Condition = "wxLUA_USE_wxXML && wxUSE_XML",
      IsNumber = false,
--- 4996,4999 ----

Index: wxbase_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_rules.lua,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wxbase_rules.lua	29 Jan 2008 00:49:11 -0000	1.9
--- wxbase_rules.lua	1 Oct 2009 04:21:00 -0000	1.10
***************
*** 79,85 ****
  --  hook_cpp_header_filename.
  --  This code will be place directly after any #includes at the top of the file
! hook_cpp_binding_header_includes =
!     "#include \"wxbind/include/wxbinddefs.h\"\n"..
!     "#include \"wxluasetup.h\"\n"
  
  -- ----------------------------------------------------------------------------
--- 79,100 ----
  --  hook_cpp_header_filename.
  --  This code will be place directly after any #includes at the top of the file
! hook_cpp_binding_header_includes = [[
! #include "wxbind/include/wxbinddefs.h"
! #include "wxluasetup.h"
!     
! // ----------------------------------------------------------------------------
! // Convert from wxWidgets wxT('') to wxT(""), a string. Copied from wx/filefn.h
! 
! // platform independent versions
! #if defined(__UNIX__) && !defined(__OS2__)
!   // CYGWIN also uses UNIX settings
!   #define wxLua_FILE_SEP_PATH     wxT("/")
! #elif defined(__MAC__)
!   #define wxLua_FILE_SEP_PATH     wxT(":")
! #else   // Windows and OS/2
!   #define wxLua_FILE_SEP_PATH     wxT("\\")
! #endif  // Unix/Windows
! 
! ]]
  
  -- ----------------------------------------------------------------------------

Index: wxcore_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wxcore_override.hpp	24 Mar 2009 04:15:07 -0000	1.20
--- wxcore_override.hpp	1 Oct 2009 04:21:01 -0000	1.21
***************
*** 144,148 ****
          if (returns != NULL)
          {
! 		    wxluaO_addgcobject(L, returns);
              // push the constructed class pointer
              wxluaT_pushuserdatatype(L, returns, wxluatype_wxAcceleratorTable);
--- 144,148 ----
          if (returns != NULL)
          {
! 		    wxluaO_addgcobject(L, returns, wxluatype_wxAcceleratorTable);
              // push the constructed class pointer
              wxluaT_pushuserdatatype(L, returns, wxluatype_wxAcceleratorTable);
***************
*** 542,546 ****
      wxTreeItemId *returns = new wxTreeItemId(self->GetFirstChild(*item, cookie));
      // add the new object to the tracked memory list
!     wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxTreeItemId(returns));
      // push the result datatype
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxTreeItemId);
--- 542,546 ----
      wxTreeItemId *returns = new wxTreeItemId(self->GetFirstChild(*item, cookie));
      // add the new object to the tracked memory list
!     wxluaO_addgcobject(L, (void*)returns, wxluatype_wxTreeItemId);
      // push the result datatype
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxTreeItemId);
***************
*** 574,578 ****
      wxTreeItemId *returns = new wxTreeItemId(self->GetNextChild(*item, cookie));
      // add the new object to the tracked memory list
!     wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxTreeItemId(returns));
      // push the result datatype
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxTreeItemId);
--- 574,578 ----
      wxTreeItemId *returns = new wxTreeItemId(self->GetNextChild(*item, cookie));
      // add the new object to the tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxTreeItemId);
      // push the result datatype
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxTreeItemId);
***************
*** 604,608 ****
      {
          wxTreeItemId* treeId = new wxTreeItemId(selection[idx]);
!         wxluaO_addgcobject(L, (void*)treeId, new wxLua_wxObject_wxTreeItemId(treeId));
          wxluaT_pushuserdatatype(L, treeId, wxluatype_wxTreeItemId);
          lua_rawseti(L, -2, idx + 1);
--- 604,608 ----
      {
          wxTreeItemId* treeId = new wxTreeItemId(selection[idx]);
!         wxluaO_addgcobject(L, treeId, wxluatype_wxTreeItemId);
          wxluaT_pushuserdatatype(L, treeId, wxluatype_wxTreeItemId);
          lua_rawseti(L, -2, idx + 1);
***************
*** 627,631 ****
      wxTreeItemId *returns = new wxTreeItemId(self->HitTest(*point, flags));
      // add the new object to the tracked memory list
!     wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxTreeItemId(returns));
  
      // push the result datatype
--- 627,631 ----
      wxTreeItemId *returns = new wxTreeItemId(self->HitTest(*point, flags));
      // add the new object to the tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxTreeItemId);
  
      // push the result datatype
***************
*** 673,677 ****
      wxGenericValidator *returns = new wxGenericValidator(boolPtr->GetBoolPtr());
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxGenericValidator);
--- 673,677 ----
      wxGenericValidator *returns = new wxGenericValidator(boolPtr->GetBoolPtr());
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxGenericValidator);
***************
*** 690,694 ****
      wxGenericValidator *returns = new wxGenericValidator(valPtr->GetStringPtr());
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxGenericValidator);
--- 690,694 ----
      wxGenericValidator *returns = new wxGenericValidator(valPtr->GetStringPtr());
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxGenericValidator);
***************
*** 707,711 ****
      wxGenericValidator *returns = new wxGenericValidator(valPtr->GetIntPtr());
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxGenericValidator);
--- 707,711 ----
      wxGenericValidator *returns = new wxGenericValidator(valPtr->GetIntPtr());
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxGenericValidator);
***************
*** 724,728 ****
      wxGenericValidator *returns = new wxGenericValidator(valPtr->GetArrayPtr());
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxGenericValidator);
--- 724,728 ----
      wxGenericValidator *returns = new wxGenericValidator(valPtr->GetArrayPtr());
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxGenericValidator);
***************
*** 885,889 ****
      wxBusyCursor *returns = new wxBusyCursor(cursor);
      // add to tracked memory list
!     wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxBusyCursor((wxBusyCursor *)returns));
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxBusyCursor);
--- 885,889 ----
      wxBusyCursor *returns = new wxBusyCursor(cursor);
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxBusyCursor);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxBusyCursor);
***************
*** 1475,1479 ****
      wxBitmap *returns = new wxBitmap(bits, width, height, depth);
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxBitmap);
--- 1475,1479 ----
      wxBitmap *returns = new wxBitmap(bits, width, height, depth);
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxBitmap);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxBitmap);
***************
*** 1522,1526 ****
  
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxBitmap);
--- 1522,1526 ----
  
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxBitmap);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxBitmap);
***************
*** 1550,1554 ****
      wxBitmap *returns = new wxBitmap(data, type, width, height, depth);
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxBitmap);
--- 1550,1554 ----
      wxBitmap *returns = new wxBitmap(data, type, width, height, depth);
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxBitmap);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxBitmap);
***************
*** 1572,1576 ****
          delete [] sizeArray;
          // add to tracked memory list
!         wxluaO_addgcobject(L, returns);
          // push the constructed class pointer
          wxluaT_pushuserdatatype(L, returns, wxluatype_wxBitmap);
--- 1572,1576 ----
          delete [] sizeArray;
          // add to tracked memory list
!         wxluaO_addgcobject(L, returns, wxluatype_wxBitmap);
          // push the constructed class pointer
          wxluaT_pushuserdatatype(L, returns, wxluatype_wxBitmap);
***************
*** 1764,1768 ****
      wxImage *returns = new wxImage(width, height, data, static_data);
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxImage);
--- 1764,1768 ----
      wxImage *returns = new wxImage(width, height, data, static_data);
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxImage);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxImage);
***************
*** 1781,1785 ****
      wxImage *returns = new wxImage(bitmap->ConvertToImage());
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxImage);
--- 1781,1785 ----
      wxImage *returns = new wxImage(bitmap->ConvertToImage());
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxImage);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxImage);
***************
*** 2023,2027 ****
      wxLuaArtProvider *returns = new wxLuaArtProvider(wxlState);
      // add to tracked memory list
!     wxluaO_addgcobject(L, (wxLuaArtProvider *)returns);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxLuaArtProvider);
--- 2023,2027 ----
      wxLuaArtProvider *returns = new wxLuaArtProvider(wxlState);
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxLuaArtProvider);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxLuaArtProvider);
***************
*** 2389,2393 ****
      *returns = *self;
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxPrintData);
--- 2389,2393 ----
      *returns = *self;
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxPrintData);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxPrintData);
***************
*** 2406,2410 ****
      *returns = *self;
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxPageSetupDialogData);
--- 2406,2410 ----
      *returns = *self;
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxPageSetupDialogData);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxPageSetupDialogData);
***************
*** 2804,2808 ****
      wxLuaPrintout *returns = new wxLuaPrintout(wxlState, title, pObject);
      // add to tracked memory list
!     wxluaO_addgcobject(L, (wxLuaPrintout *)returns);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxLuaPrintout);
--- 2804,2808 ----
      wxLuaPrintout *returns = new wxLuaPrintout(wxlState, title, pObject);
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxLuaPrintout);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxLuaPrintout);

Index: wxcore_image.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_image.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxcore_image.i	19 May 2009 03:20:53 -0000	1.5
--- wxcore_image.i	1 Oct 2009 04:21:01 -0000	1.6
***************
*** 212,216 ****
  // wxImageHistogram
  
! %class %delete %noclassinfo %encapsulate wxImageHistogramEntry
      wxImageHistogramEntry()
      %member unsigned long index // GetIndex() only, SetIndex(idx) is not allowed
--- 212,216 ----
  // wxImageHistogram
  
! %class %delete wxImageHistogramEntry
      wxImageHistogramEntry()
      %member unsigned long index // GetIndex() only, SetIndex(idx) is not allowed
***************
*** 218,222 ****
  %endclass
  
! %class %delete %noclassinfo %encapsulate wxImageHistogram::iterator
      %member long first
      %member wxImageHistogramEntry second
--- 218,222 ----
  %endclass
  
! %class %delete wxImageHistogram::iterator
      %member long first
      %member wxImageHistogramEntry second
***************
*** 227,231 ****
  %endclass
  
! %class %delete %noclassinfo %encapsulate wxImageHistogram // wxImageHistogramBase actually a hash map
      wxImageHistogram()
  
--- 227,231 ----
  %endclass
  
! %class %delete wxImageHistogram // wxImageHistogramBase actually a hash map
      wxImageHistogram()
  
***************
*** 237,245 ****
  
      // Selected functions from the base wxHashMap class
!     const wxImageHistogram::iterator begin() const
      void clear()
      size_t count(long key) const
      bool empty() const
!     const wxImageHistogram::iterator end() const
      size_t erase(long key)
      wxImageHistogram::iterator find(long key)
--- 237,245 ----
  
      // Selected functions from the base wxHashMap class
!     wxImageHistogram::iterator begin() const // not const iterator since we create a new copy of it
      void clear()
      size_t count(long key) const
      bool empty() const
!     wxImageHistogram::iterator end() const // not const iterator since we create a new copy of it
      size_t erase(long key)
      wxImageHistogram::iterator find(long key)

Index: wxbase_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wxbase_override.hpp	19 May 2009 03:20:53 -0000	1.19
--- wxbase_override.hpp	1 Oct 2009 04:21:00 -0000	1.20
***************
*** 186,190 ****
  
      // we may not be tracked, but delete us anyway
!     if (!wxluaO_deletegcobject(L, lua_touserdata(L, 1), self, WXLUA_DELETE_OBJECT_ALL))
          delete self;
  
--- 186,190 ----
  
      // we may not be tracked, but delete us anyway
!     if (!wxluaO_deletegcobject(L, 1, WXLUA_DELETE_OBJECT_ALL))
          delete self;
  
***************
*** 373,377 ****
      wxString* returns = new wxString(str);
      // add to tracked memory list
!     wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxString(returns));
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxString);
--- 373,377 ----
      wxString* returns = new wxString(str);
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxString);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxString);
***************
*** 598,607 ****
      bool returns = self->GetTimes(dtAccess, dtMod, dtCreate);
      // add to tracked memory list
!     wxluaO_addgcobject(L, (void*)dtAccess, new wxLua_wxObject_wxDateTime(dtAccess));
!     wxluaO_addgcobject(L, (void*)dtMod, new wxLua_wxObject_wxDateTime(dtMod));
!     wxluaO_addgcobject(L, (void*)dtCreate, new wxLua_wxObject_wxDateTime(dtCreate));
      // push the constructed class pointers
      wxluaT_pushuserdatatype(L, dtAccess, wxluatype_wxDateTime);
!     wxluaT_pushuserdatatype(L, dtMod, wxluatype_wxDateTime);
      wxluaT_pushuserdatatype(L, dtCreate, wxluatype_wxDateTime);
      // push the result flag
--- 598,607 ----
      bool returns = self->GetTimes(dtAccess, dtMod, dtCreate);
      // add to tracked memory list
!     wxluaO_addgcobject(L, (void*)dtAccess, wxluatype_wxDateTime);
!     wxluaO_addgcobject(L, (void*)dtMod,    wxluatype_wxDateTime);
!     wxluaO_addgcobject(L, (void*)dtCreate, wxluatype_wxDateTime);
      // push the constructed class pointers
      wxluaT_pushuserdatatype(L, dtAccess, wxluatype_wxDateTime);
!     wxluaT_pushuserdatatype(L, dtMod,    wxluatype_wxDateTime);
      wxluaT_pushuserdatatype(L, dtCreate, wxluatype_wxDateTime);
      // push the result flag
***************
*** 908,912 ****
      wxMemoryInputStream* returns = new wxMemoryInputStream(data, length);
      // add to tracked memory list
!     wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxMemoryInputStream((wxMemoryInputStream*)returns));
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxMemoryInputStream);
--- 908,912 ----
      wxMemoryInputStream* returns = new wxMemoryInputStream(data, length);
      // add to tracked memory list
!     wxluaO_addgcobject(L, returns, wxluatype_wxMemoryInputStream);
      // push the constructed class pointer
      wxluaT_pushuserdatatype(L, returns, wxluatype_wxMemoryInputStream);

Index: wxbase_config.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_config.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxbase_config.i	18 Dec 2007 01:03:32 -0000	1.2
--- wxbase_config.i	1 Oct 2009 04:21:00 -0000	1.3
***************
*** 35,39 ****
  %endenum
  
! %class %delete %noclassinfo %encapsulate wxConfigBase
      // No constructor since this is a base class
  
--- 35,39 ----
  %endenum
  
! %class %delete wxConfigBase
      // No constructor since this is a base class
  
***************
*** 121,125 ****
  // wxConfig
  
! %class %delete %noclassinfo %encapsulate wxConfig, wxConfigBase
      wxConfig(const wxString& appName = "", const wxString& vendorName = "", const wxString& localFilename = "", const wxString& globalFilename = "", long style = 0)
  
--- 121,125 ----
  // wxConfig
  
! %class %delete wxConfig, wxConfigBase
      wxConfig(const wxString& appName = "", const wxString& vendorName = "", const wxString& localFilename = "", const wxString& globalFilename = "", long style = 0)
  
***************
*** 129,133 ****
  // wxFileConfig
  
! %class %delete %noclassinfo %encapsulate wxFileConfig, wxConfigBase
      wxFileConfig(const wxString& appName = "", const wxString& vendorName = "", const wxString& localFilename = "", const wxString& globalFilename = "", long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE) //, wxMBConv& conv = wxConvUTF8)
  
--- 129,133 ----
  // wxFileConfig
  
! %class %delete wxFileConfig, wxConfigBase
      wxFileConfig(const wxString& appName = "", const wxString& vendorName = "", const wxString& localFilename = "", const wxString& globalFilename = "", long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE) //, wxMBConv& conv = wxConvUTF8)
  
***************
*** 140,144 ****
  %include "wx/memconf.h"
  
! %class %delete %noclassinfo %encapsulate wxMemoryConfig, wxFileConfig
      wxMemoryConfig()
  
--- 140,144 ----
  %include "wx/memconf.h"
  
! %class %delete wxMemoryConfig, wxFileConfig
      wxMemoryConfig()
  
***************
*** 153,157 ****
  // when the function returns
  
! %class %delete %noclassinfo %encapsulate wxConfigPathChanger
      // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxConfigPathChanger(const wxConfigBase *pContainer, const wxString& strEntry)
--- 153,157 ----
  // when the function returns
  
! %class %delete wxConfigPathChanger
      // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxConfigPathChanger(const wxConfigBase *pContainer, const wxString& strEntry)

Index: wxcore_controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_controls.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wxcore_controls.i	25 Sep 2009 18:47:57 -0000	1.9
--- wxcore_controls.i	1 Oct 2009 04:21:00 -0000	1.10
***************
*** 124,128 ****
  %include "wx/ctrlsub.h"
  
! %class %noclassinfo wxItemContainerImmutable
      // no constructor, used only as a base class
  
--- 124,128 ----
  %include "wx/ctrlsub.h"
  
! %class wxItemContainerImmutable
      // no constructor, used only as a base class
  
***************
*** 151,155 ****
  %include "wx/ctrlsub.h"
  
! %class %noclassinfo wxItemContainer, wxItemContainerImmutable
      // no constructor, used only as base class
  
--- 151,155 ----
  %include "wx/ctrlsub.h"
  
! %class wxItemContainer, wxItemContainerImmutable
      // no constructor, used only as base class
  
***************
*** 507,511 ****
  // wxListItemAttr - wxListCtrl
  
! %class %delete %noclassinfo %encapsulate wxListItemAttr
      wxListItemAttr(const wxColour& colText = wxNullColour, const wxColour& colBack = wxNullColour, const wxFont& font = wxNullFont)
  
--- 507,511 ----
  // wxListItemAttr - wxListCtrl
  
! %class %delete wxListItemAttr
      wxListItemAttr(const wxColour& colText = wxNullColour, const wxColour& colBack = wxNullColour, const wxFont& font = wxNullFont)
  
***************
*** 969,973 ****
  %define wxTEXT_ATTR_TABS
  
! %class %delete %noclassinfo %encapsulate wxTextAttr
      //wxTextAttr()
      wxTextAttr(const wxColour& colText = wxNullColour, const wxColour& colBack = wxNullColour, const wxFont& font = wxNullFont, wxTextAttrAlignment alignment = wxTEXT_ALIGNMENT_DEFAULT)
--- 969,973 ----
  %define wxTEXT_ATTR_TABS
  
! %class %delete wxTextAttr
      //wxTextAttr()
      wxTextAttr(const wxColour& colText = wxNullColour, const wxColour& colBack = wxNullColour, const wxFont& font = wxNullFont, wxTextAttrAlignment alignment = wxTEXT_ALIGNMENT_DEFAULT)
***************
*** 1168,1172 ****
  
  /*
! %class %delete %noclassinfo %encapsulate wxTreeItemAttr
      wxTreeItemAttr(const wxColour& colText = wxNullColour, const wxColour& colBack = wxNullColour, const wxFont& font = wxNullFont)
  
--- 1168,1172 ----
  
  /*
! %class %delete wxTreeItemAttr
      wxTreeItemAttr(const wxColour& colText = wxNullColour, const wxColour& colBack = wxNullColour, const wxFont& font = wxNullFont)
  
***************
*** 1187,1191 ****
  
  //%if %wxchkver_2_6
! //%class %noclassinfo wxTreeItemIdValue
  //%endclass
  //%endif
--- 1187,1191 ----
  
  //%if %wxchkver_2_6
! //%class wxTreeItemIdValue
  //%endclass
  //%endif
***************
*** 1199,1203 ****
  %endenum
  
! %class %delete %noclassinfo %encapsulate wxTreeItemId
      wxTreeItemId()
      wxTreeItemId(const wxTreeItemId& id)
--- 1199,1203 ----
  %endenum
  
! %class %delete wxTreeItemId
      wxTreeItemId()
      wxTreeItemId(const wxTreeItemId& id)
***************
*** 1220,1224 ****
  
  /*
! %class %delete %noclassinfo %encapsulate wxArrayTreeItemIds
      wxArrayTreeItemIds()
      wxArrayTreeItemIds(const wxArrayTreeItemIds& array)
--- 1220,1224 ----
  
  /*
! %class %delete wxArrayTreeItemIds
      wxArrayTreeItemIds()
      wxArrayTreeItemIds(const wxArrayTreeItemIds& array)
***************
*** 1246,1250 ****
  // of these if you're going to attach it to a wxTreeCtrl to avoid memory leaks.
  
! %class %noclassinfo wxTreeItemData, wxClientData
      wxTreeItemData()
  
--- 1246,1250 ----
  // of these if you're going to attach it to a wxTreeCtrl to avoid memory leaks.
  
! %class wxTreeItemData, wxClientData
      wxTreeItemData()
  
***************
*** 1261,1265 ****
  %include "wxbind/include/wxcore_wxlcore.h"
  
! %class %noclassinfo wxLuaTreeItemData, wxTreeItemData
      wxLuaTreeItemData(double value = 0)
  
--- 1261,1265 ----
  %include "wxbind/include/wxcore_wxlcore.h"
  
! %class wxLuaTreeItemData, wxTreeItemData
      wxLuaTreeItemData(double value = 0)
  

Index: wxhtml_html.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxhtml_html.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxhtml_html.i	10 Jan 2008 23:06:23 -0000	1.3
--- wxhtml_html.i	1 Oct 2009 04:21:01 -0000	1.4
***************
*** 171,175 ****
  %include "wx/html/htmlcell.h"
  
! %class %delete %noclassinfo wxHtmlLinkInfo
      wxHtmlLinkInfo(const wxString& href, const wxString& target = "")
  
--- 171,175 ----
  %include "wx/html/htmlcell.h"
  
! %class %delete wxHtmlLinkInfo
      wxHtmlLinkInfo(const wxString& href, const wxString& target = "")
  
***************
*** 374,378 ****
  %endenum
  
! %class %noclassinfo wxHtmlWindowInterface
  
      virtual void SetHTMLWindowTitle(const wxString& title)
--- 374,378 ----
  %endenum
  
! %class wxHtmlWindowInterface
  
      virtual void SetHTMLWindowTitle(const wxString& title)
***************
*** 396,400 ****
  %define wxHLB_MULTIPLE
  
! %class wxSimpleHtmlListBox, wxHtmlWindowInterface //: public wxHtmlListBox, public wxItemContainer
      wxSimpleHtmlListBox()
      wxSimpleHtmlListBox(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, const wxArrayString& choices, long style = wxHLB_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxSimpleHtmlListBox")
--- 396,400 ----
  %define wxHLB_MULTIPLE
  
! ...
 
[truncated message content]