wxlua-commit

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19598/wxLua/bindings/wxwidgets

Modified Files:
	wx_datatypes.lua wxaui_aui.i wxbase_base.i wxbase_config.i 
	wxbase_data.i wxbase_datetime.i wxbase_file.i 
	wxbase_override.hpp wxclassref.txt wxcore_appframe.i 
	wxcore_clipdrag.i wxcore_controls.i wxcore_core.i 
	wxcore_defsutils.i wxcore_dialogs.i wxcore_event.i 
	wxcore_gdi.i wxcore_image.i wxcore_menutool.i 
	wxcore_override.hpp wxcore_print.i wxcore_windows.i 
	wxhtml_html.i wxnet_net.i wxstc_override.hpp wxstc_stc.i 
	wxxml_xml.i 
Log Message:
Cleanup: lua to Lua
Fix various binding errors, wrong params for static wxFile functions
Bump version to 2.8.7
Add wxImage::GetData(), wxMemoryInputStream


Index: wxcore_event.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_event.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_event.i	16 Jul 2007 19:34:25 -0000	1.1
--- wxcore_event.i	18 Dec 2007 01:03:32 -0000	1.2
***************
*** 18,27 ****
      void AddPendingEvent(wxEvent& event)
  
!     // NOTE: Connect used to be called ConnectEvent which is not the name of any C++ function.
  
!     // %override wxEvtHandler::Connect(int id, int lastId, wxEventType eventType, lua function)
!     // %override wxEvtHandler::Connect(int id, wxEventType eventType, lua function)
!     // %override wxEvtHandler::Connect(wxEventType eventType, lua function)
      // The function type above is determined at runtime depending on the inputs.
      // Note: wxLua uses the userdata and the event sink and so they're not available
      void Connect(int id, int lastId, wxEventType eventType, LuaFunction func)
--- 18,28 ----
      void AddPendingEvent(wxEvent& event)
  
!     // NOTE: Connect used to be called ConnectEvent in wxLua which is not the name of any C++ function.
  
!     // %override wxEvtHandler::Connect(int id, int lastId, wxEventType eventType, Lua function)
!     // %override wxEvtHandler::Connect(int id, wxEventType eventType, Lua function)
!     // %override wxEvtHandler::Connect(wxEventType eventType, Lua function)
      // The function type above is determined at runtime depending on the inputs.
+     // C++ Func: void Connect(int id, int lastId, wxEventType eventType, wxObjectEventFunction function, wxObject* userData = NULL, wxEvtHandler* eventSink = NULL)
      // Note: wxLua uses the userdata and the event sink and so they're not available
      void Connect(int id, int lastId, wxEventType eventType, LuaFunction func)
***************
*** 31,34 ****
--- 32,37 ----
      // %override bool Disconnect(wxEventType eventType)
      // The function type above is determined at runtime depending on the inputs.
+     // C++ Func: bool Disconnect(int id, int lastId = wxID_ANY, wxEventType eventType = wxEVT_NULL, wxObjectEventFunction function = NULL, wxObject* userData = NULL, wxEvtHandler* eventSink = NULL)
+     // Note: wxLua uses the userdata and the event sink and so they're not available
      bool Disconnect(int id, int lastId, wxEventType eventType)
  
***************
*** 82,86 ****
  
  %class %delete %noclassinfo %encapsulate wxPropagationDisabler
!     // NOTE: ALWAYS delete() this when done since lua's gc may not delete it soon enough
      wxPropagationDisabler(wxEvent& event)
  
--- 85,89 ----
  
  %class %delete %noclassinfo %encapsulate wxPropagationDisabler
!     // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxPropagationDisabler(wxEvent& event)
  
***************
*** 93,97 ****
  
  %class %delete %noclassinfo %encapsulate wxPropagateOnce
!     // NOTE: ALWAYS delete() this when done since lua's gc may not delete it soon enough
      wxPropagateOnce(wxEvent& event)
  
--- 96,100 ----
  
  %class %delete %noclassinfo %encapsulate wxPropagateOnce
!     // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxPropagateOnce(wxEvent& event)
  

Index: wxcore_gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_gdi.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_gdi.i	16 Jul 2007 19:34:25 -0000	1.1
--- wxcore_gdi.i	18 Dec 2007 01:03:32 -0000	1.2
***************
*** 23,27 ****
      wxPoint(const wxPoint& pt)
  
!     // %override [int, x, int y] wxPoint::GetXY()
      // wxLua added function
      int GetXY() const
--- 23,27 ----
      wxPoint(const wxPoint& pt)
  
!     // %override [int x, int y] wxPoint::GetXY()
      // wxLua added function
      int GetXY() const
***************
*** 490,494 ****
      static wxFontMapper *Get()
  
!     // %override [bool, wxFontEncoding *altEncoding] GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true)
      // C++ Func: bool GetAltForEncoding(wxFontEncoding encoding, wxFontEncoding *altEncoding, const wxString &faceName = "", bool interactive = true)
      bool GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true)
--- 490,494 ----
      static wxFontMapper *Get()
  
!     // %override [bool, wxFontEncoding *altEncoding] wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true)
      // C++ Func: bool GetAltForEncoding(wxFontEncoding encoding, wxFontEncoding *altEncoding, const wxString &faceName = "", bool interactive = true)
      bool GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true)
***************
*** 809,813 ****
      wxPalette(const wxPalette& palette)
  
!     // %override bool wxPalette::Create(int n, lua string red, lua string green, lua string blue)
      // C++ Func: bool Create(int n, const unsigned char* red, const unsigned char* green, const unsigned char* blue)
      bool Create(int n, const unsigned char* red, const unsigned char* green, const unsigned char* blue)
--- 809,813 ----
      wxPalette(const wxPalette& palette)
  
!     // %override bool wxPalette::Create(int n, Lua string red, Lua string green, Lua string blue)
      // C++ Func: bool Create(int n, const unsigned char* red, const unsigned char* green, const unsigned char* blue)
      bool Create(int n, const unsigned char* red, const unsigned char* green, const unsigned char* blue)
***************
*** 896,906 ****
      wxBitmap(const wxImage &image, int depth = -1)
  
      // %override wxBitmap(LuaTable stringTable where each index is a row in the image)
      // C++ Func: wxBitmap(const char **data) Load from XPM
      %override_name wxLua_wxBitmapFromXPMData_constructor wxBitmap(LuaTable charTable)
  
!     // %override wxBitmap(lua string of data, int type, int width, int height, int depth = -1)
      // C++ Func: wxBitmap(const void* data, int type, int width, int height, int depth = -1)
!     %override_name wxLua_wxBitmapFromData_constructor %win wxBitmap(const wxString& data, int type, int width, int height, int depth = -1)
  
      //%win static void AddHandler(wxBitmapHandler* handler)
--- 896,910 ----
      wxBitmap(const wxImage &image, int depth = -1)
  
