wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/modules/wxbind/src picker.cpp, NONE, 1.1 Makefile, 1.14, 1.15 appframe.cpp, 1.54, 1.55 clipdrag.cpp, 1.46, 1.47 config.cpp, 1.42, 1.43 controls.cpp, 1.66, 1.67 data.cpp, 1.52, 1.53 datetime.cpp, 1.45, 1.46 defsutil.cpp, 1.41, 1.42 dialogs.cpp, 1.47, 1.48 event.cpp, 1.51, 1.52 file.cpp, 1.52, 1.53 gdi.cpp, 1.71, 1.72 geometry.cpp, 1.33, 1.34 grid.cpp, 1.43, 1.44 html.cpp, 1.48, 1.49 image.cpp, 1.45, 1.46 menutool.cpp, 1.45, 1.46 print.cpp, 1.44, 1.45 regex.cpp, 1.34, 1.35 sizer.cpp, 1.38, 1.39 wave.cpp, 1.42, 1.43 windows.cpp, 1.61, 1.62 wx_bind.cpp, 1.107, 1.108 xml.cpp, 1.39, 1.40

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

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

Modified Files:
	Makefile appframe.cpp clipdrag.cpp config.cpp controls.cpp 
	data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp 
	file.cpp gdi.cpp geometry.cpp grid.cpp html.cpp image.cpp 
	menutool.cpp print.cpp regex.cpp sizer.cpp wave.cpp 
	windows.cpp wx_bind.cpp xml.cpp 
Added Files:
	picker.cpp 
Log Message:
Add picker.i for all of the wxPicker controls
Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity.