+     // C++ Func: wxBitmap(const char bits[], int width, int height, int depth = 1)
+     // Creates a bitmap from an array of bits in the form of a Lua string.
+     %override_name wxLua_wxBitmapFromBits_constructor wxBitmap(const char* mono_bits, int width, int height, int depth /* = 1 */);
+ 
      // %override wxBitmap(LuaTable stringTable where each index is a row in the image)
      // C++ Func: wxBitmap(const char **data) Load from XPM
      %override_name wxLua_wxBitmapFromXPMData_constructor wxBitmap(LuaTable charTable)
  
!     // %override wxBitmap(Lua string of data, int type, int width, int height, int depth = -1)
      // C++ Func: wxBitmap(const void* data, int type, int width, int height, int depth = -1)
!     %override_name wxLua_wxBitmapFromData_constructor %win wxBitmap(const wxString& data, int type, int width, int height, int depth /* = -1 */)
  
      //%win static void AddHandler(wxBitmapHandler* handler)
***************
*** 1440,1444 ****
  
  %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)
  %endclass
--- 1444,1448 ----
  
  %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)
  %endclass

Index: wxbase_file.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_file.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxbase_file.i	10 Dec 2007 05:39:05 -0000	1.2
--- wxbase_file.i	18 Dec 2007 01:03:32 -0000	1.3
***************
*** 16,20 ****
  %function bool wxFileExists(const wxString& filename)
  
! // %override [new lua string] wxDos2UnixFilename(lua string)
  // C++ Func: void wxDos2UnixFilename(wxChar *s)
  %function wxString wxDos2UnixFilename(const wxString& s)
--- 16,20 ----
  %function bool wxFileExists(const wxString& filename)
  
! // %override [new Lua string] wxDos2UnixFilename(Lua string)
  // C++ Func: void wxDos2UnixFilename(wxChar *s)
  %function wxString wxDos2UnixFilename(const wxString& s)
***************
*** 30,34 ****
  %function bool wxIsAbsolutePath(const wxString& filename)
  %function wxString wxPathOnly(const wxString& path)
! // %override [new lua string] wxUnix2DosFilename(lua string)
  // C++ Func: void wxUnix2DosFilename(wxChar *s)
  %function wxString wxUnix2DosFilename(const wxString& s)
--- 30,34 ----
  %function bool wxIsAbsolutePath(const wxString& filename)
  %function wxString wxPathOnly(const wxString& path)
! // %override [new Lua string] wxUnix2DosFilename(Lua string)
  // C++ Func: void wxUnix2DosFilename(wxChar *s)
  %function wxString wxUnix2DosFilename(const wxString& s)
***************
*** 222,226 ****
      int GetDirCount() const
  
!     // %override [lua string table] wxFileName::GetDirs()
      // C++ Func: const wxArrayString& GetDirs() const
      const wxArrayString& GetDirs() const
--- 222,226 ----
      int GetDirCount() const
  
!     // %override [Lua string table] wxFileName::GetDirs()
      // C++ Func: const wxArrayString& GetDirs() const
      const wxArrayString& GetDirs() const
***************
*** 385,390 ****
      bool Open(const wxString& filename, wxFile::OpenMode mode = wxFile::read)
  
!     // %override [size_t count, lua string] wxFile::Read(unsigned int count)
!     // C++ Func: size_t Read(void* buffer,  unsigned int count)
      size_t Read(unsigned int count)
  
--- 385,390 ----
      bool Open(const wxString& filename, wxFile::OpenMode mode = wxFile::read)
  
!     // %override [size_t count, Lua string] wxFile::Read(unsigned int count)
!     // C++ Func: size_t Read(void* buffer, unsigned int count)
      size_t Read(unsigned int count)
  
***************
*** 393,397 ****
      wxFileOffset Tell() const
  
!     // %override size_t wxFile::Write(lua string, unsigned int count)
      // C++ Func: size_t Write(const void* buffer, unsigned int count)
      size_t Write(const wxString& buffer, unsigned int count)
--- 393,397 ----
      wxFileOffset Tell() const
  
!     // %override size_t wxFile::Write(Lua string, unsigned int count)
      // C++ Func: size_t Write(const void* buffer, unsigned int count)
      size_t Write(const wxString& buffer, unsigned int count)
***************
*** 454,458 ****
      static bool Exists(const wxString& dir)
  
!     // %override [unsigned int, lua string table] wxDir::GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT)
      // C++ Func: static unsigned int GetAllFiles(const wxString& dirname, wxArrayString *files, const wxString& filespec = "", int flags = wxDIR_DEFAULT)
      static unsigned int GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT)
--- 454,458 ----
      static bool Exists(const wxString& dir)
  
!     // %override [unsigned int, Lua string table] wxDir::GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT)
      // C++ Func: static unsigned int GetAllFiles(const wxString& dirname, wxArrayString *files, const wxString& filespec = "", int flags = wxDIR_DEFAULT)
      static unsigned int GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT)
***************
*** 571,575 ****
  
      // get a brief file type description ("*.txt" => "text document")
!     // %override [bool lua string] GetDescription() const;
      // C++ Func: bool GetDescription(wxString *desc) const
      bool GetDescription() const
--- 571,575 ----
  
      // get a brief file type description ("*.txt" => "text document")
!     // %override [bool Lua string] wxFileType::GetDescription() const;
      // C++ Func: bool GetDescription(wxString *desc) const
      bool GetDescription() const
***************
*** 582,586 ****
  
      // get the command to print the file of given type
!     // %override [bool lua string] GetPrintCommand(const wxFileType::MessageParameters& params) const;
      // C++ Func: bool GetPrintCommand(wxString *printCmd, const wxFileType::MessageParameters& params) const;
      bool GetPrintCommand(const wxFileType::MessageParameters& params) const;
--- 582,586 ----
  
      // get the command to print the file of given type
!     // %override [bool Lua string] wxFileType::GetPrintCommand(const wxFileType::MessageParameters& params) const;
      // C++ Func: bool GetPrintCommand(wxString *printCmd, const wxFileType::MessageParameters& params) const;
      bool GetPrintCommand(const wxFileType::MessageParameters& params) const;
***************
*** 708,712 ****
      char Peek()
  
!     // %override [lua string] wxInputStream::Read(size_t size)
      // C++ Func: wxInputStream& Read(void *buffer, size_t size)
      wxString Read(size_t size)
--- 708,712 ----
      char Peek()
  
!     // %override [Lua string] wxInputStream::Read(size_t size)
      // C++ Func: wxInputStream& Read(void *buffer, size_t size)
      wxString Read(size_t size)
***************
*** 716,720 ****
      wxFileOffset TellI() const
  
!     // %override size_t wxInputStream::Ungetch(lua string, size_t size)
      // C++ Func: size_t Ungetch(const char* buffer, size_t size)
      %override_name wxLua_wxInputStream_UngetchString size_t Ungetch(const wxString& str, size_t size)
--- 716,720 ----
      wxFileOffset TellI() const
  
!     // %override size_t wxInputStream::Ungetch(Lua string, size_t size)
      // C++ Func: size_t Ungetch(const char* buffer, size_t size)
      %override_name wxLua_wxInputStream_UngetchString size_t Ungetch(const wxString& str, size_t size)
***************
*** 735,739 ****
      wxFileOffset TellO() const
  
!     // %override wxOutputStream& wxOutputStream::Write(lua string, size_t size)
      // C++ Func: wxOutputStream& Write(const void *buffer, size_t size)
      wxOutputStream& Write(const wxString& buffer, size_t size)
--- 735,739 ----
      wxFileOffset TellO() const
  
!     // %override wxOutputStream& wxOutputStream::Write(Lua string, size_t size)
      // C++ Func: wxOutputStream& Write(const void *buffer, size_t size)
      wxOutputStream& Write(const wxString& buffer, size_t size)
***************
*** 767,770 ****
--- 767,791 ----
  
  // ---------------------------------------------------------------------------
+ //  wxMemoryInputStream
+ 
+ %include "wx/mstream.h"
+ 
+ %class %delete %noclassinfo %encapsulate wxMemoryInputStream, wxInputStream
+     wxMemoryInputStream(const char *data, size_t length)
+     //wxMemoryInputStream(const wxMemoryOutputStream& stream)
+ 
+ %endclass
+ 
+ // ---------------------------------------------------------------------------
+ //  wxMemoryOutputStream
+ 
+ //%include "wx/mstream.h"
+ 
+ //%class %delete %noclassinfo %encapsulate wxMemoryInputStream, wxInputStream
+ //    wxMemoryOutputStream(void *data, size_t length)
+ //    wxMemoryInputStream(const wxMemoryOutputStream& stream)
+ //%endclass
+ 
+ // ---------------------------------------------------------------------------
  //  wxDataInputStream
  
***************
*** 854,856 ****
--- 875,878 ----
  %endclass
  
+ 
  %endif // wxUSE_STREAMS

Index: wxcore_core.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_core.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_core.i	16 Jul 2007 19:34:24 -0000	1.1
--- wxcore_core.i	18 Dec 2007 01:03:32 -0000	1.2
***************
*** 252,256 ****
  
  %class %delete wxGenericValidator, wxValidator
!     // See the validator.wx.lua sample for usage of this class
  
      // %override wxGenericValidatorBool(wxLuaObject* boolObj)
--- 252,256 ----
  
  %class %delete wxGenericValidator, wxValidator
!     // See the validator.wx.Lua sample for usage of this class
  
      // %override wxGenericValidatorBool(wxLuaObject* boolObj)

Index: wxxml_xml.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxxml_xml.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxxml_xml.i	22 Aug 2007 20:17:09 -0000	1.2
--- wxxml_xml.i	18 Dec 2007 01:03:32 -0000	1.3
***************
*** 42,46 ****
      void InsertChild(%ungc wxXmlNode *child, wxXmlNode *before_node)
  
!     // %override bool RemoveChild(%gc wxXmlNode *child)
      // C++ Func: No change: only if child is removed will we garbage collect it
      bool RemoveChild(%gc wxXmlNode *child)
--- 42,46 ----
      void InsertChild(%ungc wxXmlNode *child, wxXmlNode *before_node)
  
!     // %override bool wxXmlNode::RemoveChild(%gc wxXmlNode *child)
      // C++ Func: No change: only if child is removed will we garbage collect it
      bool RemoveChild(%gc wxXmlNode *child)

Index: wxcore_menutool.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_menutool.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxcore_menutool.i	10 Dec 2007 05:39:05 -0000	1.2
--- wxcore_menutool.i	18 Dec 2007 01:03:32 -0000	1.3
***************
*** 31,35 ****
      // %override wxMenu* wxMenu({{wx.wxID_NEW, "&New\tCtrl-N", "New doc", [wx.wxITEM_NORMAL]}, {}, {item 2}}, const wxString& title = "", long style = "") - empty tables are separators
      // wxLua provides this function
!     %override_name wxLua_wxCreateMenu_constructor wxMenu(LuaTable luatable, const wxString& title = "", long style = 0)
  
      wxMenuItem* Append(int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL)
--- 31,35 ----
      // %override wxMenu* wxMenu({{wx.wxID_NEW, "&New\tCtrl-N", "New doc", [wx.wxITEM_NORMAL]}, {}, {item 2}}, const wxString& title = "", long style = "") - empty tables are separators
      // wxLua provides this function
!     %override_name wxLua_wxCreateMenu_constructor wxMenu(LuaTable, const wxString& title = "", long style = 0)
  
      wxMenuItem* Append(int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL)
***************
*** 350,354 ****
      %define_object wxNullAcceleratorTable
  
!     // %override wxAcceleratorTable(lua table with this format)
      // { { wx.wxACCEL_NORMAL, string.byte('0'), ID_0 },
      //   { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD0,   ID_0 } }
--- 350,354 ----
      %define_object wxNullAcceleratorTable
  
!     // %override wxAcceleratorTable(Lua table with this format)
      // { { wx.wxACCEL_NORMAL, string.byte('0'), ID_0 },
      //   { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD0,   ID_0 } }

Index: wxbase_datetime.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_datetime.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxbase_datetime.i	16 Jul 2007 19:34:23 -0000	1.1
--- wxbase_datetime.i	18 Dec 2007 01:03:32 -0000	1.2
***************
*** 138,142 ****
  
      wxDateTime()
!     wxDateTime(time_t dateTime) // use with lua's os.time() on MSW, Linux, others?
      %rename wxDateTimeFromJDN wxDateTime(double dateTime)
      %rename wxDateTimeFromHMS wxDateTime(int hour, int minute, int second, int millisec)
--- 138,142 ----
  
      wxDateTime()
!     wxDateTime(time_t dateTime) // use with Lua's os.time() on MSW, Linux, others?
      %rename wxDateTimeFromJDN wxDateTime(double dateTime)
      %rename wxDateTimeFromHMS wxDateTime(int hour, int minute, int second, int millisec)
***************
*** 144,148 ****
  
      wxDateTime& SetToCurrent()
!     wxDateTime& Set(time_t time) // use with lua's os.time() on MSW, Linux, others?
      %rename SetToJDN wxDateTime& Set(double dateTime)
      %rename SetToHMS wxDateTime& Set(int hour, int minute, int second, int millisec)
--- 144,148 ----
  
      wxDateTime& SetToCurrent()
!     wxDateTime& Set(time_t time) // use with Lua's os.time() on MSW, Linux, others?
      %rename SetToJDN wxDateTime& Set(double dateTime)
      %rename SetToHMS wxDateTime& Set(int hour, int minute, int second, int millisec)