Index: xml.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** xml.cpp	14 Jun 2007 23:59:47 -0000	1.39
--- xml.cpp	17 Jun 2007 18:36:27 -0000	1.40
***************
*** 501,505 ****
      returns = new wxXmlNode(parent, type, name, content, props, next);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxXmlNode((wxXmlNode *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
--- 501,505 ----
      returns = new wxXmlNode(parent, type, name, content, props, next);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxXmlNode((wxXmlNode *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
***************
*** 528,532 ****
      returns = new wxXmlNode(type, name, content);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxXmlNode((wxXmlNode *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
--- 528,532 ----
      returns = new wxXmlNode(type, name, content);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxXmlNode((wxXmlNode *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
***************
*** 546,550 ****
      returns = new wxXmlNode();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxXmlNode((wxXmlNode *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
--- 546,550 ----
      returns = new wxXmlNode();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxXmlNode((wxXmlNode *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
***************
*** 803,807 ****
      returns = new wxXmlProperty(name, value, next);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxXmlProperty((wxXmlProperty *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns);
--- 803,807 ----
      returns = new wxXmlProperty(name, value, next);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxXmlProperty((wxXmlProperty *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns);
***************
*** 821,825 ****
      returns = new wxXmlProperty();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxXmlProperty((wxXmlProperty *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns);
--- 821,825 ----
      returns = new wxXmlProperty();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxXmlProperty((wxXmlProperty *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxXmlProperty, returns);

Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile	12 Jun 2007 05:03:16 -0000	1.14
--- Makefile	17 Jun 2007 18:36:13 -0000	1.15
***************
*** 78,81 ****
--- 78,82 ----
      ../../../modules/wxbind/src/mdi.cpp \
      ../../../modules/wxbind/src/menutool.cpp \
+     ../../../modules/wxbind/src/picker.cpp \
      ../../../modules/wxbind/src/print.cpp \
      ../../../modules/wxbind/src/regex.cpp \

Index: defsutil.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** defsutil.cpp	14 Jun 2007 23:59:43 -0000	1.41
--- defsutil.cpp	17 Jun 2007 18:36:17 -0000	1.42
***************
*** 337,341 ****
      returns = new wxProcess(parent, nId);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxProcess((wxProcess *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxProcess, returns);
--- 337,341 ----
      returns = new wxProcess(parent, nId);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxProcess((wxProcess *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxProcess, returns);
***************
*** 756,760 ****
      returns = new wxMouseState();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxMouseState((wxMouseState *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxMouseState, returns);
--- 756,760 ----
      returns = new wxMouseState();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxMouseState((wxMouseState *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxMouseState, returns);
***************
*** 843,847 ****
      returns = new wxBusyCursor(cursor);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxBusyCursor((wxBusyCursor *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxBusyCursor, returns);
--- 843,847 ----
      returns = new wxBusyCursor(cursor);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxBusyCursor((wxBusyCursor *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxBusyCursor, returns);

Index: image.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** image.cpp	14 Jun 2007 23:59:45 -0000	1.45
--- image.cpp	17 Jun 2007 18:36:24 -0000	1.46
***************
*** 2574,2578 ****
      returns = new wxImageHistogram::iterator(self->begin());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxImageHistogram_iterator((wxImageHistogram::iterator *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxImageHistogram_iterator, returns);
--- 2574,2578 ----
      returns = new wxImageHistogram::iterator(self->begin());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxImageHistogram_iterator((wxImageHistogram::iterator *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxImageHistogram_iterator, returns);
***************
*** 2648,2652 ****
      returns = new wxImageHistogram::iterator(self->end());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxImageHistogram_iterator((wxImageHistogram::iterator *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxImageHistogram_iterator, returns);
--- 2648,2652 ----
      returns = new wxImageHistogram::iterator(self->end());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxImageHistogram_iterator((wxImageHistogram::iterator *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxImageHistogram_iterator, returns);
***************
*** 2691,2695 ****
      returns = new wxImageHistogram::iterator(self->find(key));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxImageHistogram_iterator((wxImageHistogram::iterator *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxImageHistogram_iterator, returns);
--- 2691,2695 ----
      returns = new wxImageHistogram::iterator(self->find(key));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxImageHistogram_iterator((wxImageHistogram::iterator *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxImageHistogram_iterator, returns);
***************
*** 3673,3677 ****
      returns = new wxSize(wxArtProvider::GetSizeHint(client, platform_dependent));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 3673,3677 ----
      returns = new wxSize(wxArtProvider::GetSizeHint(client, platform_dependent));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);

--- NEW FILE: picker.cpp ---
// ---------------------------------------------------------------------------
// This file was generated by genwxbind.lua 
//
// Any changes made to this file may be lost when file is regenerated.
// ---------------------------------------------------------------------------

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

#include "wx/wxprec.h"


#ifndef WX_PRECOMP
     #include "wx/wx.h"
#endif

#include "wxlua/include/wxlstate.h"
#include "wxbind/include/wxbind.h"
[...1432 lines suppressed...]
// Map Lua Class Methods to C Binding Functions
wxLuaBindMethod wxFontPickerEvent_methods[] = {
#if ((wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxFont)
    { "GetFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFontPickerEvent_GetFont, 1, NULL },
    { "SetFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFontPickerEvent_SetFont, 1, NULL },
#endif // ((wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)) && (wxLUA_USE_wxFont)

    { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxFontPickerEvent_delete, 1, NULL },

#if ((wxLUA_USE_wxFont) && (wxLUA_USE_wxObject)) && ((wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))
    { "wxFontPickerEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxFontPickerEvent_constructor, 1, NULL },
#endif // ((wxLUA_USE_wxFont) && (wxLUA_USE_wxObject)) && ((wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker))

    { 0, 0, 0, 0 },
};

int wxFontPickerEvent_methodCount = sizeof(wxFontPickerEvent_methods)/sizeof(wxLuaBindMethod) - 1;

#endif  // (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) && (wxchkver_2_8 && wxLUA_USE_wxPicker)


Index: windows.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** windows.cpp	16 Jun 2007 06:21:45 -0000	1.61
--- windows.cpp	17 Jun 2007 18:36:26 -0000	1.62
***************
*** 65,69 ****
      returns = new wxWindowDisabler(winToSkip);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxWindowDisabler((wxWindowDisabler *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxWindowDisabler, returns);
--- 65,69 ----
      returns = new wxWindowDisabler(winToSkip);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxWindowDisabler((wxWindowDisabler *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxWindowDisabler, returns);
***************
*** 452,456 ****
      returns = new wxPoint(self->ClientToScreen(*pt));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
--- 452,456 ----
      returns = new wxPoint(self->ClientToScreen(*pt));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
***************
*** 523,527 ****
      returns = new wxSize(self->ConvertDialogToPixels(*sz));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 523,527 ----
      returns = new wxSize(self->ConvertDialogToPixels(*sz));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 546,550 ****
      returns = new wxPoint(self->ConvertDialogToPixels(*pt));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
--- 546,550 ----
      returns = new wxPoint(self->ConvertDialogToPixels(*pt));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
***************
*** 569,573 ****
      returns = new wxSize(self->ConvertPixelsToDialog(*sz));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 569,573 ----
      returns = new wxSize(self->ConvertPixelsToDialog(*sz));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 592,596 ****
      returns = new wxPoint(self->ConvertPixelsToDialog(*pt));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
--- 592,596 ----
      returns = new wxPoint(self->ConvertPixelsToDialog(*pt));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
***************
*** 925,929 ****
      returns = new wxSize(self->GetAdjustedBestSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 925,929 ----
      returns = new wxSize(self->GetAdjustedBestSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 992,996 ****
      returns = new wxSize(self->GetBestFittingSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 992,996 ----
      returns = new wxSize(self->GetBestFittingSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 1013,1017 ****
      returns = new wxSize(self->GetBestSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 1013,1017 ----
      returns = new wxSize(self->GetBestSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 1132,1136 ****
      returns = new wxSize(self->GetClientSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 1132,1136 ----
      returns = new wxSize(self->GetClientSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 1460,1464 ****
      returns = new wxSize(self->GetMaxSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 1460,1464 ----
      returns = new wxSize(self->GetMaxSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 1481,1485 ****
      returns = new wxSize(self->GetMinSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 1481,1485 ----
      returns = new wxSize(self->GetMinSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 1542,1546 ****
      returns = new wxPoint(self->GetPosition());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
--- 1542,1546 ----
      returns = new wxPoint(self->GetPosition());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
***************
*** 1589,1593 ****
      returns = new wxRect(self->GetRect());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxRect((wxRect *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
--- 1589,1593 ----
      returns = new wxRect(self->GetRect());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxRect((wxRect *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
***************
*** 1610,1614 ****
      returns = new wxPoint(self->GetScreenPosition());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
--- 1610,1614 ----
      returns = new wxPoint(self->GetScreenPosition());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
***************
*** 1657,1661 ****
      returns = new wxRect(self->GetScreenRect());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxRect((wxRect *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
--- 1657,1661 ----
      returns = new wxRect(self->GetScreenRect());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxRect((wxRect *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
***************
*** 1742,1746 ****
      returns = new wxSize(self->GetSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 1742,1746 ----
      returns = new wxSize(self->GetSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 1931,1935 ****
      returns = new wxSize(self->GetVirtualSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 1931,1935 ----
      returns = new wxSize(self->GetVirtualSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 2652,2656 ****
      returns = new wxPoint(self->ScreenToClient(*pt));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
--- 2652,2656 ----
      returns = new wxPoint(self->ScreenToClient(*pt));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
***************
*** 5149,5153 ****
      returns = new wxSize(self->CalcSizeFromPage(*sizePage));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 5149,5153 ----
      returns = new wxSize(self->CalcSizeFromPage(*sizePage));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 8161,8165 ****
      returns = new wxSize(self->GetSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 8161,8165 ----
      returns = new wxSize(self->GetSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 8374,8378 ****
      returns = new wxRect(self->GetRect());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxRect((wxRect *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
--- 8374,8378 ----
      returns = new wxRect(self->GetRect());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxRect((wxRect *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
***************
*** 8511,8515 ****
      returns = new wxRect(self->GetDragRect());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxRect((wxRect *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
--- 8511,8515 ----
      returns = new wxRect(self->GetDragRect());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxRect((wxRect *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxRect, returns);

Index: grid.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** grid.cpp	14 Jun 2007 23:59:45 -0000	1.43
--- grid.cpp	17 Jun 2007 18:36:20 -0000	1.44
***************
*** 132,136 ****
      returns = new wxSize(self->GetBestSize(*grid, *attr, *dc, row, col));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 132,136 ----
      returns = new wxSize(self->GetBestSize(*grid, *attr, *dc, row, col));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 3569,3573 ****
      returns = new wxRect(self->BlockToDeviceRect(*topLeft, *bottomRight));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxRect((wxRect *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
--- 3569,3573 ----
      returns = new wxRect(self->BlockToDeviceRect(*topLeft, *bottomRight));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxRect((wxRect *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
***************
*** 3688,3692 ****
      returns = new wxRect(self->CellToRect(row, col));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxRect((wxRect *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
--- 3688,3692 ----
      returns = new wxRect(self->CellToRect(row, col));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxRect((wxRect *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
***************
*** 7505,7509 ****
      returns = new wxPoint(self->GetPosition());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
--- 7505,7509 ----
      returns = new wxPoint(self->GetPosition());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
***************
*** 7741,7745 ****
      returns = new wxPoint(self->GetPosition());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
--- 7741,7745 ----
      returns = new wxPoint(self->GetPosition());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
***************
*** 7934,7938 ****
      returns = new wxGridCellCoords(self->GetBottomRightCoords());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxGridCellCoords((wxGridCellCoords *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellCoords, returns);
--- 7934,7938 ----
      returns = new wxGridCellCoords(self->GetBottomRightCoords());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxGridCellCoords((wxGridCellCoords *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellCoords, returns);
***************
*** 8009,8013 ****
      returns = new wxGridCellCoords(self->GetTopLeftCoords());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxGridCellCoords((wxGridCellCoords *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellCoords, returns);
--- 8009,8013 ----
      returns = new wxGridCellCoords(self->GetTopLeftCoords());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxGridCellCoords((wxGridCellCoords *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxGridCellCoords, returns);

Index: file.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** file.cpp	14 Jun 2007 23:59:44 -0000	1.52
--- file.cpp	17 Jun 2007 18:36:19 -0000	1.53
***************
*** 224,228 ****
      returns = new wxPathList();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxPathList((wxPathList *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxPathList, returns);
--- 224,228 ----
      returns = new wxPathList();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxPathList((wxPathList *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxPathList, returns);
***************
*** 627,631 ****
      returns = new wxFileName(wxFileName::DirName(dir));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxFileName((wxFileName *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxFileName, returns);
--- 627,631 ----
      returns = new wxFileName(wxFileName::DirName(dir));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxFileName((wxFileName *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxFileName, returns);
***************
*** 684,688 ****
      returns = new wxFileName(wxFileName::FileName(file));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxFileName((wxFileName *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxFileName, returns);
--- 684,688 ----
      returns = new wxFileName(wxFileName::FileName(file));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxFileName((wxFileName *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxFileName, returns);
***************
*** 927,931 ****
      returns = new wxDateTime(self->GetModificationTime());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxDateTime((wxDateTime *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDateTime, returns);
--- 927,931 ----
      returns = new wxDateTime(self->GetModificationTime());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxDateTime((wxDateTime *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxDateTime, returns);
***************
*** 1071,1075 ****
      returns = new wxULongLong(self->GetSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxULongLong((wxULongLong *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxULongLong, returns);
--- 1071,1075 ----
      returns = new wxULongLong(self->GetSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxULongLong((wxULongLong *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxULongLong, returns);
***************
*** 1097,1103 ****
      returns = self->GetTimes(dtAccess, dtMod, dtCreate);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)dtAccess, new wxObject_wxDateTime(dtAccess));
!     wxlState.AddTrackedObject((long)dtMod, new wxObject_wxDateTime(dtMod));
!     wxlState.AddTrackedObject((long)dtCreate, new wxObject_wxDateTime(dtCreate));
      // push the constructed class pointers
      wxlState.PushUserDataType(s_wxluatag_wxDateTime, dtAccess);
--- 1097,1103 ----
      returns = self->GetTimes(dtAccess, dtMod, dtCreate);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)dtAccess, new wxLua_wxObject_wxDateTime(dtAccess));
!     wxlState.AddTrackedObject((long)dtMod, new wxLua_wxObject_wxDateTime(dtMod));
!     wxlState.AddTrackedObject((long)dtCreate, new wxLua_wxObject_wxDateTime(dtCreate));
      // push the constructed class pointers
      wxlState.PushUserDataType(s_wxluatag_wxDateTime, dtAccess);
***************
*** 1981,1985 ****
      returns = new wxFileName(volume, path, name, ext, format);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxFileName((wxFileName *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxFileName, returns);
--- 1981,1985 ----
      returns = new wxFileName(volume, path, name, ext, format);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxFileName((wxFileName *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxFileName, returns);
***************
*** 2008,2012 ****
      returns = new wxFileName(path, name, format);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxFileName((wxFileName *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxFileName, returns);
--- 2008,2012 ----
      returns = new wxFileName(path, name, format);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxFileName((wxFileName *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxFileName, returns);
***************
*** 2033,2037 ****
      returns = new wxFileName(fullpath, format);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxFileName((wxFileName *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxFileName, returns);
--- 2033,2037 ----
      returns = new wxFileName(fullpath, format);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxFileName((wxFileName *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxFileName, returns);
***************
*** 2054,2058 ****
      returns = new wxFileName(*filename);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxFileName((wxFileName *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxFileName, returns);
--- 2054,2058 ----
      returns = new wxFileName(*filename);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxFileName((wxFileName *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxFileName, returns);
***************
*** 2072,2076 ****
      returns = new wxFileName();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxFileName((wxFileName *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxFileName, returns);
--- 2072,2076 ----
      returns = new wxFileName();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxFileName((wxFileName *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxFileName, returns);
***************
*** 2806,2810 ****
      returns = new wxFile(filename, mode);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxFile((wxFile *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxFile, returns);
--- 2806,2810 ----
      returns = new wxFile(filename, mode);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxFile((wxFile *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxFile, returns);
***************
*** 2824,2828 ****
      returns = new wxFile();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxFile((wxFile *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxFile, returns);
--- 2824,2828 ----
      returns = new wxFile();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxFile((wxFile *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxFile, returns);
***************
*** 3114,3118 ****
      returns = new wxTempFile(strName);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxTempFile((wxTempFile *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxTempFile, returns);
--- 3114,3118 ----
      returns = new wxTempFile(strName);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxTempFile((wxTempFile *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxTempFile, returns);
***************
*** 3132,3136 ****
      returns = new wxTempFile();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxTempFile((wxTempFile *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxTempFile, returns);
--- 3132,3136 ----
      returns = new wxTempFile();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxTempFile((wxTempFile *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxTempFile, returns);
***************
*** 3355,3359 ****
      returns = new wxULongLong(wxDir::GetTotalSize(dir));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxULongLong((wxULongLong *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxULongLong, returns);
--- 3355,3359 ----
      returns = new wxULongLong(wxDir::GetTotalSize(dir));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxULongLong((wxULongLong *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxULongLong, returns);
***************
*** 3476,3480 ****
      returns = new wxDir(dir);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxDir((wxDir *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxDir, returns);
--- 3476,3480 ----
      returns = new wxDir(dir);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxDir((wxDir *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxDir, returns);
***************
*** 3494,3498 ****
      returns = new wxDir();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxDir((wxDir *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxDir, returns);
--- 3494,3498 ----
      returns = new wxDir();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxDir((wxDir *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxDir, returns);

Index: data.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** data.cpp	14 Jun 2007 23:59:43 -0000	1.52
--- data.cpp	17 Jun 2007 18:36:15 -0000	1.53
***************
*** 68,72 ****
      returns = new wxString(str);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxString(returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxString, returns);
--- 68,72 ----
      returns = new wxString(str);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxString(returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxString, returns);
***************
*** 2288,2292 ****
      returns = new wxArrayInt(array);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxArrayInt((wxArrayInt *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxArrayInt, returns);
--- 2288,2292 ----
      returns = new wxArrayInt(array);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxArrayInt((wxArrayInt *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxArrayInt, returns);
***************
*** 2306,2310 ****
      returns = new wxArrayInt();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxArrayInt((wxArrayInt *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxArrayInt, returns);
--- 2306,2310 ----
      returns = new wxArrayInt();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxArrayInt((wxArrayInt *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxArrayInt, returns);
***************
*** 2683,2687 ****
      returns = new wxArrayString(array);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxArrayString((wxArrayString *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxArrayString, returns);
--- 2683,2687 ----
      returns = new wxArrayString(array);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxArrayString((wxArrayString *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxArrayString, returns);
***************
*** 2701,2705 ****
      returns = new wxArrayString();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxArrayString((wxArrayString *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxArrayString, returns);
--- 2701,2705 ----
      returns = new wxArrayString();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxArrayString((wxArrayString *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxArrayString, returns);
***************
*** 2800,2804 ****
      returns = new wxSortedArrayString(src);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSortedArrayString((wxSortedArrayString *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxSortedArrayString, returns);
--- 2800,2804 ----
      returns = new wxSortedArrayString(src);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSortedArrayString((wxSortedArrayString *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxSortedArrayString, returns);
***************
*** 2821,2825 ****
      returns = new wxSortedArrayString(src);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSortedArrayString((wxSortedArrayString *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxSortedArrayString, returns);
--- 2821,2825 ----
      returns = new wxSortedArrayString(src);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSortedArrayString((wxSortedArrayString *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxSortedArrayString, returns);
***************
*** 2839,2843 ****
      returns = new wxSortedArrayString();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSortedArrayString((wxSortedArrayString *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxSortedArrayString, returns);
--- 2839,2843 ----
      returns = new wxSortedArrayString();
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSortedArrayString((wxSortedArrayString *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxSortedArrayString, returns);
***************
*** 2908,2912 ****
      returns = new wxLongLong(self->Abs());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxLongLong((wxLongLong *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxLongLong, returns);
--- 2908,2912 ----
      returns = new wxLongLong(self->Abs());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxLongLong((wxLongLong *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxLongLong, returns);
***************
*** 3059,3063 ****
      returns = new wxLongLong(hi, lo);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxLongLong((wxLongLong *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxLongLong, returns);
--- 3059,3063 ----
      returns = new wxLongLong(hi, lo);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxLongLong((wxLongLong *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxLongLong, returns);
***************
*** 3203,3207 ****
      returns = new wxULongLong(hi, lo);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxULongLong((wxULongLong *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxULongLong, returns);
--- 3203,3207 ----
      returns = new wxULongLong(hi, lo);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxULongLong((wxULongLong *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxULongLong, returns);

Index: controls.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** controls.cpp	16 Jun 2007 06:21:43 -0000	1.66
--- controls.cpp	17 Jun 2007 18:36:15 -0000	1.67
***************
*** 86,90 ****
      returns = new wxSize(wxButton::GetDefaultSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 86,90 ----
      returns = new wxSize(wxButton::GetDefaultSize());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 3778,3782 ****
      returns = new wxSize(self->GetItemSpacing());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
--- 3778,3782 ----
      returns = new wxSize(self->GetItemSpacing());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSize((wxSize *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxSize, returns);
***************
*** 3955,3959 ****
      returns = new wxRect(self->GetViewRect());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxRect((wxRect *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
--- 3955,3959 ----
      returns = new wxRect(self->GetViewRect());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxRect((wxRect *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
***************
*** 5125,5129 ****
      returns = new wxListItemAttr(*colText, *colBack, *font);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxListItemAttr((wxListItemAttr *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxListItemAttr, returns);
--- 5125,5129 ----
      returns = new wxListItemAttr(*colText, *colBack, *font);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxListItemAttr((wxListItemAttr *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxListItemAttr, returns);
***************
*** 6043,6047 ****
      returns = new wxPoint(self->GetPoint());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
--- 6043,6047 ----
      returns = new wxPoint(self->GetPoint());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
***************
*** 10192,10196 ****
      returns = new wxTextAttr(*colText, *colBack, *font, alignment);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxTextAttr((wxTextAttr *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxTextAttr, returns);
--- 10192,10196 ----
      returns = new wxTextAttr(*colText, *colBack, *font, alignment);
      // add to tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxTextAttr((wxTextAttr *)returns));
      // push the constructed class pointer
      wxlState.PushUserDataType(s_wxluatag_wxTextAttr, returns);
***************
*** 10307,10311 ****
      returns = new wxTreeItemId(self->AddRoot(text, image, selImage, data));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxTreeItemId((wxTreeItemId *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns);
--- 10307,10311 ----
      returns = new wxTreeItemId(self->AddRoot(text, image, selImage, data));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxTreeItemId((wxTreeItemId *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns);
***************
*** 10340,10344 ****
      returns = new wxTreeItemId(self->AppendItem(*parent, text, image, selImage, data));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxTreeItemId((wxTreeItemId *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns);
--- 10340,10344 ----
      returns = new wxTreeItemId(self->AppendItem(*parent, text, image, selImage, data));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxTreeItemId((wxTreeItemId *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns);
***************
*** 10677,10681 ****
      returns = new wxTreeItemId(self->GetFirstChild(*item, cookie));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxTreeItemId(returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns);
--- 10677,10681 ----
      returns = new wxTreeItemId(self->GetFirstChild(*item, cookie));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxTreeItemId(returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns);
***************
*** 10705,10709 ****
      returns = new wxTreeItemId(self->GetFirstVisibleItem());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxTreeItemId((wxTreeItemId *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns);
--- 10705,10709 ----
      returns = new wxTreeItemId(self->GetFirstVisibleItem());
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxTreeItemId((wxTreeItemId *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns);
***************
*** 10868,10872 ****
      returns = new wxTreeItemId(self->GetItemParent(*item));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxTreeItemId((wxTreeItemId *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns);
--- 10868,10872 ----
      returns = new wxTreeItemId(self->GetItemParent(*item));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxTreeItemId((wxTreeItemId *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns);
***************
*** 10940,10944 ****
      returns = new wxTreeItemId(self->GetLastChild(*item));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxTreeItemId((wxTreeItemId *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns);
--- 10940,10944 ----
      returns = new wxTreeItemId(self->GetLastChild(*item));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxTreeItemId((wxTreeItemId *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns);
***************
*** 10971,10975 ****
      returns = new wxTreeItemId(self->GetNextChild(*item, cookie));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxTreeItemId(returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns);
--- 10971,10975 ----
      returns = new wxTreeItemId(self->GetNextChild(*item, cookie));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxL...
 
[truncated message content]

[Wxlua-commit] wxLua/modules/wxlua/include wxlbind.h,1.52,1.53

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12639/wxLua/modules/wxlua/include

Modified Files:
	wxlbind.h 
Log Message:
Add picker.i for all of the wxPicker controls
Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity.


Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** wxlbind.h	16 Jun 2007 06:21:45 -0000	1.52
--- wxlbind.h	17 Jun 2007 18:36:28 -0000	1.53
***************
*** 286,301 ****
  
  #define wxLUA_DECLARE_ENCAPSULATION(IMPEXPSYMBOL, className, objName) \
! class IMPEXPSYMBOL wxObject_##objName : public wxObject \
  { \
  public: \
!     wxObject_##objName(className *p_##objName) : m_p##objName(p_##objName) {} \
!     ~wxObject_##objName(); \
      className *m_p##objName; \
!     DECLARE_ABSTRACT_CLASS(wxObject_##objName) \
  };
  
  #define wxLUA_IMPLEMENT_ENCAPSULATION(className, objName) \
! IMPLEMENT_ABSTRACT_CLASS(wxObject_##objName, wxObject) \
! wxObject_##objName::~wxObject_##objName() \
  { \
      delete m_p##objName; \
--- 286,302 ----
  
  #define wxLUA_DECLARE_ENCAPSULATION(IMPEXPSYMBOL, className, objName) \
! class IMPEXPSYMBOL wxLua_wxObject_##objName : public wxObject \
  { \
  public: \
!     wxLua_wxObject_##objName(className *p_##objName) : m_p##objName(p_##objName) {} \
!     ~wxLua_wxObject_##objName(); \
      className *m_p##objName; \
!     DECLARE_ABSTRACT_CLASS(wxLua_wxObject_##objName) \
  };
  
+ // we may not have fully defined the class/object in header so delete it in src.
  #define wxLUA_IMPLEMENT_ENCAPSULATION(className, objName) \
! IMPLEMENT_ABSTRACT_CLASS(wxLua_wxObject_##objName, wxObject) \
! wxLua_wxObject_##objName::~wxLua_wxObject_##objName() \
  { \
      delete m_p##objName; \

[Wxlua-commit] wxLua/modules/wxbindstc/src stc.cpp,1.41,1.42

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

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

Modified Files:
	stc.cpp 
Log Message:
Add picker.i for all of the wxPicker controls
Change WXLUA_DECLARE_ENCAPSULATION to prepend wxLua_ to it for clarity.


Index: stc.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** stc.cpp	14 Jun 2007 23:59:48 -0000	1.41
--- stc.cpp	17 Jun 2007 18:36:28 -0000	1.42
***************
*** 4700,4704 ****
      returns = new wxPoint(self->PointFromPosition(pos));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);
--- 4700,4704 ----
      returns = new wxPoint(self->PointFromPosition(pos));
      // add the new object to the tracked memory list
!     wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxPoint((wxPoint *)returns));
      // push the result datatype
      wxlState.PushUserDataType(s_wxluatag_wxPoint, returns);

[Wxlua-commit] wxLua/bindings genidocs_rules.lua, NONE, 1.1 Makefile, 1.3, 1.4 genidocs.lua, 1.6, 1.7

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

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

Modified Files:
	Makefile genidocs.lua 
Added Files:
	genidocs_rules.lua 
Log Message:
Cleanup in the bindings file, make comments more uniform for wxluaref.html
Make the genidocs.lua nicer, better colors and have it use it's own rules file.
  It can be used to generate a generic ref manual for any bindings now.


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	14 Jun 2007 01:23:07 -0000	1.3
--- Makefile	17 Jun 2007 17:17:36 -0000	1.4
***************
*** 40,44 ****
  
  genidocs:
! 	@($(LUA) -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genidocs.lua)
  
  
--- 40,44 ----
  
  genidocs:
! 	@($(LUA) -e"rulesFilename=\"genidocs_rules.lua\"" genidocs.lua)
  
  

--- NEW FILE: genidocs_rules.lua ---
-------------------------------------------------------------------------------
-- Rules to build the wxWidgets reference for wxLua
--  load using : $lua -e"rulesFilename=\"rules.lua\"" genidocs.lua
-------------------------------------------------------------------------------

-------------------------------------------------------------------------------
-- Set the root directory of the wxLua distribution, used only in this file
wxlua_dir = "../"

--=============================================================================
-- Set the output filename for the generated html
output_filename = wxlua_dir.."/docs/wxluaref.html"

--=============================================================================
-- A list of interface files to use to make the bindings. These files will be
--   converted into a html file and placed in the output_filepath directory.
--   The files are loaded from the file_path.
interface_fileTable =
{
    {
        ["namespace"] = "wx",
        ["file_path"] = "wxwidgets",
        ["prepend_name"] = "wxwidgets/",
        ["datatypes_filename"] = "wx_datatypes.lua",
        ["files"] = {
            "appframe.i",
            "clipdrag.i",
            "config.i",
            "controls.i",
            "data.i",
            "datetime.i",
            "defsutil.i",
            "dialogs.i",
            "event.i",
            "file.i",
            "gdi.i",
            "geometry.i",
            "grid.i",
            "help.i",
            "html.i",
            "image.i",
            "mdi.i",
            "menutool.i",
            "print.i",
            "regex.i",
            "sizer.i",
            "socket.i",
            "thread.i",
            "wave.i",
            "windows.i",
            "wxlua.i",
            "xml.i"
        }
    },
    {
        ["namespace"] = "wxstc",
        ["file_path"] = "wxstc",
        ["prepend_name"] = "wxstc/",
        ["datatypes_filename"] = "wxstc_datatypes.lua",
        ["files"] = {
            "stc.i"
        }
    },
    {
        ["namespace"] = "wxlua",
        ["file_path"] = "wxlua",
        ["prepend_name"] = "wxlua/",
        ["datatypes_filename"] = "wxlua_datatypes.lua",
        ["files"] = {
            "wxlua.i"
        }
    },
    {
        ["namespace"] = "wxlua",
        ["file_path"] = "wxluasocket",
        ["prepend_name"] = "wxluasocket/",
        ["datatypes_filename"] = "wxluasocket_datatypes.lua",
        ["files"] = {
            "wxluasocket.i"
        }
    }
}

--=============================================================================
-- A list of files that contain class names only that should be a complete
-- list of all classes that could be wrapped.
-- This will be mixed in with the classes in the interface files to explicitly
-- show what is and isn't wrapped.
completeClassRefFileTable = { "wxwidgets/wxclassref.txt" }

-- If you specify the complete list above, name the col that will be checked
-- if the class wrapped by lua in in the complete list
completeClassRefColLabel = "In wxWidgets Manual"

-- A message to append to the class name in the index for classes.
msgForClassInIndex = {
    ["wxArray"]             = "Not a real class, see implementations (wxArrayInt)",
    ["wxArrayInt"]          = "Interchangeable with a numeric indexed lua table",
    ["wxArrayString"]       = "Interchangeable with a numeric indexed lua table",
    ["wxCmdLineParser"]     = "Easier to implement in lua",
    ["wxCSConv"]            = "Lua uses ANSI 8-bit strings",
    ["wxDirTraverser"]      = "Use wxDir::GetFirst() and GetNext()",
    ["wxHashMap"]           = "Lua tables are hash tables",
    ["wxHashSet"]           = "Lua tables are hash tables",
    ["wxHashTable"]         = "Lua tables are hash tables",
    ["wxMBConv"]            = "Lua uses ANSI 8-bit strings",
    ["wxMBConvFile"]        = "Lua uses ANSI 8-bit strings",
    ["wxMBConvUTF16"]       = "Lua uses ANSI 8-bit strings",
    ["wxMBConvUTF32"]       = "Lua uses ANSI 8-bit strings",
    ["wxMBConvUTF7"]        = "Lua uses ANSI 8-bit strings",
    ["wxMBConvUTF8"]        = "Lua uses ANSI 8-bit strings",
    ["wxModule"]            = "Useable in C++ only",
    ["wxRealPoint"]         = "Not used anywhere in wxWidgets",
    ["wxRecursionGuard"]    = "Easier to implement in lua",
    ["wxRecursionGuardFlag"]= "Easier to implement in lua",
    ["wxScopedArray"]       = "Useable in C++ only (unnecessary in lua)",
    ["wxScopedPtr"]         = "Useable in C++ only (unnecessary in lua)",
    ["wxScopedTiedPtr"]     = "Useable in C++ only (unnecessary in lua)",
    ["wxSortedArrayString"] = "Interchangeable with a numeric indexed lua table",
    ["wxString"]            = "Interchangeable with a lua string",
    ["wxStringBuffer"]      = "Useable in C++ only (unnecessary in lua)",
    ["wxStringBufferLength"]= "Useable in C++ only (unnecessary in lua)",
    ["wxVariant"]           = "Unnecessary in lua",
    ["wxVariantData"]       = "Unnecessary in lua",
}

--=============================================================================
-- The HTML header for the generated file.
htmlHeader = [[
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
    <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
    <title>wxLua Reference Manual</title>
    <meta content="John Labenski" name="author">
</head>
<body>

<h1>wxLua 2.8.4.0 Reference Manual for wxWidgets 2.8.4</h1>
]]


Index: genidocs.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs.lua,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** genidocs.lua	14 Jun 2007 01:23:07 -0000	1.6
--- genidocs.lua	17 Jun 2007 17:17:36 -0000	1.7
***************
*** 8,12 ****
  -------------------------------------------------------------------------------
  
! wxWidgetsClassRefTable = {} -- a list of wx classes from the alphabetical class list
  
  typedefTable          = {} -- filled from the data cache files
--- 8,16 ----
  -------------------------------------------------------------------------------
  
! completeClassRefTable = nil -- a table of names that is a complete list of classes
!                             -- from a library the wrapper are for
!                             -- For wxWidgets this is taken from the alphabetical
!                             -- list of classes in the wxWidgets reference manual
!                             -- This is used to print if a class is wrapped or not.
  
  typedefTable          = {} -- filled from the data cache files
***************
*** 16,31 ****
  colours = {}
  
! colours.class    = "AA0000"
! colours.prop     = "000077"
! colours.member   = "005577"
! colours.rename   = "CC0033"
! colours.override = "CC3300"
! colours.overload = "CC3333"
! colours.operator = "550077"
  
! colours.enum     = "007700"
! colours.define   = "007755"
! colours.event    = "557700"
  
  
  -- ----------------------------------------------------------------------------
--- 20,36 ----
  colours = {}
  
! colours.class    = "DD0000" -- red
! colours.member   = "CC6600" -- orange
! colours.rename   = "990099" -- dark pink
! colours.override = "BB0055" -- reddish pink
! colours.operator = "663300" -- brown
  
! colours.enum     = "0066CC" -- blue
! colours.define   = "006666" -- turquoise
! colours.event    = "660033" -- purple
! colours.func     = "AA0000" -- dark red
  
+ colours.comment    = "009900" -- green
+ colours.blkcomment = "888888" -- grey
  
  -- ----------------------------------------------------------------------------
***************
*** 42,55 ****
      table.insert(fileTable, "<h2>Colours used to denote types</h2>")
  
      table.insert(fileTable, MakeColour("Enums - %enum", colours.enum).."<br>")
!     table.insert(fileTable, MakeColour("Defines - %define [%string] [%object] [%pointer]", colours.define).."<br>")
!     table.insert(fileTable, MakeColour("Events - %define %event", colours.event).."<br>")
  
      table.insert(fileTable, MakeColour("Classes - %class", colours.class).."<br>")
-     table.insert(fileTable, MakeColour("Class Properties - %property", colours.prop).."<br>")
      table.insert(fileTable, MakeColour("Class Members - %member", colours.member).."<br>")
      table.insert(fileTable, MakeColour("Renamed Functions - %rename", colours.rename).."<br>")
      table.insert(fileTable, MakeColour("Overridden Functions - %override", colours.override).."<br>")
-     table.insert(fileTable, MakeColour("Overloaded Functions - %overload", colours.overload).."<br>")
      table.insert(fileTable, MakeColour("Operator Functions - %operator", colours.operator).."<br><br>")
  end
--- 47,62 ----
      table.insert(fileTable, "<h2>Colours used to denote types</h2>")
  
+     table.insert(fileTable, MakeColour("Comments - //", colours.comment).."<br>")
+     table.insert(fileTable, MakeColour("Block Comments - /* ... */", colours.blkcomment).."<br>")
+ 
      table.insert(fileTable, MakeColour("Enums - %enum", colours.enum).."<br>")
!     table.insert(fileTable, MakeColour("Defines - %define [_string] [_object] [_pointer]", colours.define).."<br>")
!     table.insert(fileTable, MakeColour("Events - %define_event", colours.event).."<br>")
!     table.insert(fileTable, MakeColour("Functions - %function", colours.func).."<br>")
  
      table.insert(fileTable, MakeColour("Classes - %class", colours.class).."<br>")
      table.insert(fileTable, MakeColour("Class Members - %member", colours.member).."<br>")
      table.insert(fileTable, MakeColour("Renamed Functions - %rename", colours.rename).."<br>")
      table.insert(fileTable, MakeColour("Overridden Functions - %override", colours.override).."<br>")
      table.insert(fileTable, MakeColour("Operator Functions - %operator", colours.operator).."<br><br>")
  end
***************
*** 60,98 ****
  -- ----------------------------------------------------------------------------
  
! function MakeColour(name, color) -- color is "RRGGBB" in hex
!     return "<font color=#"..color..">"..name.."</font>"
  end
! function MakeBold(name)
!     return "<b>"..name.."</b>"
  end
! function MakeItalic(name)
!     return "<i>"..name.."</i>"
  end
! function MakeLink(name)
      --<a href="#papers">papers</a>
!     return "<a href=\"#"..name.."\">"..name.."</a>"
  end
! function MakeTag(name)
      --<a name="papers">Papers</a>
!     return "<b><a name=\""..name.."\">"..name.."</a></b>"
  end
  
! -- ----------------------------------------------------------------------------
! -- Make the HTML header
! -- ----------------------------------------------------------------------------
! 
! function GenerateHeader(fileTable)
!     table.insert(fileTable, "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">")
!     table.insert(fileTable, "<html>")
!     table.insert(fileTable, "<head>")
!     table.insert(fileTable, "<meta content=\"text/html; charset=ISO-8859-1\" http-equiv=\"content-type\">")
!     table.insert(fileTable, "<title>wxLua Class Reference</title>")
!     table.insert(fileTable, "<meta content=\"John Labenski\" name=\"author\">")
!     table.insert(fileTable, "</head>")
!     table.insert(fileTable, "<body>")
! 
!     table.insert(fileTable, "<h1>wxLua 2.8.4.0 Class Reference for wxWidgets 2.8.4</h1>")
  
!     return fileTable
  end
  
--- 67,109 ----
  -- ----------------------------------------------------------------------------
  
! -- color is "RRGGBB" in hex
! function MakeColour(str, color, size)
!     if size then
!         return "<font size=+"..size.." color=#"..color..">"..str.."</font>"
!     end
! 
!     return "<font color=#"..color..">"..str.."</font>"
  end
! function MakeBold(str)
!     return "<b>"..str.."</b>"
  end
! function MakeItalic(str)
!     return "<i>"..str.."</i>"
  end
! function MakeLink(link_name, str)
      --<a href="#papers">papers</a>
!     return "<a href=\"#"..link_name.."\">"..(str or link_name).."</a>"
  end
! function MakeTag(link_name, str)
      --<a name="papers">Papers</a>
!     return "<a name=\""..link_name.."\">"..(str or link_name).."</a>"
  end
  
! -- convert invalid chars to something valid for use in <a name=...
! function MakeTagName(name)
!     local s = string.lower(name)
!     s = string.gsub(s, "%/", "_")
!     s = string.gsub(s, "% ", "_")
!     s = string.gsub(s, "%(", "_")
!     s = string.gsub(s, "%)", "_")
!     return s
! end
  
! -- replace any chars as necessary before adding our own code
! function MakeHTML(str)
!     local s = string.gsub(str, "&", "&amp;")
!     s = string.gsub(s, ">", "&gt;")
!     s = string.gsub(s, "<", "&lt;")
!     return s
  end
  
***************
*** 115,124 ****
      local names = {}
  
!     table.insert(fileTable, "<h2>wxWidgets Classes</h2>")
  
      local allClasses = {}
  
!     for k, v in pairs(wxWidgetsClassRefTable) do
!         allClasses[k] = false -- wxWidgets classes
      end
      for k, v in pairs(dataTypeTable) do
--- 126,137 ----
      local names = {}
  
!     table.insert(fileTable, "<h2>Classes</h2>")
  
      local allClasses = {}
  
!     if completeClassRefTable then
!         for k, v in pairs(completeClassRefTable) do
!             allClasses[k] = false -- for example ALL wxWidgets classes
!         end
      end
      for k, v in pairs(dataTypeTable) do
***************
*** 133,147 ****
      end
      table.sort(names)
-     for n = 1, #names do
-         local cname = names[n]
  
!         if allClasses[cname] then
!             if wxWidgetsClassRefTable[cname] then
!                 table.insert(fileTable, MakeLink(cname).."<br>")
              else
!                 table.insert(fileTable, MakeLink(cname).." - (Not in wxWidgets reference manual)<br>")
              end
!         else
!             table.insert(fileTable, cname.." - (Not wrapped)<br>")
          end
      end
--- 146,198 ----
      end
      table.sort(names)
  
!     --[[
!     <table border="1">
!         <tr>  <td>row 1, cell 1</td>  <td>row 1, cell 2</td> </tr>
!         <tr>  <td>row 2, cell 1</td>  <td>row 2, cell 2</td> </tr>
!     </table>
!     ]]
! 
!     if completeClassRefTable then
! 
!         table.insert(fileTable, "<table border=\"1\">")
!         table.insert(fileTable, "  <tr><th>Class Name</th> <th>"..completeClassRefColLabel.."</th> <th>Wrapped by wxLua</th> <th>Notes</th></tr>")
! 
!         for n = 1, #names do
!             local cname = names[n]
! 
!             table.insert(fileTable, "<tr>")
! 
!             if allClasses[cname] then
!                 table.insert(fileTable, "<td>"..MakeLink(cname)) -- optional </td>
              else
!                 table.insert(fileTable, "<td>"..cname)
              end
! 
!             if completeClassRefTable and completeClassRefTable[cname] then
!                 table.insert(fileTable, "<td align=\"center\">X")
!             else
!                 table.insert(fileTable, "<td>&nbsp;")
!             end
! 
!             if allClasses[cname] then
!                 table.insert(fileTable, "<td align=\"center\">X")
!             else
!                 table.insert(fileTable, "<td>&nbsp;")
!             end
! 
!             if msgForClassInIndex and msgForClassInIndex[cname] then
!                 table.insert(fileTable, "<td>"..msgForClassInIndex[cname])
!             else
!                 table.insert(fileTable, "<td>&nbsp;")
!             end
! 
!             -- table.insert(fileTable, "</tr>") -- optional </tr>
!         end
! 
!         table.insert(fileTable, "</table><br>")
!     else
!         for n = 1, #names do
!             table.insert(fileTable, MakeLink(names[n]).."<br>")
          end
      end
***************
*** 159,163 ****
      local names = {}
  
!     table.insert(fileTable, "<h2>wxWidgets Enums</h2>")
  
      for k, v in pairs(dataTypeTable) do
--- 210,214 ----
      local names = {}
  
!     table.insert(fileTable, "<h2>Enums</h2>")
  
      for k, v in pairs(dataTypeTable) do
***************
*** 189,199 ****
  function GetPreviousWord(str, pos)
      local start_pos = 0
      for n = pos, 0, -1 do
          if not nameChars[string.byte(str, n)] then
!             start_pos = n+1
!             break
          end
      end
!     return string.sub(str, start_pos, pos), start_pos
  end
  
--- 240,255 ----
  function GetPreviousWord(str, pos)
      local start_pos = 0
+     local end_pos = 0
      for n = pos, 0, -1 do
          if not nameChars[string.byte(str, n)] then
!             if end_pos ~= 0 then
!                 start_pos = n+1
!                 break
!             end
!         elseif end_pos == 0 then
!             end_pos = n
          end
      end
!     return string.sub(str, start_pos, end_pos), start_pos
  end
  
***************
*** 207,260 ****
  end
  
- -- ----------------------------------------------------------------------------
- -- Read the .i files and convert them to HTML
- -- ----------------------------------------------------------------------------
  
! function InterfaceFileNameToTag(name)
!     local s = name
!     s = string.gsub(s, "%.%./wxstc/", "wxstc_")
!     s = string.gsub(s, "%.%./wxlua/", "wxlua_")
!     s = string.gsub(s, "%.%./wxluasocket/", "wxluasocket_")
!     if not string.find(s, "_", 1, 1) then s = "wxwidgets_"..s end
!     s = string.gsub(s, "%.", "_")
  
!     return s
  end
  
  function ReadInterfaceFiles(fileTable)
  
      table.insert(fileTable, "<h2>Interface files</h2>")
  
!     local idx = 0
!     while interface_fileTable[idx+1] do
!         idx = idx + 1
!         local s = InterfaceFileNameToTag(interface_fileTable[idx])
! 
!         table.insert(fileTable, MakeLink(s).."<br>")
! 
      end
  
      local strSp = string.byte(" ")
  
!     local idx = 0
!     while interface_fileTable[idx+1] do
!         idx = idx + 1
  
          table.insert(fileTable, "<br><HR>\n")
!         table.insert(fileTable, "<h2>"..MakeTag(InterfaceFileNameToTag(interface_fileTable[idx])).."</h2>")
  
-         local filename = interface_filepath.."/"..interface_fileTable[idx]
          for line in io.lines(filename) do
              local cname = ""
!             local out_line = line
  
              local comment_pos = string.find(line, "//", 1, 1) or 1E6
-             local class_pos   = string.find(line, "%class", 1, 1)
-             local enum_pos    = string.find(line, "%enum", 1, 1)
  
!             local start_block = false
!             local end_block   = false
  
!             if (class_pos and class_pos < comment_pos) or (enum_pos and enum_pos < comment_pos) then
                  start_block = true
  
--- 263,351 ----
  end
  
  
! function GetAllComments(str)
!     local function FindAllStrings(str, find_txt, tbl)
!         local s, e = string.find(str, find_txt, 1, 1)
!         while s do
!             table.insert(tbl, { ["s"] = s, ["e"] = e, ["txt"] = find_txt })
!             s, e = string.find(str, find_txt, e+1, 1)
!         end
!     end
  
!     local t = {}
!     FindAllStrings(str, "//", t)
!     FindAllStrings(str, "/*", t)
!     FindAllStrings(str, "*/", t)
! 
!     table.sort(t, function(t1, t2) return t1.s < t2.s end)
! 
!     return t
  end
  
+ -- ----------------------------------------------------------------------------
+ -- Read the .i files and convert them to HTML
+ -- ----------------------------------------------------------------------------
+ 
  function ReadInterfaceFiles(fileTable)
  
      table.insert(fileTable, "<h2>Interface files</h2>")
  
!     for i = 1, #interface_fileTable do
!         for j = 1, #interface_fileTable[i].files do
!             local s = interface_fileTable[i].prepend_name..interface_fileTable[i].files[j]
!             table.insert(fileTable, MakeLink(MakeTagName(s), s).."<br>")
!         end
      end
  
      local strSp = string.byte(" ")
  
!     for i = 1, #interface_fileTable do
!     for j = 1, #interface_fileTable[i].files do
  
          table.insert(fileTable, "<br><HR>\n")
!         local filename = interface_fileTable[i].prepend_name..interface_fileTable[i].files[j]
!         table.insert(fileTable, "<h2>"..MakeTag(MakeTagName(filename), filename).."</h2>")
!         table.insert(fileTable, "<HR>\n")
! 
!         local in_blk_comment = false
! 
!         local line_n = 0
  
          for line in io.lines(filename) do
+             line_n = line_n + 1
              local cname = ""
!             local out_line = MakeHTML(line)
  
              local comment_pos = string.find(line, "//", 1, 1) or 1E6
  
!             -- handle all comments in the order they appear
!             local t = GetAllComments(out_line)
!             for n = 1, #t do
!                 if t[n].txt == "//" then
!                     out_line = string.sub(out_line, 1, t[n].s-1)..MakeColour(string.sub(out_line, t[n].s), colours.comment)
!                     break
!                 elseif t[n].txt == "/*" then
!                     if in_blk_comment then print("ERROR mismatched /* */ in :", filename, line_n, line) end
  
!                     in_blk_comment = true
!                     out_line = string.sub(out_line, 1, t[n].s-1).."<font color=#"..colours.blkcomment..">"..string.sub(out_line, t[n].s)
!                 elseif t[n].txt == "*/" then
!                     if not in_blk_comment then print("ERROR mismatched /* */ in :", filename, line_n, line) end
!                     in_blk_comment = false
!                     out_line = string.sub(out_line, 1, t[n].s-1).."</font>"..string.sub(out_line, t[n].s)
!                 end
!             end
! 
!             local class_pos, class_pos2   = string.find(line, "%class", 1, 1)
!             local enum_pos,  enum_pos2    = string.find(line, "%enum", 1, 1)
! 
!             if not class_pos then
!                 class_pos, class_pos2   = string.find(line, "%struct", 1, 1)
!             end
! 
!             local start_block = nil
!             local end_block   = nil
! 
!             if (class_pos and (class_pos < comment_pos)) or (enum_pos and (enum_pos < comment_pos)) then
                  start_block = true
  
***************
*** 262,275 ****
                  local comma = string.find(line, ",", 1, 1)
                  local start_pos = 0
!                 if comma then
                      cname, start_pos = GetPreviousWord(line, comma-1)
                  else
                      cname, start_pos = GetPreviousWord(line, string.len(line))
                  end
  
!                 out_line = "<font size=+1>"..string.sub(out_line, 1, start_pos-1)..MakeTag(cname)..string.sub(out_line, start_pos+string.len(cname)).."</font>"
  
!                 if class_pos then out_line = MakeColour(out_line, colours.class) end
!                 if enum_pos then out_line = "<font color=#"..colours.enum..">"..out_line end
              else
                  -- priortize the colouring so we don't have to check for every single case
--- 353,378 ----
                  local comma = string.find(line, ",", 1, 1)
                  local start_pos = 0
!                 if class_pos and comma then
                      cname, start_pos = GetPreviousWord(line, comma-1)
+                 elseif comment_pos < 1E6 then
+                     cname, start_pos = GetPreviousWord(line, comment_pos-1)
                  else
                      cname, start_pos = GetPreviousWord(line, string.len(line))
                  end
  
!                 if cname == "enum" then
!                     out_line = string.sub(out_line, 1, start_pos-1)..cname..string.sub(out_line, start_pos+string.len(cname))
!                 else
!                     out_line = string.sub(out_line, 1, start_pos-1)..MakeTag(cname)..string.sub(out_line, start_pos+string.len(cname))
!                 end
  
!                 if class_pos then
!                     out_line = MakeColour(out_line, colours.class, 1)
!                 end
!                 if enum_pos then
!                     out_line = MakeColour(out_line, colours.enum, 1)
!                 end
! 
!                 out_line = MakeBold(out_line)
              else
                  -- priortize the colouring so we don't have to check for every single case
***************
*** 278,290 ****
                      out_line = MakeColour(out_line, colours.class)
                      end_block = true
                  elseif TagIsBefore(line, "%endenum", comment_pos)  then
-                     out_line = out_line.."</font>"
                      end_block = true
!                 elseif TagIsBefore(line, "%property", comment_pos) then
!                     out_line = MakeColour(out_line, colours.prop)
                  elseif TagIsBefore(line, "%member", comment_pos) then
                      out_line = MakeColour(out_line, colours.member)
-                 elseif TagIsBefore(line, "%overload", comment_pos) then
-                     out_line = MakeColour(out_line, colours.overload)
                  elseif TagIsBefore(line, "%rename", comment_pos) then
                      out_line = MakeColour(out_line, colours.rename)
--- 381,394 ----
                      out_line = MakeColour(out_line, colours.class)
                      end_block = true
+                     class_pos = string.find(line, "%endclass", 1, 1)
+                 elseif TagIsBefore(line, "%endstruct", comment_pos)  then
+                     out_line = MakeColour(out_line, colours.class)
+                     end_block = true
+                     class_pos = string.find(line, "%endstruct", 1, 1)
                  elseif TagIsBefore(line, "%endenum", comment_pos)  then
                      end_block = true
!                     enum_pos = string.find(line, "%endenum", 1, 1)
                  elseif TagIsBefore(line, "%member", comment_pos) then
                      out_line = MakeColour(out_line, colours.member)
                  elseif TagIsBefore(line, "%rename", comment_pos) then
                      out_line = MakeColour(out_line, colours.rename)
***************
*** 295,298 ****
--- 399,404 ----
                  elseif TagIsBefore(line, "%define", comment_pos) then
                      out_line = MakeColour(out_line, colours.define)
+                 elseif TagIsBefore(line, "%function", comment_pos) then
+                     out_line = MakeColour(out_line, colours.func)
                  end
              end
***************
*** 306,310 ****
--- 412,418 ----
                      dataTypeTable[w] and (dataTypeTable[w].DefType ~= "number") and
                      (dataTypeTable[w].DefType ~= "wxtypedef") and (dataTypeTable[w].DefType ~= "special") then
+ 
                      used[w] = true
+ 
                      -- replace the classname with a link, but not if it's part of a name
                      --out_line = string.gsub(out_line, w, MakeLink(w))
***************
*** 323,327 ****
              out_line = string.gsub(out_line, "(%%[%w_]+)", function(s) return "<i>"..s.."</i>" end)
  
! --[[        -- alternate to blockquote, just force the spaces
              local start_spaces = 0
  
--- 431,436 ----
              out_line = string.gsub(out_line, "(%%[%w_]+)", function(s) return "<i>"..s.."</i>" end)
  
! --[[
!             -- alternate to blockquote, just force the spaces
              local start_spaces = 0
  
***************
*** 341,354 ****
  
              if start_block then
!                 tail = "" -- don't add extra space
!                 out_line = out_line.."<blockquote>"
              elseif end_block then
!                 out_line = "</blockquote>"..out_line
              end
  
              table.insert(fileTable, out_line..tail)
- 
          end
! 
      end
  end
--- 450,486 ----
  
              if start_block then
!                 tail = "" -- don't add extra space since blockquote already gives a linebreak
! 
!                 if in_blk_comment then
!                     out_line = out_line.."</font>"
!                 end
! 
!                 out_line = out_line.."\n<blockquote>"
! 
!                 -- need to restart font color after blockquote for "tidy"
!                 if enum_pos then
!                     out_line = out_line.."<font color=#"..colours.enum..">"
!                 end
!                 -- restart the block comment after blockquote, overrides enum colour
!                 if in_blk_comment then
!                     out_line = out_line.."<font color=#"..colours.blkcomment..">"
!                 end
              elseif end_block then
!                 -- need to restart font color after blockquote for "tidy"
!                 if class_pos then
!                     out_line = "</blockquote>"..MakeColour(out_line, colours.class)
!                 end
!                 if enum_pos then
!                     out_line = "</font>\n</blockquote>"..MakeColour(out_line, colours.enum)
!                 end
!                 -- restart the block comment after blockquote
!                 if in_blk_comment then
!                     out_line = "</font>"..out_line.."<font color=#"..colours.blkcomment..">"
!                 end
              end
  
              table.insert(fileTable, out_line..tail)
          end
!     end
      end
  end
***************
*** 358,369 ****
  -- ----------------------------------------------------------------------------
  
! function LoadwxClassRef()
!     for line in io.lines(interface_filepath.."/".."wxclassref.txt") do
!         for w in string.gmatch(line, "([%w_]+)") do
!             wxWidgetsClassRefTable[w] = true
          end
      end
  end
  
  -- ----------------------------------------------------------------------------
  -- main()
--- 490,548 ----
  -- ----------------------------------------------------------------------------
  
! function LoadCompleteClassRef(filePath)
!     for line in io.lines(filePath) do
!         -- only create this if necessary
!         if not completeClassRefTable then completeClassRefTable = {} end
! 
!         for w in string.gmatch(line, "([%w_]+)") do -- strip spaces if any
!             completeClassRefTable[w] = true
          end
      end
  end
  
+ -- ---------------------------------------------------------------------------
+ -- Do the contents of the file match the strings in the fileData table?
+ --   the table may contain any number of \n per index
+ --   returns true for a match or false if not
+ -- ---------------------------------------------------------------------------
+ function FileDataIsTableData(filename, fileData)
+     local file_handle = io.open(filename)
+     if not file_handle then return false end -- ok if it doesn't exist
+ 
+     local f = file_handle:read("*a")
+     local is_same = (f == table.concat(fileData, "\n"))
+     io.close(file_handle)
+     return is_same
+ end
+ 
+ -- ---------------------------------------------------------------------------
+ -- Write the contents of the table fileData (indexes 1.. are line numbers)
+ --  to the filename, but only write to the file if FileDataIsTableData returns
+ --  false. If overwrite_always is true then always overwrite the file.
+ --  returns true if the file was overwritten
+ -- ---------------------------------------------------------------------------
+ function WriteTableToFile(filename, fileData, overwrite_always)
+     assert(filename and fileData, "Invalid filename or fileData in WriteTableToFile")
+ 
+     if (not overwrite_always) and FileDataIsTableData(filename, fileData) then
+         print("No changes to file : '"..filename.."'")
+         return false
+     end
+ 
+     print("Updating file : '"..filename.."'")
+ 
+     local outfile = io.open(filename, "w+")
+     if not outfile then
+         print("Unable to open file for writing '"..filename.."'.")
+         return
+     end
+ 
+     outfile:write(table.concat(fileData, "\n"))
+ 
+     outfile:flush()
+     outfile:close()
+     return true
+ end
+ 
  -- ----------------------------------------------------------------------------
  -- main()
***************
*** 377,416 ****
      end
  
!     local rules = loadfile(rulesFilename)
      if rules then
          rules()
!         --print("loaded rules file: "..rulesFilename)
      end
  
!     -- FIXME - hack to add wxSTC and other bindings
!     table.insert(interface_fileTable, "../wxstc/stc.i")
!     table.insert(interface_fileTable, "../wxlua/wxlua.i")
!     table.insert(interface_fileTable, "../wxluasocket/wxluasocket.i")
! 
!     local datatypes_file = loadfile(interface_filepath.."/"..datatypes_cache_output_filename)
!     if datatypes_file then
!         datatypes_file()
!         --print("loaded data types file: "..datatypes_cache_output_filename)
      end
  
      dataTypeTable["wxString"].DefType = "class" -- FIXME hack for wxString DefType as "special"
  
!     -- load any cached settings from other wrappers
!     if datatype_cache_input_fileTable then
!         for key, filename in pairs(datatype_cache_input_fileTable) do
!             if FileExists(filename) then
!                 local cache = loadfile(filename)
!                 cache() -- run loaded file
!             else
!                 assert(false, "unable to load datatypes cache file: "..filename)
!             end
          end
      end
  
! 
!     LoadwxClassRef()
! 
!     fileTable = {}
!     GenerateHeader(fileTable)
      GenerateClassReference(fileTable)
      table.insert(fileTable, "<HR>")
--- 556,590 ----
      end
  
!     local rules = loadfile("./"..rulesFilename)
      if rules then
          rules()
!         print("Loaded rules file: "..rulesFilename)
!     else
!         print("ERROR : unable to load rules file: "..rulesFilename)
!         print("This could mean that either the file cannot be found or there is an error in it.")
!         print("The rules file should be valid lua code, try running it with lua directly.")
      end
  
!     for n = 1, #interface_fileTable do
!         local datatypes_filename = interface_fileTable[n].file_path.."/"..interface_fileTable[n].datatypes_filename
!         local datatypes_file = loadfile(datatypes_filename)
!         if datatypes_file then
!             datatypes_file()
!             print("Loaded data types file: "..datatypes_filename)
!         else
!             print("WARNING: unable to load data types file: "..datatypes_filename)
!         end
      end
  
      dataTypeTable["wxString"].DefType = "class" -- FIXME hack for wxString DefType as "special"
  
!     if completeClassRefFileTable then
!         for n = 1, #completeClassRefFileTable do
!             LoadCompleteClassRef(completeClassRefFileTable[n])
!             print("Loaded complete class reference : "..completeClassRefFileTable[n])
          end
      end
  
!     fileTable = { htmlHeader }
      GenerateClassReference(fileTable)
      table.insert(fileTable, "<HR>")
***************
*** 422,428 ****
      GenerateFooter(fileTable)
  
!     for n = 1, #fileTable do
!         print(fileTable[n])
!     end
  
  end
--- 596,602 ----
      GenerateFooter(fileTable)
  
! 
!     WriteTableToFile(output_filename , fileTable)
!     --for n = 1, #fileTable do print(fileTable[n]) end
  
  end

[Wxlua-commit] wxLua/bindings/wxluasocket wxluasocket.i,1.12,1.13

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

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

Modified Files:
	wxluasocket.i 
Log Message:
Cleanup in the bindings file, make comments more uniform for wxluaref.html
Make the genidocs.lua nicer, better colors and have it use it's own rules file.
  It can be used to generate a generic ref manual for any bindings now.


Index: wxluasocket.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/wxluasocket.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wxluasocket.i	14 Jun 2007 01:23:07 -0000	1.12
--- wxluasocket.i	17 Jun 2007 17:17:36 -0000	1.13
***************
*** 1,3 ****
! // ============================================================================
  // Purpose:     wxLuaSocket specific wrappers
  // Author:      J Winwood, John Labenski
--- 1,3 ----
! // ===========================================================================
  // Purpose:     wxLuaSocket specific wrappers
  // Author:      J Winwood, John Labenski
***************
*** 6,10 ****
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ============================================================================
  
  %include "wx/defs.h"
--- 6,10 ----
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ===========================================================================
  
  %include "wx/defs.h"
***************
*** 21,25 ****
  %function void LuaStackDialog()
  
! //-----------------------------------------------------------------------------
  // wxLuaDebugServer
  
--- 21,25 ----
  %function void LuaStackDialog()
  
! // ---------------------------------------------------------------------------
  // wxLuaDebugServer
  
***************
*** 54,58 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxLuaDebugData
  
--- 54,58 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxLuaDebugData
  
***************
*** 60,64 ****
  //%endclass
  
! //-----------------------------------------------------------------------------
  // wxLuaDebuggerEvent
  
--- 60,64 ----
  //%endclass
  
! // ---------------------------------------------------------------------------
  // wxLuaDebuggerEvent
  

[Wxlua-commit] wxLua/bindings/wxlua wxlua.i,1.3,1.4

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

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

Modified Files:
	wxlua.i 
Log Message:
Cleanup in the bindings file, make comments more uniform for wxluaref.html
Make the genidocs.lua nicer, better colors and have it use it's own rules file.
  It can be used to generate a generic ref manual for any bindings now.


Index: wxlua.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/wxlua.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxlua.i	16 Jun 2007 06:21:42 -0000	1.3
--- wxlua.i	17 Jun 2007 17:17:36 -0000	1.4
***************
*** 1,3 ****
! // ============================================================================
  // Purpose:     wxLua specific wrappers
  // Author:      J Winwood, John Labenski
--- 1,3 ----
! // ===========================================================================
  // Purpose:     wxLua specific wrappers
  // Author:      J Winwood, John Labenski
***************
*** 6,12 ****
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ============================================================================
  
! //-----------------------------------------------------------------------------
  // Compile the luaScript of the given name and return the lua error code, a message
  // and the line number (or -1) of the error.
--- 6,12 ----
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ===========================================================================
  
! // ---------------------------------------------------------------------------
  // Compile the luaScript of the given name and return the lua error code, a message
  // and the line number (or -1) of the error.
***************
*** 14,18 ****
  %function int CompileLuaScript(const wxString& luaScript, const wxString& fileName)
  
! //-----------------------------------------------------------------------------
  // Get information about the status of wxLua.
  //
--- 14,18 ----
  %function int CompileLuaScript(const wxString& luaScript, const wxString& fileName)
  
! // ---------------------------------------------------------------------------
  // Get information about the status of wxLua.
  //
***************
*** 38,42 ****
  %function LuaTable GetTrackedWindows()
  
! //-----------------------------------------------------------------------------
  // Type information about the bindings or current userdata
  
--- 38,42 ----
  %function LuaTable GetTrackedWindows()
  
! // ---------------------------------------------------------------------------
  // Type information about the bindings or current userdata
  
***************
*** 99,103 ****
  %function int wxlua_type(void* object)
  
! //-----------------------------------------------------------------------------
  // wxLuaBinding - This is NOT wrapped, but implemented in wxlbind.cpp
  
--- 99,103 ----
  %function int wxlua_type(void* object)
  
! // ---------------------------------------------------------------------------
  // wxLuaBinding - This is NOT wrapped, but implemented in wxlbind.cpp
  
***************
*** 179,183 ****
  
  
! //-----------------------------------------------------------------------------
  // wxLuaState
  
--- 179,183 ----
  
  
! // ---------------------------------------------------------------------------
  // wxLuaState
  
***************
*** 208,212 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxLuaObject - Allows Lua data items to be used for wxClientData.
  
--- 208,212 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxLuaObject - Allows Lua data items to be used for wxClientData.
  

[Wxlua-commit] wxLua/docs FAQ.html, 1.1, 1.2 wxluaref.html, 1.24, 1.25

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

Update of /cvsroot/wxlua/wxLua/docs
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14496/wxLua/docs

Modified Files:
	FAQ.html wxluaref.html 
Log Message:
Cleanup in the bindings file, make comments more uniform for wxluaref.html
Make the genidocs.lua nicer, better colors and have it use it's own rules file.
  It can be used to generate a generic ref manual for any bindings now.


Index: wxluaref.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** wxluaref.html	16 Jun 2007 06:21:43 -0000	1.24
--- wxluaref.html	17 Jun 2007 17:17:38 -0000	1.25
***************
*** 2,565 ****
  <html>
  <head>
! <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
! <title>wxLua Class Reference</title>
! <meta content="John Labenski" name="author">
  </head>
  <body>
! <h1>wxLua 2.8.4.0 Class Reference for wxWidgets 2.8.4</h1>
! <h2>wxWidgets Classes</h2>
! <a href="#wxANIHandler">wxANIHandler</a> - (Not in wxWidgets reference manual)<br>
[...36762 lines suppressed...]
! <font color=#006666>    <i>%define_event</i> wxEVT_WXLUA_DEBUGGER_TABLE_ENUM               <font color=#009900>// EVT_WXLUA_DEBUGGER_TABLE_ENUM(id, fn)</font></font><br>
! <font color=#006666>    <i>%define_event</i> wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR            <font color=#009900>// EVT_WXLUA_DEBUGGER_EVALUATE_EXPR(id, fn)</font></font><br>
  <br>
      int GetLineNumber() const<br>
***************
*** 18379,18384 ****
      <a href="#wxString">wxString</a> GetFileName() const<br>
      <a href="#wxString">wxString</a> GetMessage() const<br>
!     //const wxLuaDebugData GetDebugData() const<br>
! </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  </body>
! </html>
--- 21809,21814 ----
      <a href="#wxString">wxString</a> GetFileName() const<br>
      <a href="#wxString">wxString</a> GetMessage() const<br>
!     <font color=#009900>//const wxLuaDebugData GetDebugData() const</font><br>
! </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br>
  </body>
! </html>
\ No newline at end of file

Index: FAQ.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/FAQ.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FAQ.html	16 Jun 2007 06:21:43 -0000	1.1
--- FAQ.html	17 Jun 2007 17:17:38 -0000	1.2
***************
*** 3,7 ****
  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua FAQ</title> 
  <meta content="John Labenski" name="author"></head>
- 
  <body><h2><u>wxLua
  FAQ</u></h2>
--- 3,6 ----
***************
*** 12,16 ****
  I use wxLua as script interpreter embedded in my own C++ applications?</a></li>
  </ol> <li><a href="#Programming_in_wxLua">Programming
! in wxLua</a></li><ol><li><a href="#wxStrings">wxStrings?</a></li><li><a href="#wxArrayString_and_wxSortedArrayString">wxArrayString and wxSortedArrayString?</a></li><li><a href="#wxArrayInt">wxArrayInt?</a></li><li><a href="#When_and_how_should_you_delete_objects">When and how should you delete objects?</a></li></ol>
  </ol><hr size="2" width="100%">
  <ol> <li> <h3><a name="Why_wxLua"></a>Why
--- 11,15 ----
  I use wxLua as script interpreter embedded in my own C++ applications?</a></li>
  </ol> <li><a href="#Programming_in_wxLua">Programming
! in wxLua</a></li><ol><li><a href="#wxStrings">wxStrings?</a></li><li><a href="#wxArrayString_and_wxSortedArrayString">wxArrayString and wxSortedArrayString?</a></li><li><a href="#wxArrayInt">wxArrayInt?</a></li><li><a href="#When_and_how_should_you_delete_objects">When and how should you delete() objects?</a></li><li><a href="#Why_do_the_samples_use_the_function">Why do the samples use the function main() is it special to wxLua?</a></li></ol>
  </ol><hr size="2" width="100%">
  <ol> <li> <h3><a name="Why_wxLua"></a>Why
***************
*** 49,53 ****
  that return wxArrayStrings or wxSortedArrayStrings will return a
  wxArrayString or wxSortedArrayString unless specified otherwise in
! wxluaref.html</li></ul><li><h4><a name="wxArrayInt"></a>wxArrayInt?</h4></li><ul><li>All functions that take a wxArrayInt can also take a numerically indexed table of numbers.</li><li>Functions that return wxArrayInts will return a wxArrayInt unless specified otherwise in wxluaref.html.</li></ul><li><h4><a name="When_and_how_should_you_delete_objects"></a>When and how should you delete objects?</h4></li><ul><li>You should read the section "C++ Classes
  CLASS_NAME" in the "Programming in wxLua" in the wxlua.html manual.</li><li>In
  short, all objects that you create that deal with graphics should be
--- 48,52 ----
  that return wxArrayStrings or wxSortedArrayStrings will return a
  wxArrayString or wxSortedArrayString unless specified otherwise in
! wxluaref.html</li></ul><li><h4><a name="wxArrayInt"></a>wxArrayInt?</h4></li><ul><li>All functions that take a wxArrayInt can also take a numerically indexed table of numbers.</li><li>Functions that return wxArrayInts will return a wxArrayInt unless specified otherwise in wxluaref.html.</li></ul><li><h4><a name="When_and_how_should_you_delete_objects"></a>When and how should you delete() objects?</h4></li><ul><li>You should read the section "C++ Classes
  CLASS_NAME" in the "Programming in wxLua" in the wxlua.html manual.</li><li>In
  short, all objects that you create that deal with graphics should be
***************
*** 58,61 ****
  the function "table = wxlua.GetTrackedUserdata()" to get a table of
  items that are tracked and occasionally print them out while developing
! a program. </li></ul></ol><ol><ol>
  </ol></ol><ul> </ul> </ol></body></html>
\ No newline at end of file
--- 57,64 ----
  the function "table = wxlua.GetTrackedUserdata()" to get a table of
  items that are tracked and occasionally print them out while developing
! a program.</li></ul><li><h4><a name="Why_do_the_samples_use_the_function"></a>Why do the samples use the function main() is it special to wxLua?</h4></li><ul><li>There's nothing special about the function main() other than that it's a common name for an entry point into a program.</li><li>It
! is often helpful and a good idea to encapsulate the program
! initialization code within a function so that you can use local
! variables and not pollute the global table with temporary variables
! that won't be needed again.</li><li>Additionally, it allows you to break out of this initialization code at any point by putting <span style="font-style: italic;">"do return end"</span> inside of the function for debugging, as opposed to wrapping parts you don't want using <span style="font-style: italic;">"if false then ... end"</span>.</li></ul></ol><ol><ol>
  </ol></ol><ul> </ul> </ol></body></html>
\ No newline at end of file

[Wxlua-commit] wxLua/bindings/wxwidgets Makefile, 1.8, 1.9 appframe.i, 1.38, 1.39 clipdrag.i, 1.27, 1.28 config.i, 1.22, 1.23 controls.i, 1.39, 1.40 data.i, 1.33, 1.34 datetime.i, 1.29, 1.30 defsutil.i, 1.43, 1.44 dialogs.i, 1.33, 1.34 event.i, 1.26, 1.27 file.i, 1.24, 1.25 fl.i, 1.9, 1.10 gdi.i, 1.52, 1.53 geometry.i, 1.9, 1.10 grid.i, 1.15, 1.16 help.i, 1.17, 1.18 html.i, 1.23, 1.24 image.i, 1.27, 1.28 mdi.i, 1.15, 1.16 menutool.i, 1.20, 1.21 print.i, 1.18, 1.19 regex.i, 1.9, 1.10 sizer.i, 1.13, 1.14 socket.i, 1.17, 1.18 thread.i, 1.5, 1.6 wave.i, 1.18, 1.19 windows.i, 1.41, 1.42 wxclassref.txt, 1.1, 1.2 wxlua.i, 1.26, 1.27 xml.i, 1.12, 1.13

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

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

Modified Files:
	Makefile appframe.i clipdrag.i config.i controls.i data.i 
	datetime.i defsutil.i dialogs.i event.i file.i fl.i gdi.i 
	geometry.i grid.i help.i html.i image.i mdi.i menutool.i 
	print.i regex.i sizer.i socket.i thread.i wave.i windows.i 
	wxclassref.txt wxlua.i xml.i 
Log Message:
Cleanup in the bindings file, make comments more uniform for wxluaref.html
Make the genidocs.lua nicer, better colors and have it use it's own rules file.
  It can be used to generate a generic ref manual for any bindings now.


Index: wave.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wave.i	11 Jun 2007 03:57:59 -0000	1.18
--- wave.i	17 Jun 2007 17:17:37 -0000	1.19
***************
*** 1,3 ****
! // ============================================================================
  // Purpose:     wxSound/wxWave
  // Author:      J Winwood, John Labenski
--- 1,3 ----
! // ===========================================================================
  // Purpose:     wxSound/wxWave
  // Author:      J Winwood, John Labenski
***************
*** 6,14 ****
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ============================================================================
  
  %if wxLUA_USE_wxWave
  
! //-----------------------------------------------------------------------------
  //  wxSound
  
--- 6,14 ----
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ===========================================================================
  
  %if wxLUA_USE_wxWave
  
! // ---------------------------------------------------------------------------
  //  wxSound
  
***************
*** 37,41 ****
  %endif // %wxchkver_2_6 & wxUSE_SOUND
  
! //-----------------------------------------------------------------------------
  //  wxWave
  
--- 37,41 ----
  %endif // %wxchkver_2_6 & wxUSE_SOUND
  
! // ---------------------------------------------------------------------------
  //  wxWave
  
***************
*** 58,62 ****
  %endif //wxLUA_USE_wxWave
  
! //-----------------------------------------------------------------------------
  //  wxMediaCtrl
  
--- 58,62 ----
  %endif //wxLUA_USE_wxWave
  
! // ---------------------------------------------------------------------------
  //  wxMediaCtrl
  
***************
*** 112,116 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  //  wxMediaEvent
  
--- 112,116 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  //  wxMediaEvent
  
***************
*** 136,140 ****
  %endif //wxLUA_USE_wxMediaCtrl & wxUSE_MEDIACTRL
  
! //-----------------------------------------------------------------------------
  //  wxJoystick
  
--- 136,140 ----
  %endif //wxLUA_USE_wxMediaCtrl & wxUSE_MEDIACTRL
  
! // ---------------------------------------------------------------------------
  //  wxJoystick
  
***************
*** 202,206 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxJoystickEvent - FIXME add rest of wxJoystick?
  
--- 202,206 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxJoystickEvent - FIXME add rest of wxJoystick?
  

Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	31 May 2007 17:18:46 -0000	1.8
--- Makefile	17 Jun 2007 17:17:36 -0000	1.9
***************
*** 20,26 ****
  	@(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets/error.txt)
  
- genidocs:
- 	@(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genidocs.lua)
- 
  
  # do nothing to clean
--- 20,23 ----

Index: menutool.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** menutool.i	14 Jun 2007 01:23:08 -0000	1.20
--- menutool.i	17 Jun 2007 17:17:37 -0000	1.21
***************
*** 1,3 ****
! // ============================================================================
  // Purpose:     wxMenu and wxToolbar classes
  // Author:      J Winwood, John Labenski
--- 1,3 ----
! // ===========================================================================
  // Purpose:     wxMenu and wxToolbar classes
  // Author:      J Winwood, John Labenski
***************
*** 6,12 ****
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ============================================================================
  
! //-----------------------------------------------------------------------------
  // wxMenu
  
--- 6,12 ----
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ===========================================================================
  
! // ---------------------------------------------------------------------------
  // wxMenu
  
***************
*** 78,82 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxMenuBar
  
--- 78,82 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxMenuBar
  
***************
*** 110,114 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxMenuItem
  
--- 110,114 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxMenuItem
  
***************
*** 152,156 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxMenuItemList
  
--- 152,156 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxMenuItemList
  
***************
*** 162,166 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxMenuEvent
  
--- 162,166 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxMenuEvent
  
***************
*** 180,184 ****
  %endif //wxLUA_USE_wxMenu & wxUSE_MENUS
  
! //-----------------------------------------------------------------------------
  // wxToolBarBase
  
--- 180,184 ----
  %endif //wxLUA_USE_wxMenu & wxUSE_MENUS
  
! // ---------------------------------------------------------------------------
  // wxToolBarBase
  
***************
*** 250,254 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxToolBar
  
--- 250,254 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxToolBar
  
***************
*** 262,266 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxToolBarSimple
  
--- 262,266 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxToolBarSimple
  
***************
*** 279,283 ****
  %endif // !%wxchkver_2_5
  
! //-----------------------------------------------------------------------------
  // wxToolBarToolBase
  
--- 279,283 ----
  %endif // !%wxchkver_2_5
  
! // ---------------------------------------------------------------------------
  // wxToolBarToolBase
  
***************
*** 328,332 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxToolBarTool
  
--- 328,332 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxToolBarTool
  

Index: clipdrag.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** clipdrag.i	11 Jun 2007 03:57:58 -0000	1.27
--- clipdrag.i	17 Jun 2007 17:17:37 -0000	1.28
***************
*** 1,3 ****
! // ============================================================================
  // Purpose:     wxClipboard and drag & drop and their wxDataFormat
  // Author:      J Winwood, John Labenski
--- 1,3 ----
! // ===========================================================================
  // Purpose:     wxClipboard and drag & drop and their wxDataFormat
  // Author:      J Winwood, John Labenski
***************
*** 6,12 ****
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ============================================================================
  
! //-----------------------------------------------------------------------------
  // wxClipboard
  
--- 6,12 ----
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ===========================================================================
  
! // ---------------------------------------------------------------------------
  // wxClipboard
  
***************
*** 33,37 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxClipboardLocker
  
--- 33,37 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxClipboardLocker
  
***************
*** 40,44 ****
  // does in C++.
  
! //-----------------------------------------------------------------------------
  // wxClipboardTextEvent
  
--- 40,44 ----
  // does in C++.
  
! // ---------------------------------------------------------------------------
  // wxClipboardTextEvent
  
***************
*** 60,64 ****
  %endif //wxLUA_USE_wxClipboard & wxUSE_CLIPBOARD
  
! //-----------------------------------------------------------------------------
  // wxDataFormat
  
--- 60,64 ----
  %endif //wxLUA_USE_wxClipboard & wxUSE_CLIPBOARD
  
! // ---------------------------------------------------------------------------
  // wxDataFormat
  
***************
*** 104,108 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxDataObject
  
--- 104,108 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxDataObject
  
***************
*** 133,137 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxDataObjectSimple
  
--- 133,137 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxDataObjectSimple
  
***************
*** 153,157 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxDataObjectComposite
  
--- 153,157 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxDataObjectComposite
  
***************
*** 163,167 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxFileDataObject
  
--- 163,167 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxFileDataObject
  
***************
*** 173,177 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxTextDataObject
  
--- 173,177 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxTextDataObject
  
***************
*** 184,188 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxBitmapDataObject
  
--- 184,188 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxBitmapDataObject
  
***************
*** 194,198 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxCustomDataObject
  
--- 194,198 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxCustomDataObject
  
***************
*** 208,212 ****
  //%endclass
  
! //-----------------------------------------------------------------------------
  // wxURLDataObject - is simply wxTextDataObject with a different name
  
--- 208,212 ----
  //%endclass
  
! // ---------------------------------------------------------------------------
  // wxURLDataObject - is simply wxTextDataObject with a different name
  
***************
*** 224,228 ****
  %endif //wxLUA_USE_wxDataObject & wxUSE_DATAOBJ
  
! //-----------------------------------------------------------------------------
  // wxDropTarget
  
--- 224,228 ----
  %endif //wxLUA_USE_wxDataObject & wxUSE_DATAOBJ
  
! // ---------------------------------------------------------------------------
  // wxDropTarget
  
***************
*** 262,266 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxFileDropTarget
  
--- 262,266 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxFileDropTarget
  
***************
*** 272,276 ****
  //%endclass
  
! //-----------------------------------------------------------------------------
  // wxTextDropTarget
  
--- 272,276 ----
  //%endclass
  
! // ---------------------------------------------------------------------------
  // wxTextDropTarget
  
***************
*** 281,285 ****
  //%endclass
  
! //-----------------------------------------------------------------------------
  // wxDropSource
  
--- 281,285 ----
  //%endclass
  
! // ---------------------------------------------------------------------------
  // wxDropSource
  
***************
*** 297,301 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxDropFilesEvent
  
--- 297,301 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxDropFilesEvent
  
***************
*** 317,321 ****
  %endif //wxLUA_USE_wxDragDrop & wxUSE_DRAG_AND_DROP
  
! //-----------------------------------------------------------------------------
  // wxMetafile
  
--- 317,321 ----
  %endif //wxLUA_USE_wxDragDrop & wxUSE_DRAG_AND_DROP
  
! // ---------------------------------------------------------------------------
  // wxMetafile
  
***************
*** 334,338 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxMetafileDC
  %class %delete %noclassinfo wxMetafileDC, wxDC
--- 334,338 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxMetafileDC
  %class %delete %noclassinfo wxMetafileDC, wxDC

Index: data.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** data.i	14 Jun 2007 23:59:41 -0000	1.33
--- data.i	17 Jun 2007 17:17:37 -0000	1.34
***************
*** 1,3 ****
! // ============================================================================
  // Purpose:     data classes, wxObject, arrays, lists, hash
  // Author:      J Winwood, John Labenski
--- 1,3 ----
! // ===========================================================================
  // Purpose:     data classes, wxObject, arrays, lists, hash
  // Author:      J Winwood, John Labenski
***************
*** 6,13 ****
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ============================================================================
  
! //-----------------------------------------------------------------------------
  // wxString - a stub class for people who need wxString (wxLua uses lua strings)
  
  %class %noclassinfo %encapsulate wxString
--- 6,16 ----
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ===========================================================================
  
! // ---------------------------------------------------------------------------
  // wxString - a stub class for people who need wxString (wxLua uses lua strings)
+ //
+ // NOTE : Any function that takes a wxString can take a lua string. And all
+ //        functions that return wxStrings actually return lua strings.
  
  %class %noclassinfo %encapsulate wxString
***************
*** 18,22 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxClientData
  
--- 21,25 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxClientData
  
***************
*** 32,36 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxStringClientData
  
--- 35,39 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxStringClientData
  
***************
*** 42,46 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxClientDataContainer
  
--- 45,49 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxClientDataContainer
  
***************
*** 56,60 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxObject
  
--- 59,63 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxObject
  
***************
*** 89,93 ****
  %endif //wxLUA_USE_wxObject
  
! //-----------------------------------------------------------------------------
  // wxClassInfo
  
--- 92,96 ----
  %endif //wxLUA_USE_wxObject
  
! // ---------------------------------------------------------------------------
  // wxClassInfo
  
***************
*** 118,122 ****
  %endif //wxLUA_USE_wxClassInfo
  
! //-----------------------------------------------------------------------------
  // wxValidator
  
--- 121,125 ----
  %endif //wxLUA_USE_wxClassInfo
  
! // ---------------------------------------------------------------------------
  // wxValidator
  
***************
*** 139,143 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxTextValidator
  
--- 142,146 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxTextValidator
  
***************
*** 176,180 ****
  %endif //wxLUA_USE_wxTextValidator
  
! //-----------------------------------------------------------------------------
  // wxGenericValidator
  
--- 179,183 ----
  %endif //wxLUA_USE_wxTextValidator
  
! // ---------------------------------------------------------------------------
  // wxGenericValidator
  
***************
*** 211,215 ****
  %endif //wxLUA_USE_wxValidator & wxUSE_VALIDATORS
  
! //-----------------------------------------------------------------------------
  // wxList
  
--- 214,218 ----
  %endif //wxLUA_USE_wxValidator & wxUSE_VALIDATORS
  
! // ---------------------------------------------------------------------------
  // wxList
  
***************
*** 249,253 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxNode - wxList
  
--- 252,256 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxNode - wxList
  
***************
*** 281,286 ****
  %endif //wxLUA_USE_wxList & !wxUSE_STL
  
! //-----------------------------------------------------------------------------
! // wxArray - can't implement, here's the list of generic functions
  
  //%class %noclassinfo wxArray
--- 284,289 ----
  %endif //wxLUA_USE_wxList & !wxUSE_STL
  
! // ---------------------------------------------------------------------------
! // wxArray - can't implement is not really a class, here's the list of generic functions
  
  //%class %noclassinfo wxArray
***************
*** 297,302 ****
  //%endclass
  
! //-----------------------------------------------------------------------------
  // wxArrayInt
  
  %if wxLUA_USE_wxArrayInt
--- 300,308 ----
  //%endclass
  
! // ---------------------------------------------------------------------------
  // wxArrayInt
+ //
+ // NOTE: Any function that takes a "const wxArrayInt& arr" or "wxArrayInt arr"
+ //       can take a lua table of integers with numeric indexes
  
  %if wxLUA_USE_wxArrayInt
***************
*** 327,332 ****
  %endif //wxLUA_USE_wxArrayInt
  
! //-----------------------------------------------------------------------------
  // wxArrayString
  
  %if wxLUA_USE_wxArrayString
--- 333,341 ----
  %endif //wxLUA_USE_wxArrayInt
  
! // ---------------------------------------------------------------------------
  // wxArrayString
+ //
+ // NOTE: Any function that takes a "const wxArrayString& arr" or "wxArrayString arr"
+ //       can take a lua table of strings with numeric indexes
  
  %if wxLUA_USE_wxArrayString
***************
*** 357,363 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxSortedArrayString
! 
  // Note: We cheat by saying that it's derived from a wxArrayString to not
  //       have to duplicate it's methods. The binder doesn't know any better.
--- 366,375 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxSortedArrayString
! //
! // NOTE: Any function that takes a "const wxSortedArrayString& arr" or "wxSortedArrayString arr"
! //       can take a lua table of strings with numeric indexes
! //
  // Note: We cheat by saying that it's derived from a wxArrayString to not
  //       have to duplicate it's methods. The binder doesn't know any better.
***************
*** 372,376 ****
  %endif //wxLUA_USE_wxArrayString
  
! //-----------------------------------------------------------------------------
  // wxStringList - is deprecated in wxWidgets since 2.2
  
--- 384,388 ----
  %endif //wxLUA_USE_wxArrayString
  
! // ---------------------------------------------------------------------------
  // wxStringList - is deprecated in wxWidgets since 2.2
  
***************
*** 387,391 ****
  //%endif wxLUA_USE_wxStringList
  
! //-----------------------------------------------------------------------------
  // wxHashTable - lua tables are hashtables
  
--- 399,403 ----
  //%endif wxLUA_USE_wxStringList
  
! // ---------------------------------------------------------------------------
  // wxHashTable - lua tables are hashtables
  
***************
*** 418,422 ****
  //%endif wxLUA_USE_wxHashTable
  
! //-----------------------------------------------------------------------------
  // wxLongLong - FIXME it's a typedef so %encapsulate fails on class wxLongLong
  //              Works in GCC
--- 430,434 ----
  //%endif wxLUA_USE_wxHashTable
  
! // ---------------------------------------------------------------------------
  // wxLongLong - FIXME it's a typedef so %encapsulate fails on class wxLongLong
  //              Works in GCC
***************
*** 444,448 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxULongLong
  
--- 456,460 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxULongLong
  

Index: print.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** print.i	14 Jun 2007 01:23:09 -0000	1.18
--- print.i	17 Jun 2007 17:17:37 -0000	1.19
***************
*** 1,3 ****
! // ============================================================================
  // Purpose:     printing related classes
  // Author:      J Winwood, John Labenski
--- 1,3 ----
! // ===========================================================================
  // Purpose:     printing related classes
  // Author:      J Winwood, John Labenski
***************
*** 6,10 ****
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ============================================================================
  
  %if wxLUA_USE_wxPrint & wxUSE_PRINTING_ARCHITECTURE
--- 6,10 ----
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ===========================================================================
  
  %if wxLUA_USE_wxPrint & wxUSE_PRINTING_ARCHITECTURE
***************
*** 15,19 ****
  %include "wxbind/include/wxlprint.h"
  
! //-----------------------------------------------------------------------------
  // wxPrintout
  
--- 15,19 ----
  %include "wxbind/include/wxlprint.h"
  
! // ---------------------------------------------------------------------------
  // wxPrintout
  
***************
*** 56,60 ****
  %if wxLUA_USE_wxLuaPrintout
  
! //-----------------------------------------------------------------------------
  // wxPrinter
  
--- 56,60 ----
  %if wxLUA_USE_wxLuaPrintout
  
! // ---------------------------------------------------------------------------
  // wxPrinter
  
***************
*** 81,85 ****
  %endif //wxLUA_USE_wxLuaPrintout
  
! //-----------------------------------------------------------------------------
  // wxPrintData
  
--- 81,85 ----
  %endif //wxLUA_USE_wxLuaPrintout
  
! // ---------------------------------------------------------------------------
  // wxPrintData
  
***************
*** 311,315 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxPageSetupDialogData
  
--- 311,315 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxPageSetupDialogData
  
***************
*** 358,362 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxPageSetupDialog
  
--- 358,362 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxPageSetupDialog
  
***************
*** 372,376 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxPrintDialog
  
--- 372,376 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxPrintDialog
  
***************
*** 384,388 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxPrintDialogData
  
--- 384,388 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxPrintDialogData
  
***************
*** 428,432 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxPreviewCanvas
  
--- 428,432 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxPreviewCanvas
  
***************
*** 436,440 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxPreviewControlBar
  
--- 436,440 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxPreviewControlBar
  
***************
*** 465,469 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxPrintPreview
  %if wxLUA_USE_wxLuaPrintout
--- 465,469 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxPrintPreview
  %if wxLUA_USE_wxLuaPrintout
***************
*** 491,495 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxPreviewFrame
  
--- 491,495 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxPreviewFrame
  
***************
*** 505,509 ****
  %endif //wxLUA_USE_wxLuaPrintout
  
! //-----------------------------------------------------------------------------
  // wxPostScriptDC
  
--- 505,509 ----
  %endif //wxLUA_USE_wxLuaPrintout
  
! // ---------------------------------------------------------------------------
  // wxPostScriptDC
  
***************
*** 521,525 ****
  %endif //wxUSE_POSTSCRIPT
  
! //-----------------------------------------------------------------------------
  // wxPrinterDC
  
--- 521,525 ----
  %endif //wxUSE_POSTSCRIPT
  
! // ---------------------------------------------------------------------------
  // wxPrinterDC
  

Index: file.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** file.i	11 Jun 2007 03:57:59 -0000	1.24
--- file.i	17 Jun 2007 17:17:37 -0000	1.25
***************
*** 1,3 ****
! // ============================================================================
  // Purpose:     wxFile, wxDir, wxFileName and file functions
  // Author:      J Winwood, John Labenski
--- 1,3 ----
! // ===========================================================================
  // Purpose:     wxFile, wxDir, wxFileName and file functions
  // Author:      J Winwood, John Labenski
***************
*** 6,10 ****
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ============================================================================
  
  %include "wx/filefn.h"
--- 6,10 ----
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ===========================================================================
  
  %include "wx/filefn.h"
***************
*** 76,80 ****
  
  
! //-----------------------------------------------------------------------------
  // wxPathList
  
--- 76,80 ----
  
  
! // ---------------------------------------------------------------------------
  // wxPathList
  
***************
*** 101,105 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxFileName
  //    Note: Most of the static methods are not implemented since it is just as
--- 101,105 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxFileName
  //    Note: Most of the static methods are not implemented since it is just as
***************
*** 269,273 ****
  %endif //wxLUA_USE_wxFileName
  
! //-----------------------------------------------------------------------------
  // wxFile
  
--- 269,273 ----
  %endif //wxLUA_USE_wxFileName
  
! // ---------------------------------------------------------------------------
  // wxFile
  
***************
*** 349,353 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxTempFile
  
--- 349,353 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxTempFile
  
***************
*** 384,388 ****
  %endif //wxLUA_USE_wxFile & wxUSE_FILE
  
! //-----------------------------------------------------------------------------
  // wxDir
  
--- 384,388 ----
  %endif //wxLUA_USE_wxFile & wxUSE_FILE
  
! // ---------------------------------------------------------------------------
  // wxDir
  
***************
*** 431,435 ****
  %endif //wxLUA_USE_wxDir
  
! //-----------------------------------------------------------------------------
  //  wxStreamBase
  
--- 431,435 ----
  %endif //wxLUA_USE_wxDir
  
! // ---------------------------------------------------------------------------
  //  wxStreamBase
  
***************
*** 453,457 ****
  %endenum
  
! //-----------------------------------------------------------------------------
  //  wxStreamBase
  
--- 453,457 ----
  %endenum
  
! // ---------------------------------------------------------------------------
  //  wxStreamBase
  
***************
*** 467,471 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  //  wxInputStream
  
--- 467,471 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  //  wxInputStream
  
***************
*** 494,498 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  //  wxOutputStream
  
--- 494,498 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  //  wxOutputStream
  
***************
*** 513,517 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  //  wxFileInputStream
  
--- 513,517 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  //  wxFileInputStream
  
***************
*** 526,530 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  //  wxFileOutputStream
  
--- 526,530 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  //  wxFileOutputStream
  
***************
*** 537,541 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  //  wxDataInputStream
  
--- 537,541 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  //  wxDataInputStream
  
***************
*** 584,588 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  //  wxDataOutputStream
  
--- 584,588 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  //  wxDataOutputStream
  

Index: regex.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/regex.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** regex.i	1 Jun 2007 18:19:46 -0000	1.9
--- regex.i	17 Jun 2007 17:17:37 -0000	1.10
***************
*** 1,3 ****
! // ============================================================================
  // Purpose:     wxRegEx
  // Author:      J Winwood, John Labenski
--- 1,3 ----
! // ===========================================================================
  // Purpose:     wxRegEx
  // Author:      J Winwood, John Labenski
***************
*** 6,12 ****
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ============================================================================
  
! //-----------------------------------------------------------------------------
  //  wxRegEx - Regular expression support
  
--- 6,12 ----
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ===========================================================================
  
! // ---------------------------------------------------------------------------
  //  wxRegEx - Regular expression support
  

Index: dialogs.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** dialogs.i	14 Jun 2007 01:23:08 -0000	1.33
--- dialogs.i	17 Jun 2007 17:17:37 -0000	1.34
***************
*** 1,3 ****
! // ============================================================================
  // Purpose:     wxDialog and all dialog classes and functions
  // Author:      J Winwood, John Labenski
--- 1,3 ----
! // ===========================================================================
  // Purpose:     wxDialog and all dialog classes and functions
  // Author:      J Winwood, John Labenski
***************
*** 6,10 ****
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ============================================================================
  
  
--- 6,10 ----
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ===========================================================================
  
  
***************
*** 45,49 ****
  %endif //%wxchkver_2_8
  
! //-----------------------------------------------------------------------------
  // Dialog functions from wxWidgets functions documentation
  
--- 45,49 ----
  %endif //%wxchkver_2_8
  
! // ---------------------------------------------------------------------------
  // Dialog functions from wxWidgets functions documentation
  
***************
*** 76,80 ****
  // bool wxShowTip(wxWindow *parent, wxTipProvider *tipProvider, bool showAtStartup = true)
  
! //-----------------------------------------------------------------------------
  // wxDialog
  
--- 76,80 ----
  // bool wxShowTip(wxWindow *parent, wxTipProvider *tipProvider, bool showAtStartup = true)
  
! // ---------------------------------------------------------------------------
  // wxDialog
  
***************
*** 120,124 ****
  %endif // wxLUA_USE_wxDialog
  
! //-----------------------------------------------------------------------------
  // wxAboutDialog
  
--- 120,124 ----
  %endif // wxLUA_USE_wxDialog
  
! // ---------------------------------------------------------------------------
  // wxAboutDialog
  
***************
*** 190,194 ****
  %endif //%wxchkver_2_8 & wxUSE_ABOUTDLG & wxLUA_USE_wxAboutDialog
  
! //-----------------------------------------------------------------------------
  // wxColourDialog
  
--- 190,194 ----
  %endif //%wxchkver_2_8 & wxUSE_ABOUTDLG & wxLUA_USE_wxAboutDialog
  
! // ---------------------------------------------------------------------------
  // wxColourDialog
  
***************
*** 205,209 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxColourData
  
--- 205,209 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxColourData
  
***************
*** 224,228 ****
  %endif // wxLUA_USE_wxColourDialog & wxUSE_COLOURDLG
  
! //-----------------------------------------------------------------------------
  // wxFileDialog
  
--- 224,228 ----
  %endif // wxLUA_USE_wxColourDialog & wxUSE_COLOURDLG
  
! // ---------------------------------------------------------------------------
  // wxFileDialog
  
***************
*** 267,271 ****
  %endif //wxLUA_USE_wxFileDialog & wxUSE_FILEDLG
  
! //-----------------------------------------------------------------------------
  // wxDirDialog
  
--- 267,271 ----
  %endif //wxLUA_USE_wxFileDialog & wxUSE_FILEDLG
  
! // ---------------------------------------------------------------------------
  // wxDirDialog
  
***************
*** 293,297 ****
  %endif //wxLUA_USE_wxDirDialog & wxUSE_DIRDLG
  
! //-----------------------------------------------------------------------------
  // wxMessageDialog
  
--- 293,297 ----
  %endif //wxLUA_USE_wxDirDialog & wxUSE_DIRDLG
  
! // ---------------------------------------------------------------------------
  // wxMessageDialog
  
***************
*** 309,313 ****
  %endif //wxLUA_USE_wxMessageDialog & wxUSE_MSGDLG
  
! //-----------------------------------------------------------------------------
  // wxMultiChoiceDialog - use wxGetMultipleChoices
  
--- 309,313 ----
  %endif //wxLUA_USE_wxMessageDialog & wxUSE_MSGDLG
  
! // ---------------------------------------------------------------------------
  // wxMultiChoiceDialog - use wxGetMultipleChoices
  
***************
*** 324,328 ****
  %endif //wxUSE_CHOICEDLG & wxLUA_USE_wxMultiChoiceDialog
  
! //-----------------------------------------------------------------------------
  // wxSingleChoiceDialog - use wxGetSingleChoice or wxGetSingleChoiceIndex
  
--- 324,328 ----
  %endif //wxUSE_CHOICEDLG & wxLUA_USE_wxMultiChoiceDialog
  
! // ---------------------------------------------------------------------------
  // wxSingleChoiceDialog - use wxGetSingleChoice or wxGetSingleChoiceIndex
  
***************
*** 342,346 ****
  %endif //wxUSE_CHOICEDLG & wxLUA_USE_wxSingleChoiceDialog
  
! //-----------------------------------------------------------------------------
  // wxTextEntryDialog - see also wxGetTextFromUser
  
--- 342,346 ----
  %endif //wxUSE_CHOICEDLG & wxLUA_USE_wxSingleChoiceDialog
  
! // ---------------------------------------------------------------------------
  // wxTextEntryDialog - see also wxGetTextFromUser
  
***************
*** 357,361 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxPasswordEntryDialog - see also wxGetPasswordFromUser
  
--- 357,361 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxPasswordEntryDialog - see also wxGetPasswordFromUser
  
***************
*** 367,371 ****
  %endif //wxUSE_TEXTDLG & wxLUA_USE_wxTextEntryDialog
  
! //-----------------------------------------------------------------------------
  // wxFontDialog
  
--- 367,371 ----
  %endif //wxUSE_TEXTDLG & wxLUA_USE_wxTextEntryDialog
  
! // ---------------------------------------------------------------------------
  // wxFontDialog
  
***************
*** 381,385 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxFontData - for wxFontDialog
  
--- 381,385 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxFontData - for wxFontDialog
  
***************
*** 407,411 ****
  %endif //wxUSE_FONTDLG & wxLUA_USE_wxFontDialog
  
! //-----------------------------------------------------------------------------
  // wxFindReplaceDialog
  
--- 407,411 ----
  %endif //wxUSE_FONTDLG & wxLUA_USE_wxFontDialog
  
! // ---------------------------------------------------------------------------
  // wxFindReplaceDialog
  
***************
*** 430,434 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxFindReplaceData
  
--- 430,434 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxFindReplaceData
  
***************
*** 450,454 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxFindDialogEvent
  
--- 450,454 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxFindDialogEvent
  
***************
*** 473,477 ****
  %endif //wxUSE_FINDREPLDLG & wxLUA_USE_wxFindReplaceDialog
  
! //-----------------------------------------------------------------------------
  // wxProgressDialog
  
--- 473,477 ----
  %endif //wxUSE_FINDREPLDLG & wxLUA_USE_wxFindReplaceDialog
  
! // ---------------------------------------------------------------------------
  // wxProgressDialog
  
***************
*** 502,506 ****
  %endif //wxUSE_PROGRESSDLG & wxLUA_USE_wxProgressDialog
  
! //-----------------------------------------------------------------------------
  // wxTabbedDialog                deprecated; use wxNotebook instead
  //
--- 502,506 ----
  %endif //wxUSE_PROGRESSDLG & wxLUA_USE_wxProgressDialog
  
! // ---------------------------------------------------------------------------
  // wxTabbedDialog                deprecated; use wxNotebook instead
  //
***************
*** 513,517 ****
  
  
! //-----------------------------------------------------------------------------
  // wxSplashScreen
  
--- 513,517 ----
  
  
! // ---------------------------------------------------------------------------
  // wxSplashScreen
  
***************
*** 543,547 ****
  %endif //wxLUA_USE_wxSplashScreen
  
! //-----------------------------------------------------------------------------
  // wxWizard
  
--- 543,547 ----
  %endif //wxLUA_USE_wxSplashScreen
  
! // ---------------------------------------------------------------------------
  // wxWizard
  
***************
*** 567,571 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxWizardPage - this has virtual functions so it can't be used?
  
--- 567,571 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxWizardPage - this has virtual functions so it can't be used?
  
***************
*** 578,582 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxWizardPageSimple - use this
  
--- 578,582 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxWizardPageSimple - use this
  
***************
*** 592,596 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxWizardEvent
  
--- 592,596 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxWizardEvent
  

Index: geometry.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/geometry.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** geometry.i	31 May 2007 17:18:46 -0000	1.9
--- geometry.i	17 Jun 2007 17:17:37 -0000	1.10
***************
*** 1,3 ****
! // ============================================================================
  // Purpose:     wxPoint2DInt, wxRect2DInt and other classes from wx/geometry.h
  // Author:      J Winwood, John Labenski
--- 1,3 ----
! // ===========================================================================
  // Purpose:     wxPoint2DInt, wxRect2DInt and other classes from wx/geometry.h
  // Author:      J Winwood, John Labenski
***************
*** 6,10 ****
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ============================================================================
  
  %if wxLUA_USE_Geometry & wxUSE_GEOMETRY
--- 6,10 ----
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ===========================================================================
  
  %if wxLUA_USE_Geometry & wxUSE_GEOMETRY
***************
*** 21,25 ****
  %endenum
  
! //-----------------------------------------------------------------------------
  // wxPoint2DInt
  
--- 21,25 ----
  %endenum
  
! // ---------------------------------------------------------------------------
  // wxPoint2DInt
  
***************
*** 65,69 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxPoint2DDouble
  
--- 65,69 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxPoint2DDouble
  
***************
*** 106,110 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxRect2DDouble
  
--- 106,110 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxRect2DDouble
  
***************
*** 175,179 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxRect2DInt
  
--- 175,179 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxRect2DInt
  
***************
*** 250,254 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxTransform2D - an abstract class
  
--- 250,254 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxTransform2D - an abstract class
  

Index: xml.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/xml.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** xml.i	14 Jun 2007 01:23:09 -0000	1.12
--- xml.i	17 Jun 2007 17:17:37 -0000	1.13
***************
*** 1,3 ****
! // ============================================================================
  // Purpose:     XML Resource system from contribs
  // Author:      J Winwood, John Labenski
--- 1,3 ----
! // ===========================================================================
  // Purpose:     XML Resource system from contribs
  // Author:      J Winwood, John Labenski
***************
*** 5,9 ****
  // Copyright:   (c) 2001-2002 Lomtick Software. All rights reserved.
  // Licence:     wxWidgets licence
! // ============================================================================
  
  %if wxLUA_USE_wxXMLResource & wxUSE_XML
--- 5,9 ----
  // Copyright:   (c) 2001-2002 Lomtick Software. All rights reserved.
  // Licence:     wxWidgets licence
! // ===========================================================================
  
  %if wxLUA_USE_wxXMLResource & wxUSE_XML
***************
*** 29,33 ****
  %endenum
  
! //-----------------------------------------------------------------------------
  // wxXmlNode
  
--- 29,33 ----
  %endenum
  
! // ---------------------------------------------------------------------------
  // wxXmlNode
  
***************
*** 66,70 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxXmlProperty
  
--- 66,70 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxXmlProperty
  
***************
*** 81,85 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxXmlDocument
  
--- 81,85 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxXmlDocument
  
***************
*** 107,111 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxXmlResourceHandler
  
--- 107,111 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxXmlResourceHandler
  
***************
*** 119,123 ****
  %endenum
  
! //-----------------------------------------------------------------------------
  // wxXmlResource
  
--- 119,123 ----
  %endenum
  
! // ---------------------------------------------------------------------------
  // wxXmlResource
  

Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** windows.i	16 Jun 2007 06:21:43 -0000	1.41
--- windows.i	17 Jun 2007 17:17:37 -0000	1.42
***************
*** 1,3 ****
! // ============================================================================
  // Purpose:     wxWindow and other container type windows
  // Author:      J Winwood, John Labenski
--- 1,3 ----
! // ===========================================================================
  // Purpose:     wxWindow and other container type windows
  // Author:      J Winwood, John Labenski
***************
*** 6,15 ****
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ============================================================================
  
  
  %wxchkver_2_8 %function wxWindow* wxFindFocusDescendant(wxWindow* ancestor)
  
! //-----------------------------------------------------------------------------
  // wxWindowDisabler
  
--- 6,15 ----
  // Licence:     wxWidgets licence
  // wxWidgets:   Updated to 2.6.3
! // ===========================================================================
  
  
  %wxchkver_2_8 %function wxWindow* wxFindFocusDescendant(wxWindow* ancestor)
  
! // ---------------------------------------------------------------------------
  // wxWindowDisabler
  
***************
*** 21,25 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxWindow
  %define wxSIMPLE_BORDER
--- 21,25 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxWindow
  %define wxSIMPLE_BORDER
***************
*** 304,308 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxWindowList
  
--- 304,308 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxWindowList
  
***************
*** 321,325 ****
  %endif //wxLUA_USE_wxWindowList & !wxUSE_STL
  
! //-----------------------------------------------------------------------------
  // wxPanel
  
--- 321,325 ----
  %endif //wxLUA_USE_wxWindowList & !wxUSE_STL
  
! // ---------------------------------------------------------------------------
  // wxPanel
  
***************
*** 336,340 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxControl
  
--- 336,340 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxControl
  
***************
*** 355,359 ****
  
  
! //-----------------------------------------------------------------------------
  // wxBookCtrlBase
  
--- 355,359 ----
  
  
! // ---------------------------------------------------------------------------
  // wxBookCtrlBase
  
***************
*** 421,425 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxBookCtrlBaseEvent
  
--- 421,425 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxBookCtrlBaseEvent
  
***************
*** 435,439 ****
  %endif //wxLUA_USE_wxNotebook & wxUSE_BOOKCTRL
  
! //-----------------------------------------------------------------------------
  // wxNotebook
  
--- 435,439 ----
  %endif //wxLUA_USE_wxNotebook & wxUSE_BOOKCTRL
  
! // ---------------------------------------------------------------------------
  // wxNotebook
  
***************
*** 497,501 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxNotebookEvent
  
--- 497,501 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxNotebookEvent
  
***************
*** 515,519 ****
  %endif //wxLUA_USE_wxNotebook & wxUSE_NOTEBOOK
  
! //-----------------------------------------------------------------------------
  // wxListbook
  
--- 515,519 ----
  %endif //wxLUA_USE_wxNotebook & wxUSE_NOTEBOOK
  
! // ---------------------------------------------------------------------------
  // wxListbook
  
***************
*** 541,545 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxListbookEvent
  
--- 541,545 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxListbookEvent
  
***************
*** 559,563 ****
  %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxListCtrl & wxUSE_LISTBOOK
  
! //-----------------------------------------------------------------------------
  // wxChoicebook
  
--- 559,563 ----
  %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxListCtrl & wxUSE_LISTBOOK
  
! // ---------------------------------------------------------------------------
  // wxChoicebook
  
***************
*** 585,589 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxChoicebookEvent
  
--- 585,589 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxChoicebookEvent
  
***************
*** 603,607 ****
  %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxChoice & wxUSE_CHOICEBOOK
  
! //-----------------------------------------------------------------------------
  // wxTabCtrl
  
--- 603,607 ----
  %endif //wxLUA_USE_wxNotebook & wxLUA_USE_wxChoice & wxUSE_CHOICEBOOK
  
! // ---------------------------------------------------------------------------
  // wxTabCtrl
  
***************
*** 645,649 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxTabEvent
  
--- 645,649 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxTabEvent
  
***************
*** 657,661 ****
  %endif //%wxchkver_2_4 & %msw & wxLUA_USE_wxTabCtrl & wxUSE_TAB_DIALOG
  
! //-----------------------------------------------------------------------------
  // wxSashWindow
  
--- 657,661 ----
  %endif //%wxchkver_2_4 & %msw & wxLUA_USE_wxTabCtrl & wxUSE_TAB_DIALOG
  
! // ---------------------------------------------------------------------------
  // wxSashWindow
  
***************
*** 701,705 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxSashLayoutWindow
  
--- 701,705 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxSashLayoutWindow
  
***************
*** 733,737 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxLayoutAlgorithm - for wxSashLayoutWindow
  
--- 733,737 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxLayoutAlgorithm - for wxSashLayoutWindow
  
***************
*** 746,750 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxQueryLayoutInfoEvent - for wxSashLayoutWindow
  
--- 746,750 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxQueryLayoutInfoEvent - for wxSashLayoutWindow
  
***************
*** 768,772 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxCalculateLayoutEvent - for wxSashLayoutWindow
  
--- 768,772 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxCalculateLayoutEvent - for wxSashLayoutWindow
  
***************
*** 784,788 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxSashEvent
  
--- 784,788 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxSashEvent
  
***************
*** 802,806 ****
  %endif //wxLUA_USE_wxSashWindow & wxUSE_SASH
  
! //-----------------------------------------------------------------------------
  // wxScrolledWindow
  
--- 802,806 ----
  %endif //wxLUA_USE_wxSashWindow & wxUSE_SASH
  
! // ---------------------------------------------------------------------------
  // wxScrolledWindow
  
***************
*** 846,850 ****
  %endif //wxLUA_USE_wxScrolledWindow
  
! //-----------------------------------------------------------------------------
  // wxSplitterWindow
  
--- 846,850 ----
  %endif //wxLUA_USE_wxScrolledWindow
  
! // ---------------------------------------------------------------------------
  // wxSplitterWindow
  
***************
*** 890,894 ****
  %endclass
  
! //-----------------------------------------------------------------------------
  // wxSplitterEvent
  
--- 890,894 ----
  %endclass
  
! // ---------------------------------------------------------------------------
  // wxSplitterEvent
  
***************
*** 910,914 ****
  %endif //wxLUA_USE_wxSplitterWindow
  
! //-----------------------------------------------------------------------------
  // wxStaticBox
  
--- 910,914 ----
  %endif //wxLUA_USE_wxSplitterWindow
  
! // ---------------------------------------------------------------------------
  // wxStaticBox
  
***************
*** 926,930 ****
  %endif //wxLUA_USE_wxStaticBox & wxUSE_STATBOX
  
! //-----------------------------------------------------------------------------
  // wxStaticBitmap
  
--- 926,930 ----
  %endif //wxLUA_USE_wxStaticBox & wxUSE_STATBOX
  
! // ---------------------------------------------------------------------------
  // wxStaticBitmap
  
***************
*** 944,948 ****
  %endif //wxLUA_USE_wxStaticBitmap & wxUSE_STATBMP
  
! //-----------------------------------------------------------------------------
  // wxStaticText
  
--- 944,948 ----
  %endif //wxLUA_USE_wxStaticBitmap & wxUSE_STATBMP
  
! // ---------------------------------------------------------------------------
  // wxStaticText
  
***************
*** 967,971 ****
  %endif //wxLUA_USE_wxStaticText & wxUSE_STATTEXT
  
! //-----------------------------------------------------------------------------
  // wxStaticLine...
 
[truncated message content]

[Wxlua-commit] wxLua/modules/wxluadebug/src wxlstack.cpp,1.6,1.7

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

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

Modified Files:
	wxlstack.cpp 
Log Message:
Snip long string values for listctrl in stack dialog and replace \r\n with \\r\\n strings


Index: wxlstack.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxlstack.cpp	16 Jun 2007 06:21:47 -0000	1.6
--- wxlstack.cpp	16 Jun 2007 06:39:45 -0000	1.7
***************
*** 464,468 ****
              m_listCtrl->SetItem(lc_item, 1, wxString::Format(wxT("%d:%d"), level+1, n+1));
              m_listCtrl->SetItem(lc_item, 2, item->GetType());
!             m_listCtrl->SetItem(lc_item, 3, item->GetValue());
          }
  
--- 464,474 ----
              m_listCtrl->SetItem(lc_item, 1, wxString::Format(wxT("%d:%d"), level+1, n+1));
              m_listCtrl->SetItem(lc_item, 2, item->GetType());
! 
!             // generic listctrl doesn't like showing huge strings, nor \n
!             wxString value(item->GetValue());
!             if (value.Length() > 200) value = value.Mid(0, 200) + wxT("... <snip>");
!             value.Replace(wxT("\n"), wxT("\\n"));
!             value.Replace(wxT("\r"), wxT("\\r"));
!             m_listCtrl->SetItem(lc_item, 3, value);
          }
  

[Wxlua-commit] wxLua/docs FAQ.html, NONE, 1.1 changelog.txt, 1.36, 1.37 wxlua.html, 1.25, 1.26 wxluaref.html, 1.23, 1.24

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

Update of /cvsroot/wxlua/wxLua/docs
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19284/wxLua/docs

Modified Files:
	changelog.txt wxlua.html wxluaref.html 
Added Files:
	FAQ.html 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: wxluaref.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** wxluaref.html	14 Jun 2007 01:23:09 -0000	1.23
--- wxluaref.html	16 Jun 2007 06:21:43 -0000	1.24
***************
*** 1976,1980 ****
  <br>
      int Append(const <a href="#wxString">wxString</a>&  item)<br>
!     //int Append(const <a href="#wxString">wxString</a>&  item, void *clientData)<br>
      int Append(const <a href="#wxString">wxString</a>&  item, <a href="#wxClientData">wxClientData</a> *clientData)<br>
      void Append(const <a href="#wxArrayString">wxArrayString</a>& strings)<br>
--- 1976,1980 ----
  <br>
      int Append(const <a href="#wxString">wxString</a>&  item)<br>
!     int Append(const <a href="#wxString">wxString</a>&  item, voidptr_long number) // C++ is (void *clientData) You can put a number here<br>
      int Append(const <a href="#wxString">wxString</a>&  item, <a href="#wxClientData">wxClientData</a> *clientData)<br>
      void Append(const <a href="#wxArrayString">wxArrayString</a>& strings)<br>
***************
*** 1982,1986 ****
      void Delete(unsigned int n)<br>
      int FindString(const <a href="#wxString">wxString</a>& string)<br>
!     //void* GetClientData(unsigned int n) const<br>
      <a href="#wxClientData">wxClientData</a>* GetClientObject(unsigned int n) const<br>
  <font color=#CC0033>    <i>%rename</i> GetStringClientObject <a href="#wxStringClientData">wxStringClientData</a>* GetClientObject(unsigned int n) const</font><br>
--- 1982,1988 ----
      void Delete(unsigned int n)<br>
      int FindString(const <a href="#wxString">wxString</a>& string)<br>
!     // C++ Func: void* GetClientData(unsigned int n) const<br>
!     voidptr_long GetClientData(unsigned int n) const // C++ returns (void *) You get a number here<br>
! <br>
      <a href="#wxClientData">wxClientData</a>* GetClientObject(unsigned int n) const<br>
  <font color=#CC0033>    <i>%rename</i> GetStringClientObject <a href="#wxStringClientData">wxStringClientData</a>* GetClientObject(unsigned int n) const</font><br>
***************
*** 1990,1999 ****
      <a href="#wxString">wxString</a> GetStringSelection() const<br>
      int Insert(const <a href="#wxString">wxString</a>&  item, int pos)<br>
!     //int Insert(const <a href="#wxString">wxString</a>&  item, unsigned int pos, void *clientData)<br>
      int Insert(const <a href="#wxString">wxString</a>& item, unsigned int pos, <a href="#wxClientData">wxClientData</a> *clientData)<br>
      bool IsEmpty() const<br>
      // int Number() const // obsolete since 2.2 use GetCount()<br>
      void Select(int n)<br>
!     //void SetClientData(unsigned int n, void *data)<br>
      void SetClientObject(unsigned int n, <a href="#wxClientData">wxClientData</a> *data)<br>
      void SetSelection(unsigned int n)<br>
--- 1992,2001 ----
      <a href="#wxString">wxString</a> GetStringSelection() const<br>
      int Insert(const <a href="#wxString">wxString</a>&  item, int pos)<br>
!     int Insert(const <a href="#wxString">wxString</a>&  item, unsigned int pos, voidptr_long number) // C++ is (void *clientData) You can put a number here<br>
      int Insert(const <a href="#wxString">wxString</a>& item, unsigned int pos, <a href="#wxClientData">wxClientData</a> *clientData)<br>
      bool IsEmpty() const<br>
      // int Number() const // obsolete since 2.2 use GetCount()<br>
      void Select(int n)<br>
!     void SetClientData(unsigned int n, voidptr_long number) // C++ is (void *clientData) You can put a number here<br>
      void SetClientObject(unsigned int n, <a href="#wxClientData">wxClientData</a> *data)<br>
      void SetSelection(unsigned int n)<br>
***************
*** 3162,3165 ****
--- 3164,3181 ----
  <br>
  //-----------------------------------------------------------------------------<br>
+ // <a href="#wxClientDataContainer">wxClientDataContainer</a><br>
+ <br>
+ <font color=#AA0000><font size=+1><i>%class</i> <i>%noclassinfo</i> <b><a name="wxClientDataContainer">wxClientDataContainer</a></b></font></font><blockquote>
+     <a href="#wxClientDataContainer">wxClientDataContainer</a>()<br>
+ <br>
+     void SetClientObject( <a href="#wxClientData">wxClientData</a> *data )<br>
+     <a href="#wxClientData">wxClientData</a> *GetClientObject() const<br>
+ <br>
+     void SetClientData( voidptr_long data ) // C++ is (void *clientData) You can put a number here<br>
+     // C++ Func: void *GetClientData() const<br>
+     voidptr_long GetClientData() const // C++ returns (void *) You get a number here<br>
+ </blockquote><font color=#AA0000><i>%endclass</i></font><br>
+ <br>
+ //-----------------------------------------------------------------------------<br>
  // <a href="#wxObject">wxObject</a><br>
  <br>
***************
*** 5783,5798 ****
      bool Disconnect(int id, int lastId, wxEventType eventType)<br>
  <br>
!     //void* GetClientData()<br>
      <a href="#wxClientData">wxClientData</a>* GetClientObject() const<br>
      bool GetEvtHandlerEnabled()<br>
!     //<a href="#wxEvtHandler">wxEvtHandler</a>* GetNextHandler()<br>
!     //<a href="#wxEvtHandler">wxEvtHandler</a>* GetPreviousHandler()<br>
      virtual bool ProcessEvent(<a href="#wxEvent">wxEvent</a>& event)<br>
      //virtual bool SearchEventTable(wxEventTable& table, <a href="#wxEvent">wxEvent</a>& event)<br>
!     //void SetClientData(void* data)<br>
      void SetClientObject(<a href="#wxClientData">wxClientData</a>* data)<br>
      void SetEvtHandlerEnabled(bool enabled)<br>
!     //void SetNextHandler(<a href="#wxEvtHandler">wxEvtHandler</a>* handler)<br>
!     //void SetPreviousHandler(<a href="#wxEvtHandler">wxEvtHandler</a>* handler)<br>
  </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br>
--- 5799,5814 ----
      bool Disconnect(int id, int lastId, wxEventType eventType)<br>
  <br>
!     voidptr_long GetClientData() // C++ returns (void *) You get a number here<br>
      <a href="#wxClientData">wxClientData</a>* GetClientObject() const<br>
      bool GetEvtHandlerEnabled()<br>
!     <a href="#wxEvtHandler">wxEvtHandler</a>* GetNextHandler()<br>
!     <a href="#wxEvtHandler">wxEvtHandler</a>* GetPreviousHandler()<br>
      virtual bool ProcessEvent(<a href="#wxEvent">wxEvent</a>& event)<br>
      //virtual bool SearchEventTable(wxEventTable& table, <a href="#wxEvent">wxEvent</a>& event)<br>
!     void SetClientData(voidptr_long number) // C++ is (void *clientData) You can put a number here<br>
      void SetClientObject(<a href="#wxClientData">wxClientData</a>* data)<br>
      void SetEvtHandlerEnabled(bool enabled)<br>
!     void SetNextHandler(<a href="#wxEvtHandler">wxEvtHandler</a>* handler)<br>
!     void SetPreviousHandler(<a href="#wxEvtHandler">wxEvtHandler</a>* handler)<br>
  </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br>
***************
*** 5894,5898 ****
      <a href="#wxCommandEvent">wxCommandEvent</a>(wxEventType commandEventType = wxEVT_NULL, int id = 0)<br>
  <br>
!     <a href="#wxObject">wxObject</a>* GetClientData()<br>
      <a href="#wxClientData">wxClientData</a>* GetClientObject()<br>
  <font color=#CC0033>    <i>%rename</i> GetStringClientObject <a href="#wxStringClientData">wxStringClientData</a>* GetClientObject()</font><br>
--- 5910,5914 ----
      <a href="#wxCommandEvent">wxCommandEvent</a>(wxEventType commandEventType = wxEVT_NULL, int id = 0)<br>
  <br>
!     voidptr_long GetClientData() // C++ returns (void *) You get a number here<br>
      <a href="#wxClientData">wxClientData</a>* GetClientObject()<br>
  <font color=#CC0033>    <i>%rename</i> GetStringClientObject <a href="#wxStringClientData">wxStringClientData</a>* GetClientObject()</font><br>
***************
*** 5903,5907 ****
      bool IsChecked() const<br>
      bool IsSelection()<br>
!     void SetClientData(<a href="#wxObject">wxObject</a> *clientData)<br>
      void SetExtraLong(int extraLong)<br>
      void SetInt(int intCommand)<br>
--- 5919,5923 ----
      bool IsChecked() const<br>
      bool IsSelection()<br>
!     void SetClientData(voidptr_long number) // C++ is (void *clientData) You can put a number here<br>
      void SetExtraLong(int extraLong)<br>
      void SetInt(int intCommand)<br>
***************
*** 10526,10531 ****
      void Append(const <a href="#wxArrayString">wxArrayString</a>& strings)<br>
      int Append(const <a href="#wxString">wxString</a>& item)<br>
!     //int Append(const <a href="#wxString">wxString</a>& item, void *clientData)<br>
!     //int Append(const <a href="#wxString">wxString</a>& item, <a href="#wxClientData">wxClientData</a> *clientData)<br>
  </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br>
--- 10542,10547 ----
      void Append(const <a href="#wxArrayString">wxArrayString</a>& strings)<br>
      int Append(const <a href="#wxString">wxString</a>& item)<br>
!     int Append(const <a href="#wxString">wxString</a>& item, voidptr_long number) // C++ is (void *clientData) You can put a number here<br>
!     int Append(const <a href="#wxString">wxString</a>& item, <a href="#wxClientData">wxClientData</a> *clientData)<br>
  </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br>
***************
*** 12857,12861 ****
      void Discard()<br>
      bool Error() const<br>
!     <a href="#wxObject">wxObject</a>* GetClientData() const<br>
      bool GetLocal(<a href="#wxSockAddress">wxSockAddress</a>& addr) const<br>
      <a href="#wxSocketFlags">wxSocketFlags</a> GetFlags() const<br>
--- 12873,12877 ----
      void Discard()<br>
      bool Error() const<br>
!     voidptr_long GetClientData() const // C++ returns (void *) You get a number here<br>
      bool GetLocal(<a href="#wxSockAddress">wxSockAddress</a>& addr) const<br>
      <a href="#wxSocketFlags">wxSocketFlags</a> GetFlags() const<br>
***************
*** 12871,12875 ****
      void RestoreState()<br>
      void SaveState()<br>
!     void SetClientData(<a href="#wxObject">wxObject</a> *data)<br>
      void SetEventHandler(<a href="#wxEvtHandler">wxEvtHandler</a>& handler, int id = -1)<br>
      void SetFlags(<a href="#wxSocketFlags">wxSocketFlags</a> flags)<br>
--- 12887,12891 ----
      void RestoreState()<br>
      void SaveState()<br>
!     void SetClientData(voidptr_long number) // C++ is (void *clientData) You can put a number here<br>
      void SetEventHandler(<a href="#wxEvtHandler">wxEvtHandler</a>& handler, int id = -1)<br>
      void SetFlags(<a href="#wxSocketFlags">wxSocketFlags</a> flags)<br>
***************
*** 12937,12941 ****
      <a href="#wxSocketEvent">wxSocketEvent</a>(int id = 0)<br>
  <br>
!     <a href="#wxObject">wxObject</a> * GetClientData()<br>
      <a href="#wxSocketBase">wxSocketBase</a> * GetSocket() const<br>
      <a href="#wxSocketNotify">wxSocketNotify</a> GetSocketEvent() const<br>
--- 12953,12957 ----
      <a href="#wxSocketEvent">wxSocketEvent</a>(int id = 0)<br>
  <br>
!     voidptr_long GetClientData() // C++ returns (void *) You get a number here<br>
      <a href="#wxSocketBase">wxSocketBase</a> * GetSocket() const<br>
      <a href="#wxSocketNotify">wxSocketNotify</a> GetSocketEvent() const<br>
***************
*** 13588,13591 ****
--- 13604,13608 ----
      <a href="#wxWindow">wxWindow</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxString">wxString</a>& name = "wxWindow")<br>
  <br>
+     bool Create(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxString">wxString</a>& name = "wxWindow")<br>
      virtual void AddChild(<a href="#wxWindow">wxWindow</a>* child)<br>
      void CacheBestSize(const <a href="#wxSize">wxSize</a>& size) const<br>
***************
*** 18044,18047 ****
--- 18061,18065 ----
  // ============================================================================<br>
  <br>
+ //-----------------------------------------------------------------------------<br>
  // Compile the luaScript of the given name and return the lua error code, a message<br>
  // and the line number (or -1) of the error.<br>
***************
*** 18050,18053 ****
--- 18068,18095 ----
  <br>
  //-----------------------------------------------------------------------------<br>
+ // Get information about the status of wxLua.<br>
+ //<br>
+ // Please take special note of<br>
+ <br>
+ // Get a table of all tracked top level windows that wxLua will Destroy()<br>
+ // when lua is closed.<br>
+ // Example output : { ["wxFrame"] = 1, ["wxDialog"] = 2 }<br>
+ <i>%function</i> LuaTable GetTrackedTopLevelWindows()<br>
+ <br>
+ // Get a table of all tracked userdata wxLua will delete when lua is closed<br>
+ // or lua will eventually garbage collect.<br>
+ // Example output : { ["wxPoint"] = 3, ["wxPen"] = 5 }<br>
+ <i>%function</i> LuaTable GetTrackedUserData()<br>
+ <br>
+ // Get a table of all tracked <a href="#wxEvent">wxEvent</a> callbacks that have been installed using<br>
+ // wxEvtHandler::Connect(...)<br>
+ // Example output : { ["wxEVT_COMMAND_TOOL_CLICKED"] = 2, ... }<br>
+ <i>%function</i> LuaTable GetTrackedEventCallbacks()<br>
+ <br>
+ // Get a table of all <a href="#wxWindow">wxWindow</a> derived classes that have been created in wxLua.<br>
+ // Example output : { ["wxFrame"] = 1, ["wxButton"] = 4 }<br>
+ <i>%function</i> LuaTable GetTrackedWindows()<br>
+ <br>
+ //-----------------------------------------------------------------------------<br>
  // Type information about the bindings or current userdata<br>
  <br>
***************
*** 18080,18087 ****
  <font color=#007755><i>%define</i> WXLUAARG_Number</font><br>
  <font color=#007755><i>%define</i> WXLUAARG_String</font><br>
! <font color=#007755><i>%define</i> WXLUAARG_LuaTable</font><br>
! <font color=#007755><i>%define</i> WXLUAARG_LuaFunction</font><br>
  <font color=#007755><i>%define</i> WXLUAARG_UserData</font><br>
! <font color=#007755><i>%define</i> WXLUAARG_LuaThread</font><br>
  <font color=#007755><i>%define</i> WXLUAARG_Integer</font><br>
  <br>
--- 18122,18129 ----
  <font color=#007755><i>%define</i> WXLUAARG_Number</font><br>
  <font color=#007755><i>%define</i> WXLUAARG_String</font><br>
! <font color=#007755><i>%define</i> WXLUAARG_Table</font><br>
! <font color=#007755><i>%define</i> WXLUAARG_Function</font><br>
  <font color=#007755><i>%define</i> WXLUAARG_UserData</font><br>
! <font color=#007755><i>%define</i> WXLUAARG_Thread</font><br>
  <font color=#007755><i>%define</i> WXLUAARG_Integer</font><br>
  <br>
***************
*** 18097,18102 ****
  <font color=#007755><i>%define</i> LUA_TTHREAD            // 8</font><br>
  <br>
! <br>
! // Is this lua_type() (or in lua type()) considered<br>
  <i>%function</i> int wxlua_iswxluatype(int luatype, int wxluaarg_tag)<br>
  <br>
--- 18139,18143 ----
  <font color=#007755><i>%define</i> LUA_TTHREAD            // 8</font><br>
  <br>
! // Is this lua_type() (or in lua the type() function) considered equivalent<br>
  <i>%function</i> int wxlua_iswxluatype(int luatype, int wxluaarg_tag)<br>
  <br>
***************
*** 18107,18111 ****
  <i>%function</i> <a href="#wxString">wxString</a> wxlua_typename(int wxluaarg_tag)<br>
  <br>
- <br>
  <font color=#CC3300>// <i>%override</i> int wxlua_type(void* object)</font><br>
  // Get the wxlua type (tag) of the object, this is the arg tags number<br>
--- 18148,18151 ----
***************
*** 18121,18124 ****
--- 18161,18165 ----
  // Note: Use only '.' and NO () to make it a function call, also check to see<br>
  // if the item exists first (unlike the example above)!<br>
+ // Please see the bindings.wx.lua sample program for usage.<br>
  <br>
  /*<br>
***************
*** 18146,18150 ****
  </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br>
! <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxLuaBindClass">wxLuaBindClass</a></b></font></font><blockquote>
      // No constructor as this is read only<br>
  <br>
--- 18187,18191 ----
  </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br>
! <i>%struct</i> wxLuaBindClass<br>
      // No constructor as this is read only<br>
  <br>
***************
*** 18159,18165 ****
      int                 enums_n<br>
  <br>
! </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br>
! <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxLuaBindMethod">wxLuaBindMethod</a></b></font></font><blockquote>
      // No constructor as this is read only<br>
  <br>
--- 18200,18206 ----
      int                 enums_n<br>
  <br>
! <i>%endstruct</i><br>
  <br>
! <i>%struct</i> wxLuaBindMethod<br>
      // No constructor as this is read only<br>
  <br>
***************
*** 18173,18179 ****
      <a href="#wxString">wxString</a>            class_name // class name this is part of (not in struct)<br>
  <br>
! </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br>
! <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxLuaBindCFunc">wxLuaBindCFunc</a></b></font></font><blockquote>
      // No constructor as this is read only<br>
  <br>
--- 18214,18220 ----
      <a href="#wxString">wxString</a>            class_name // class name this is part of (not in struct)<br>
  <br>
! <i>%endstruct</i><br>
  <br>
! <i>%struct</i> wxLuaBindCFunc<br>
      // No constructor as this is read only<br>
  <br>
***************
*** 18186,18190 ****
      <a href="#wxString">wxString</a>            class_name // added, not in struct<br>
  <br>
! </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br>
  */<br>
--- 18227,18231 ----
      <a href="#wxString">wxString</a>            class_name // added, not in struct<br>
  <br>
! <i>%endstruct</i><br>
  <br>
  */<br>
***************
*** 18221,18225 ****
  <br>
  //-----------------------------------------------------------------------------<br>
! // <a href="#wxLuaObject">wxLuaObject</a> - Allows Lua data items to be used for client data.<br>
  <br>
  <font color=#007700><font size=+1><i>%enum</i> <b><a name="wxLuaObject_Type">wxLuaObject_Type</a></b></font><blockquote>
--- 18262,18266 ----
  <br>
  //-----------------------------------------------------------------------------<br>
! // <a href="#wxLuaObject">wxLuaObject</a> - Allows Lua data items to be used for <a href="#wxClientData">wxClientData</a>.<br>
  <br>
  <font color=#007700><font size=+1><i>%enum</i> <b><a name="wxLuaObject_Type">wxLuaObject_Type</a></b></font><blockquote>
***************
*** 18231,18235 ****
  </blockquote><i>%endenum</i></font><br>
  <br>
! <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxLuaObject">wxLuaObject</a></b>, <a href="#wxObject">wxObject</a></font></font><blockquote>
  <font color=#CC3300>    // <i>%override</i> <a href="#wxLuaObject">wxLuaObject</a>(any value type)</font><br>
      // C++ Func: <a href="#wxLuaObject">wxLuaObject</a>(const wxLuaState& wxlState, int stack_idx = 1)<br>
--- 18272,18276 ----
  </blockquote><i>%endenum</i></font><br>
  <br>
! <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxLuaObject">wxLuaObject</a></b>, <a href="#wxObject">wxObject</a> // ALSO! <a href="#wxClientData">wxClientData</a> use it anywhere that takes that</font></font><blockquote>
  <font color=#CC3300>    // <i>%override</i> <a href="#wxLuaObject">wxLuaObject</a>(any value type)</font><br>
      // C++ Func: <a href="#wxLuaObject">wxLuaObject</a>(const wxLuaState& wxlState, int stack_idx = 1)<br>
***************
*** 18253,18259 ****
      //<a href="#wxArrayInt">wxArrayInt</a> *GetArrayPtr();<br>
  <br>
!     int  GetAllocationFlags() const<br>
!     bool HasAllocationFlag(wxLuaObject_Type flag)<br>
!     //int  SetAllocationFlag(wxLuaObject_Type flag, bool set) // NOT for use in lua<br>
  </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br><HR>
--- 18294,18298 ----
      //<a href="#wxArrayInt">wxArrayInt</a> *GetArrayPtr();<br>
  <br>
!     int  GetAllocationFlag() const<br>
  </blockquote><font color=#AA0000><i>%endclass</i></font><br>
  <br><HR>
***************
*** 18280,18284 ****
  // wxLua is tracking and will delete.<br>
  <font color=#CC3300>// <i>%override</i> void StackDialog()</font><br>
! <i>%function</i> void StackDialog()<br>
  <br>
  //-----------------------------------------------------------------------------<br>
--- 18319,18323 ----
  // wxLua is tracking and will delete.<br>
  <font color=#CC3300>// <i>%override</i> void StackDialog()</font><br>
! <i>%function</i> void LuaStackDialog()<br>
  <br>
  //-----------------------------------------------------------------------------<br>

Index: wxlua.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** wxlua.html	14 Jun 2007 01:23:09 -0000	1.25
--- wxlua.html	16 Jun 2007 06:21:43 -0000	1.26
***************
*** 843,850 ****
  Samples</h3>
  <ul> <li><b>bindings.wx.lua</b></li> <ul>
! <li>Lets you explore the C++ binding structs from within lua
  using a wxListCtrl. This is the raw data that is used to push the
  bindings into lua when a wxLuaState is created.</li><li>Take
! note of </li> </ul>
  <li><b>calculator.wx.lua</b></li> <ul> <li>A
  simple calculator program the demonstrates loading and
--- 843,852 ----
  Samples</h3>
  <ul> <li><b>bindings.wx.lua</b></li> <ul>
! <li>This is a MUST use program, at least once, to get a better understanding of the bindings.</li><li>Lets you explore the C++ binding structs from within lua
  using a wxListCtrl. This is the raw data that is used to push the
  bindings into lua when a wxLuaState is created.</li><li>Take
! note of the menu item "Show lua stack dialog..." and the code for it.
! You can use this dialog to debug your own programs by viewing the
! stack, local, and global variables. </li> </ul>
  <li><b>calculator.wx.lua</b></li> <ul> <li>A
  simple calculator program the demonstrates loading and
***************
*** 859,864 ****
  <ul> <li>A
  demo of how to use coroutines in wxLua using wxEVT_IDLE to call
! coroutine.resume().</li> </ul> <li><b>debug.wx.lua</b></li>
! <ul> <li>Does not work... TODO ?</li> </ul> <li><b>dialog.wx.lua</b></li>
  <ul> <li>A simple temperature conversion program to/from
  Fahrenheit to/from Celsius. Shows the use of wxSizers, wxButtons, and
--- 861,866 ----
  <ul> <li>A
  demo of how to use coroutines in wxLua using wxEVT_IDLE to call
! coroutine.resume().</li> </ul> 
!  <li><b>dialog.wx.lua</b></li>
  <ul> <li>A simple temperature conversion program to/from
  Fahrenheit to/from Celsius. Shows the use of wxSizers, wxButtons, and

--- NEW FILE: FAQ.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua FAQ</title> 
<meta content="John Labenski" name="author"></head>

<body><h2><u>wxLua
FAQ</u></h2>
<ol> <li><a href="#Why_wxLua">Why wxLua?</a></li>
<ol> <li><a href="#Whats_best_for_my_needs:_wxLua">What's
best for my needs: wxLua, wxPython, wxSomethingElse?</a></li>
<li><a href="FAQ.html#Can_I_use_wxLua_as_script_interpreter">Can
I use wxLua as script interpreter embedded in my own C++ applications?</a></li>
</ol> <li><a href="#Programming_in_wxLua">Programming
in wxLua</a></li><ol><li><a href="#wxStrings">wxStrings?</a></li><li><a href="#wxArrayString_and_wxSortedArrayString">wxArrayString and wxSortedArrayString?</a></li><li><a href="#wxArrayInt">wxArrayInt?</a></li><li><a href="#When_and_how_should_you_delete_objects">When and how should you delete objects?</a></li></ol>
</ol><hr size="2" width="100%">
<ol> <li> <h3><a name="Why_wxLua"></a>Why
wxLua?</h3> </li> <ul> <li>Because the Lua
language is easy and "fun" to program in.&nbsp;</li> <li>It
vaguely looks like BASIC or C which many people are familiar with.</li>
<li>The code is very readable, almost no special
notation,&nbsp;gotchas, or oddball constructs that require a large
shift in thinking from BASIC or C.</li> <li>Size : The Lua
interpreter itself is ~100Kb, wxWidgets adds the remaining few Mb.</li>
<li>Speed : Lua is one of the fastest interpreted languages, see
the Great Computer Language Shootout.</li> <li>Again, why
Lua? See <a href="http://www.lua.org/about.html">http://www.lua.org/about.html</a></li></ul><ol><li><h4><a name="Whats_best_for_my_needs:_wxLua"></a>What's best
for my needs: wxLua, wxPython, wxSomethingElse?</h4></li><ol>
<ol> </ol></ol><ul><li>It depends:
wxPython has a much larger footprint and greater overhead
than wxLua, but it does provide more add-ons from the Python standard
library.</li><li>On the other hand, wxLua is as large as
the wxWidgets library + ~100Kb&nbsp;for Lua + ~500Kb for the wxLua
library.</li><li>wxLua&nbsp;can
be easily interfaced with C++ code making it a powerful
extension language,&nbsp;which is exactly the intent of its
designers.</li><li>In conclusion, if you want to write an
entire application in a
scripting language and you need things supported by Python which are
not present in wxLua out-of-the-box, then you should use wxPython.
Instead, if you want to write applications with little overhead or
extend your C++ applications, go for wxLua.</li></ul><li><h4><a name="Can_I_use_wxLua_as_script_interpreter"></a>Can I
use wxLua as script interpreter embedded in my own C++ applications?</h4></li><ul><li>Yes!
That's explained on the wxLua homepage.&nbsp;</li><li>This
is one of the strong
points of wxLua: it can be a lightweight, fast interpreter to extend
your application and let the user customize it...&nbsp;</li><li>You
may create as
many wxLua interpreters in a single program as you like.</li> </ul></ol><li><h3><a name="Programming_in_wxLua"></a>Programming in wxLua</h3></li><ol><li><h4><a name="wxStrings"></a>wxStrings?</h4></li><ul><li>wxLua uses Lua strings and so all functions that take or return a wxString take or return a Lua string.</li><li>However, you can also use a wxString is you really want.</li></ul><li><h4><a name="wxArrayString_and_wxSortedArrayString"></a>wxArrayString and wxSortedArrayString?</h4></li><ul><li>All functions that take a wxArrayString or wxSortedArrayString can also take a numerically indexed table of strings.</li><li>Functions
that return wxArrayStrings or wxSortedArrayStrings will return a
wxArrayString or wxSortedArrayString unless specified otherwise in
wxluaref.html</li></ul><li><h4><a name="wxArrayInt"></a>wxArrayInt?</h4></li><ul><li>All functions that take a wxArrayInt can also take a numerically indexed table of numbers.</li><li>Functions that return wxArrayInts will return a wxArrayInt unless specified otherwise in wxluaref.html.</li></ul><li><h4><a name="When_and_how_should_you_delete_objects"></a>When and how should you delete objects?</h4></li><ul><li>You should read the section "C++ Classes
CLASS_NAME" in the "Programming in wxLua" in the wxlua.html manual.</li><li>In
short, all objects that you create that deal with graphics should be
deleted as soon as they're no longer used. Functions that take a "const
wxPen&amp; pen"&nbsp;or any&nbsp;wxObject derived class that is passed
to a function that is&nbsp;const and not a pointer* will make a refed
copy of them and so you may delete them.</li><li>Use the wxLua added function delete() to delete them.</li><li>Use
the function "table = wxlua.GetTrackedUserdata()" to get a table of
items that are tracked and occasionally print them out while developing
a program. </li></ul></ol><ol><ol>
</ol></ol><ul> </ul> </ol></body></html>
Index: changelog.txt
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** changelog.txt	14 Jun 2007 01:23:09 -0000	1.36
--- changelog.txt	16 Jun 2007 06:21:43 -0000	1.37
***************
*** 100,103 ****
--- 100,112 ----
   - Fix mismatches between the bindings base classes and what they really are.
  
+  - Add back the treectrl to the Stack Dialog so you get a tree on the left
+    and the list on the right.
+  - Added functions to get the items that wxLua tracks (userdata) to know
+    if you need to garbage collect things
+  - Use qsort and bsearch to find the class member functions to run.
+    Combined with using integer items in lua's registry ~ %25 faster.
+  - Make wxLuaDebugData a real wxObject refed class that can !Ok(), before
+    it always created it's ref data even if it wasn't used.
+ 
   version 2.8.0.0 (released 24/12/2006)
   --------------------------------------------------------------------

[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.73,1.74

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

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

Modified Files:
	wxbind.h 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** wxbind.h	14 Jun 2007 23:59:42 -0000	1.73
--- wxbind.h	16 Jun 2007 06:21:43 -0000	1.74
***************
*** 43,49 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 13
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 13
  // ---------------------------------------------------------------------------
  
--- 43,49 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 14
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 14
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/bindings/wxwidgets windows.i,1.40,1.41

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

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

Modified Files:
	windows.i 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** windows.i	14 Jun 2007 01:23:09 -0000	1.40
--- windows.i	16 Jun 2007 06:21:43 -0000	1.41
***************
*** 76,79 ****
--- 76,80 ----
      wxWindow(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxWindow")
  
+     bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxWindow")
      virtual void AddChild(wxWindow* child)
      void CacheBestSize(const wxSize& size) const

[Wxlua-commit] wxLua/bindings/wxlua override.hpp, 1.2, 1.3 wxlua.i, 1.2, 1.3

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

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

Modified Files:
	override.hpp wxlua.i 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: wxlua.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/wxlua.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxlua.i	14 Jun 2007 23:59:41 -0000	1.2
--- wxlua.i	16 Jun 2007 06:21:42 -0000	1.3
***************
*** 8,11 ****
--- 8,12 ----
  // ============================================================================
  
+ //-----------------------------------------------------------------------------
  // Compile the luaScript of the given name and return the lua error code, a message
  // and the line number (or -1) of the error.
***************
*** 14,17 ****
--- 15,42 ----
  
  //-----------------------------------------------------------------------------
+ // Get information about the status of wxLua.
+ //
+ // Please take special note of
+ 
+ // Get a table of all tracked top level windows that wxLua will Destroy()
+ // when lua is closed.
+ // Example output : { ["wxFrame"] = 1, ["wxDialog"] = 2 }
+ %function LuaTable GetTrackedTopLevelWindows()
+ 
+ // Get a table of all tracked userdata wxLua will delete when lua is closed
+ // or lua will eventually garbage collect.
+ // Example output : { ["wxPoint"] = 3, ["wxPen"] = 5 }
+ %function LuaTable GetTrackedUserData()
+ 
+ // Get a table of all tracked wxEvent callbacks that have been installed using
+ // wxEvtHandler::Connect(...)
+ // Example output : { ["wxEVT_COMMAND_TOOL_CLICKED"] = 2, ... }
+ %function LuaTable GetTrackedEventCallbacks()
+ 
+ // Get a table of all wxWindow derived classes that have been created in wxLua.
+ // Example output : { ["wxFrame"] = 1, ["wxButton"] = 4 }
+ %function LuaTable GetTrackedWindows()
+ 
+ //-----------------------------------------------------------------------------
  // Type information about the bindings or current userdata
  
***************
*** 44,51 ****
  %define WXLUAARG_Number
  %define WXLUAARG_String
! %define WXLUAARG_LuaTable
! %define WXLUAARG_LuaFunction
  %define WXLUAARG_UserData
! %define WXLUAARG_LuaThread
  %define WXLUAARG_Integer
  
--- 69,76 ----
  %define WXLUAARG_Number
  %define WXLUAARG_String
! %define WXLUAARG_Table
! %define WXLUAARG_Function
  %define WXLUAARG_UserData
! %define WXLUAARG_Thread
  %define WXLUAARG_Integer
  
***************
*** 61,66 ****
  %define LUA_TTHREAD            // 8
  
! 
! // Is this lua_type() (or in lua type()) considered
  %function int wxlua_iswxluatype(int luatype, int wxluaarg_tag)
  
--- 86,90 ----
  %define LUA_TTHREAD            // 8
  
! // Is this lua_type() (or in lua the type() function) considered equivalent
  %function int wxlua_iswxluatype(int luatype, int wxluaarg_tag)
  
***************
*** 71,75 ****
  %function wxString wxlua_typename(int wxluaarg_tag)
  
- 
  // %override int wxlua_type(void* object)
  // Get the wxlua type (tag) of the object, this is the arg tags number
--- 95,98 ----
***************
*** 85,88 ****
--- 108,112 ----
  // Note: Use only '.' and NO () to make it a function call, also check to see
  // if the item exists first (unlike the example above)!
+ // Please see the bindings.wx.lua sample program for usage.
  
  /*
***************
*** 110,114 ****
  %endclass
  
! %class wxLuaBindClass
      // No constructor as this is read only
  
--- 134,138 ----
  %endclass
  
! %struct wxLuaBindClass
      // No constructor as this is read only
  
***************
*** 123,129 ****
      int                 enums_n
  
! %endclass
  
! %class wxLuaBindMethod
      // No constructor as this is read only
  
--- 147,153 ----
      int                 enums_n
  
! %endstruct
  
! %struct wxLuaBindMethod
      // No constructor as this is read only
  
***************
*** 137,143 ****
      wxString            class_name // class name this is part of (not in struct)
  
! %endclass
  
! %class wxLuaBindCFunc
      // No constructor as this is read only
  
--- 161,167 ----
      wxString            class_name // class name this is part of (not in struct)
  
! %endstruct
  
! %struct wxLuaBindCFunc
      // No constructor as this is read only
  
***************
*** 150,154 ****
      wxString            class_name // added, not in struct
  
! %endclass
  
  */
--- 174,178 ----
      wxString            class_name // added, not in struct
  
! %endstruct
  
  */

Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/override.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** override.hpp	14 Jun 2007 05:02:45 -0000	1.2
--- override.hpp	16 Jun 2007 06:21:42 -0000	1.3
***************
*** 32,35 ****
--- 32,123 ----
  %end
  
+ %override wxLua_function_GetTrackedTopLevelWindows
+ // %function LuaTable GetTrackedTopLevelWindows()
+ static int LUACALL wxLua_function_GetTrackedTopLevelWindows(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxArrayString strArr = wxlState.GetTrackedWindowStrings();
+     size_t n, count = strArr.GetCount();
+     long val = 0;
+     lua_createtable(L, 0, count);
+ 
+     for (n = 0; n < count; ++n)
+     {
+         lua_pushstring(L, wx2lua(strArr[n].BeforeLast(wxT(' '))));
+         strArr[n].AfterLast(wxT(' ')).ToLong(&val);
+         lua_pushnumber(L, (double)val);
+         lua_rawset(L, -3);
+     }
+ 
+     return 1;
+ }
+ %end
+ 
+ %override wxLua_function_GetTrackedUserData
+ // %function LuaTable GetTrackedUserData()
+ static int LUACALL wxLua_function_GetTrackedUserData(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxArrayString strArr = wxlState.GetTrackedObjectStrings();
+     size_t n, count = strArr.GetCount();
+     long val = 0;
+     lua_createtable(L, 0, count);
+ 
+     for (n = 0; n < count; ++n)
+     {
+         lua_pushstring(L, wx2lua(strArr[n].BeforeLast(wxT(' '))));
+         strArr[n].AfterLast(wxT(' ')).ToLong(&val);
+         lua_pushnumber(L, (double)val);
+         lua_rawset(L, -3);
+     }
+ 
+     return 1;
+ }
+ %end
+ 
+ %override wxLua_function_GetTrackedEventCallbacks
+ // %function LuaTable GetTrackedEventCallbacks()
+ static int LUACALL wxLua_function_GetTrackedEventCallbacks(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxArrayString strArr = wxlState.GetTrackedCallbackStrings();
+     size_t n, count = strArr.GetCount();
+     long val = 0;
+     lua_createtable(L, 0, count);
+ 
+     for (n = 0; n < count; ++n)
+     {
+         lua_pushstring(L, wx2lua(strArr[n].BeforeFirst(wxT(' '))));
+         strArr[n].AfterLast(wxT(' ')).ToLong(&val);
+         lua_pushnumber(L, (double)val);
+         lua_rawset(L, -3);
+     }
+ 
+     return 1;
+ }
+ %end
+ 
+ %override wxLua_function_GetTrackedWindows
+ // %function LuaTable GetTrackedWindows()
+ static int LUACALL wxLua_function_GetTrackedWindows(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxArrayString strArr = wxlState.GetTrackedWinDestroyCallbackStrings();
+     size_t n, count = strArr.GetCount();
+     long val = 0;
+     lua_createtable(L, 0, count);
+ 
+     for (n = 0; n < count; ++n)
+     {
+         lua_pushstring(L, wx2lua(strArr[n].BeforeLast(wxT(' '))));
+         strArr[n].AfterLast(wxT(' ')).ToLong(&val);
+         lua_pushnumber(L, (double)val);
+         lua_rawset(L, -3);
+     }
+ 
+     return 1;
+ }
+ %end
+ 
  %override wxLua_function_wxlua_typename
  // %function wxString wxlua_getwxluatypename(int wxluaarg_tag)

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.123,1.124

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

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

Modified Files:
	genwxbind.lua 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** genwxbind.lua	14 Jun 2007 23:59:41 -0000	1.123
--- genwxbind.lua	16 Jun 2007 06:21:42 -0000	1.124
***************
*** 18,22 ****
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 13 -- Used to verify that the bindings are updated
                             -- This must match modules/wxlua/include/wxldefs.h
                             -- otherwise a compile time error will be generated.
--- 18,22 ----
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 14 -- Used to verify that the bindings are updated
                             -- This must match modules/wxlua/include/wxldefs.h
                             -- otherwise a compile time error will be generated.
***************
*** 3116,3120 ****
                          -- THIS MUST BE AN OVERRIDE AND HANDLED THERE, we just set overload_argList
                          -- the code genererated here is nonsense
!                         overload_argList = overload_argList.."&s_wxluaarg_LuaTable, "
                          argItem = "YOU MUST OVERRIDE THIS FUNCTION "
                          declare = "YOU MUST OVERRIDE THIS FUNCTION "
--- 3116,3120 ----
                          -- THIS MUST BE AN OVERRIDE AND HANDLED THERE, we just set overload_argList
                          -- the code genererated here is nonsense
!                         overload_argList = overload_argList.."&s_wxluaarg_Table, "
                          argItem = "YOU MUST OVERRIDE THIS FUNCTION "
                          declare = "YOU MUST OVERRIDE THIS FUNCTION "
***************
*** 3122,3126 ****
                          -- THIS MUST BE AN OVERRIDE AND HANDLED THERE, we just set overload_argList
                          -- the code genererated here is nonsense
!                         overload_argList = overload_argList.."&s_wxluaarg_LuaFunction, "
                          argItem = "YOU MUST OVERRIDE THIS FUNCTION "
                          declare = "YOU MUST OVERRIDE THIS FUNCTION "
--- 3122,3126 ----
                          -- THIS MUST BE AN OVERRIDE AND HANDLED THERE, we just set overload_argList
                          -- the code genererated here is nonsense
!                         overload_argList = overload_argList.."&s_wxluaarg_Function, "
                          argItem = "YOU MUST OVERRIDE THIS FUNCTION "
                          declare = "YOU MUST OVERRIDE THIS FUNCTION "

[Wxlua-commit] wxLua/apps/wxlua/src editor.h,1.39,1.40

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

Update of /cvsroot/wxlua/wxLua/apps/wxlua/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19284/wxLua/apps/wxlua/src

Modified Files:
	editor.h 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: editor.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** editor.h	14 Jun 2007 05:34:00 -0000	1.39
--- editor.h	16 Jun 2007 06:21:41 -0000	1.40
***************
*** 10,15 ****
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 90589;
! const unsigned char wxLuaEditor[90590] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
--- 10,15 ----
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 90592;
! const unsigned char wxLuaEditor[90593] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
***************
*** 1734,1738 ****
   32, 32, 32, 32,108,111, 99, 97,108, 32,105,100, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,101,100,105,116,111,114, 58, 71,101,116, 73,100, 40, 41, 10,
   32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 80, 97,116,104, 32, 32, 32, 61, 32, 77, 97,107,101, 68,101, 98,117,103, 70,105,108,101, 78, 97,109,101, 40,101,100,105,116,111,114, 44, 32,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 91,105,100, 93, 46,102,105,108,101, 80, 97,116,104, 41, 10,
!  32, 32, 32, 32,108,111, 99, 97,108, 32,114,101,116, 44, 32,101,114,114, 77,115,103, 44, 32,108,105,110,101, 95,110,117,109, 32, 61, 32,119,120, 46, 67,111,109,112,105,108,101, 76,117, 97, 83, 99,114,105,112,116, 40,101,100,105,116,111,114, 84,101,120,116, 44, 32,102,105,108,101, 80, 97,116,104, 41, 10,
   32, 32, 32, 32,105,102, 32,109,101,110,117, 66, 97,114, 58, 73,115, 67,104,101, 99,107,101,100, 40, 73, 68, 95, 67, 76, 69, 65, 82, 79, 85, 84, 80, 85, 84, 41, 32,116,104,101,110, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 67,108,101, 97,114, 79,117,116,112,117,116, 40, 41, 10,
--- 1734,1738 ----
   32, 32, 32, 32,108,111, 99, 97,108, 32,105,100, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,101,100,105,116,111,114, 58, 71,101,116, 73,100, 40, 41, 10,
   32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 80, 97,116,104, 32, 32, 32, 61, 32, 77, 97,107,101, 68,101, 98,117,103, 70,105,108,101, 78, 97,109,101, 40,101,100,105,116,111,114, 44, 32,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 91,105,100, 93, 46,102,105,108,101, 80, 97,116,104, 41, 10,
!  32, 32, 32, 32,108,111, 99, 97,108, 32,114,101,116, 44, 32,101,114,114, 77,115,103, 44, 32,108,105,110,101, 95,110,117,109, 32, 61, 32,119,120,108,117, 97, 46, 67,111,109,112,105,108,101, 76,117, 97, 83, 99,114,105,112,116, 40,101,100,105,116,111,114, 84,101,120,116, 44, 32,102,105,108,101, 80, 97,116,104, 41, 10,
   32, 32, 32, 32,105,102, 32,109,101,110,117, 66, 97,114, 58, 73,115, 67,104,101, 99,107,101,100, 40, 73, 68, 95, 67, 76, 69, 65, 82, 79, 85, 84, 80, 85, 84, 41, 32,116,104,101,110, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 67,108,101, 97,114, 79,117,116,112,117,116, 40, 41, 10,

[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.h,1.30,1.31

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

Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19284/wxLua/apps/wxluacan/src

Modified Files:
	wxluacan.h 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: wxluacan.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** wxluacan.h	14 Jun 2007 01:23:06 -0000	1.30
--- wxluacan.h	16 Jun 2007 06:21:42 -0000	1.31
***************
*** 18,24 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 13
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 13
  // ---------------------------------------------------------------------------
  
--- 18,24 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 14
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 14
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp, 1.76, 1.77 wxlstate.cpp, 1.113, 1.114 wxlua_bind.cpp, 1.3, 1.4

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

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

Modified Files:
	wxlbind.cpp wxlstate.cpp wxlua_bind.cpp 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** wxlstate.cpp	14 Jun 2007 23:59:48 -0000	1.113
--- wxlstate.cpp	16 Jun 2007 06:21:46 -0000	1.114
***************
*** 471,474 ****
--- 471,503 ----
  }
  
+ int LUACALL wxlua_tisrefed(lua_State* L, int stack_idx)
+ {
+     int tag = LUA_NOREF;
+ 
+     lua_pushvalue(L, stack_idx);        // push value to compare
+ 
+     wxlua_pushkey_wxLuaReferences(L);   // push name of table to get as key
+     lua_rawget(L, LUA_REGISTRYINDEX);   // pop key, push result (the refs table)
+     int nTop = lua_gettop(L);           // this is where refs table is
+ 
+     lua_pushnil(L);
+     while (lua_next(L, nTop) != 0)      // ref table can have holes in it
+     {
+         // value = -1, key = -2, table = -3, object = -4
+         if (lua_equal(L, -1, -4))
+         {
+             tag = (int)lua_tonumber(L, -2);
+             lua_pop(L, 2);               // pop key, value
+             break;
+         }
+         else
+             lua_pop(L, 1);               // pop value, lua_next will pop key at end
+     }
+ 
+     lua_pop(L, 2); // pop object we pushed and the ref table
+ 
+     return tag;
+ }
+ 
  // ----------------------------------------------------------------------------
  // Functions to get info about the tags wxlua uses to determine type
***************
*** 578,585 ****
              ret = (luatype == LUA_TSTRING) ? 1 : 0;
              break;
!         case WXLUAARG_LuaTable :
              ret = (luatype == LUA_TTABLE) ? 1 : 0;
              break;
!         case WXLUAARG_LuaFunction :
              ret = (luatype == LUA_TFUNCTION) ? 1 : 0;
              break;
--- 607,614 ----
              ret = (luatype == LUA_TSTRING) ? 1 : 0;
              break;
!         case WXLUAARG_Table :
              ret = (luatype == LUA_TTABLE) ? 1 : 0;
              break;
!         case WXLUAARG_Function :
              ret = (luatype == LUA_TFUNCTION) ? 1 : 0;
              break;
***************
*** 587,591 ****
              ret = (luatype == LUA_TUSERDATA) ? 1 : 0;
              break;
!         case WXLUAARG_LuaThread :
              ret = (luatype == LUA_TTHREAD) ? 1 : 0;
              break;
--- 616,620 ----
              ret = (luatype == LUA_TUSERDATA) ? 1 : 0;
              break;
!         case WXLUAARG_Thread :
              ret = (luatype == LUA_TTHREAD) ? 1 : 0;
              break;
***************
*** 601,617 ****
  wxString wxlua_getwxluatypename(int wxluaarg_tag)
  {
      switch (wxluaarg_tag)
      {
!         case WXLUAARG_None :          return wxT("none");
!         case WXLUAARG_Nil :           return wxT("nil");
!         case WXLUAARG_Boolean :       return wxT("boolean");
!         case WXLUAARG_LightUserData : return wxT("lightuserdata");
!         case WXLUAARG_Number :        return wxT("number");
!         case WXLUAARG_String :        return wxT("string");
!         case WXLUAARG_LuaTable :      return wxT("table");
!         case WXLUAARG_LuaFunction :   return wxT("function");
!         case WXLUAARG_UserData :      return wxT("userdata");
!         case WXLUAARG_LuaThread :     return wxT("thread");
!         case WXLUAARG_Integer :       return wxT("integer");
      }
  
--- 630,662 ----
  wxString wxlua_getwxluatypename(int wxluaarg_tag)
  {
+     // try to use wxString's ref counting and return this existing copy
+     static wxString s[11] = {
+         wxT("none"),
+         wxT("nil"),
+         wxT("boolean"),
+         wxT("lightuserdata"),
+         wxT("number"),
+         wxT("string"),
+         wxT("table"),
+         wxT("function"),
+         wxT("userdata"),
+         wxT("thread"),
+         wxT("integer")
+     };
+ 
      switch (wxluaarg_tag)
      {
!         case WXLUAARG_None :          return s[0];
!         case WXLUAARG_Nil :           return s[1];
!         case WXLUAARG_Boolean :       return s[2];
!         case WXLUAARG_LightUserData : return s[3];
!         case WXLUAARG_Number :        return s[4];
!         case WXLUAARG_String :        return s[5];
!         case WXLUAARG_Table :         return s[6];
!         case WXLUAARG_Function :      return s[7];
!         case WXLUAARG_UserData :      return s[8];
!         case WXLUAARG_Thread :        return s[9];
! 
!         case WXLUAARG_Integer :       return s[10];
      }
  
***************
*** 629,636 ****
          case LUA_TNUMBER        : return WXLUAARG_Number;
          case LUA_TSTRING        : return WXLUAARG_String;
!         case LUA_TTABLE         : return WXLUAARG_LuaTable;
!         case LUA_TFUNCTION      : return WXLUAARG_LuaFunction;
          case LUA_TUSERDATA      : return WXLUAARG_UserData;
!         case LUA_TTHREAD        : return WXLUAARG_LuaThread;
          //case LUA_T???         : return WXLUAARG_Integer;
      }
--- 674,681 ----
          case LUA_TNUMBER        : return WXLUAARG_Number;
          case LUA_TSTRING        : return WXLUAARG_String;
!         case LUA_TTABLE         : return WXLUAARG_Table;
!         case LUA_TFUNCTION      : return WXLUAARG_Function;
          case LUA_TUSERDATA      : return WXLUAARG_UserData;
!         case LUA_TTHREAD        : return WXLUAARG_Thread;
          //case LUA_T???         : return WXLUAARG_Integer;
      }
***************
*** 649,656 ****
          case WXLUAARG_Number :        return LUA_TNUMBER;
          case WXLUAARG_String :        return LUA_TSTRING;
!         case WXLUAARG_LuaTable :      return LUA_TTABLE;
!         case WXLUAARG_LuaFunction :   return LUA_TFUNCTION;
          case WXLUAARG_UserData :      return LUA_TUSERDATA;
!         case WXLUAARG_LuaThread :     return LUA_TTHREAD;
          case WXLUAARG_Integer :       return LUA_TNUMBER;
      }
--- 694,701 ----
          case WXLUAARG_Number :        return LUA_TNUMBER;
          case WXLUAARG_String :        return LUA_TSTRING;
!         case WXLUAARG_Table :         return LUA_TTABLE;
!         case WXLUAARG_Function :      return LUA_TFUNCTION;
          case WXLUAARG_UserData :      return LUA_TUSERDATA;
!         case WXLUAARG_Thread :        return LUA_TTHREAD;
          case WXLUAARG_Integer :       return LUA_TNUMBER;
      }
***************
*** 1184,1187 ****
--- 1229,1234 ----
      }
  
+     // m_wxlStateData->m_windowList.Clear(); wxLuaCleanupWindows does this for us
+ 
      ClearCallbacks();
      CleanupWxLua(!m_lua_State_static);
***************
*** 1203,1211 ****
          m_lua_State = NULL;
      }
- 
-     // Clear these after closing lua for gc to run
-     m_wxlStateData->m_callbackList.Clear();
-     m_wxlStateData->m_winDestroyCallbackList.Clear();
-     m_wxlStateData->m_windowList.Clear();
  }
  
--- 1250,1253 ----
***************
*** 1899,1902 ****
--- 1941,1998 ----
      }
  
+     // Link together all of the class member functions with base class functions
+     // with the same name so the overloads work for them too.
+     node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst();
+     while (node)
+     {
+         wxLuaBinding* binding = node->GetData();
+         wxLuaBindClass* wxlClass = binding->GetClassArray();
+         size_t i, class_count = binding->GetClassCount();
+ 
+         for (i = 0; i < class_count; ++i, ++wxlClass)
+         {
+             if (wxlClass->baseclass) // does it have a base class at all?
+             {
+                 wxLuaBindMethod *wxlMethod = wxlClass->methods;
+                 size_t j, method_count = wxlClass->methods_n;
+ 
+                 for (j = 0; j < method_count; ++j, ++wxlMethod)
+                 {
+                     // iterate through the base classes to find if this function is
+                     // an overload, but only if we haven't checked already.
+                     if (!WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_OVERLOAD_BASE|WXLUAMETHOD_DELETE))
+                     {
+                         wxLuaBindClass *baseClass = wxlClass->baseclass;
+                         wxLuaBindMethod *parentMethod = wxlMethod;
+ 
+                         while (baseClass)
+                         {
+                             parentMethod->type |= WXLUAMETHOD_OVERLOAD_BASE; // have checked this
+ 
+                             wxLuaBindMethod* baseMethod = wxLuaBinding::GetClassMethod(baseClass, wxlMethod->name, false);
+                             if (baseMethod)
+                             {
+                                 // don't link to base class delete functions
+                                 if (!WXLUA_HASBIT(baseMethod->type, WXLUAMETHOD_DELETE))
+                                 {
+                                     parentMethod->basemethod = baseMethod;
+                                     parentMethod = baseMethod;
+                                 }
+ 
+                                 // we have already checked the base classes below this
+                                 if (WXLUA_HASBIT(baseMethod->type, WXLUAMETHOD_OVERLOAD_BASE))
+                                     break;
+                             }
+ 
+                             baseClass = baseClass->baseclass;
+                         }
+                     }
+                 }
+             }
+         }
+ 
+         node = node->GetNext();
+     }
+ 
      // register our 'function' object handlers
      if (registerTypes)
***************
*** 1909,1915 ****
      tsettagmethod(g_wxluatag_wxLuaFunction, "__call", wxlua_call_wxLuaFunction);
  
  
      const wxLuaBindClass* wxlClass = NULL;
-     
      wxlClass = GetLuaClass("wxEvent");
      wxCHECK_RET(wxlClass, wxT("wxEvent lua tag is missing in wxLuaState, forgot to add wxWidgets binding?"));
--- 2005,2011 ----
      tsettagmethod(g_wxluatag_wxLuaFunction, "__call", wxlua_call_wxLuaFunction);
  
+     // Finally - set the global tags from the bindings we've just installed
  
      const wxLuaBindClass* wxlClass = NULL;
      wxlClass = GetLuaClass("wxEvent");
      wxCHECK_RET(wxlClass, wxT("wxEvent lua tag is missing in wxLuaState, forgot to add wxWidgets binding?"));
***************
*** 2095,2098 ****
--- 2191,2232 ----
  }
  
+ wxArrayString wxLuaState::GetTrackedObjectStrings()
+ {
+     wxArrayString names;
+     wxArrayInt counts;
+ 
+     wxCHECK_MSG(Ok(), names, wxT("Invalid wxLuaState"));
+ 
+     wxLongToLongHashMap::iterator it;
+     wxLongToLongHashMap* hashMap = GetTrackedObjects();
+ 
+     for (it = hashMap->begin(); it != hashMap->end(); ++it)
+     {
+         wxString name(wxT("Unknown Tracked Item"));
+ 
+         wxObject* obj = (wxObject*)it->second;
+         if (obj && obj->GetClassInfo() && obj->GetClassInfo()->GetClassName())
+             name = obj->GetClassInfo()->GetClassName();
+ 
+         //name = wxString::Format(wxT("%p "), obj) + name;
+ 
+         int idx = names.Index(name);
+         if (idx == wxNOT_FOUND)
+         {
+             names.Add(name);
+             counts.Add(1);
+         }
+         else
+             counts[idx]++;
+     }
+ 
+     size_t n, count = names.GetCount();
+     for (n = 0; n < count; ++n)
+         names[n] += wxString::Format(wxT(" %d"), counts[n]);
+ 
+     names.Sort();
+     return names;
+ }
+ 
  bool wxLuaState::AddTrackedWindow(wxObject *obj)
  {
***************
*** 2144,2147 ****
--- 2278,2317 ----
  }
  
+ wxArrayString wxLuaState::GetTrackedWindowStrings()
+ {
+     wxArrayString names;
+     wxArrayInt counts;
+ 
+     wxCHECK_MSG(Ok(), names, wxT("Invalid wxLuaState"));
+ 
+     wxWindowList::compatibility_iterator node = GetLuaStateData()->m_windowList.GetFirst();
+     while (node)
+     {
+         wxWindow *win= (wxWindow*)node->GetData();
+         wxCHECK_MSG(win, false, wxT("Invalid wxLuaCallback"));
+         if (win && win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+         {
+             wxString name(win->GetClassInfo()->GetClassName());
+             int idx = names.Index(name);
+             if (idx == wxNOT_FOUND)
+             {
+                 names.Add(name);
+                 counts.Add(1);
+             }
+             else
+                 counts[idx]++;
+         }
+ 
+         node = node->GetNext();
+     }
+ 
+     size_t n, count = names.GetCount();
+     for (n = 0; n < count; ++n)
+         names[n] += wxString::Format(wxT(" %d"), counts[n]);
+ 
+     names.Sort();
+     return names;
+ }
+ 
  void wxLuaState::GarbageCollectWindows(bool closeWindows)
  {
***************
*** 2168,2171 ****
--- 2338,2387 ----
  }
  
+ wxArrayString wxLuaState::GetTrackedCallbackStrings()
+ {
+     wxArrayString names;
+     wxArrayInt counts;
+ 
+     wxCHECK_MSG(Ok(), names, wxT("Invalid wxLuaState"));
+ 
+     wxList::compatibility_iterator node = GetTrackedCallbackList()->GetFirst();
+     while (node)
+     {
+         wxLuaCallback *wxlCallback = (wxLuaCallback *)node->GetData();
+         wxCHECK_MSG(wxlCallback, false, wxT("Invalid wxLuaCallback"));
+ 
+         wxString evtName;
+         if (GetLuaBindingList())
+         {
+             wxLuaBindingList::compatibility_iterator bindNode = GetLuaBindingList()->GetFirst();
+             for (; bindNode; bindNode = bindNode->GetNext())
+             {
+                 wxLuaBinding* binding = bindNode->GetData();
+                 evtName = binding->GetEventTypeName(wxlCallback->GetEventType());
+                 if (!evtName.IsEmpty()) break;
+             }
+         }
+ 
+         wxString name = wxString::Format(wxT("%s (%d)"), evtName.c_str(), (int)wxlCallback->GetEventType());
+         int idx = names.Index(name);
+         if (idx == wxNOT_FOUND)
+         {
+             names.Add(name);
+             counts.Add(1);
+         }
+         else
+             counts[idx]++;
+ 
+         node = node->GetNext();
+     }
+ 
+     size_t n, count = names.GetCount();
+     for (n = 0; n < count; ++n)
+         names[n] += wxString::Format(wxT(" %d"), counts[n]);
+ 
+     names.Sort();
+     return names;
+ }
+ 
  void wxLuaState::AddTrackedWinDestroyCallback(wxLuaWinDestroyCallback* callback)
  {
***************
*** 2184,2187 ****
--- 2400,2436 ----
  }
  
+ wxArrayString wxLuaState::GetTrackedWinDestroyCallbackStrings()
+ {
+     wxArrayString names;
+     wxArrayInt counts;
+ 
+     wxCHECK_MSG(Ok(), names, wxT("Invalid wxLuaState"));
+ 
+     wxList::compatibility_iterator node = GetTrackedWinDestroyCallbackList()->GetFirst();
+     while (node)
+     {
+         wxLuaWinDestroyCallback *wxlDestroyCallBack = (wxLuaWinDestroyCallback *) node->GetData();
+         wxCHECK_MSG(wxlDestroyCallBack, false, wxT("Invalid wxLuaWinDestroyCallback"));
+ 
+         wxString name(wxT("Unknown Tracked Window Type"));
+ 
+         wxObject* obj = (wxObject*)wxlDestroyCallBack->GetEvtHandler();
+         if (obj && obj->GetClassInfo() && obj->GetClassInfo()->GetClassName())
+             name = obj->GetClassInfo()->GetClassName();
+ 
+         names.Add(name);
+         counts.Add(1);
+ 
+         node = node->GetNext();
+     }
+ 
+     size_t n, count = names.GetCount();
+     for (n = 0; n < count; ++n)
+         names[n] += wxString::Format(wxT(" %d"), counts[n]);
+ 
+     names.Sort();
+     return names;
+ }
+ 
  // ----------------------------------------------------------------------------
  // wxLua Lua Registry Table Functions
***************
*** 2294,2299 ****
          if ((g_wxluatag_NULL == stack_tag) || // FIXME, how to check when NULL is valid or not?
              (g_wxluatag_wxLuaFunction == stack_tag) ||
!             ((tag == WXLUAARG_String) && (IsDerivedClass(stack_tag, g_wxluatag_wxString) >= 0)) ||
!             (IsDerivedClass(stack_tag, tag) >= 0))
              return true;
      }
--- 2543,2548 ----
          if ((g_wxluatag_NULL == stack_tag) || // FIXME, how to check when NULL is valid or not?
              (g_wxluatag_wxLuaFunction == stack_tag) ||
!             ((tag == WXLUAARG_String) && (wxlua_isderivedclass(L, stack_tag, g_wxluatag_wxString) >= 0)) ||
!             (wxlua_isderivedclass(L, stack_tag, tag) >= 0))
              return true;
      }
***************
*** 2309,2327 ****
      if (wxlua_iswxuserdata(L, stack_idx))
      {
!         int stack_tag = ttag(stack_idx);
  
          if (g_wxluatag_wxLuaFunction == stack_tag)
          {
!             wxLuaFunction *pFunction = (wxLuaFunction *)ttouserdata(stack_idx);
              return pFunction->GetObject();
          }
          else if (g_wxluatag_NULL == stack_tag)
              return NULL;
!         else if (IsDerivedClass(stack_tag, tag) >= 0)
!             return ttouserdata(stack_idx);
      }
  
      terror(wxString::Format(_("wxLua: Expected user defined data type '%s' for parameter %d, but got '%s'."),
          GetLuaTagName(tag).c_str(), stack_idx, lua_TypeNameIndex(stack_idx).c_str()));
      return NULL;
  }
--- 2558,2577 ----
      if (wxlua_iswxuserdata(L, stack_idx))
      {
!         int stack_tag = wxlua_ttag(L, stack_idx);
  
          if (g_wxluatag_wxLuaFunction == stack_tag)
          {
!             wxLuaFunction *pFunction = (wxLuaFunction *)wxlua_ttouserdata(L, stack_idx);
              return pFunction->GetObject();
          }
          else if (g_wxluatag_NULL == stack_tag)
              return NULL;
!         else if (wxlua_isderivedclass(L, stack_tag, tag) >= 0)
!             return wxlua_ttouserdata(L, stack_idx);
      }
  
      terror(wxString::Format(_("wxLua: Expected user defined data type '%s' for parameter %d, but got '%s'."),
          GetLuaTagName(tag).c_str(), stack_idx, lua_TypeNameIndex(stack_idx).c_str()));
+ 
      return NULL;
  }
***************
*** 2330,2333 ****
--- 2580,2584 ----
  {
      wxCHECK_RET(Ok(), wxT("Invalid wxLuaState"));
+     lua_State* L = M_WXLSTATEDATA->m_lua_State;
  
      if (data != NULL)
***************
*** 2336,2340 ****
  
          // if the object we are referencing is derived from wxWindow
!         if (IsDerivedClass(tag, g_wxluatag_wxWindow) >= 0)
          {
              wxWindow* win = wxDynamicCast(data, wxWindow);
--- 2587,2591 ----
  
          // if the object we are referencing is derived from wxWindow
!         if (wxlua_isderivedclass(L, tag, g_wxluatag_wxWindow) >= 0)
          {
              wxWindow* win = wxDynamicCast(data, wxWindow);
***************
*** 2375,2379 ****
          // Otherwise handle normally
          if (!handled)
!             tpushusertag(data, tag);
      }
      else
--- 2626,2630 ----
          // Otherwise handle normally
          if (!handled)
!             wxlua_tpushusertag(L, data, tag);
      }
      else
***************
*** 2391,2395 ****
  {
      wxCHECK_MSG(Ok(), wxEmptyString, wxT("Invalid wxLuaState"));
- 
      lua_State* L = M_WXLSTATEDATA->m_lua_State;
  
--- 2642,2645 ----
***************
*** 2400,2404 ****
          int stack_tag = wxlua_ttag(L, stack_idx);
  
!         if (IsDerivedClass(stack_tag, g_wxluatag_wxString) >= 0)
          {
              wxString* wxstr = (wxString*)wxlua_ttouserdata(L, stack_idx, false);
--- 2650,2654 ----
          int stack_tag = wxlua_ttag(L, stack_idx);
  
!         if (wxlua_isderivedclass(L, stack_tag, g_wxluatag_wxString) >= 0)
          {
              wxString* wxstr = (wxString*)wxlua_ttouserdata(L, stack_idx, false);
***************
*** 2432,2436 ****
  {
      wxCHECK_MSG(Ok(), false, wxT("Invalid wxLuaState"));
- 
      lua_State* L = M_WXLSTATEDATA->m_lua_State;
  
--- 2682,2685 ----
***************
*** 2440,2444 ****
      {
          int stack_tag = wxlua_ttag(L, stack_idx);
!         return (IsDerivedClass(stack_tag, g_wxluatag_wxString) >= 0);
      }
  
--- 2689,2693 ----
      {
          int stack_tag = wxlua_ttag(L, stack_idx);
!         return (wxlua_isderivedclass(L, stack_tag, g_wxluatag_wxString) >= 0);
      }
  

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** wxlbind.cpp	14 Jun 2007 23:59:48 -0000	1.76
--- wxlbind.cpp	16 Jun 2007 06:21:46 -0000	1.77
***************
*** 37,44 ****
  int s_wxluaarg_Number        = WXLUAARG_Number;
  int s_wxluaarg_String        = WXLUAARG_String;
! int s_wxluaarg_LuaTable      = WXLUAARG_LuaTable;
! int s_wxluaarg_LuaFunction   = WXLUAARG_LuaFunction;
  int s_wxluaarg_UserData      = WXLUAARG_UserData;      // raw data
! int s_wxluaarg_LuaThread     = WXLUAARG_LuaThread;
  int s_wxluaarg_Integer       = WXLUAARG_Integer;
  
--- 37,44 ----
  int s_wxluaarg_Number        = WXLUAARG_Number;
  int s_wxluaarg_String        = WXLUAARG_String;
! int s_wxluaarg_Table         = WXLUAARG_Table;
! int s_wxluaarg_Function      = WXLUAARG_Function;
  int s_wxluaarg_UserData      = WXLUAARG_UserData;      // raw data
! int s_wxluaarg_Thread        = WXLUAARG_Thread;
  int s_wxluaarg_Integer       = WXLUAARG_Integer;
  
***************
*** 71,78 ****
  int LUACALL wxlua_gc_wxLuaFunction(lua_State *L)
  {
!     wxLuaState wxlState(L);
!     wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState"));
! 
!     if (wxlua_iswxuserdata(L, 1) && (wxlua_ttag(L, 1) == g_wxluatag_wxLuaFunction))
      {
          wxLuaFunction *wxlFunction = (wxLuaFunction *)wxlua_ttouserdata(L, 1, true);
--- 71,76 ----
  int LUACALL wxlua_gc_wxLuaFunction(lua_State *L)
  {
!     // Sanity check, but this is only attached to a wxLuaFunction, so it has to be ok.
!     //if (wxlua_iswxuserdata(L, 1) && (wxlua_ttag(L, 1) == g_wxluatag_wxLuaFunction))
      {
          wxLuaFunction *wxlFunction = (wxLuaFunction *)wxlua_ttouserdata(L, 1, true);
***************
*** 85,92 ****
  int LUACALL wxlua_call_wxLuaFunction(lua_State *L)
  {
!     wxLuaState wxlState(L);
!     wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState"));
! 
!     if (wxlua_iswxuserdata(L, 1) && (wxlua_ttag(L, 1) == g_wxluatag_wxLuaFunction))
      {
          wxLuaFunction *wxlFunction = (wxLuaFunction *)wxlua_ttouserdata(L, 1, false);
--- 83,88 ----
  int LUACALL wxlua_call_wxLuaFunction(lua_State *L)
  {
!     // Sanity check, but this is only attached to a wxLuaFunction, so it has to be ok.
!     //if (wxlua_iswxuserdata(L, 1) && (wxlua_ttag(L, 1) == g_wxluatag_wxLuaFunction))
      {
          wxLuaFunction *wxlFunction = (wxLuaFunction *)wxlua_ttouserdata(L, 1, false);
***************
*** 110,114 ****
              : m_wxlState(new wxLuaState(wxlState)),
                m_alloc_flag(wxLUAOBJECT_NONE),
!               m_bool(false), m_int(0), m_string(NULL), m_arrayInt(NULL)
  
  {
--- 106,110 ----
              : m_wxlState(new wxLuaState(wxlState)),
                m_alloc_flag(wxLUAOBJECT_NONE),
!               m_int(0) // GCC only wants one initializer
  
  {
***************
*** 122,126 ****
          delete m_string;
      else if (m_alloc_flag == wxLUAOBJECT_ARRAYINT)
!         delete m_arrayInt; 
  
      // If a refererence exists, remove it, but don't bother if lua is being closed
--- 118,122 ----
          delete m_string;
      else if (m_alloc_flag == wxLUAOBJECT_ARRAYINT)
!         delete m_arrayInt;
  
      // If a refererence exists, remove it, but don't bother if lua is being closed
***************
*** 328,331 ****
--- 324,328 ----
          {
              wxLuaBindMethod* wxlMethod = wxLuaBinding::GetClassMethod(wxlClass, name);
+ 
              if (wxlMethod != NULL)
              {
***************
*** 491,499 ****
          // get methods are either WXLUAMETHOD_METHOD or WXLUAMETHOD_GETPROP
          // and they can't both have the same names so either type will work
          int t1 = 0xFF & ((const wxLuaBindMethod*)p1)->type;
          int t2 = 0xFF & ((const wxLuaBindMethod*)p2)->type;
!         int t12 = int(t1) & int(t2);
!         if ((t12 == WXLUAMETHOD_METHOD) || (t12 == WXLUAMETHOD_GETPROP) ||
!             (t12 == (int(WXLUAMETHOD_METHOD)|int(WXLUAMETHOD_GETPROP))))
              return 0;
  
--- 488,496 ----
          // get methods are either WXLUAMETHOD_METHOD or WXLUAMETHOD_GETPROP
          // and they can't both have the same names so either type will work
+         // we have also set the reference item's type to 0 so we don't test positive for it
          int t1 = 0xFF & ((const wxLuaBindMethod*)p1)->type;
          int t2 = 0xFF & ((const wxLuaBindMethod*)p2)->type;
!         if (WXLUA_HASBIT(t1, WXLUAMETHOD_METHOD|WXLUAMETHOD_GETPROP) ||
!             WXLUA_HASBIT(t2, WXLUAMETHOD_METHOD|WXLUAMETHOD_GETPROP))
              return 0;
  
***************
*** 1034,1040 ****
  {
      wxCHECK_MSG(wxlClass, NULL, wxT("Invalid wxLuaBindClass to find method from."));
! /*
!     wxLuaBindMethod methodItem = { 0, WXLUAMETHOD_METHOD, 0, 0, 0 };
!     methodItem.name = methodName;
  
      // this relies on LUA allocating tags in ascending order of definition
--- 1031,1039 ----
  {
      wxCHECK_MSG(wxlClass, NULL, wxT("Invalid wxLuaBindClass to find method from."));
! 
! #if 1
! 
!     // Note : type must be 0 for the compare function to work
!     wxLuaBindMethod methodItem = { methodName, 0, 0, 0, 0 };
  
      // this relies on LUA allocating tags in ascending order of definition
***************
*** 1047,1051 ****
  
      //wxPrintf(wxT("wxlMethod %d\n"), wxlMethod);
! */
  
      wxLuaBindMethod *wxlMethod = wxlClass->methods;
--- 1046,1057 ----
  
      //wxPrintf(wxT("wxlMethod %d\n"), wxlMethod);
! 
!     if (wxlMethod != NULL)
!         return wxlMethod;
! 
!     if (search_baseclasses && wxlClass->baseclass)
!         return GetClassMethod(wxlClass->baseclass, methodName, search_baseclasses);
! 
! #else
  
      wxLuaBindMethod *wxlMethod = wxlClass->methods;
***************
*** 1058,1061 ****
--- 1064,1070 ----
                  && (strcmp(wxlMethod->name, methodName) == 0))
          {
+ /*          // NOTE: This is now implemented in wxLuaState::RegisterBindings
+ 
+ 
              // iterate through the base classes to find if this function is
              // an overload, but only if we haven't checked already.
***************
*** 1086,1090 ****
                  }
              }
! 
              return wxlMethod;
          }
--- 1095,1099 ----
                  }
              }
! */
              return wxlMethod;
          }
***************
*** 1094,1097 ****
--- 1103,1108 ----
          return GetClassMethod(wxlClass->baseclass, methodName, search_baseclasses);
  
+ #endif
+ 
      return NULL;
  }
***************
*** 1349,1353 ****
                  {
                      // Force the baseclass methods to be found
!                     wxLuaBinding::GetClassMethod(wxlClass, wxlMethod->name, true);
  
                      // Create table { wxLuaBindClass userdata }
--- 1360,1364 ----
                  {
                      // Force the baseclass methods to be found
!                     //wxLuaBinding::GetClassMethod(wxlClass, wxlMethod->name, true); FIXME
  
                      // Create table { wxLuaBindClass userdata }

Index: wxlua_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxlua_bind.cpp	14 Jun 2007 23:59:48 -0000	1.3
--- wxlua_bind.cpp	16 Jun 2007 06:21:46 -0000	1.4
***************
*** 60,72 ****
          { "LUA_TUSERDATA", LUA_TUSERDATA },
          { "WXLUAARG_Boolean", WXLUAARG_Boolean },
          { "WXLUAARG_Integer", WXLUAARG_Integer },
          { "WXLUAARG_LightUserData", WXLUAARG_LightUserData },
-         { "WXLUAARG_LuaFunction", WXLUAARG_LuaFunction },
-         { "WXLUAARG_LuaTable", WXLUAARG_LuaTable },
-         { "WXLUAARG_LuaThread", WXLUAARG_LuaThread },
          { "WXLUAARG_Nil", WXLUAARG_Nil },
          { "WXLUAARG_None", WXLUAARG_None },
          { "WXLUAARG_Number", WXLUAARG_Number },
          { "WXLUAARG_String", WXLUAARG_String },
          { "WXLUAARG_UserData", WXLUAARG_UserData },
          { "WXLUAMETHOD_CFUNCTION", WXLUAMETHOD_CFUNCTION },
--- 60,72 ----
          { "LUA_TUSERDATA", LUA_TUSERDATA },
          { "WXLUAARG_Boolean", WXLUAARG_Boolean },
+         { "WXLUAARG_Function", WXLUAARG_Function },
          { "WXLUAARG_Integer", WXLUAARG_Integer },
          { "WXLUAARG_LightUserData", WXLUAARG_LightUserData },
          { "WXLUAARG_Nil", WXLUAARG_Nil },
          { "WXLUAARG_None", WXLUAARG_None },
          { "WXLUAARG_Number", WXLUAARG_Number },
          { "WXLUAARG_String", WXLUAARG_String },
+         { "WXLUAARG_Table", WXLUAARG_Table },
+         { "WXLUAARG_Thread", WXLUAARG_Thread },
          { "WXLUAARG_UserData", WXLUAARG_UserData },
          { "WXLUAMETHOD_CFUNCTION", WXLUAMETHOD_CFUNCTION },
***************
*** 150,153 ****
--- 150,245 ----
  static wxLuaBindCFunc s_wxluafunc_wxLua_function_CompileLuaScript[1] = {{ wxLua_function_CompileLuaScript, WXLUAMETHOD_CFUNCTION, 2, 2, s_wxluatagArray_wxLua_function_CompileLuaScript }};
  
+ // %override wxLua_function_GetTrackedEventCallbacks
+ // %function LuaTable GetTrackedEventCallbacks()
+ static int LUACALL wxLua_function_GetTrackedEventCallbacks(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxArrayString strArr = wxlState.GetTrackedCallbackStrings();
+     size_t n, count = strArr.GetCount();
+     long val = 0;
+     lua_createtable(L, 0, count);
+ 
+     for (n = 0; n < count; ++n)
+     {
+         lua_pushstring(L, wx2lua(strArr[n].BeforeFirst(wxT(' '))));
+         strArr[n].AfterLast(wxT(' ')).ToLong(&val);
+         lua_pushnumber(L, (double)val);
+         lua_rawset(L, -3);
+     }
+ 
+     return 1;
+ }
+ 
+ static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedEventCallbacks[1] = {{ wxLua_function_GetTrackedEventCallbacks, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }};
+ 
+ // %override wxLua_function_GetTrackedTopLevelWindows
+ // %function LuaTable GetTrackedTopLevelWindows()
+ static int LUACALL wxLua_function_GetTrackedTopLevelWindows(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxArrayString strArr = wxlState.GetTrackedWindowStrings();
+     size_t n, count = strArr.GetCount();
+     long val = 0;
+     lua_createtable(L, 0, count);
+ 
+     for (n = 0; n < count; ++n)
+     {
+         lua_pushstring(L, wx2lua(strArr[n].BeforeLast(wxT(' '))));
+         strArr[n].AfterLast(wxT(' ')).ToLong(&val);
+         lua_pushnumber(L, (double)val);
+         lua_rawset(L, -3);
+     }
+ 
+     return 1;
+ }
+ 
+ static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedTopLevelWindows[1] = {{ wxLua_function_GetTrackedTopLevelWindows, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }};
+ 
+ // %override wxLua_function_GetTrackedUserData
+ // %function LuaTable GetTrackedUserData()
+ static int LUACALL wxLua_function_GetTrackedUserData(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxArrayString strArr = wxlState.GetTrackedObjectStrings();
+     size_t n, count = strArr.GetCount();
+     long val = 0;
+     lua_createtable(L, 0, count);
+ 
+     for (n = 0; n < count; ++n)
+     {
+         lua_pushstring(L, wx2lua(strArr[n].BeforeLast(wxT(' '))));
+         strArr[n].AfterLast(wxT(' ')).ToLong(&val);
+         lua_pushnumber(L, (double)val);
+         lua_rawset(L, -3);
+     }
+ 
+     return 1;
+ }
+ 
+ static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedUserData[1] = {{ wxLua_function_GetTrackedUserData, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }};
+ 
+ // %override wxLua_function_GetTrackedWindows
+ // %function LuaTable GetTrackedWindows()
+ static int LUACALL wxLua_function_GetTrackedWindows(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxArrayString strArr = wxlState.GetTrackedWinDestroyCallbackStrings();
+     size_t n, count = strArr.GetCount();
+     long val = 0;
+     lua_createtable(L, 0, count);
+ 
+     for (n = 0; n < count; ++n)
+     {
+         lua_pushstring(L, wx2lua(strArr[n].BeforeLast(wxT(' '))));
+         strArr[n].AfterLast(wxT(' ')).ToLong(&val);
+         lua_pushnumber(L, (double)val);
+         lua_rawset(L, -3);
+     }
+ 
+     return 1;
+ }
+ 
+ static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedWindows[1] = {{ wxLua_function_GetTrackedWindows, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }};
+ 
  static wxLuaArgTag s_wxluatagArray_wxLua_function_wxlua_iswxluatype[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, NULL };
  // %function int wxlua_iswxluatype(int luatype, int wxluaarg_tag)
***************
*** 219,222 ****
--- 311,318 ----
      {
          { "CompileLuaScript", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_CompileLuaScript, 1, NULL },
+         { "GetTrackedEventCallbacks", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_GetTrackedEventCallbacks, 1, NULL },
+         { "GetTrackedTopLevelWindows", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_GetTrackedTopLevelWindows, 1, NULL },
+         { "GetTrackedUserData", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_GetTrackedUserData, 1, NULL },
+         { "GetTrackedWindows", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_GetTrackedWindows, 1, NULL },
          { "wxlua_iswxluatype", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_wxlua_iswxluatype, 1, NULL },
          { "wxlua_type", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_wxlua_type, 1, NULL },

[Wxlua-commit] wxLua/modules/wxluasocket/src wxldserv.cpp, 1.44, 1.45 wxldtarg.cpp, 1.37, 1.38 wxlsock.cpp, 1.29, 1.30

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

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

Modified Files:
	wxldserv.cpp wxldtarg.cpp wxlsock.cpp 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: wxldtarg.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** wxldtarg.cpp	31 May 2007 17:18:55 -0000	1.37
--- wxldtarg.cpp	16 Jun 2007 06:21:47 -0000	1.38
***************
*** 446,450 ****
  bool wxLuaDebugTarget::EnumerateStack()
  {
!     wxLuaDebugData debugData;
  
      EnterLuaCriticalSection();
--- 446,450 ----
  bool wxLuaDebugTarget::EnumerateStack()
  {
!     wxLuaDebugData debugData(true);
  
      EnterLuaCriticalSection();
***************
*** 457,461 ****
  bool wxLuaDebugTarget::EnumerateStackEntry(int stackRef)
  {
!     wxLuaDebugData debugData;
  
      EnterLuaCriticalSection();
--- 457,461 ----
  bool wxLuaDebugTarget::EnumerateStackEntry(int stackRef)
  {
!     wxLuaDebugData debugData(true);
  
      EnterLuaCriticalSection();
***************
*** 468,472 ****
  bool wxLuaDebugTarget::EnumerateTable(int tableRef, int nIndex, long nItemNode)
  {
!     wxLuaDebugData debugData;
  
      EnterLuaCriticalSection();
--- 468,472 ----
  bool wxLuaDebugTarget::EnumerateTable(int tableRef, int nIndex, long nItemNode)
  {
!     wxLuaDebugData debugData(true);
  
      EnterLuaCriticalSection();

Index: wxldserv.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** wxldserv.cpp	11 Jun 2007 03:58:10 -0000	1.44
--- wxldserv.cpp	16 Jun 2007 06:21:47 -0000	1.45
***************
*** 52,58 ****
                      m_has_message(event.m_has_message),
                      m_lua_ref(event.m_lua_ref),
                      m_enabled_flag(event.m_enabled_flag)
  {
!     SetDebugData(event.GetReference(), event.GetDebugData().Copy());
  }
  
--- 52,59 ----
                      m_has_message(event.m_has_message),
                      m_lua_ref(event.m_lua_ref),
+                     m_debugData(wxNullLuaDebugData),
                      m_enabled_flag(event.m_enabled_flag)
  {
!     SetDebugData(event.GetReference(), event.GetDebugData());
  }
  
***************
*** 66,69 ****
--- 67,71 ----
                      m_has_message(false),
                      m_lua_ref(-1),
+                     m_debugData(wxNullLuaDebugData),
                      m_enabled_flag(enabled_flag)
  {
***************
*** 79,84 ****
  void wxLuaDebuggerEvent::SetDebugData(long nReference, const wxLuaDebugData& debugData)
  {
!     m_lua_ref    = nReference;
!     m_debugData  = debugData;
  }
  
--- 81,86 ----
  void wxLuaDebuggerEvent::SetDebugData(long nReference, const wxLuaDebugData& debugData)
  {
!     m_lua_ref   = nReference;
!     m_debugData = debugData;
  }
  
***************
*** 430,434 ****
          case wxLUASOCKET_DEBUGGEE_EVENT_STACK_ENUM:
          {
!             wxLuaDebugData debugData;
  
              if (CheckSocketRead(
--- 432,436 ----
          case wxLUASOCKET_DEBUGGEE_EVENT_STACK_ENUM:
          {
!             wxLuaDebugData debugData(true);
  
              if (CheckSocketRead(
***************
*** 447,451 ****
          {
              wxInt32 stackRef = 0;
!             wxLuaDebugData debugData;
  
              if (CheckSocketRead(
--- 449,453 ----
          {
              wxInt32 stackRef = 0;
!             wxLuaDebugData debugData(true);
  
              if (CheckSocketRead(
***************
*** 465,469 ****
          {
              long itemNode = 0;
!             wxLuaDebugData debugData;
  
              if (CheckSocketRead(
--- 467,471 ----
          {
              long itemNode = 0;
!             wxLuaDebugData debugData(true);
  
              if (CheckSocketRead(

Index: wxlsock.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** wxlsock.cpp	11 Jun 2007 03:58:10 -0000	1.29
--- wxlsock.cpp	16 Jun 2007 06:21:47 -0000	1.30
***************
*** 153,157 ****
  bool wxLuaSocketBase::ReadDebugData(wxLuaDebugData& value)
  {
!     wxLuaDebugData debugData;
      bool ok = false;
  
--- 153,157 ----
  bool wxLuaSocketBase::ReadDebugData(wxLuaDebugData& value)
  {
!     wxLuaDebugData debugData(true);
      bool ok = false;
  

[Wxlua-commit] wxLua/samples bindings.wx.lua, 1.9, 1.10 editor.wx.lua, 1.54, 1.55 unittest.wx.lua, 1.12, 1.13 debug.wx.lua, 1.13, NONE

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

Update of /cvsroot/wxlua/wxLua/samples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19284/wxLua/samples

Modified Files:
	bindings.wx.lua editor.wx.lua unittest.wx.lua 
Removed Files:
	debug.wx.lua 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** editor.wx.lua	14 Jun 2007 01:23:20 -0000	1.54
--- editor.wx.lua	16 Jun 2007 06:21:47 -0000	1.55
***************
*** 1721,1725 ****
      local id         = editor:GetId()
      local filePath   = MakeDebugFileName(editor, openDocuments[id].filePath)
!     local ret, errMsg, line_num = wx.CompileLuaScript(editorText, filePath)
      if menuBar:IsChecked(ID_CLEAROUTPUT) then
          ClearOutput()
--- 1721,1725 ----
      local id         = editor:GetId()
      local filePath   = MakeDebugFileName(editor, openDocuments[id].filePath)
!     local ret, errMsg, line_num = wxlua.CompileLuaScript(editorText, filePath)
      if menuBar:IsChecked(ID_CLEAROUTPUT) then
          ClearOutput()

--- debug.wx.lua DELETED ---

Index: bindings.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/bindings.wx.lua,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** bindings.wx.lua	14 Jun 2007 23:59:49 -0000	1.9
--- bindings.wx.lua	16 Jun 2007 06:21:47 -0000	1.10
***************
*** 128,131 ****
--- 128,136 ----
  }
  
+ list_colors = {
+     ["purple"] = wx.wxColour("purple"),
+ }
+ 
+ 
  listColWidths = {}  -- stored by "object_type" name
  
***************
*** 144,147 ****
--- 149,158 ----
  
  -- ----------------------------------------------------------------------------
+ -- Function to simulate var = cond ? a : b
+ -- ----------------------------------------------------------------------------
+ 
+ function iff(cond, a, b) if cond then return a else return b end end
+ 
+ -- ----------------------------------------------------------------------------
  -- Find the bindings installed into wxLua, tables that might have wxLuaBinding_
  -- ----------------------------------------------------------------------------
***************
*** 159,232 ****
  
  -- ----------------------------------------------------------------------------
- -- Load all the wxWidgets wxClassInfo
- -- ----------------------------------------------------------------------------
- function CreatewxClassInfoTable()
- 
-     -- create a table of tables of cols of the classname and baseclass names
-     -- if there is a baseclass2 then the returned table will have > 1 tables
-     local function GetBases(ci)
-         local c = ci
-         local t = {{}}
- 
-         while c do
-             table.insert(t[1], c:GetClassName())
- 
-             if c:GetBaseClass2() then
-                 --print(c:GetClassName(), "Has Base2", c:GetBaseClass2())
- 
-                 local baseTable2 = GetBases(c:GetBaseClass2())
-                 for i = 1, #baseTable2 do
-                     -- insert back in the original info
-                     for j = 1, #t do
-                         table.insert(baseTable2[i], j, t[1][j])
-                     end
-                     baseTable2[i][1] = baseTable2[i][1].." "..tostring(i) -- count # of base2s
-                     table.insert(t, baseTable2[i])
-                 end
-             end
- 
-             c = c:GetBaseClass1()
-         end
- 
-         return t
-     end
- 
-     local t = {
-         {"..", ["icon"] = list_images.folder},
-         ["col_labels"] = {"wxClassInfo::GetClassName()"},
-         ["object_type"] = "All Classes"
-     }
- 
-     local ci = wx.wxClassInfo.GetFirst()
-     local max_cols = 1
- 
-     while ci do
-         local baseTable = GetBases(ci)
-         for i = 1, #baseTable do
-             if max_cols < #baseTable[i] then max_cols = #baseTable[i] end
-             table.insert(t, baseTable[i])
-         end
- 
-         ci = ci:GetNext()
-     end
- 
-     -- Fill remainder of items with "" string
-     for i = 1, #t do
-         for j = #t[i], max_cols do
-             table.insert(t[i], "")
-         end
-     end
- 
-     -- Create col labels
-     for i = 2, max_cols do
-         table.insert(t.col_labels, "Base Class "..tostring(i-1))
-     end
- 
-     table.sort(t, function(t1, t2) return t1[1] < t2[1] end)
- 
-     return t
- end
- 
- -- ----------------------------------------------------------------------------
  -- Save the current listctrl settings into the listColWidths table
  -- ----------------------------------------------------------------------------
--- 170,173 ----
***************
*** 262,265 ****
--- 203,207 ----
              local w = listCtrl:GetTextExtent(txt)
              if w > (listColWidths[data.object_type][col] or 0) - 25 then
+                 if w > 400 then w = 400 end
                  listColWidths[data.object_type][col] = w + 25
              end
***************
*** 303,312 ****
          li:SetData(i) -- key into the listData table for sorting
  
!         if (d.icon) then
!             li:SetImage(d.icon)
!         end
!         if (d.color) then
!             li:SetTextColour(d.color)
!         end
  
          lc_item = listCtrl:InsertItem(li)
--- 245,250 ----
          li:SetData(i) -- key into the listData table for sorting
  
!         if (d.icon)  then li:SetImage(d.icon) end
!         if (d.color) then li:SetTextColour(d.color) end
  
          lc_item = listCtrl:InsertItem(li)
***************
*** 386,394 ****
  -- Convert the argtags table into a readable string
  -- ----------------------------------------------------------------------------
! function CreateArgTagsString(args_table)
      local arg_names = {}
  
      for j = 1, #args_table do
!         table.insert(arg_names, wxlua.wxlua_typename(args_table[j]))
      end
  
--- 324,342 ----
  -- Convert the argtags table into a readable string
  -- ----------------------------------------------------------------------------
! function CreateArgTagsString(args_table, wxlua_type)
      local arg_names = {}
  
      for j = 1, #args_table do
!         local s = wxlua.wxlua_typename(args_table[j])
! 
!         -- The first arg for a class member function is the self
!         if (j == 1) and
!            (bit.band(wxlua_type, wxlua.WXLUAMETHOD_CFUNCTION) == 0) and
!            (bit.band(wxlua_type, wxlua.WXLUAMETHOD_CONSTRUCTOR) == 0) and
!            (bit.band(wxlua_type, wxlua.WXLUAMETHOD_STATIC) == 0) then
!            s = s.."(self)"
!         end
! 
!         table.insert(arg_names, s)
      end
  
***************
*** 402,406 ****
      local t = {
          {"..", ["icon"] = list_images.folder},
!         ["col_labels"] = { "name", "# methods", "wxClassInfo", "class tag", "Base Class Name", "# enums" },
          ["object_type"] = "wxLuaBindClass"
      }
--- 350,354 ----
      local t = {
          {"..", ["icon"] = list_images.folder},
!         ["col_labels"] = { "Class Name", "# Methods", "wxClassInfo", "Class Tag", "Base Class Name", "# Enums" },
          ["object_type"] = "wxLuaBindClass"
      }
***************
*** 466,479 ****
          -- some sanity checks to make sure the bindings are working
          if (tbl[i].methods_n > 0) and (type(tbl[i].methods) ~= "table") then
!             print(tbl[i].name, "is missing methods table")
          end
          if (tbl[i].baseclassName) and (type(tbl[i].baseclass) ~= "userdata") then
!             print(tbl[i].name, "is missing baseclass userdata")
          end
          if (tbl[i].enums_n > 0) and (type(tbl[i].enums) ~= "table") then
!             print(tbl[i].name, "is missing enums table")
          end
  
- 
          table.insert(t, item)
      end
--- 414,426 ----
          -- some sanity checks to make sure the bindings are working
          if (tbl[i].methods_n > 0) and (type(tbl[i].methods) ~= "table") then
!             print(tbl[i].name, "is missing methods table, please report this.")
          end
          if (tbl[i].baseclassName) and (type(tbl[i].baseclass) ~= "userdata") then
!             print(tbl[i].name, "is missing baseclass userdata, please report this.")
          end
          if (tbl[i].enums_n > 0) and (type(tbl[i].enums) ~= "table") then
!             print(tbl[i].name, "is missing enums table, please report this.")
          end
  
          table.insert(t, item)
      end
***************
*** 553,564 ****
      local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindDefine")
  
!     for i = 2, #t do
!         local n = t[i][2]
!         t[i][3] = n -- store real number for sorting w/o hex
  
!         -- these are often enums or flags, it's easier to see them as hex
!         if n > 0 then
!             t[i][2] = n..string.format(" (0x%X)", n)
!         end
      end
  
--- 500,511 ----
      local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindDefine")
  
!     t.col_numbers = {}
!     t.col_numbers[2] = true
  
!     -- these are often enums or flags, it's easier to see them as hex
!     table.insert(t.col_labels, "hex")
! 
!     for i = 2, #t do
!         t[i][3] = string.format("0x%X", t[i][2])
      end
  
***************
*** 581,584 ****
--- 528,534 ----
      local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindEvent")
  
+     t.col_numbers = {}
+     t.col_numbers[2] = true
+ 
      -- Add the class tag name for the event
      for i = 2, #t do
***************
*** 622,629 ****
      for i = 2, #t do
          local args = t[i][5]
  
          t[i][2] = CreatewxLuaMethod_TypeString(t[i][2])
-         t[i][5] = CreateArgTagsString(args) -- swap these two
-         t[i][6] = table.concat(args, ", ")
      end
  
--- 572,579 ----
      for i = 2, #t do
          local args = t[i][5]
+         t[i][5] = CreateArgTagsString(args, t[i][2]) -- swap these two
+         t[i][6] = table.concat(args, ", ")
  
          t[i][2] = CreatewxLuaMethod_TypeString(t[i][2])
      end
  
***************
*** 685,693 ****
          local i2 = data2[col]
  
!         if (data.object_type == "wxLuaBindDefine") and (col == 2) then
!             -- sort on the real numbers, not the strings w/ hex
!             i1 = data1[3]
!             i2 = data2[3]
!         elseif data.col_numbers[col] then
              -- sort on the real numbers, but treat "" as lower
              if (i1 == "") and (i2 == "") then
--- 635,639 ----
          local i2 = data2[col]
  
!         if data.col_numbers and data.col_numbers[col] then
              -- sort on the real numbers, but treat "" as lower
              if (i1 == "") and (i2 == "") then
***************
*** 757,766 ****
  -- ----------------------------------------------------------------------------
  function OnListItemActivated(event)
!     local index    = event:GetIndex() -- note: 0 based, lua tables start at 1
!     local data_index = event:GetData()
!     local itemText = listCtrl:GetItemText(index)
  
      local data = listData[list_level]
  
      -- -----------------------------------------------------------------------
      -- Find what column we're in
--- 703,715 ----
  -- ----------------------------------------------------------------------------
  function OnListItemActivated(event)
!     local index      = event:GetIndex() -- note: 0 based, lua tables start at 1
!     local data_index = event:GetData()  -- this is the table index
!     local itemText   = listCtrl:GetItemText(index)
  
      local data = listData[list_level]
  
+     listData[list_level].list_item = index -- last clicked
+     SaveListColWidths(list_level) -- remember user's col widths
+ 
      -- -----------------------------------------------------------------------
      -- Find what column we're in
***************
*** 792,798 ****
      end
  
!     listData[list_level].list_item = index
!     SaveListColWidths(list_level) -- remember user's col widths
! 
      if (itemText == "..") then
          list_level = list_level - 1
--- 741,745 ----
      end
  
!     -- Handle the different lists we may show
      if (itemText == "..") then
          list_level = list_level - 1
***************
*** 800,826 ****
      elseif (list_level == 1) then
          if itemText == "wxLua Types" then
-             local t = CreatewxLuaTypeTable()
- 
              list_level = list_level + 1
!             listData[list_level] = t
              GotoBindingLevel(listCtrl, list_level)
          elseif itemText == "All wxLua Classes" then
-             local t = CreateAllClassesTable()
- 
              list_level = list_level + 1
!             listData[list_level] = t
              GotoBindingLevel(listCtrl, list_level)
          elseif itemText == "All wxWidgets wxClassInfo" then
-             local t = CreatewxClassInfoTable()
- 
              list_level = list_level + 1
!             listData[list_level] = t
              GotoBindingLevel(listCtrl, list_level)
- 
          elseif itemText == "Overloaded Baseclass Functions" then
-             local t = CreateOverloadedBasecassFunctionsTable()
- 
              list_level = list_level + 1
!             listData[list_level] = t
              GotoBindingLevel(listCtrl, list_level)
          else
--- 747,764 ----
      elseif (list_level == 1) then
          if itemText == "wxLua Types" then
              list_level = list_level + 1
!             listData[list_level] = CreatewxLuaTypeTable()
              GotoBindingLevel(listCtrl, list_level)
          elseif itemText == "All wxLua Classes" then
              list_level = list_level + 1
!             listData[list_level] = CreateAllClassesTable()
              GotoBindingLevel(listCtrl, list_level)
          elseif itemText == "All wxWidgets wxClassInfo" then
              list_level = list_level + 1
!             listData[list_level] = CreatewxClassInfoTable()
              GotoBindingLevel(listCtrl, list_level)
          elseif itemText == "Overloaded Baseclass Functions" then
              list_level = list_level + 1
!             listData[list_level] = CreateOverloadedBasecassFunctionsTable()
              GotoBindingLevel(listCtrl, list_level)
          else
***************
*** 851,855 ****
      elseif (list_level == 2) then
          local binding = listData[2].binding
- 
          local t = nil
  
--- 789,792 ----
***************
*** 873,877 ****
              GotoBindingLevel(listCtrl, list_level)
          end
!     elseif (data_index > 1) and listData[list_level].object_type == "wxLuaBindClass" then
          local t = nil
  
--- 810,814 ----
              GotoBindingLevel(listCtrl, list_level)
          end
!     elseif (data_index > 1) and data.object_type == "wxLuaBindClass" then
          local t = nil
  
***************
*** 880,890 ****
  
              if frame:GetMenuBar():IsChecked(ID_VIEW_BASECLASS_FUNCTIONS) then
!                 local c = data[data_index][5]
                  while type(c) == "userdata" do
                      local tt = CreatewxLuaBindMethod(c.methods, c.name)
                      for i = 2, #tt do -- skip ".."
                          if not (string.find(tt[i][2], "Constructor", 1, 1) or
!                                 string.find(t[i][1], "Delete", 1, 1) or
!                                 string.find(t[i][1], "::"..c.name, 1, 1)) then
                              table.insert(t, tt[i])
                          end
--- 817,827 ----
  
              if frame:GetMenuBar():IsChecked(ID_VIEW_BASECLASS_FUNCTIONS) then
!                 local c = data[data_index].data[5]
                  while type(c) == "userdata" do
                      local tt = CreatewxLuaBindMethod(c.methods, c.name)
                      for i = 2, #tt do -- skip ".."
                          if not (string.find(tt[i][2], "Constructor", 1, 1) or
!                                 string.find(t[i][1], "delete", 1, 1)) then
!                                 --string.find(t[i][1], "::"..c.name, 1, 1)) then
                              table.insert(t, tt[i])
                          end
***************
*** 906,910 ****
              GotoBindingLevel(listCtrl, list_level)
          end
!     elseif (data_index > 1) and listData[list_level].object_type == "wxLuaBindMethod" then
          local t = nil
  
--- 843,847 ----
              GotoBindingLevel(listCtrl, list_level)
          end
!     elseif (data_index > 1) and data.object_type == "wxLuaBindMethod" then
          local t = nil
  
***************
*** 962,984 ****
          "WXLUAARG_Number",
          "WXLUAARG_String",
!         "WXLUAARG_LuaTable",
!         "WXLUAARG_LuaFunction",
          "WXLUAARG_UserData",
!         "WXLUAARG_LuaThread",
          "WXLUAARG_Integer"
      }
  
      for i = 1, #wxltype_names do
          local wxltype = wxlua[wxltype_names[i]]
!         local row = { wxltype_names[i].." "..tostring(wxltype) }
!         for j = 2, #t.col_labels do
!             local ltype = wxlua[lua_types[j-1]]
              local ok = wxlua.wxlua_iswxluatype(ltype, wxltype)
!             if ok == 1 then ok = "X" end
!             if ok == 0 then ok = "" end
!             if ok == -1 then ok = "?" end -- shouldn't happen!
!             table.insert(row, ok)
          end
!         table.insert(t, row)
      end
  
--- 899,920 ----
          "WXLUAARG_Number",
          "WXLUAARG_String",
!         "WXLUAARG_Table",
!         "WXLUAARG_Function",
          "WXLUAARG_UserData",
!         "WXLUAARG_Thread",
          "WXLUAARG_Integer"
      }
  
+     local tostr = { [1] = "X", [0] = "", [-1] = "?" }
+ 
      for i = 1, #wxltype_names do
          local wxltype = wxlua[wxltype_names[i]]
!         local item = { wxltype_names[i].." "..tostring(wxltype) }
!         for j = 1, #lua_types do
!             local ltype = wxlua[lua_types[j]]
              local ok = wxlua.wxlua_iswxluatype(ltype, wxltype)
!             table.insert(item, tostr[ok])
          end
!         table.insert(t, item)
      end
  
***************
*** 1002,1005 ****
--- 938,946 ----
          ["wxDCBase"] = 1,
          ["wxFileDialogBase"] = 1,
+         ["wxGenericDirDialog"] = 1,
+         ["wxGenericFileDialog"] = 1,
+         ["wxGenericImageList"] = 1,
+         ["wxGenericListCtrl"] = 1,
+         ["wxGenericTreeCtrl"] = 1,
          ["wxPrinterBase"] = 1,
          ["wxPrintPreviewBase"] = 1,
***************
*** 1019,1022 ****
--- 960,974 ----
      }
  
+     -- These notes for classes that where the classinfo doesn't match
+     -- the classname is the one that wxLua uses, not the one wxWidgets uses
+     local classinfoNotes = {
+         ["wxAutoBufferedPaintDC"]   = "(Platform dep. baseclass, wxDC is ok)",
+         ["wxHelpController"]        = "(Platform dep. typedef by wxWidgets)",
+         ["wxLuaDebuggerServer"]     = "(Platform dep. typedef by wxLua)",
+         ["wxMemoryDC"]              = "(Platform dep. baseclass, wxDC is ok)",
+         ["wxPaintDC"]               = "(Platform dep. baseclass, wxWindowDC is ok)",
+         ["wxScreenDC"]              = "(Platform dep. baseclass, wxDC is ok)",
+     }
+ 
      for b = 1, #bindingList do
          local binding = _G
***************
*** 1061,1066 ****
  
                  while ci do
-                     local item
- 
                      -- we don't bind some classes since we wouldn't need them
                      if unwrappedBaseClasses[ci:GetClassName()] then
--- 1013,1016 ----
***************
*** 1069,1075 ****
                          table.insert(c_table2, c_table[#c_table2+1].." - No wxClassInfo")
                          table.insert(c_table2, ci:GetClassName())
                      else
                          table.insert(c_table2, ci:GetClassName())
!                         if (c_table[#c_table2] ~= c_table2[#c_table2]) then
                              c_table2.color = wx.wxRED
                          end
--- 1019,1030 ----
                          table.insert(c_table2, c_table[#c_table2+1].." - No wxClassInfo")
                          table.insert(c_table2, ci:GetClassName())
+                     elseif c_table[#c_table2+1] and classinfoNotes[c_table[#c_table2+1]] then
+                         c_table[#c_table2+1] = c_table[#c_table2+1]..classinfoNotes[c_table[#c_table2+1]]
+                         table.insert(c_table2, ci:GetClassName())
+                         c_table2.color = list_colors.purple
                      else
                          table.insert(c_table2, ci:GetClassName())
!                         if ((c_table[#c_table2] ~= c_table2[#c_table2])) and
!                            (c_table2.color == nil) then
                              c_table2.color = wx.wxRED
                          end
***************
*** 1096,1100 ****
      end
  
!     -- Put strings where there is no base class
      for i = 1, #t do
          for j = 1, max_cols do
--- 1051,1055 ----
      end
  
!     -- Put "" strings where there is no base class
      for i = 1, #t do
          for j = 1, max_cols do
***************
*** 1106,1109 ****
--- 1061,1153 ----
  end
  
+ -- ----------------------------------------------------------------------------
+ -- Load all the wxWidgets wxClassInfo
+ -- ----------------------------------------------------------------------------
+ function CreatewxClassInfoTable()
+ 
+     -- gather up all of wxLua wrapped classes
+     local wxluaClasses = {}
+ 
+     for b = 1, #bindingList do
+         local binding = _G
+         for i = 1, #bindingList[b] do
+             binding = binding[bindingList[b][i]]
+         end
+ 
+         local classTable = binding.GetClassArray
+ 
+         for i = 1, #classTable do
+             wxluaClasses[classTable[i].name] = true
+         end
+     end
+ 
+     -- create a table of tables of cols of the classname and baseclass names
+     -- if there is a baseclass2 then the returned table will have > 1 tables
+     local function GetBases(ci)
+         local c = ci
+         local t = {{}}
+ 
+         while c do
+             table.insert(t[1], c:GetClassName())
+ 
+             if c:GetBaseClass2() then
+                 --print(c:GetClassName(), "Has Base2", c:GetBaseClass2())
+ 
+                 local baseTable2 = GetBases(c:GetBaseClass2())
+                 for i = 1, #baseTable2 do
+                     -- insert back in the original info
+                     for j = 1, #t do
+                         table.insert(baseTable2[i], j, t[1][j])
+                     end
+                     baseTable2[i][1] = baseTable2[i][1].." (Multiple base classes "..tostring(i)..")" -- count # of base2s
+                     table.insert(t, baseTable2[i])
+                 end
+             end
+ 
+             c = c:GetBaseClass1()
+         end
+ 
+         return t
+     end
+ 
+     local t = {
+         {"..", ["icon"] = list_images.folder},
+         ["col_labels"] = {"wxClassInfo::GetClassName() (wxLua wraps blue)"},
+         ["object_type"] = "All wxWidgets wxClassInfo"
+     }
+ 
+     local ci = wx.wxClassInfo.GetFirst()
+     local max_cols = 1
+ 
+     while ci do
+         local baseTable = GetBases(ci)
+         for i = 1, #baseTable do
+             if wxluaClasses[baseTable[i][1]] then
+                 baseTable[i].color = wx.wxBLUE
+             end
+ 
+             if max_cols < #baseTable[i] then max_cols = #baseTable[i] end
+             table.insert(t, baseTable[i])
+         end
+ 
+         ci = ci:GetNext()
+     end
+ 
+     -- Fill remainder of items with "" string
+     for i = 1, #t do
+         for j = #t[i], max_cols do
+             table.insert(t[i], "")
+         end
+     end
+ 
+     -- Create col labels
+     for i = 2, max_cols do
+         table.insert(t.col_labels, "Base Class "..tostring(i-1))
+     end
+ 
+     table.sort(t, function(t1, t2) return t1[1] < t2[1] end)
+ 
+     return t
+ end
  
  -- ----------------------------------------------------------------------------
***************
*** 1133,1156 ****
              for j = 1, classTable[i].methods_n do
                  local m = methods[j]
!                 local m_table = {m.class_name, m.name}
! 
!                 local funcs = m.funcs
!                 local s = ""
!                 for f = 1, m.funcs_n do
!                     s = s.."("..CreateArgTagsString(funcs[f].argtags)..") "
!                 end
!                 table.insert(m_table, s)
! 
!                 while m.basemethod do
!                     m = m.basemethod
!                     table.insert(m_table, m.class_name)
  
                      local funcs = m.funcs
                      local s = ""
                      for f = 1, m.funcs_n do
!                         s = s.."("..CreateArgTagsString(funcs[f].argtags)..") "
                      end
                      table.insert(m_table, s)
                  end
                  if #m_table > 3 then
                      if max_cols < #m_table then max_cols = #m_table end
--- 1177,1194 ----
              for j = 1, classTable[i].methods_n do
                  local m = methods[j]
!                 local m_table = {m.name}
  
+                 while m do
                      local funcs = m.funcs
                      local s = ""
                      for f = 1, m.funcs_n do
!                         s = s.."("..CreateArgTagsString(funcs[f].argtags, funcs[f].type)..") "
                      end
+ 
+                     table.insert(m_table, m.class_name)
                      table.insert(m_table, s)
+                     m = m.basemethod
                  end
+ 
                  if #m_table > 3 then
                      if max_cols < #m_table then max_cols = #m_table end
***************
*** 1211,1218 ****
      frame:Connect(ID_STACK_DIALOG, wx.wxEVT_COMMAND_MENU_SELECTED,
          function (event)
!             local LocalNumberVariable = 2
!             local LocalStringVariable = "Hello"
  
!             wxlua.LuaStackDialog()
          end )
  
--- 1249,1263 ----
      frame:Connect(ID_STACK_DIALOG, wx.wxEVT_COMMAND_MENU_SELECTED,
          function (event)
!             local LocalVar1_InEventFn = 1
!             local LocalVar2_InEventFn = "Two"
  
!             local function LocalFunction(var)
!                 local LocalVar1_InLocalFuncInEventFn = 3
!                 local LocalVar2_InLocalFuncInInEventFn = "Four"
! 
!                 wxlua.LuaStackDialog()
!             end
! 
!             LocalFunction(LocalStringVariable)
          end )
  

Index: unittest.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/unittest.wx.lua,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** unittest.wx.lua	14 Jun 2007 05:02:49 -0000	1.12
--- unittest.wx.lua	16 Jun 2007 06:21:47 -0000	1.13
***************
*** 256,259 ****
--- 256,263 ----
  PrintOk(b:GetX() == 1, "Test wxLuaObject::GetObject(userdata).")
  
+ a = function(txt) return txt.."!" end
+ o = wxlua.wxLuaObject(a); b = o:GetObject()
+ PrintOk((a == b) and (b("Hello") == "Hello!"), "Test wxLuaObject::GetObject(function).")
+ 
  -- ---------------------------------------------------------------------------
  print("\nTest the bit library.\n")

[Wxlua-commit] wxLua/modules/wxluadebug/include wxldebug.h, 1.35, 1.36 wxlstack.h, 1.2, 1.3

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

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19284/wxLua/modules/wxluadebug/include

Modified Files:
	wxldebug.h wxlstack.h 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: wxldebug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** wxldebug.h	6 Jun 2007 03:53:40 -0000	1.35
--- wxldebug.h	16 Jun 2007 06:21:47 -0000	1.36
***************
*** 41,48 ****
      WXLUA_DEBUGITEM_TCFUNCTION      = 11, // LUA_TFUNCTION & lua_iscfunction, not a LUA_TXXX
  
!     WXLUA_DEBUGITEM_T_COUNT         = 12, // # of T items
!     WXLUA_DEBUGITEM_T_MASK          = 0x00ff,
  
!     WXLUA_DEBUGITEM_EXPANDED        = 0x0200
  };
  
--- 41,52 ----
      WXLUA_DEBUGITEM_TCFUNCTION      = 11, // LUA_TFUNCTION & lua_iscfunction, not a LUA_TXXX
  
!     WXLUA_DEBUGITEM__TCOUNT         = 12, // # of T items
!     WXLUA_DEBUGITEM__TMASK          = 0x00ff,
  
!     WXLUA_DEBUGITEM_EXPANDABLE      = 0x0200, // for wxLuaStackDialog
!     WXLUA_DEBUGITEM_EXPANDED        = 0x0400, // for wxLuaStackDialog
!     WXLUA_DEBUGITEM_LUAREFED        = 0x0800  // This item was created with a
!                                               // new tinsert() reference
!                                               // rather than using an existing one.
  };
  
***************
*** 67,74 ****
      int      GetFlag() const      { return m_flag; }     // see wxLuaDebugItem_Type
      bool     GetFlagBit(int mask) const { return WXLUA_HASBIT(m_flag, mask); }
!     int      GetTypeN() const     { return m_flag & WXLUA_DEBUGITEM_T_MASK; }
  
      void     SetFlag(int flag)             { m_flag = flag; }
      void     SetFlagBit(int bit, bool set) { m_flag = WXLUA_SETBIT(m_flag, bit, set); }
  
      // Get a human readable string for debugging
--- 71,79 ----
      int      GetFlag() const      { return m_flag; }     // see wxLuaDebugItem_Type
      bool     GetFlagBit(int mask) const { return WXLUA_HASBIT(m_flag, mask); }
!     int      GetTypeN() const     { return m_flag & WXLUA_DEBUGITEM__TMASK; }
  
      void     SetFlag(int flag)             { m_flag = flag; }
      void     SetFlagBit(int bit, bool set) { m_flag = WXLUA_SETBIT(m_flag, bit, set); }
+     void     SetReference(int lua_ref)     { m_lua_ref = lua_ref; } // only if you're tremoved it
  
      // Get a human readable string for debugging
***************
*** 100,111 ****
  // ----------------------------------------------------------------------------
  
  class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugData : public wxObject
  {
  public:
!     wxLuaDebugData();
      wxLuaDebugData(const wxLuaDebugData &debugData) { Ref(debugData); }
  
      virtual ~wxLuaDebugData() {} // make gcc happy even though it's not used
  
      // Get the data array, please use safe array access functions if possible
      wxLuaDebugItemArray* GetArray();
--- 105,122 ----
  // ----------------------------------------------------------------------------
  
+ // an invalid wxLuaState for comparison (like wxNullBitmap)
+ extern WXDLLIMPEXP_DATA_WXLUA(wxLuaDebugData) wxNullLuaDebugData;
+ 
  class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugData : public wxObject
  {
  public:
!     wxLuaDebugData(bool create);
      wxLuaDebugData(const wxLuaDebugData &debugData) { Ref(debugData); }
  
      virtual ~wxLuaDebugData() {} // make gcc happy even though it's not used
  
+     // Has this been created with it's ref data?
+     bool Ok() const { return (m_refData != NULL); }
+ 
      // Get the data array, please use safe array access functions if possible
      wxLuaDebugItemArray* GetArray();

Index: wxlstack.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxlstack.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxlstack.h	31 May 2007 17:18:54 -0000	1.2
--- wxlstack.h	16 Jun 2007 06:21:47 -0000	1.3
***************
*** 12,16 ****
  
  #include "wx/dialog.h"
! #include "wx/listctrl.h"
  
  #include "wxluadebug/include/wxluadebugdefs.h"
--- 12,20 ----
  
  #include "wx/dialog.h"
! #include "wx/treectrl.h"
! 
! class WXDLLEXPORT wxListCtrl;
! class WXDLLEXPORT wxListEvent;
! class WXDLLEXPORT wxSplitterWindow;
  
  #include "wxluadebug/include/wxluadebugdefs.h"
***************
*** 31,35 ****
      ID_WXLUA_STACK_FINDPREV_BUTTON,
      ID_WXLUA_STACK_FINDCASE_CHECKBOX,
!     ID_WXLUA_STACK_LISTCTRL
  };
  
--- 35,75 ----
      ID_WXLUA_STACK_FINDPREV_BUTTON,
      ID_WXLUA_STACK_FINDCASE_CHECKBOX,
!     ID_WXLUA_STACK_SPLITTERWIN,
!     ID_WXLUA_STACK_LISTCTRL,
!     ID_WXLUA_STACK_TREECTRL
! };
! 
! // ----------------------------------------------------------------------------
! // wxLuaStackListData - the data we store in the wxListCtrl item's data
! // ----------------------------------------------------------------------------
! 
! class WXDLLIMPEXP_WXLUADEBUG wxLuaStackListData
! {
! public:
!     wxLuaStackListData(int item_idx,
!                        const wxLuaDebugData& parentDebugData,
!                        const wxLuaDebugData& childrenDebugData = wxNullLuaDebugData) :
!                        m_item_idx(item_idx),
!                        m_parentDebugData(parentDebugData),
!                        m_childrenDebugData(childrenDebugData) {}
! 
!     wxLuaDebugItem* GetDebugItem() { return m_parentDebugData.Item(m_item_idx); }
! 
!     int             m_item_idx;
!     wxLuaDebugData  m_parentDebugData;
!     wxLuaDebugData  m_childrenDebugData;
!     wxTreeItemId    m_treeId;
! };
! 
! // ----------------------------------------------------------------------------
! // wxLuaStackListData - the data we store in the wxTreeCtrl item's data
! // ----------------------------------------------------------------------------
! 
! class WXDLLIMPEXP_WXLUADEBUG wxLuaStackTreeData : public wxTreeItemData
! {
! public:
!     wxLuaStackTreeData(wxLuaStackListData* stkData) : m_stkListData(stkData) {}
! 
!     wxLuaStackListData*  m_stkListData; // we don't delete this
  };
  
***************
*** 108,111 ****
--- 148,154 ----
      // implementation
  
+     wxTreeItemId FindTreeItemId(const wxTreeItemId& id, wxLuaStackListData* stkListData) const;
+     long FindListItem(wxLuaStackListData* stkListData, bool get_parent = false) const;
+ 
      void OnExpandButton(wxCommandEvent& event);
      void OnFind(wxCommandEvent& event);
***************
*** 114,127 ****
      void OnSelectStack(wxCommandEvent &event);
      void SelectStack(int stack_sel);
!     // Handle and expand a listctrl item
!     void OnItemDeleted(wxListEvent &event);
!     void OnAllItemsDeleted(wxListEvent &event);
!     void OnItemActivated(wxListEvent &event);
      bool ExpandItem(long lc_item, bool show_err_msg = true);
  
  protected:
      void DeleteAllListItemData();
  
!     wxListCtrl*  m_listCtrl;
  
      wxChoice*    m_stackChoice;   // display stack entries
--- 157,177 ----
      void OnSelectStack(wxCommandEvent &event);
      void SelectStack(int stack_sel);
!     // Handle all wxTreeCtrl events
!     void OnTreeItem(wxTreeEvent &event);
!     // Handle and expand/collapse a listctrl item
!     void OnListItemActivated(wxListEvent &event);
      bool ExpandItem(long lc_item, bool show_err_msg = true);
+     bool CollapseItem(long lc_item);
+ 
+     void OnListItemDeleted(wxListEvent &event);
+     void OnListAllItemsDeleted(wxListEvent &event);
  
  protected:
      void DeleteAllListItemData();
+     void RemoveAllLuaReferences();
  
!     wxSplitterWindow* m_splitterWin;
!     wxListCtrl*       m_listCtrl;
!     wxTreeCtrl*       m_treeCtrl;
  
      wxChoice*    m_stackChoice;   // display stack entries

[Wxlua-commit] wxLua/modules/wxluasocket/include wxldserv.h, 1.36, 1.37 wxluasocket_bind.h, 1.22, 1.23

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

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19284/wxLua/modules/wxluasocket/include

Modified Files:
	wxldserv.h wxluasocket_bind.h 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: wxldserv.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** wxldserv.h	11 Jun 2007 03:58:10 -0000	1.36
--- wxldserv.h	16 Jun 2007 06:21:47 -0000	1.37
***************
*** 387,391 ****
  
      void SetMessage(const wxString &message);
!     void SetDebugData(long nReference, const wxLuaDebugData& pDebugData = wxLuaDebugData());
  
      int      GetLineNumber() const  { return m_line_number;}
--- 387,391 ----
  
      void SetMessage(const wxString &message);
!     void SetDebugData(long nReference, const wxLuaDebugData& pDebugData = wxNullLuaDebugData);
  
      int      GetLineNumber() const  { return m_line_number;}

Index: wxluasocket_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** wxluasocket_bind.h	14 Jun 2007 01:23:20 -0000	1.22
--- wxluasocket_bind.h	16 Jun 2007 06:21:47 -0000	1.23
***************
*** 27,33 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 13
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 13
  // ---------------------------------------------------------------------------
  
--- 27,33 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 14
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 14
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp, 1.34, 1.35 wxlstack.cpp, 1.5, 1.6

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

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

Modified Files:
	wxldebug.cpp wxlstack.cpp 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: wxlstack.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxlstack.cpp	14 Jun 2007 23:59:48 -0000	1.5
--- wxlstack.cpp	16 Jun 2007 06:21:47 -0000	1.6
***************
*** 20,23 ****
--- 20,26 ----
  #include "wx/imaglist.h"
  #include "wx/artprov.h"
+ #include "wx/listctrl.h"
+ #include "wx/splitter.h"
+ 
  #include "wxluadebug/include/wxlstack.h"
  #include "wxlua/include/wxlua.h"
***************
*** 43,49 ****
[...1088 lines suppressed...]
+             debugItem->SetReference(LUA_NOREF);
+ 
+             int idx = m_luaReferences.Index(lua_ref);
+             if (idx != wxNOT_FOUND)
+                 m_luaReferences.RemoveAt(idx);
+             else
+                 wxPrintf(wxT("Missing lua reference in listctrl #%d ok %d ref %d count %d idx %d\n"), i, ok, debugItem->GetReference(), m_luaReferences.GetCount(), idx);
+         }
+     }
+ */
+ 
+     for (i = 0; i < (int)m_luaReferences.GetCount(); ++i)
+     {
+         bool ok = m_wxlState.tremove(m_luaReferences[i]);
+         wxCHECK_RET(ok, wxT("Unable to remove a reference in lua"));
+         //wxPrintf(wxT("Extra lua reference in listctrl #%d ok %d ref %d count %d\n"), i, ok, m_luaReferences[i], m_luaReferences.GetCount());
+     }
+ 
+     m_luaReferences.Clear();
+ }

Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** wxldebug.cpp	14 Jun 2007 23:59:48 -0000	1.34
--- wxldebug.cpp	16 Jun 2007 06:21:47 -0000	1.35
***************
*** 20,23 ****
--- 20,25 ----
  #include "wxluadebug/include/wxldebug.h"
  
+ wxLuaDebugData wxNullLuaDebugData(false);
+ 
  #define lua_Debug_to_String(ld) \
      wxString::Format(wxT("%p event=%d name='%s' namewhat='%s' what='%s' source='%s' currentline=%d nups=%d linedefined=%d lastlinedefined=%d short_src='%s' i_ci=%d"), \
***************
*** 73,79 ****
  #define M_DEBUGREFDATA ((wxLuaDebugDataRefData*)m_refData)
  
! wxLuaDebugData::wxLuaDebugData() : wxObject()
  {
!     m_refData = new wxLuaDebugDataRefData;
  
      // Sanity check to make sure that lua hasn't changed the items on us
--- 75,82 ----
  #define M_DEBUGREFDATA ((wxLuaDebugDataRefData*)m_refData)
  
! wxLuaDebugData::wxLuaDebugData(bool create) : wxObject()
  {
!     if (create)
!         m_refData = new wxLuaDebugDataRefData;
  
      // Sanity check to make sure that lua hasn't changed the items on us
***************
*** 121,126 ****
  wxLuaDebugData wxLuaDebugData::Copy() const
  {
!     wxLuaDebugData copyData;
!     wxCHECK_MSG(M_DEBUGREFDATA != NULL, copyData, wxT("Invalid ref data"));
  
      size_t idx, count = GetCount();
--- 124,130 ----
  wxLuaDebugData wxLuaDebugData::Copy() const
  {
!     wxCHECK_MSG(M_DEBUGREFDATA != NULL, wxNullLuaDebugData, wxT("Invalid ref data"));
! 
!     wxLuaDebugData copyData(true);
  
      size_t idx, count = GetCount();
***************
*** 219,225 ****
              if (lua_istable(L, -1))
              {
!                 lua_pushvalue(L, -1);
!                 nRef = wxlState.tinsert(-1);
!                 references.Add(nRef);
              }
              else
--- 223,235 ----
              if (lua_istable(L, -1))
              {
!                 nRef = wxlua_tisrefed(L, -1); // don't duplicate refs
! 
!                 if (nRef == LUA_NOREF)
!                 {
!                     flag_type |= WXLUA_DEBUGITEM_LUAREFED;
!                     lua_pushvalue(L, -1);
!                     nRef = wxlState.tinsert(-1);
!                     references.Add(nRef);
!                 }
              }
              else
***************
*** 254,259 ****
          wxlState.GetGlobals();
          GetTypeValue(wxlState, -1, type, value, &flag_type);
!         int nRef = wxlState.tinsert(-1);
!         Add(new wxLuaDebugItem(wxT("Globals"), wxT("Table"), value, wxT(""), nRef, 0, WXLUA_DEBUGITEM_TTABLE));
          references.Add(nRef);
      }
--- 264,269 ----
          wxlState.GetGlobals();
          GetTypeValue(wxlState, -1, type, value, &flag_type);
!         int nRef = wxlua_tinsert(L, -1);
!         Add(new wxLuaDebugItem(wxT("Globals"), wxT("Table"), value, wxT(""), nRef, 0, WXLUA_DEBUGITEM_TTABLE|WXLUA_DEBUGITEM_LUAREFED));
          references.Add(nRef);
      }
***************
*** 262,292 ****
          wxlState.lua_PushValue(LUA_REGISTRYINDEX);
          GetTypeValue(wxlState, -1, type, value, &flag_type);
!         int nRef = wxlState.tinsert(-1);
!         Add(new wxLuaDebugItem(wxT("Lua Registry"), wxT("Table"), value, wxT(""), nRef, 0, WXLUA_DEBUGITEM_TTABLE));
          references.Add(nRef);
      }
      else
      {
          if (wxlState.tget(tableRef))
          {
-             // ------------------------------
-             // if we're actually looking at the wxLuaReferences table we'd just
-             // keep adding new refs, so count what we've got now and show only them.
-             // This is only for debugging or curiosity.
-             int is_reftable = -1;
-             wxlua_pushkey_wxLuaReferences(L);
-             wxlState.lua_RawGet(LUA_REGISTRYINDEX);
- 
-             if (wxlState.lua_Equal(-1, -2))
-                 is_reftable = lua_objlen(L, -1);
- 
-             wxlState.lua_Pop(1);
-             // ------------------------------
- 
              int nTop = lua_gettop(L);
  
              // start iterating
              lua_pushnil(L);
!             while ((lua_next(L, nTop) != 0) && ((is_reftable < 0) || (count < is_reftable)))
              {
                  // get the index, just want the name=value, type is dummy here
--- 272,289 ----
          wxlState.lua_PushValue(LUA_REGISTRYINDEX);
          GetTypeValue(wxlState, -1, type, value, &flag_type);
!         int nRef = wxlua_tinsert(L, -1);
!         Add(new wxLuaDebugItem(wxT("Lua Registry"), wxT("Table"), value, wxT(""), nRef, 0, WXLUA_DEBUGITEM_TTABLE|WXLUA_DEBUGITEM_LUAREFED));
          references.Add(nRef);
      }
      else
      {
+         // push the table onto the stack to iterate through
          if (wxlState.tget(tableRef))
          {
              int nTop = lua_gettop(L);
  
              // start iterating
              lua_pushnil(L);
!             while (lua_next(L, nTop) != 0)
              {
                  // get the index, just want the name=value, type is dummy here
***************
*** 300,305 ****
                  if (lua_istable(L, -1))
                  {
!                     nRef = wxlState.tinsert(-1);
!                     references.Add(nRef);
                  }
                  else
--- 297,310 ----
                  if (lua_istable(L, -1))
                  {
!                     nRef = wxlua_tisrefed(L, -1); // don't duplicate refs
! 
!                     if (nRef == LUA_NOREF)
!                     {
!                         flag_type |= WXLUA_DEBUGITEM_LUAREFED;
!                         nRef = wxlua_tinsert(L, -1); // pops value
!                         references.Add(nRef);
!                     }
!                     else
!                         lua_pop(L, 1);
                  }
                  else
***************
*** 321,348 ****
      wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState"));
  
-     // try to use the wxString ref counting to reduce memory
-     static wxString s_typeStrings[WXLUA_DEBUGITEM_T_COUNT] = {
-         wxT("Unknown data type"),
-         wxT("None"),
-         wxT("Nil"),
-         wxT("Boolean"),
-         wxT("Light User Data"),
-         wxT("Number"),
-         wxT("String"),
-         wxT("Table"),
-         wxT("Lua Function"),
-         wxT("User Data"),
-         wxT("Thread"),
-         wxT("C Function")
-     };
- 
      lua_State* L = wxlState.GetLuaState();
      int l_type = lua_type(L, index);
      int flag_type = WXLUA_DEBUGITEM_TUNKNOWN;
  
      switch (l_type)
      {
          case LUA_TNONE:
-             type  = s_typeStrings[WXLUA_DEBUGITEM_TNONE];
              value = wxEmptyString;
              flag_type = WXLUA_DEBUGITEM_TNONE;
--- 326,338 ----
      wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState"));
  
      lua_State* L = wxlState.GetLuaState();
      int l_type = lua_type(L, index);
      int flag_type = WXLUA_DEBUGITEM_TUNKNOWN;
  
+     type = wxlua_getwxluatypename(wxlua_getwxluatype(l_type));
+ 
      switch (l_type)
      {
          case LUA_TNONE:
              value = wxEmptyString;
              flag_type = WXLUA_DEBUGITEM_TNONE;
***************
*** 350,354 ****
  
          case LUA_TNIL:
-             type  = s_typeStrings[WXLUA_DEBUGITEM_TNIL];
              value = wxT("nil");
              flag_type = WXLUA_DEBUGITEM_TNIL;
--- 340,343 ----
***************
*** 356,360 ****
  
          case LUA_TBOOLEAN:
-             type  = s_typeStrings[WXLUA_DEBUGITEM_TBOOLEAN];
              value = MakeBoolean(lua_toboolean(L, index));
              flag_type = WXLUA_DEBUGITEM_TBOOLEAN;
--- 345,348 ----
***************
*** 362,366 ****
  
          case LUA_TLIGHTUSERDATA:
-             type  = s_typeStrings[WXLUA_DEBUGITEM_TLIGHTUSERDATA];
              value = GetUserDataInfo(wxlState, index, false);
              flag_type = WXLUA_DEBUGITEM_TLIGHTUSERDATA;
--- 350,353 ----
***************
*** 368,372 ****
  
          case LUA_TNUMBER:
-             type  = s_typeStrings[WXLUA_DEBUGITEM_TNUMBER];
              value = MakeNumber(lua_tonumber(L, index));
              flag_type = WXLUA_DEBUGITEM_TNUMBER;
--- 355,358 ----
***************
*** 374,378 ****
  
          case LUA_TSTRING:
-             type  = s_typeStrings[WXLUA_DEBUGITEM_TSTRING];
              value = lua2wx(lua_tostring(L, index));
              flag_type = WXLUA_DEBUGITEM_TSTRING;
--- 360,363 ----
***************
*** 380,384 ****
  
          case LUA_TTABLE:
-             type  = s_typeStrings[WXLUA_DEBUGITEM_TTABLE];
              value = GetTableInfo(wxlState, index);
              flag_type = WXLUA_DEBUGITEM_TTABLE;
--- 365,368 ----
***************
*** 388,392 ****
              if (lua_iscfunction(L, index))
              {
!                 type = s_typeStrings[WXLUA_DEBUGITEM_TCFUNCTION];
                  value.Printf(wxT("%p"), lua_tocfunction(L, index));
                  flag_type = WXLUA_DEBUGITEM_TCFUNCTION;
--- 372,376 ----
              if (lua_iscfunction(L, index))
              {
!                 type = wxT("cfunction");
                  value.Printf(wxT("%p"), lua_tocfunction(L, index));
                  flag_type = WXLUA_DEBUGITEM_TCFUNCTION;
***************
*** 394,398 ****
              else
              {
-                 type = s_typeStrings[WXLUA_DEBUGITEM_TFUNCTION];
                  value.Printf(wxT("%p"), lua_topointer(L, index));
                  flag_type = WXLUA_DEBUGITEM_TFUNCTION;
--- 378,381 ----
***************
*** 401,405 ****
  
          case LUA_TUSERDATA:
-             type  = s_typeStrings[WXLUA_DEBUGITEM_TUSERDATA];
              value = GetUserDataInfo(wxlState, index, true);
              flag_type = WXLUA_DEBUGITEM_TUSERDATA;
--- 384,387 ----
***************
*** 407,411 ****
  
          case LUA_TTHREAD:
-             type = s_typeStrings[WXLUA_DEBUGITEM_TTHREAD];
              value.Printf(wxT("%p"), lua_topointer(L, index));
              flag_type = WXLUA_DEBUGITEM_TTHREAD;
--- 389,392 ----
***************
*** 413,417 ****
  
          default :
!             type  = s_typeStrings[WXLUA_DEBUGITEM_TUNKNOWN];
              value = wxEmptyString;
              flag_type = WXLUA_DEBUGITEM_TUNKNOWN;
--- 394,398 ----
  
          default :
!             type  = wxT("Unknown Data Type?");
              value = wxEmptyString;
              flag_type = WXLUA_DEBUGITEM_TUNKNOWN;

[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.53, 1.54 controls.cpp, 1.65, 1.66 event.cpp, 1.50, 1.51 gdi.cpp, 1.70, 1.71 html.cpp, 1.47, 1.48 menutool.cpp, 1.44, 1.45 windows.cpp, 1.60, 1.61 wx_bind.cpp, 1.106, 1.107

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

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

Modified Files:
	appframe.cpp controls.cpp event.cpp gdi.cpp html.cpp 
	menutool.cpp windows.cpp wx_bind.cpp 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: controls.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** controls.cpp	14 Jun 2007 23:59:42 -0000	1.65
--- controls.cpp	16 Jun 2007 06:21:43 -0000	1.66
***************
*** 4490,4494 ****
  #endif // (wxLUA_USE_wxListCtrl && wxUSE_LISTCTRL) && (wxLUA_USE_wxColourPenBrush)
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxListCtrl_SortItems[] = { &s_wxluatag_wxListCtrl, &s_wxluaarg_LuaFunction, &s_wxluaarg_Number, NULL };
  static int LUACALL wxLua_wxListCtrl_SortItems(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxListCtrl_SortItems[1] = {{ wxLua_wxListCtrl_SortItems, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxListCtrl_SortItems }};
--- 4490,4494 ----
  #endif // (wxLUA_USE_wxListCtrl && wxUSE_LISTCTRL) && (wxLUA_USE_wxColourPenBrush)
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxListCtrl_SortItems[] = { &s_wxluatag_wxListCtrl, &s_wxluaarg_Function, &s_wxluaarg_Number, NULL };
  static int LUACALL wxLua_wxListCtrl_SortItems(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxListCtrl_SortItems[1] = {{ wxLua_wxListCtrl_SortItems, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxListCtrl_SortItems }};

Index: appframe.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** appframe.cpp	14 Jun 2007 23:59:42 -0000	1.53
--- appframe.cpp	16 Jun 2007 06:21:43 -0000	1.54
***************
*** 2395,2399 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxStatusBar_SetFieldsCount[] = { &s_wxluatag_wxStatusBar, &s_wxluaarg_LuaTable, NULL };
  static int LUACALL wxLua_wxStatusBar_SetFieldsCount(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxStatusBar_SetFieldsCount[1] = {{ wxLua_wxStatusBar_SetFieldsCount, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStatusBar_SetFieldsCount }};
--- 2395,2399 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxStatusBar_SetFieldsCount[] = { &s_wxluatag_wxStatusBar, &s_wxluaarg_Table, NULL };
  static int LUACALL wxLua_wxStatusBar_SetFieldsCount(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxStatusBar_SetFieldsCount[1] = {{ wxLua_wxStatusBar_SetFieldsCount, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStatusBar_SetFieldsCount }};
***************
*** 2787,2791 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxAcceleratorTable_constructor[] = { &s_wxluaarg_LuaTable, NULL };
  static int LUACALL wxLua_wxAcceleratorTable_constructor(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxAcceleratorTable_constructor[1] = {{ wxLua_wxAcceleratorTable_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxAcceleratorTable_constructor }};
--- 2787,2791 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxAcceleratorTable_constructor[] = { &s_wxluaarg_Table, NULL };
  static int LUACALL wxLua_wxAcceleratorTable_constructor(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxAcceleratorTable_constructor[1] = {{ wxLua_wxAcceleratorTable_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxAcceleratorTable_constructor }};

Index: event.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/event.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** event.cpp	14 Jun 2007 23:59:43 -0000	1.50
--- event.cpp	16 Jun 2007 06:21:44 -0000	1.51
***************
*** 50,54 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxEvtHandler_Connect[] = { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_LuaFunction, NULL };
  static int LUACALL wxLua_wxEvtHandler_Connect(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxEvtHandler_Connect[1] = {{ wxLua_wxEvtHandler_Connect, WXLUAMETHOD_METHOD, 5, 5, s_wxluatagArray_wxLua_wxEvtHandler_Connect }};
--- 50,54 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxEvtHandler_Connect[] = { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Function, NULL };
  static int LUACALL wxLua_wxEvtHandler_Connect(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxEvtHandler_Connect[1] = {{ wxLua_wxEvtHandler_Connect, WXLUAMETHOD_METHOD, 5, 5, s_wxluatagArray_wxLua_wxEvtHandler_Connect }};

Index: windows.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** windows.cpp	14 Jun 2007 23:59:46 -0000	1.60
--- windows.cpp	16 Jun 2007 06:21:45 -0000	1.61
***************
*** 599,602 ****
--- 599,634 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_Create[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL };
+ static int LUACALL wxLua_wxWindow_Create(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_Create[1] = {{ wxLua_wxWindow_Create, WXLUAMETHOD_METHOD, 3, 7, s_wxluatagArray_wxLua_wxWindow_Create }};
+ //     bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxWindow")
+ static int LUACALL wxLua_wxWindow_Create(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // const wxString name = "wxWindow"
+     const wxString name = (argCount >= 7 ? wxlState.GetwxStringType(7) : wxString(wxT("wxWindow")));
+     // long style = 0
+     long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0);
+     // const wxSize size = wxDefaultSize
+     const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize);
+     // const wxPoint pos = wxDefaultPosition
+     const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition);
+     // wxWindowID id
+     wxWindowID id = (wxWindowID)wxlua_getnumbertype(L, 3);
+     // wxWindow parent
+     wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow);
+     // get this
+     wxWindow * self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow);
+     // call Create
+     returns = (self->Create(parent, id, *pos, *size, style, name));
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
  #endif // wxLUA_USE_wxPointSizeRect
  
***************
*** 4304,4307 ****
--- 4336,4343 ----
  #endif // (wxLUA_USE_wxPointSizeRect)
  
+ #if wxLUA_USE_wxPointSizeRect
+     { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_Create, 1, NULL },
+ #endif // wxLUA_USE_wxPointSizeRect
+ 
      { "Destroy", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_Destroy, 1, NULL },
      { "DestroyChildren", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_DestroyChildren, 1, NULL },

Index: menutool.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/menutool.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** menutool.cpp	14 Jun 2007 23:59:45 -0000	1.44
--- menutool.cpp	16 Jun 2007 06:21:45 -0000	1.45
***************
*** 866,870 ****
  
  #define wxLua_wxMenu_constructor1 wxLua_wxCreateMenu_constructor
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMenu_constructor1[] = { &s_wxluaarg_LuaTable, &s_wxluaarg_String, &s_wxluaarg_Number, NULL };
  static int LUACALL wxLua_wxMenu_constructor1(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenu_constructor1[1] = {{ wxLua_wxMenu_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatagArray_wxLua_wxMenu_constructor1 }};
--- 866,870 ----
  
  #define wxLua_wxMenu_constructor1 wxLua_wxCreateMenu_constructor
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMenu_constructor1[] = { &s_wxluaarg_Table, &s_wxluaarg_String, &s_wxluaarg_Number, NULL };
  static int LUACALL wxLua_wxMenu_constructor1(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenu_constructor1[1] = {{ wxLua_wxMenu_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatagArray_wxLua_wxMenu_constructor1 }};

Index: html.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/html.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** html.cpp	14 Jun 2007 23:59:45 -0000	1.47
--- html.cpp	16 Jun 2007 06:21:45 -0000	1.48
***************
*** 1681,1685 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlWindow_SetFonts[] = { &s_wxluatag_wxHtmlWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LuaTable, NULL };
  static int LUACALL wxLua_wxHtmlWindow_SetFonts(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxHtmlWindow_SetFonts[1] = {{ wxLua_wxHtmlWindow_SetFonts, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxHtmlWindow_SetFonts }};
--- 1681,1685 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlWindow_SetFonts[] = { &s_wxluatag_wxHtmlWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Table, NULL };
  static int LUACALL wxLua_wxHtmlWindow_SetFonts(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxHtmlWindow_SetFonts[1] = {{ wxLua_wxHtmlWindow_SetFonts, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxHtmlWindow_SetFonts }};
***************
*** 2621,2625 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlWinParser_SetFonts[] = { &s_wxluatag_wxHtmlWinParser, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LuaTable, NULL };
  static int LUACALL wxLua_wxHtmlWinParser_SetFonts(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxHtmlWinParser_SetFonts[1] = {{ wxLua_wxHtmlWinParser_SetFonts, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxHtmlWinParser_SetFonts }};
--- 2621,2625 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlWinParser_SetFonts[] = { &s_wxluatag_wxHtmlWinParser, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Table, NULL };
  static int LUACALL wxLua_wxHtmlWinParser_SetFonts(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxHtmlWinParser_SetFonts[1] = {{ wxLua_wxHtmlWinParser_SetFonts, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxHtmlWinParser_SetFonts }};

Index: wx_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** wx_bind.cpp	14 Jun 2007 23:59:46 -0000	1.106
--- wx_bind.cpp	16 Jun 2007 06:21:45 -0000	1.107
***************
*** 4939,4943 ****
  
  #if wxUSE_CHOICEDLG
! static wxLuaArgTag s_wxluatagArray_wxLua_function_wxGetMultipleChoices[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LuaTable, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Boolean, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL };
  // %override wxLua_function_wxGetMultipleChoices
  // %function size_t wxGetMultipleChoices(wxArrayInt& selections,const wxString& message,const wxString& caption,int n, const wxString *choices,wxWindow *parent = (wxWindow *) NULL,int x = -1, int y = -1, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
--- 4939,4943 ----
  
  #if wxUSE_CHOICEDLG
! static wxLuaArgTag s_wxluatagArray_wxLua_function_wxGetMultipleChoices[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Table, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Boolean, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL };
  // %override wxLua_function_wxGetMultipleChoices
  // %function size_t wxGetMultipleChoices(wxArrayInt& selections,const wxString& message,const wxString& caption,int n, const wxString *choices,wxWindow *parent = (wxWindow *) NULL,int x = -1, int y = -1, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);

Index: gdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** gdi.cpp	14 Jun 2007 23:59:44 -0000	1.70
--- gdi.cpp	16 Jun 2007 06:21:45 -0000	1.71
***************
*** 8227,8231 ****
  
  #define wxLua_wxBitmap_constructor5 wxLua_wxBitmapFromXPMData_constructor
! static wxLuaArgTag s_wxluatagArray_wxLua_wxBitmap_constructor5[] = { &s_wxluaarg_LuaTable, NULL };
  static int LUACALL wxLua_wxBitmap_constructor5(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmap_constructor5[1] = {{ wxLua_wxBitmap_constructor5, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxBitmap_constructor5 }};
--- 8227,8231 ----
  
  #define wxLua_wxBitmap_constructor5 wxLua_wxBitmapFromXPMData_constructor
! static wxLuaArgTag s_wxluatagArray_wxLua_wxBitmap_constructor5[] = { &s_wxluaarg_Table, NULL };
  static int LUACALL wxLua_wxBitmap_constructor5(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmap_constructor5[1] = {{ wxLua_wxBitmap_constructor5, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxBitmap_constructor5 }};
***************
*** 13361,13365 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_LuaTable, &s_wxluatag_wxPalette, NULL };
  static int LUACALL wxLua_wxGLCanvas_constructor(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor[1] = {{ wxLua_wxGLCanvas_constructor, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatagArray_wxLua_wxGLCanvas_constructor }};
--- 13361,13365 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Table, &s_wxluatag_wxPalette, NULL };
  static int LUACALL wxLua_wxGLCanvas_constructor(lua_State *L);
  // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor[1] = {{ wxLua_wxGLCanvas_constructor, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatagArray_wxLua_wxGLCanvas_constructor }};

[Wxlua-commit] wxLua/modules/wxlua/include wxlbind.h, 1.51, 1.52 wxldefs.h, 1.26, 1.27 wxlstate.h, 1.79, 1.80 wxlua_bind.h, 1.1, 1.2

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19284/wxLua/modules/wxlua/include

Modified Files:
	wxlbind.h wxldefs.h wxlstate.h wxlua_bind.h 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: wxldefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** wxldefs.h	14 Jun 2007 05:02:48 -0000	1.26
--- wxldefs.h	16 Jun 2007 06:21:46 -0000	1.27
***************
*** 67,71 ****
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 13
  
  // ----------------------------------------------------------------------------
--- 67,71 ----
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 14
  
  // ----------------------------------------------------------------------------

Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** wxlbind.h	14 Jun 2007 23:59:48 -0000	1.51
--- wxlbind.h	16 Jun 2007 06:21:45 -0000	1.52
***************
*** 52,59 ****
  #define WXLUAARG_Number         -5
  #define WXLUAARG_String         -6
! #define WXLUAARG_LuaTable       -7
! #define WXLUAARG_LuaFunction    -8
  #define WXLUAARG_UserData       -9
! #define WXLUAARG_LuaThread      -10
  #define WXLUAARG_Integer        -11
  
--- 52,59 ----
  #define WXLUAARG_Number         -5
  #define WXLUAARG_String         -6
! #define WXLUAARG_Table          -7
! #define WXLUAARG_Function       -8
  #define WXLUAARG_UserData       -9
! #define WXLUAARG_Thread         -10
  #define WXLUAARG_Integer        -11
  
***************
*** 64,71 ****
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Number;
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_String;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaTable;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaFunction;
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_UserData;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaThread;
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Integer;
  
--- 64,71 ----
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Number;
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_String;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Table;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Function;
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_UserData;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Thread;
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Integer;
  
***************
*** 261,265 ****
      union
      {
!         bool        m_bool; 
          int         m_int;
          wxString*   m_string;
--- 261,265 ----
      union
      {
!         bool        m_bool;
          int         m_int;
          wxString*   m_string;

Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** wxlstate.h	14 Jun 2007 23:59:48 -0000	1.79
--- wxlstate.h	16 Jun 2007 06:21:46 -0000	1.80
***************
*** 89,93 ****
  // ----------------------------------------------------------------------------
  // Push a special number into lua, defines to make sure it's always done the same.
! // 
  // Note we do not push a human readable string for these because lua always makes
  // a copy of the string and the copying takes a considerable amount of time
--- 89,93 ----
  // ----------------------------------------------------------------------------
  // Push a special number into lua, defines to make sure it's always done the same.
! //
  // Note we do not push a human readable string for these because lua always makes
  // a copy of the string and the copying takes a considerable amount of time
***************
*** 102,107 ****
  #define WXLUA_METATABLE_CLASS         1
  
! // Push a key that is index in the LUA_REGISTRYINDEX table that is a table indexed 
! // on the "tags" and each item is a metatable for classes 
  // or a reference to an object we want to keep a handle to.
  #define wxlua_pushkey_wxLuaReferences(L) lua_pushnumber(L, WXLUA_LREG_REFERENCES)
--- 102,107 ----
  #define WXLUA_METATABLE_CLASS         1
  
! // Push a key that is index in the LUA_REGISTRYINDEX table that is a table indexed
! // on the "tags" and each item is a metatable for classes
  // or a reference to an object we want to keep a handle to.
  #define wxlua_pushkey_wxLuaReferences(L) lua_pushnumber(L, WXLUA_LREG_REFERENCES)
***************
*** 175,178 ****
--- 175,181 ----
  WXDLLIMPEXP_WXLUA bool LUACALL wxlua_tsettagmethod(lua_State* L, int tag, const char* method,
                                                     lua_CFunction func, void* pClass = NULL);
+ // Is the item at the stack_idx in the wxLuaReferences table already?
+ //   returns the tag or LUA_NOREF if it's not.
+ WXDLLIMPEXP_WXLUA int LUACALL wxlua_tisrefed(lua_State* L, int stack_idx);
  
  // ----------------------------------------------------------------------------
***************
*** 593,596 ****
--- 596,601 ----
      bool RemoveTrackedObject(void *pObject, bool fDelete = true);
      wxLongToLongHashMap* GetTrackedObjects();
+     // Get an array of strings "wxObject_classname count#"
+     wxArrayString GetTrackedObjectStrings();
  
      // Add a wxWindow to track and delete when we're closed, only track
***************
*** 604,607 ****
--- 609,614 ----
      // Is this window tracked, if check_parents see if a parent of it is.
      bool IsWindowTracked(wxWindow *win, bool check_parents = true) const;
+     // Get an array of strings "wxWindow_classname count#"
+     wxArrayString GetTrackedWindowStrings();
  
      // delete all stray wxWindow derived classes that have been destroyed
***************
*** 614,617 ****
--- 621,626 ----
      bool RemoveTrackedCallback(wxLuaCallback* callback);
      wxList* GetTrackedCallbackList();
+     // Get an array of strings "wxEVT_XXX (wxEventType #) count#"
+     wxArrayString GetTrackedCallbackStrings();
  
      // Add or remove a tracked wxLuaWinDestroyCallback connected to wxEVT_DESTROY.
***************
*** 619,622 ****
--- 628,633 ----
      bool RemoveTrackedWinDestroyCallback(wxLuaWinDestroyCallback* callback);
      wxList* GetTrackedWinDestroyCallbackList();
+     // Get an array of strings "wxWindow_classname count#"
+     wxArrayString GetTrackedWinDestroyCallbackStrings();
  
      // -----------------------------------------------------------------------

Index: wxlua_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua_bind.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxlua_bind.h	14 Jun 2007 01:23:19 -0000	1.1
--- wxlua_bind.h	16 Jun 2007 06:21:46 -0000	1.2
***************
*** 17,23 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 13
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 13
  // ---------------------------------------------------------------------------
  
--- 17,23 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 14
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 14
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxbindstc/include wxbind.h,1.28,1.29

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

Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19284/wxLua/modules/wxbindstc/include

Modified Files:
	wxbind.h 
Log Message:
Add back the wxTreeCtrl into the stack dialog, on left of listctrl so
  you get both for easier navigation.
Added functions to the wxlua.XXX table to get info about the status of wxLua
Use qsort and bsearch to find the class methods ~ %25 faster
Make wxLuaDebugData not always create it's ref data so it can !Ok()


Index: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/include/wxbind.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** wxbind.h	14 Jun 2007 01:23:19 -0000	1.28
--- wxbind.h	16 Jun 2007 06:21:45 -0000	1.29
***************
*** 26,32 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 13
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 13
  // ---------------------------------------------------------------------------
  
--- 26,32 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 14
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 14
  // ---------------------------------------------------------------------------