Index: wxcore_defsutils.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_defsutils.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxcore_defsutils.i	7 Aug 2007 20:23:25 -0000	1.3
--- wxcore_defsutils.i	18 Dec 2007 01:03:32 -0000	1.4
***************
*** 103,109 ****
  !%wxchkver_2_6 %function long wxExecute(const wxString& command, bool sync = false, wxProcess *callback = NULL)
  %wxchkver_2_6 %function long wxExecute(const wxString& command, int flags = wxEXEC_ASYNC, wxProcess *process = NULL)
! // %override [long, lua table of output strings] wxExecuteStdout(const wxString& command, int flags = 0)
  %function %rename wxExecuteStdout long wxExecute(const wxString& command, wxArrayString& output, int flags = 0)
! // %override [long, lua table of output strings, lua table of error strings] wxExecuteStdoutStderr(const wxString& command, int flags = 0)
  %function %rename wxExecuteStdoutStderr long wxExecute(const wxString& command, wxArrayString& output, wxArrayString& errors, int flags = 0)
  %function void wxExit()
--- 103,109 ----
  !%wxchkver_2_6 %function long wxExecute(const wxString& command, bool sync = false, wxProcess *callback = NULL)
  %wxchkver_2_6 %function long wxExecute(const wxString& command, int flags = wxEXEC_ASYNC, wxProcess *process = NULL)
! // %override [long, Lua table of output strings] wxExecuteStdout(const wxString& command, int flags = 0)
  %function %rename wxExecuteStdout long wxExecute(const wxString& command, wxArrayString& output, int flags = 0)
! // %override [long, Lua table of output strings, Lua table of error strings] wxExecuteStdoutStderr(const wxString& command, int flags = 0)
  %function %rename wxExecuteStdoutStderr long wxExecute(const wxString& command, wxArrayString& output, wxArrayString& errors, int flags = 0)
  %function void wxExit()
***************
*** 497,511 ****
  
  %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)
  %endclass
  
  // ---------------------------------------------------------------------------
! // wxBusyCursorSuspender - we don't wrap this since lua's garbage collector doesn't
  // automatically collect items when they go out of scope so you would have to
  // 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()
  
--- 497,511 ----
  
  %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)
  %endclass
  
  // ---------------------------------------------------------------------------
! // wxBusyCursorSuspender - we don't wrap this since Lua's garbage collector doesn't
  // automatically collect items when they go out of scope so you would have to
  // 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()
  
***************
*** 522,526 ****
  
  %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)
  %endclass
--- 522,526 ----
  
  %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)
  %endclass

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** wx_datatypes.lua	10 Dec 2007 05:39:05 -0000	1.89
--- wx_datatypes.lua	18 Dec 2007 01:03:32 -0000	1.90
***************
*** 2664,2667 ****
--- 2664,2675 ----
      ValueType = "class",
    },
+   wxMemoryInputStream = {
+     ["%encapsulate"] = true,
+     BaseClass = "wxInputStream",
+     Condition = "wxUSE_STREAMS",
+     IsNumber = false,
+     Name = "wxMemoryInputStream",
+     ValueType = "class",
+   },
    wxMemorySize = {
      IsNumber = true,

Index: wxcore_appframe.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_appframe.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxcore_appframe.i	10 Dec 2007 05:39:05 -0000	1.2
--- wxcore_appframe.i	18 Dec 2007 01:03:32 -0000	1.3
***************
*** 23,27 ****
      // wxApp() NO CONSTRUCTOR! the wxApp is created in C++, use wxGetApp()
  
!     // These two are pushed into lua by C++ at startup as table arg = { argv }
      // int wxApp::argc
      // wxChar** wxApp::argv
--- 23,27 ----
      // wxApp() NO CONSTRUCTOR! the wxApp is created in C++, use wxGetApp()
  
!     // These two are pushed into Lua by C++ at startup as table arg = { argv }
      // int wxApp::argc
      // wxChar** wxApp::argv
***************
*** 40,46 ****
      wxString GetVendorName() const
      bool IsActive() const
!     // static bool IsMainLoopRunning()
      // bool Initialized() obsolete in wxWidgets
      int MainLoop()
      // virtual int OnExit() nothing we can do here
      // virtual bool OnInit() nothing we can do here
--- 40,50 ----
      wxString GetVendorName() const
      bool IsActive() const
!     static bool IsMainLoopRunning()
      // bool Initialized() obsolete in wxWidgets
+ 
+     // %override int wxApp::MainLoop() Only calls it if !IsMainLoopRunning(), returns 0 if it already is
+     // C++ Func: int MainLoop()
      int MainLoop()
+ 
      // virtual int OnExit() nothing we can do here
      // virtual bool OnInit() nothing we can do here
***************
*** 162,166 ****
      virtual void SetStatusText(const wxString& text, int number = 0)
  
!     // void wxFrame::SetStatusWidths(lua table with number indexes and values)
      // C++ Func: virtual void SetStatusWidths(int n, int *widths)
      virtual void SetStatusWidths(IntArray_FromLuaTable intTable)
--- 166,170 ----
      virtual void SetStatusText(const wxString& text, int number = 0)
  
!     // void wxFrame::SetStatusWidths(Lua table with number indexes and values)
      // C++ Func: virtual void SetStatusWidths(int n, int *widths)
      virtual void SetStatusWidths(IntArray_FromLuaTable intTable)
***************
*** 212,216 ****
      void PushStatusText(const wxString& string, int field = 0)
  
!     // %override void wxStatusBar::SetFieldsCount(either a single number or a lua table with number indexes and values)
      // C++ Func: virtual void SetFieldsCount(int number = 1, int* widths = NULL)
      virtual void SetFieldsCount(LuaTable intTable)
--- 216,220 ----
      void PushStatusText(const wxString& string, int field = 0)
  
!     // %override void wxStatusBar::SetFieldsCount(either a single number or a Lua table with number indexes and values)
      // C++ Func: virtual void SetFieldsCount(int number = 1, int* widths = NULL)
      virtual void SetFieldsCount(LuaTable intTable)
***************
*** 219,227 ****
      virtual void SetStatusText(const wxString& text, int i = 0)
  
!     // void wxStatusBar::SetStatusWidths(lua table with number indexes and values)
      // C++ Func: virtual void SetStatusWidths(int n, int *widths)
      virtual void SetStatusWidths(IntArray_FromLuaTable intTable)
  
!     // void wxStatusBar::SetStatusStyles(lua table with number indexes and values)
      // C++ Func: virtual void SetStatusStyles(int n, int *styles)
      virtual void SetStatusStyles(IntArray_FromLuaTable intTable)
--- 223,231 ----
      virtual void SetStatusText(const wxString& text, int i = 0)
  
!     // void wxStatusBar::SetStatusWidths(Lua table with number indexes and values)
      // C++ Func: virtual void SetStatusWidths(int n, int *widths)
      virtual void SetStatusWidths(IntArray_FromLuaTable intTable)
  
!     // void wxStatusBar::SetStatusStyles(Lua table with number indexes and values)
      // C++ Func: virtual void SetStatusStyles(int n, int *styles)
      virtual void SetStatusStyles(IntArray_FromLuaTable intTable)

Index: wxstc_stc.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxstc_stc.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxstc_stc.i	16 Jul 2007 19:34:26 -0000	1.1
--- wxstc_stc.i	18 Dec 2007 01:03:32 -0000	1.2
***************
*** 1800,1804 ****
  //    wxString GetCurLine(int* OUTPUT);
  //#else
!     // %override [int linePos] GetCurLine()
      // C++ Func: wxString GetCurLine(int* linePos=NULL);
      wxString GetCurLine();
--- 1800,1804 ----
  //    wxString GetCurLine(int* OUTPUT);
  //#else
!     // %override [int linePos] wxStyledTextCtrl::GetCurLine()
      // C++ Func: wxString GetCurLine(int* linePos=NULL);
      wxString GetCurLine();
***************
*** 1955,1959 ****
      // Set the styles for a segment of the document.
  
!     // %override [lua string styleBytes] SetStyleBytes(int length, lua string styleBytes)
      // C++ Func: void SetStyleBytes(int length, char* styleBytes);
      void SetStyleBytes(int length, char* styleBytes);
--- 1955,1959 ----
      // Set the styles for a segment of the document.
  
!     // %override [Lua string styleBytes] wxStyledTextCtrl::SetStyleBytes(int length, Lua string styleBytes)
      // C++ Func: void SetStyleBytes(int length, char* styleBytes);
      void SetStyleBytes(int length, char* styleBytes);
***************
*** 3100,3104 ****
  //    void GetSelection(int* OUTPUT, int* OUTPUT);
  //#else
!     // %override [int startPos, int endPos] GetSelection()
      // C++ Func: void GetSelection(int* startPos, int* endPos);
      void GetSelection();
--- 3100,3104 ----
  //    void GetSelection(int* OUTPUT, int* OUTPUT);
  //#else
!     // %override [int startPos, int endPos] wxStyledTextCtrl::GetSelection()
      // C++ Func: void GetSelection(int* startPos, int* endPos);
      void GetSelection();

Index: wxcore_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wxcore_override.hpp	15 Dec 2007 16:56:40 -0000	1.12
--- wxcore_override.hpp	18 Dec 2007 01:03:32 -0000	1.13
***************
*** 23,26 ****
--- 23,41 ----
  %end
  
+ %override wxLua_wxApp_MainLoop
+ //     int MainLoop()
+ static int LUACALL wxLua_wxApp_MainLoop(lua_State *L)
+ {
+     // get this
+     wxApp * self = (wxApp *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxApp);
+     // call MainLoop
+     int returns = !wxApp::IsMainLoopRunning() ? (self->MainLoop()) : 0;
+     // push the result number
+     lua_pushnumber(L, returns);
+ 
+     return 1;
+ }
+ %end
+ 
  %override wxLua_wxStatusBar_SetFieldsCount
  // virtual void SetFieldsCount(int number = 1, int* widths = NULL)
***************
*** 1453,1456 ****
--- 1468,1498 ----
  %end
  
+ %override wxLua_wxBitmapFromBits_constructor
+ // %win wxBitmap(const char* bits, int width, int height, int depth = -1)
+ static int LUACALL wxLua_wxBitmapFromBits_constructor(lua_State *L)
+ {
+     wxluabind_removetableforcall(L);
+ 
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // int depth = -1
+     int depth = (argCount >= 4 ? (int)wxlua_getintegertype(L, 4) : -1);
+     // int height
+     int height = (int)wxlua_getintegertype(L, 3);
+     // int width
+     int width = (int)wxlua_getintegertype(L, 2);
+     // const char* bits
+     const char *bits = (const char *)lua_tostring(L, 1);
+     // call constructor
+     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, s_wxluatag_wxBitmap, returns);
+     // return the number of parameters
+     return 1;
+ }
+ %end
+ 
  %override wxLua_wxBitmapFromData_constructor
  // %win wxBitmap(void* data, int type, int width, int height, int depth = -1)
***************
*** 1747,1750 ****
--- 1789,1807 ----
  %end
  
+ %override wxLua_wxImage_GetData
+ //     unsigned char* GetData() const
+ static int LUACALL wxLua_wxImage_GetData(lua_State *L)
+ {
+     // get this
+     wxImage * self = (wxImage *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxImage);
+     // call GetData
+     char* returns = (char*)self->GetData();
+     // push the result pointer
+     lua_pushlstring(L, returns, self->GetWidth()*self->GetHeight()*3);
+ 
+     return 1;
+ }
+ %end
+ 
  %override wxLua_wxImage_GetOrFindMaskColour
  // bool GetOrFindMaskColour(unsigned char *r, unsigned char *g, unsigned char *b) const

Index: wxcore_print.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_print.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxcore_print.i	10 Dec 2007 05:39:05 -0000	1.2
--- wxcore_print.i	18 Dec 2007 01:03:32 -0000	1.3
***************
*** 70,74 ****
      void SetPageInfo(int minPage, int maxPage, int pageFrom = 0, int pageTo = 0)
  
!     // The functions below are all virtual functions that you can override in lua.
      // See the printing sample and wxPrintout for proper parameters and usage.
      //void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo)
--- 70,74 ----
      void SetPageInfo(int minPage, int maxPage, int pageFrom = 0, int pageTo = 0)
  
!     // The functions below are all virtual functions that you can override in Lua.
      // See the printing sample and wxPrintout for proper parameters and usage.
      //void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo)

Index: wxbase_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxbase_override.hpp	13 Dec 2007 06:23:53 -0000	1.11
--- wxbase_override.hpp	18 Dec 2007 01:03:32 -0000	1.12
***************
*** 597,606 ****
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getintegertype(L, 3) : wxPATH_NATIVE);
      wxString ext;
      wxString name;
      wxString path;
      // const wxString& fullpath
!     wxString fullpath = wxlua_getwxStringtype(L, 2);
      // call SplitPath
      wxFileName::SplitPath(fullpath, &path, &name, &ext, format);
--- 597,606 ----
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getintegertype(L, 2) : wxPATH_NATIVE);
      wxString ext;
      wxString name;
      wxString path;
      // const wxString& fullpath
!     wxString fullpath = wxlua_getwxStringtype(L, 1);
      // call SplitPath
      wxFileName::SplitPath(fullpath, &path, &name, &ext, format);
***************
*** 621,625 ****
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getintegertype(L, 3) : wxPATH_NATIVE);
      wxString ext;
      wxString name;
--- 621,625 ----
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getintegertype(L, 2) : wxPATH_NATIVE);
      wxString ext;
      wxString name;
***************
*** 627,631 ****
      wxString volume;
      // const wxString& fullpath
!     wxString fullpath = wxlua_getwxStringtype(L, 2);
      // call SplitPath
      wxFileName::SplitPath(fullpath, &volume, &path, &name, &ext, format);
--- 627,631 ----
      wxString volume;
      // const wxString& fullpath
!     wxString fullpath = wxlua_getwxStringtype(L, 1);
      // call SplitPath
      wxFileName::SplitPath(fullpath, &volume, &path, &name, &ext, format);
***************
*** 647,653 ****
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 3 ? (wxPathFormat)wxlua_getintegertype(L, 3) : wxPATH_NATIVE);
      // const wxString fullpath
!     const wxString fullpath = wxlua_getwxStringtype(L, 2);
      wxString volume;
      wxString path;
--- 647,653 ----
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getintegertype(L, 2) : wxPATH_NATIVE);
      // const wxString fullpath
!     const wxString fullpath = wxlua_getwxStringtype(L, 1);
      wxString volume;
      wxString path;
***************
*** 743,747 ****
          // push the result number
          lua_pushnumber(L, returns);
!         lua_pushlstring(L, (const char *) buffer, count);
          free(buffer);
          // return the number of parameters
--- 743,747 ----
          // push the result number
          lua_pushnumber(L, returns);
!         lua_pushlstring(L, (const char *) buffer, returns);
          free(buffer);
          // return the number of parameters
***************
*** 873,874 ****
--- 873,895 ----
  }
  %end
+ 
+ 
+ %override wxLua_wxMemoryInputStream_constructor
+ //     wxMemoryInputStream(const char *data, size_t length)
+ static int LUACALL wxLua_wxMemoryInputStream_constructor(lua_State *L)
+ {
+     wxluabind_removetableforcall(L);
+     // size_t length
+     size_t length = (size_t)wxlua_getnumbertype(L, 2);
+     // const char data
+     const char* data = (const char*)wxlua_getstringtype(L, 1);
+     // call constructor
+     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, s_wxluatag_wxMemoryInputStream, returns);
+ 
+     return 1;
+ }
+ %end

Index: wxbase_config.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_config.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxbase_config.i	16 Jul 2007 19:34:23 -0000	1.1
--- wxbase_config.i	18 Dec 2007 01:03:32 -0000	1.2
***************
*** 43,47 ****
      //  deleting them. This is because the wxConfig you install using
      //  wxConfigBase::Set may need to exist outside of the scope it was created
!     //  in and we don't want lua to garbage collect it.
      //void delete()
  
--- 43,47 ----
      //  deleting them. This is because the wxConfig you install using
      //  wxConfigBase::Set may need to exist outside of the scope it was created
!     //  in and we don't want Lua to garbage collect it.
      //void delete()
  
***************
*** 89,93 ****
      bool Read(const wxString& key, const wxString& defaultVal = "") const
  
!     // Since lua uses double as it's number type, we only read/write doubles
  
      // %override [bool, double] wxConfigBase::Read(const wxString& key, double defaultVal = 0)
--- 89,93 ----
      bool Read(const wxString& key, const wxString& defaultVal = "") const
  
!     // Since Lua uses double as it's number type, we only read/write doubles
  
      // %override [bool, double] wxConfigBase::Read(const wxString& key, double defaultVal = 0)
***************
*** 111,115 ****
  
      bool Write(const wxString& key, wxString &value)
!     // Since lua uses double as it's number type, we only read/write doubles
      bool Write(const wxString &key, double value)
  
--- 111,115 ----
  
      bool Write(const wxString& key, wxString &value)
!     // Since Lua uses double as it's number type, we only read/write doubles
      bool Write(const wxString &key, double value)
  
***************
*** 154,158 ****
  
  %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)
  
--- 154,158 ----
  
  %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)
  

Index: wxcore_controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_controls.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxcore_controls.i	16 Jul 2007 19:34:24 -0000	1.1
--- wxcore_controls.i	18 Dec 2007 01:03:32 -0000	1.2
***************
*** 272,276 ****
      void     Deselect(int n)
  
!     // %override [lua table of int selections] wxListBox::GetSelections()
      // C++ Func: int GetSelections(wxArrayInt& selections) const
      int GetSelections() const
--- 272,276 ----
      void     Deselect(int n)
  
!     // %override [Lua table of int selections] wxListBox::GetSelections()
      // C++ Func: int GetSelections(wxArrayInt& selections) const
      int GetSelections() const
***************
*** 451,455 ****
      //void     SetWindowStyleFlag(long style) - see wxWindow
  
!     // %override bool SortItems(lua function(long item1, long item2, long data) returning int, long data)
      // C++ Func: bool SortItems(wxListCtrlCompare fnSortCallBack, long data)
      // Note: the data can only be a number, but you can create a table where the data is
--- 451,455 ----
      //void     SetWindowStyleFlag(long style) - see wxWindow
  
!     // %override bool SortItems(Lua function(long item1, long item2, long data) returning int, long data)
      // C++ Func: bool SortItems(wxListCtrlCompare fnSortCallBack, long data)
      // Note: the data can only be a number, but you can create a table where the data is
***************
*** 459,463 ****
      // you may want to make this "data" equal to an index in a table where you
      // store more information needed for sorting.
!     // Your lua function should return 1, 0, -1 for item1 > item2, item1 == item2, item1 < item2
      bool SortItems(LuaFunction fnSortCallBack, long data)
  %endclass
--- 459,463 ----
      // you may want to make this "data" equal to an index in a table where you
      // store more information needed for sorting.
!     // Your Lua function should return 1, 0, -1 for item1 > item2, item1 == item2, item1 < item2
      bool SortItems(LuaFunction fnSortCallBack, long data)
  %endclass
***************
*** 1062,1066 ****
      wxTreeItemId GetSelection() const
  
!     // %override [size_t, lua table of wxTreeItemIds] wxTreeCtrl::GetSelections()
      // C++ Func: size_t GetSelections(wxArrayTreeItemIds& selection) const
      size_t GetSelections() const
--- 1062,1066 ----
      wxTreeItemId GetSelection() const
  
!     // %override [size_t, Lua table of wxTreeItemIds] wxTreeCtrl::GetSelections()
      // C++ Func: size_t GetSelections(wxArrayTreeItemIds& selection) const
      size_t GetSelections() const
***************
*** 1139,1143 ****
  %enum wxTreeItemIdValue
      // FAKE enum, actually typedef void* wxTreeItemIdValue
!     // but lua only uses double. This gets around compiler errors/warnings
  %endenum
  
--- 1139,1143 ----
  %enum wxTreeItemIdValue
      // FAKE enum, actually typedef void* wxTreeItemIdValue
!     // but Lua only uses double. This gets around compiler errors/warnings
  %endenum
  
***************
*** 1147,1151 ****
  
      bool IsOk()
!     wxTreeItemIdValue GetValue() const // get a pointer to the internal data to use as a reference in a lua table
  
      %operator wxTreeItemId& operator=(const wxTreeItemId& otherId)
--- 1147,1151 ----
  
      bool IsOk()
!     wxTreeItemIdValue GetValue() const // get a pointer to the internal data to use as a reference in a Lua table
  
      %operator wxTreeItemId& operator=(const wxTreeItemId& otherId)

Index: wxhtml_html.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxhtml_html.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxhtml_html.i	16 Jul 2007 19:34:25 -0000	1.1
--- wxhtml_html.i	18 Dec 2007 01:03:32 -0000	1.2
***************
*** 35,39 ****
      //virtual void DrawInvisible(wxDC& dc, int x, int y, wxHtmlRenderingInfo& info)
  
!     // %override wxHtmlCell* Find(int condition, [none, string, or int])
      // C++ Func: virtual const wxHtmlCell* Find(int condition, void *param = 0)
      virtual const wxHtmlCell* Find(int condition, void *param = 0)
--- 35,39 ----
      //virtual void DrawInvisible(wxDC& dc, int x, int y, wxHtmlRenderingInfo& info)
  
!     // %override wxHtmlCell* wxHtmlCell::Find(int condition, [none, string, or int])
      // C++ Func: virtual const wxHtmlCell* Find(int condition, void *param = 0)
      virtual const wxHtmlCell* Find(int condition, void *param = 0)
***************
*** 241,245 ****
      void SetBorders(int b)
  
!     // %override void SetFonts(wxString normal_face, wxString fixed_face, lua int table)
      // C++ Func: void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes)
      void SetFonts(wxString normal_face, wxString fixed_face, LuaTable intTable)
--- 241,245 ----
      void SetBorders(int b)
  
!     // %override void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, Lua int table)
      // C++ Func: void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes)
      void SetFonts(wxString normal_face, wxString fixed_face, LuaTable intTable)
***************
*** 263,267 ****
      wxLuaHtmlWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHW_SCROLLBAR_AUTO, const wxString& name = "wxLuaHtmlWindow")
  
!     // The functions below are all virtual functions that you can override in lua.
      // See the html sample and wxHtmlWindow for proper parameters and usage.
      //bool OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event)
--- 263,267 ----
      wxLuaHtmlWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHW_SCROLLBAR_AUTO, const wxString& name = "wxLuaHtmlWindow")
  
!     // The functions below are all virtual functions that you can override in Lua.
      // See the html sample and wxHtmlWindow for proper parameters and usage.
      //bool OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event)
***************
*** 355,359 ****
      void SetFontUnderlined(int x)
  
!     // %override void SetFonts(wxString normal_face, wxString fixed_face, lua int table)
      // C++ Func: void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes)
      void SetFonts(wxString normal_face, wxString fixed_face, LuaTable intTable)
--- 355,359 ----
      void SetFontUnderlined(int x)
  
!     // %override void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, Lua int table)
      // C++ Func: void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes)
      void SetFonts(wxString normal_face, wxString fixed_face, LuaTable intTable)

Index: wxnet_net.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxnet_net.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxnet_net.i	16 Jul 2007 19:34:26 -0000	1.1
--- wxnet_net.i	18 Dec 2007 01:03:32 -0000	1.2
***************
*** 85,101 ****
      void SetTimeout(int seconds)
  
!     // %override [lua string] wxSocketBase::Peek(unsigned long nbytes)
      // C++ Func: void Peek(void * buffer, unsigned long nbytes)
      void Peek(unsigned long nbytes)
  
!     // %override [lua string] wxSocketBase::Read(unsigned long nbytes)
      // C++ Func: void Read(unsigned long nbytes)
      void Read(void * buffer, unsigned long nbytes)
  
!     // %override [lua string] wxSocketBase::ReadMsg(unsigned long nbytes)
      // C++ Func: void ReadMsg(void * buffer, unsigned long nbytes)
      void ReadMsg(unsigned long nbytes)
  
!     // %override void wxSocketBase::Unread(lua string, [optional unsigned long nbytes])
      // C++ Func: void Unread(const void * buffer, unsigned long nbytes)
      void Unread(const char* buffer, unsigned long nbytes)
--- 85,101 ----
      void SetTimeout(int seconds)
  
!     // %override [Lua string] wxSocketBase::Peek(unsigned long nbytes)
      // C++ Func: void Peek(void * buffer, unsigned long nbytes)
      void Peek(unsigned long nbytes)
  
!     // %override [Lua string] wxSocketBase::Read(unsigned long nbytes)
      // C++ Func: void Read(unsigned long nbytes)
      void Read(void * buffer, unsigned long nbytes)
  
!     // %override [Lua string] wxSocketBase::ReadMsg(unsigned long nbytes)
      // C++ Func: void ReadMsg(void * buffer, unsigned long nbytes)
      void ReadMsg(unsigned long nbytes)
  
!     // %override void wxSocketBase::Unread(Lua string, [optional unsigned long nbytes])
      // C++ Func: void Unread(const void * buffer, unsigned long nbytes)
      void Unread(const char* buffer, unsigned long nbytes)
***************
*** 106,114 ****
      bool WaitForWrite(long seconds = -1, long millisecond = 0)
  
!     // %override void wxSocketBase::Write(lua string, [optional unsigned long nbytes])
      // C++ Func: void Write(const void * buffer, unsigned long nbytes)
      void Write(const char* buffer, unsigned long nbytes)
  
!     // %override void wxSocketBase::WriteMsg(lua string, [optional unsigned long nbytes])
      // C++ Func: void WriteMsg(const void * buffer, wxUint32 nbytes)
      void WriteMsg(const char* buffer, wxUint32 nbytes)
--- 106,114 ----
      bool WaitForWrite(long seconds = -1, long millisecond = 0)
  
!     // %override void wxSocketBase::Write(Lua string, [optional unsigned long nbytes])
      // C++ Func: void Write(const void * buffer, unsigned long nbytes)
      void Write(const char* buffer, unsigned long nbytes)
  
!     // %override void wxSocketBase::WriteMsg(Lua string, [optional unsigned long nbytes])
      // C++ Func: void WriteMsg(const void * buffer, wxUint32 nbytes)
      void WriteMsg(const char* buffer, wxUint32 nbytes)

Index: wxcore_image.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_image.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxcore_image.i	10 Dec 2007 05:39:05 -0000	1.2
--- wxcore_image.i	18 Dec 2007 01:03:32 -0000	1.3
***************
*** 62,65 ****
--- 62,66 ----
  //%define_string wxIMAGE_OPTION_PNG_FORMAT     see wxPNGHandler
  //%define_string wxIMAGE_OPTION_PNG_BITDEPTH   see wxPNGHandler
+ //%define_string wxIMAGE_OPTION_BMP_FORMAT     see wxBMPHandler
  
  %define_string wxIMAGE_OPTION_QUALITY        _T("quality")
***************
*** 109,113 ****
      void Destroy()
  
!     // %override [bool, uchar r, uchar g, char b] FindFirstUnusedColour(unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0)
      // C++ Func: bool FindFirstUnusedColour(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0)
      bool FindFirstUnusedColour(unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0)
--- 110,114 ----
      void Destroy()
  
!     // %override [bool, uchar r, uchar g, char b] wxImage::FindFirstUnusedColour(unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0)
      // C++ Func: bool FindFirstUnusedColour(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0)
      bool FindFirstUnusedColour(unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0)
***************
*** 120,124 ****
      unsigned char GetAlpha(int x, int y) const
      unsigned char GetBlue(int x, int y) const
!     //unsigned char* GetData() const
      unsigned char GetGreen(int x, int y) const
      static int GetImageCount(const wxString& filename, long type = wxBITMAP_TYPE_ANY)
--- 121,129 ----
      unsigned char GetAlpha(int x, int y) const
      unsigned char GetBlue(int x, int y) const
! 
!     // %override [Lua string] wxImage::GetData() const
!     // C++ Func: unsigned char* GetData() const
!     unsigned char* GetData() const
! 
      unsigned char GetGreen(int x, int y) const
      static int GetImageCount(const wxString& filename, long type = wxBITMAP_TYPE_ANY)
***************
*** 130,134 ****
      unsigned char GetMaskRed() const
  
!     // %override [bool, uchar r, uchar g, uchar b] GetOrFindMaskColour() const
      // C++ Func: bool GetOrFindMaskColour(unsigned char *r, unsigned char *g, unsigned char *b) const
      bool GetOrFindMaskColour() const
--- 135,139 ----
      unsigned char GetMaskRed() const
  
!     // %override [bool, uchar r, uchar g, uchar b] wxImage::GetOrFindMaskColour() const
      // C++ Func: bool GetOrFindMaskColour(unsigned char *r, unsigned char *g, unsigned char *b) const
      bool GetOrFindMaskColour() const
***************
*** 140,148 ****
  
      // note: we're tricking generator to not gag on RGB/HSVValue, so pretend to return an int
!     // %override [r, g, b] HSVtoRGB(double h, double s, double v)
      // C++ Func: static RGBValue HSVtoRGB(const HSVValue& hsv)
      static int HSVtoRGB(double h, double s, double v)
  
!     // %override [h, s, v] RGBtoHSV(unsigned char r, unsigned char g, unsigned char b)
      // C++ Func: static HSVValue RGBtoHSV(const RGBValue& rgb)
      static int RGBtoHSV(unsigned char r, unsigned char g, unsigned char b)
--- 145,153 ----
  
      // note: we're tricking generator to not gag on RGB/HSVValue, so pretend to return an int
!     // %override [r, g, b] wxImage::HSVtoRGB(double h, double s, double v)
      // C++ Func: static RGBValue HSVtoRGB(const HSVValue& hsv)
      static int HSVtoRGB(double h, double s, double v)
  
!     // %override [h, s, v] wxImage::RGBtoHSV(unsigned char r, unsigned char g, unsigned char b)
      // C++ Func: static HSVValue RGBtoHSV(const RGBValue& rgb)
      static int RGBtoHSV(unsigned char r, unsigned char g, unsigned char b)
***************
*** 157,163 ****
      static void InsertHandler(%ungc wxImageHandler* handler)
      bool IsTransparent(int x, int y, unsigned char threshold = 128) const
!     bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_ANY)
!     bool LoadFile(const wxString& name, const wxString& mimetype)
!     bool LoadFile(wxInputStream& stream, long type, int index = -1)
      bool Ok() const
      static bool RemoveHandler(const wxString& name)
--- 162,171 ----
      static void InsertHandler(%ungc wxImageHandler* handler)
      bool IsTransparent(int x, int y, unsigned char threshold = 128) const
! 
!     bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1)
!     bool LoadFile(const wxString& name, const wxString& mimetype, int index = -1)
!     bool LoadFile(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1)
!     bool LoadFile(wxInputStream& stream, const wxString& mimetype, int index = -1)
! 
      bool Ok() const
      static bool RemoveHandler(const wxString& name)
***************
*** 180,188 ****
      void SetAlpha(int x, int y, unsigned char alpha)
  
!     // %override void wxImage::SetAlpha(lua string) - copy contents of string to image
      // C++ Func: void SetAlpha(unsigned char *alpha = NULL,bool static_data = false)
      %override_name wxLua_wxImage_SetAlphaData void SetAlpha(const wxString& dataStr)
  
!     // %override void SetData(lua string) - copy contents of string to image
      // C++ Func: void SetData(unsigned char *data)
      void SetData(const wxString& data)
--- 188,196 ----
      void SetAlpha(int x, int y, unsigned char alpha)
  
!     // %override void wxImage::SetAlpha(Lua string) - copy contents of string to image
      // C++ Func: void SetAlpha(unsigned char *alpha = NULL,bool static_data = false)
      %override_name wxLua_wxImage_SetAlphaData void SetAlpha(const wxString& dataStr)
  
!     // %override void wxImage::SetData(Lua string) - copy contents of string to image
      // C++ Func: void SetData(unsigned char *data)
      void SetData(const wxString& data)
***************
*** 300,303 ****
--- 308,313 ----
  %endenum
  
+ %define_string wxIMAGE_OPTION_BMP_FORMAT // wxString(_T("wxBMP_FORMAT"))
+ 
  %class %delete wxBMPHandler, wxImageHandler
      wxBMPHandler()

Index: wxaui_aui.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxaui_aui.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxaui_aui.i	25 Nov 2007 21:34:04 -0000	1.2
--- wxaui_aui.i	18 Dec 2007 01:03:32 -0000	1.3
***************
*** 218,222 ****
      void MakeTabVisible(int tabPage, wxWindow* win);
  
!     bool IsDragging() const
  %endclass
  
--- 218,222 ----
      void MakeTabVisible(int tabPage, wxWindow* win);
  
!     %wxchkver_2_8_5 bool IsDragging() const
  %endclass
  

Index: wxbase_base.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_base.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxbase_base.i	16 Jul 2007 19:34:23 -0000	1.1
--- wxbase_base.i	18 Dec 2007 01:03:32 -0000	1.2
***************
*** 321,325 ****
  
  // All of the wxLogXXX functions take only a single string,
! // use string.format(...) to format the string in lua.
  
  // C++ Func: void wxLogError(const char *formatString, ...)
--- 321,325 ----
  
  // All of the wxLogXXX functions take only a single string,
! // use string.format(...) to format the string in Lua.
  
  // C++ Func: void wxLogError(const char *formatString, ...)
***************
*** 439,443 ****
  
  %class %delete %noclassinfo %encapsulate wxLogNull, wxLog
!     // NOTE: ALWAYS delete() this when done since lua's gc may not delete it soon enough
      wxLogNull()
  
--- 439,443 ----
  
  %class %delete %noclassinfo %encapsulate wxLogNull, wxLog
!     // NOTE: ALWAYS delete() this when done since Lua's gc may not delete it soon enough
      wxLogNull()
  
***************
*** 691,703 ****
      bool Matches(const wxString &text, int flags = 0) const
  
!     // %override...
 
[truncated message content]