Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2008-01-03 00:06:01
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27681/wxLua/modules/wxbind/src Modified Files: wxcore_event.cpp Log Message: Change wxLuaEventCallback so it doesn't connect in the constructor to allow deleting it if it fails before calling lua_error() and it's long jmp. Renamed the event handler functions to OnEvent() to match the wxWidgets semantics. Index: wxcore_event.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_event.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxcore_event.cpp 22 Dec 2007 06:07:12 -0000 1.11 --- wxcore_event.cpp 3 Jan 2008 00:05:57 -0000 1.12 *************** *** 73,78 **** wxWindowID winId = wxID_ANY; wxWindowID lastId = wxID_ANY; ! wxEventType eventType = 0; ! wxLuaEventCallback *pCallback = NULL; int nParams = lua_gettop(L); --- 73,77 ---- wxWindowID winId = wxID_ANY; wxWindowID lastId = wxID_ANY; ! wxEventType eventType = wxEVT_NULL; int nParams = lua_gettop(L); *************** *** 170,174 **** // Create and connect the callback ! pCallback = new wxLuaEventCallback(wxlState, func_idx, winId, lastId, eventType, evtHandler); return 0; --- 169,179 ---- // Create and connect the callback ! wxLuaEventCallback* pCallback = new wxLuaEventCallback; ! wxString errMsg(pCallback->Connect(wxlState, func_idx, winId, lastId, eventType, evtHandler)); ! if (!errMsg.IsEmpty()) ! { ! delete pCallback; ! wxlua_error(L, errMsg); ! } return 0; *************** *** 191,195 **** wxWindowID winId = wxID_ANY; wxWindowID lastId = wxID_ANY; ! wxEventType eventType = 0; int nParams = lua_gettop(L); --- 196,200 ---- wxWindowID winId = wxID_ANY; wxWindowID lastId = wxID_ANY; ! wxEventType eventType = wxEVT_NULL; int nParams = lua_gettop(L); *************** *** 261,266 **** } ! // Try to disconnect from the callback ! bool returns = evtHandler->Disconnect(winId, lastId, eventType, (wxObjectEventFunction)&wxLuaEventCallback::EventHandler); lua_pushboolean(L, returns); --- 266,271 ---- } ! // Try to disconnect from the callback, it will delete the wxLuaEventCallback. ! bool returns = evtHandler->Disconnect(winId, lastId, eventType, (wxObjectEventFunction)&wxLuaEventCallback::OnAllEvents); lua_pushboolean(L, returns); |
|
From: John L. <jr...@us...> - 2008-01-01 18:27:53
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16544/docs Modified Files: wxluaref.html Log Message: fix colorizing comments Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** wxluaref.html 22 Dec 2007 06:07:09 -0000 1.45 --- wxluaref.html 1 Jan 2008 18:27:48 -0000 1.46 *************** *** 12069,12073 **** <font color=#009900>// C++ Func: <a href="#wxBitmap">wxBitmap</a>(const char bits[], int width, int height, int depth = 1)</font><br> <font color=#009900>// Creates a bitmap from an array of bits in the form of a Lua string.</font><br> ! <font color=#BB0055> <i>%override_name</i> wxLua_wxBitmapFromBits_constructor <a href="#wxBitmap">wxBitmap</a>(const char* mono_bits, int width, int height, int depth <font col</font>or=#888888>/* = 1 */);</font><br> <br> <font color=#BB0055> <font color=#009900>// <i>%override</i> <a href="#wxBitmap">wxBitmap</a>(LuaTable stringTable where each index is a row in the image)</font></font><br> --- 12069,12073 ---- <font color=#009900>// C++ Func: <a href="#wxBitmap">wxBitmap</a>(const char bits[], int width, int height, int depth = 1)</font><br> <font color=#009900>// Creates a bitmap from an array of bits in the form of a Lua string.</font><br> ! <font color=#BB0055> <i>%override_name</i> wxLua_wxBitmapFromBits_constructor <a href="#wxBitmap">wxBitmap</a>(const char* mono_bits, int width, int height, int depth <font color=#888888>/* = 1 */</font>);</font><br> <br> <font color=#BB0055> <font color=#009900>// <i>%override</i> <a href="#wxBitmap">wxBitmap</a>(LuaTable stringTable where each index is a row in the image)</font></font><br> *************** *** 12077,12081 **** <font color=#BB0055> <font color=#009900>// <i>%override</i> <a href="#wxBitmap">wxBitmap</a>(Lua string of data, int type, int width, int height, int depth = -1)</font></font><br> <font color=#009900>// C++ Func: <a href="#wxBitmap">wxBitmap</a>(const void* data, int type, int width, int height, int depth = -1)</font><br> ! <font color=#BB0055> <i>%override_name</i> wxLua_wxBitmapFromData_constructor <i>%win</i> <a href="#wxBitmap">wxBitmap</a>(const <a href="#wxString">wxString</a>& data, int type, int width, int height, int depth <font colo</font>r=#888888>/* = -1 */)</font><br> <br> <font color=#009900>//<i>%win</i> static void AddHandler(wxBitmapHandler* handler)</font><br> --- 12077,12081 ---- <font color=#BB0055> <font color=#009900>// <i>%override</i> <a href="#wxBitmap">wxBitmap</a>(Lua string of data, int type, int width, int height, int depth = -1)</font></font><br> <font color=#009900>// C++ Func: <a href="#wxBitmap">wxBitmap</a>(const void* data, int type, int width, int height, int depth = -1)</font><br> ! <font color=#BB0055> <i>%override_name</i> wxLua_wxBitmapFromData_constructor <i>%win</i> <a href="#wxBitmap">wxBitmap</a>(const <a href="#wxString">wxString</a>& data, int type, int width, int height, int depth <font color=#888888>/* = -1 */</font>)</font><br> <br> <font color=#009900>//<i>%win</i> static void AddHandler(wxBitmapHandler* handler)</font><br> |
|
From: John L. <jr...@us...> - 2008-01-01 18:27:23
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16162/bindings Modified Files: genidocs.lua Log Message: Fix colorizing comments Index: genidocs.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs.lua,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** genidocs.lua 18 Dec 2007 01:03:32 -0000 1.12 --- genidocs.lua 1 Jan 2008 18:27:20 -0000 1.13 *************** *** 339,346 **** --- 339,348 ---- 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) + t = GetAllComments(out_line) 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+2) + t = GetAllComments(out_line) end end |
|
From: John L. <jr...@us...> - 2007-12-25 18:11:32
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24509/wxluacan/src Modified Files: canlua.cpp Log Message: Update for tags to types change Index: canlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/canlua.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** canlua.cpp 14 Aug 2007 13:42:13 -0000 1.13 --- canlua.cpp 25 Dec 2007 18:11:27 -0000 1.14 *************** *** 224,228 **** lua_getglobal( L, wx2lua(m_objectname + wxT("Draw")) ); ! lst.PushUserDataType(s_wxluatag_wxDC, &dc); lst.lua_PushNumber( m_canvas->WorldToDeviceX( absx ) ); --- 224,228 ---- lua_getglobal( L, wx2lua(m_objectname + wxT("Draw")) ); ! lst.wxluaT_PushUserDataType(&dc, g_wxluatype_wxDC, true); lst.lua_PushNumber( m_canvas->WorldToDeviceX( absx ) ); *************** *** 299,303 **** { lua_getglobal( L, wx2lua( wxT("AddChilds") ) ); ! lst.PushUserDataType(s_wxluatag_wxlCanObj, this); lst.lua_PushNumber( m_canvas->WorldToDeviceX( absx ) ); --- 299,303 ---- { lua_getglobal( L, wx2lua( wxT("AddChilds") ) ); ! lst.wxluaT_PushUserDataType(this, g_wxluatype_wxlCanObj, true); lst.lua_PushNumber( m_canvas->WorldToDeviceX( absx ) ); |
|
From: John L. <jr...@us...> - 2007-12-22 16:42:05
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv994/wxLua/modules/wxluadebug/src Modified Files: wxldebug.cpp Log Message: Give a message about not being able to traverse refed tables for the stack dialog instead of silently failing. Index: wxldebug.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** wxldebug.cpp 22 Dec 2007 06:07:16 -0000 1.62 --- wxldebug.cpp 22 Dec 2007 16:42:01 -0000 1.63 *************** *** 413,416 **** --- 413,420 ---- value += wxLuaBindClassString(wxlClass); } + else if (key == &wxlua_lreg_debug_refs_key) + { + value += wxT(" Note: You cannot traverse refed tables"); + } } |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/modules/wxbind/src Modified Files: wxadv_adv.cpp wxadv_bind.cpp wxadv_grid.cpp wxaui_aui.cpp wxaui_bind.cpp wxbase_base.cpp wxbase_bind.cpp wxbase_config.cpp wxbase_data.cpp wxbase_datetime.cpp wxbase_file.cpp wxcore_appframe.cpp wxcore_bind.cpp wxcore_clipdrag.cpp wxcore_controls.cpp wxcore_core.cpp wxcore_defsutils.cpp wxcore_dialogs.cpp wxcore_event.cpp wxcore_gdi.cpp wxcore_geometry.cpp wxcore_help.cpp wxcore_image.cpp wxcore_mdi.cpp wxcore_menutool.cpp wxcore_picker.cpp wxcore_print.cpp wxcore_sizer.cpp wxcore_windows.cpp wxcore_wxlprint.cpp wxgl_bind.cpp wxgl_gl.cpp wxhtml_bind.cpp wxhtml_html.cpp wxhtml_wxlhtmlwin.cpp wxmedia_bind.cpp wxmedia_media.cpp wxnet_bind.cpp wxnet_net.cpp wxrichtext_bind.cpp wxstc_bind.cpp wxstc_stc.cpp wxxml_bind.cpp wxxml_xml.cpp wxxrc_bind.cpp wxxrc_xrc.cpp Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxxrc_xrc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_xrc.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxxrc_xrc.cpp 20 Dec 2007 02:26:57 -0000 1.9 --- wxxrc_xrc.cpp 22 Dec 2007 06:07:15 -0000 1.10 *************** *** 27,35 **** // Lua MetaTable Tag for Class 'wxXmlResource' ! int s_wxluatag_wxXmlResource = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_AttachUnknownControl[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, &s_wxluatag_wxWindow, &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_AttachUnknownControl[1] = {{ wxLua_wxXmlResource_AttachUnknownControl, WXLUAMETHOD_METHOD, 3, 4, s_wxluatagArray_wxLua_wxXmlResource_AttachUnknownControl }}; // bool AttachUnknownControl(const wxString& name, wxWindow* control, wxWindow* parent = NULL); static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L) --- 27,35 ---- // Lua MetaTable Tag for Class 'wxXmlResource' ! int g_wxluatype_wxXmlResource = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_AttachUnknownControl[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, &g_wxluatype_wxWindow, &g_wxluatype_wxWindow, NULL }; static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_AttachUnknownControl[1] = {{ wxLua_wxXmlResource_AttachUnknownControl, WXLUAMETHOD_METHOD, 3, 4, s_wxluatypeArray_wxLua_wxXmlResource_AttachUnknownControl }}; // bool AttachUnknownControl(const wxString& name, wxWindow* control, wxWindow* parent = NULL); static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L) *************** *** 38,48 **** int argCount = lua_gettop(L); // wxWindow parent = NULL ! wxWindow * parent = (argCount >= 4 ? (wxWindow *)wxluaT_getuserdatatype(L, 4, s_wxluatag_wxWindow) : NULL); // wxWindow control ! wxWindow * control = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); // const wxString name const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call AttachUnknownControl bool returns = (self->AttachUnknownControl(name, control, parent)); --- 38,48 ---- int argCount = lua_gettop(L); // wxWindow parent = NULL ! wxWindow * parent = (argCount >= 4 ? (wxWindow *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxWindow) : NULL); // wxWindow control ! wxWindow * control = (wxWindow *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxWindow); // const wxString name const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call AttachUnknownControl bool returns = (self->AttachUnknownControl(name, control, parent)); *************** *** 53,64 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_ClearHandlers[] = { &s_wxluatag_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_ClearHandlers(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_ClearHandlers[1] = {{ wxLua_wxXmlResource_ClearHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_ClearHandlers }}; // void ClearHandlers(); static int LUACALL wxLua_wxXmlResource_ClearHandlers(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call ClearHandlers self->ClearHandlers(); --- 53,64 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_ClearHandlers[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_ClearHandlers(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_ClearHandlers[1] = {{ wxLua_wxXmlResource_ClearHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_ClearHandlers }}; // void ClearHandlers(); static int LUACALL wxLua_wxXmlResource_ClearHandlers(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call ClearHandlers self->ClearHandlers(); *************** *** 67,73 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_CompareVersion[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxXmlResource_CompareVersion(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_CompareVersion[1] = {{ wxLua_wxXmlResource_CompareVersion, WXLUAMETHOD_METHOD, 5, 5, s_wxluatagArray_wxLua_wxXmlResource_CompareVersion }}; // int CompareVersion(int major, int minor, int release, int revision) const; static int LUACALL wxLua_wxXmlResource_CompareVersion(lua_State *L) --- 67,73 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_CompareVersion[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxXmlResource_CompareVersion(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_CompareVersion[1] = {{ wxLua_wxXmlResource_CompareVersion, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxXmlResource_CompareVersion }}; // int CompareVersion(int major, int minor, int release, int revision) const; static int LUACALL wxLua_wxXmlResource_CompareVersion(lua_State *L) *************** *** 82,86 **** int major = (int)wxlua_getnumbertype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call CompareVersion int returns = (self->CompareVersion(major, minor, release, revision)); --- 82,86 ---- int major = (int)wxlua_getnumbertype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call CompareVersion int returns = (self->CompareVersion(major, minor, release, revision)); *************** *** 92,96 **** static int LUACALL wxLua_wxXmlResource_Get(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Get[1] = {{ wxLua_wxXmlResource_Get, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; // static wxXmlResource* Get(); static int LUACALL wxLua_wxXmlResource_Get(lua_State *L) --- 92,96 ---- static int LUACALL wxLua_wxXmlResource_Get(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Get[1] = {{ wxLua_wxXmlResource_Get, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, g_wxluaargtypeArray_None }}; // static wxXmlResource* Get(); static int LUACALL wxLua_wxXmlResource_Get(lua_State *L) *************** *** 99,115 **** wxXmlResource* returns = (wxXmlResource*)wxXmlResource::Get(); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxXmlResource, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_GetFlags[] = { &s_wxluatag_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetFlags[1] = {{ wxLua_wxXmlResource_GetFlags, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_GetFlags }}; // int GetFlags() static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call GetFlags int returns = (self->GetFlags()); --- 99,115 ---- wxXmlResource* returns = (wxXmlResource*)wxXmlResource::Get(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlResource); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_GetFlags[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetFlags[1] = {{ wxLua_wxXmlResource_GetFlags, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_GetFlags }}; // int GetFlags() static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call GetFlags int returns = (self->GetFlags()); *************** *** 120,131 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_GetVersion[] = { &s_wxluatag_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetVersion[1] = {{ wxLua_wxXmlResource_GetVersion, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_GetVersion }}; // long GetVersion() const; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call GetVersion long returns = (self->GetVersion()); --- 120,131 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_GetVersion[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetVersion[1] = {{ wxLua_wxXmlResource_GetVersion, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_GetVersion }}; // long GetVersion() const; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call GetVersion long returns = (self->GetVersion()); *************** *** 136,142 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_GetXRCID[] = { &s_wxluaarg_String, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxXmlResource_GetXRCID(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetXRCID[1] = {{ wxLua_wxXmlResource_GetXRCID, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatagArray_wxLua_wxXmlResource_GetXRCID }}; // static int GetXRCID(const wxString &stringID, int value_if_not_found = wxID_NONE); static int LUACALL wxLua_wxXmlResource_GetXRCID(lua_State *L) --- 136,142 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_GetXRCID[] = { &g_wxluatype_TSTRING, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxXmlResource_GetXRCID(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_GetXRCID[1] = {{ wxLua_wxXmlResource_GetXRCID, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatypeArray_wxLua_wxXmlResource_GetXRCID }}; // static int GetXRCID(const wxString &stringID, int value_if_not_found = wxID_NONE); static int LUACALL wxLua_wxXmlResource_GetXRCID(lua_State *L) *************** *** 156,167 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_InitAllHandlers[] = { &s_wxluatag_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_InitAllHandlers[1] = {{ wxLua_wxXmlResource_InitAllHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_InitAllHandlers }}; // void InitAllHandlers(); static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call InitAllHandlers self->InitAllHandlers(); --- 156,167 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_InitAllHandlers[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_InitAllHandlers[1] = {{ wxLua_wxXmlResource_InitAllHandlers, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_InitAllHandlers }}; // void InitAllHandlers(); static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L) { // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call InitAllHandlers self->InitAllHandlers(); *************** *** 170,176 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_Load[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_Load(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Load[1] = {{ wxLua_wxXmlResource_Load, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_Load }}; // bool Load(const wxString& filemask); static int LUACALL wxLua_wxXmlResource_Load(lua_State *L) --- 170,176 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_Load[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_Load(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Load[1] = {{ wxLua_wxXmlResource_Load, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_Load }}; // bool Load(const wxString& filemask); static int LUACALL wxLua_wxXmlResource_Load(lua_State *L) *************** *** 179,183 **** const wxString filemask = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call Load bool returns = (self->Load(filemask)); --- 179,183 ---- const wxString filemask = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call Load bool returns = (self->Load(filemask)); *************** *** 190,196 **** #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadBitmap(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadBitmap[1] = {{ wxLua_wxXmlResource_LoadBitmap, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap }}; // wxBitmap LoadBitmap(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadBitmap(lua_State *L) --- 190,196 ---- #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadBitmap[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadBitmap(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadBitmap[1] = {{ wxLua_wxXmlResource_LoadBitmap, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadBitmap }}; // wxBitmap LoadBitmap(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadBitmap(lua_State *L) *************** *** 199,203 **** const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadBitmap // allocate a new object using the copy constructor --- 199,203 ---- const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadBitmap // allocate a new object using the copy constructor *************** *** 206,210 **** wxluaO_addgcobject(L, (wxBitmap*)returns); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxBitmap, returns); return 1; --- 206,210 ---- wxluaO_addgcobject(L, (wxBitmap*)returns); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxBitmap); return 1; *************** *** 214,220 **** #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadDialog1[] = { &s_wxluatag_wxXmlResource, &s_wxluatag_wxDialog, &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadDialog1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog1[1] = {{ wxLua_wxXmlResource_LoadDialog1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog1 }}; // bool LoadDialog(wxDialog* dlg, wxWindow *parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadDialog1(lua_State *L) --- 214,220 ---- #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog1[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxDialog, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadDialog1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog1[1] = {{ wxLua_wxXmlResource_LoadDialog1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog1 }}; // bool LoadDialog(wxDialog* dlg, wxWindow *parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadDialog1(lua_State *L) *************** *** 223,231 **** const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); // wxDialog dlg ! wxDialog * dlg = (wxDialog *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxDialog); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadDialog bool returns = (self->LoadDialog(dlg, parent, name)); --- 223,231 ---- const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxWindow); // wxDialog dlg ! wxDialog * dlg = (wxDialog *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxDialog); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadDialog bool returns = (self->LoadDialog(dlg, parent, name)); *************** *** 236,242 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadDialog[] = { &s_wxluatag_wxXmlResource, &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadDialog(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog[1] = {{ wxLua_wxXmlResource_LoadDialog, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog }}; // wxDialog* LoadDialog(wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadDialog(lua_State *L) --- 236,242 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadDialog(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog[1] = {{ wxLua_wxXmlResource_LoadDialog, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog }}; // wxDialog* LoadDialog(wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadDialog(lua_State *L) *************** *** 245,255 **** const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadDialog wxDialog* returns = (wxDialog*)self->LoadDialog(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxDialog, returns); return 1; --- 245,255 ---- const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadDialog wxDialog* returns = (wxDialog*)self->LoadDialog(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxDialog); return 1; *************** *** 259,265 **** #if (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadFrame[] = { &s_wxluatag_wxXmlResource, &s_wxluatag_wxFrame, &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadFrame(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadFrame[1] = {{ wxLua_wxXmlResource_LoadFrame, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadFrame }}; // bool LoadFrame(wxFrame* frame, wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadFrame(lua_State *L) --- 259,265 ---- #if (wxLUA_USE_wxFrame) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadFrame[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxFrame, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadFrame(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadFrame[1] = {{ wxLua_wxXmlResource_LoadFrame, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadFrame }}; // bool LoadFrame(wxFrame* frame, wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadFrame(lua_State *L) *************** *** 268,276 **** const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); // wxFrame frame ! wxFrame * frame = (wxFrame *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxFrame); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadFrame bool returns = (self->LoadFrame(frame, parent, name)); --- 268,276 ---- const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxWindow); // wxFrame frame ! wxFrame * frame = (wxFrame *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxFrame); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadFrame bool returns = (self->LoadFrame(frame, parent, name)); *************** *** 284,290 **** #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadIcon[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadIcon(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadIcon[1] = {{ wxLua_wxXmlResource_LoadIcon, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadIcon }}; // wxIcon LoadIcon(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadIcon(lua_State *L) --- 284,290 ---- #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadIcon[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadIcon(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadIcon[1] = {{ wxLua_wxXmlResource_LoadIcon, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadIcon }}; // wxIcon LoadIcon(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadIcon(lua_State *L) *************** *** 293,297 **** const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadIcon // allocate a new object using the copy constructor --- 293,297 ---- const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadIcon // allocate a new object using the copy constructor *************** *** 300,304 **** wxluaO_addgcobject(L, (wxIcon*)returns); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxIcon, returns); return 1; --- 300,304 ---- wxluaO_addgcobject(L, (wxIcon*)returns); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxIcon); return 1; *************** *** 308,314 **** #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadMenu[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenu(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenu[1] = {{ wxLua_wxXmlResource_LoadMenu, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadMenu }}; // wxMenu* LoadMenu(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenu(lua_State *L) --- 308,314 ---- #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadMenu[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenu(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenu[1] = {{ wxLua_wxXmlResource_LoadMenu, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenu }}; // wxMenu* LoadMenu(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenu(lua_State *L) *************** *** 317,332 **** const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadMenu wxMenu* returns = (wxMenu*)self->LoadMenu(name); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxMenu, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar1[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenuBar1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar1[1] = {{ wxLua_wxXmlResource_LoadMenuBar1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar1 }}; // wxMenuBar* LoadMenuBar(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenuBar1(lua_State *L) --- 317,332 ---- const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadMenu wxMenu* returns = (wxMenu*)self->LoadMenu(name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxMenu); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar1[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenuBar1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar1[1] = {{ wxLua_wxXmlResource_LoadMenuBar1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar1 }}; // wxMenuBar* LoadMenuBar(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenuBar1(lua_State *L) *************** *** 335,350 **** const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadMenuBar wxMenuBar* returns = (wxMenuBar*)self->LoadMenuBar(name); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxMenuBar, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar[] = { &s_wxluatag_wxXmlResource, &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenuBar(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar[1] = {{ wxLua_wxXmlResource_LoadMenuBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar }}; // wxMenuBar* LoadMenuBar(wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenuBar(lua_State *L) --- 335,350 ---- const wxString name = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadMenuBar wxMenuBar* returns = (wxMenuBar*)self->LoadMenuBar(name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxMenuBar); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadMenuBar(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar[1] = {{ wxLua_wxXmlResource_LoadMenuBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar }}; // wxMenuBar* LoadMenuBar(wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenuBar(lua_State *L) *************** *** 353,363 **** const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadMenuBar wxMenuBar* returns = (wxMenuBar*)self->LoadMenuBar(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxMenuBar, returns); return 1; --- 353,363 ---- const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadMenuBar wxMenuBar* returns = (wxMenuBar*)self->LoadMenuBar(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxMenuBar); return 1; *************** *** 366,372 **** #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadPanel1[] = { &s_wxluatag_wxXmlResource, &s_wxluatag_wxPanel, &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadPanel1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel1[1] = {{ wxLua_wxXmlResource_LoadPanel1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel1 }}; // bool LoadPanel(wxPanel *panel, wxWindow *parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadPanel1(lua_State *L) --- 366,372 ---- #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel1[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxPanel, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadPanel1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel1[1] = {{ wxLua_wxXmlResource_LoadPanel1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel1 }}; // bool LoadPanel(wxPanel *panel, wxWindow *parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadPanel1(lua_State *L) *************** *** 375,383 **** const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); // wxPanel panel ! wxPanel * panel = (wxPanel *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxPanel); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadPanel bool returns = (self->LoadPanel(panel, parent, name)); --- 375,383 ---- const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxWindow); // wxPanel panel ! wxPanel * panel = (wxPanel *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxPanel); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadPanel bool returns = (self->LoadPanel(panel, parent, name)); *************** *** 388,394 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadPanel[] = { &s_wxluatag_wxXmlResource, &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadPanel(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel[1] = {{ wxLua_wxXmlResource_LoadPanel, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel }}; // wxPanel* LoadPanel(wxWindow* parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadPanel(lua_State *L) --- 388,394 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadPanel(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel[1] = {{ wxLua_wxXmlResource_LoadPanel, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel }}; // wxPanel* LoadPanel(wxWindow* parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadPanel(lua_State *L) *************** *** 397,407 **** const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadPanel wxPanel* returns = (wxPanel*)self->LoadPanel(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxPanel, returns); return 1; --- 397,407 ---- const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadPanel wxPanel* returns = (wxPanel*)self->LoadPanel(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxPanel); return 1; *************** *** 410,416 **** #if (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar[] = { &s_wxluatag_wxXmlResource, &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_LoadToolBar(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadToolBar[1] = {{ wxLua_wxXmlResource_LoadToolBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar }}; // wxToolBar* LoadToolBar(wxWindow *parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadToolBar(lua_State *L) --- 410,416 ---- #if (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_LoadToolBar[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_wxWindow, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_LoadToolBar(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadToolBar[1] = {{ wxLua_wxXmlResource_LoadToolBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadToolBar }}; // wxToolBar* LoadToolBar(wxWindow *parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadToolBar(lua_State *L) *************** *** 419,429 **** const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadToolBar wxToolBar* returns = (wxToolBar*)self->LoadToolBar(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxToolBar, returns); return 1; --- 419,429 ---- const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxWindow); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call LoadToolBar wxToolBar* returns = (wxToolBar*)self->LoadToolBar(parent, name); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxToolBar); return 1; *************** *** 432,443 **** #endif // (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_Set[] = { &s_wxluatag_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_Set(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Set[1] = {{ wxLua_wxXmlResource_Set, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_Set }}; // static %gc wxXmlResource* Set(%ungc wxXmlResource *res); static int LUACALL wxLua_wxXmlResource_Set(lua_State *L) { // wxXmlResource res ! wxXmlResource * res = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); if (wxluaO_isgcobject(L, res)) wxluaO_undeletegcobject(L, res); // call Set --- 432,443 ---- #endif // (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_Set[] = { &g_wxluatype_wxXmlResource, NULL }; static int LUACALL wxLua_wxXmlResource_Set(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Set[1] = {{ wxLua_wxXmlResource_Set, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_Set }}; // static %gc wxXmlResource* Set(%ungc wxXmlResource *res); static int LUACALL wxLua_wxXmlResource_Set(lua_State *L) { // wxXmlResource res ! wxXmlResource * res = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); if (wxluaO_isgcobject(L, res)) wxluaO_undeletegcobject(L, res); // call Set *************** *** 445,456 **** if (!wxluaO_isgcobject(L, returns)) wxluaO_addgcobject(L, returns); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxXmlResource, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_SetDomain[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_SetDomain(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_SetDomain[1] = {{ wxLua_wxXmlResource_SetDomain, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_SetDomain }}; // void SetDomain(const wxString& domain) static int LUACALL wxLua_wxXmlResource_SetDomain(lua_State *L) --- 445,456 ---- if (!wxluaO_isgcobject(L, returns)) wxluaO_addgcobject(L, returns); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlResource); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_SetDomain[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_SetDomain(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_SetDomain[1] = {{ wxLua_wxXmlResource_SetDomain, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_SetDomain }}; // void SetDomain(const wxString& domain) static int LUACALL wxLua_wxXmlResource_SetDomain(lua_State *L) *************** *** 459,463 **** const wxString domain = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call SetDomain self->SetDomain(domain); --- 459,463 ---- const wxString domain = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call SetDomain self->SetDomain(domain); *************** *** 466,472 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_SetFlags[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_SetFlags[1] = {{ wxLua_wxXmlResource_SetFlags, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_SetFlags }}; // void SetFlags(int flags); static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L) --- 466,472 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_SetFlags[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_SetFlags[1] = {{ wxLua_wxXmlResource_SetFlags, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_SetFlags }}; // void SetFlags(int flags); static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L) *************** *** 475,479 **** int flags = (int)wxlua_getnumbertype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call SetFlags self->SetFlags(flags); --- 475,479 ---- int flags = (int)wxlua_getnumbertype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call SetFlags self->SetFlags(flags); *************** *** 482,488 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_Unload[] = { &s_wxluatag_wxXmlResource, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Unload[1] = {{ wxLua_wxXmlResource_Unload, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_Unload }}; // bool Unload(const wxString& filename) static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L) --- 482,488 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_Unload[] = { &g_wxluatype_wxXmlResource, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_Unload[1] = {{ wxLua_wxXmlResource_Unload, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_Unload }}; // bool Unload(const wxString& filename) static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L) *************** *** 491,495 **** const wxString filename = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call Unload bool returns = (self->Unload(filename)); --- 491,495 ---- const wxString filename = wxlua_getwxStringtype(L, 2); // get this ! wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlResource); // call Unload bool returns = (self->Unload(filename)); *************** *** 500,509 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_delete[] = { &s_wxluatag_wxXmlResource, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_delete }}; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_constructor1[] = { &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor1[1] = {{ wxLua_wxXmlResource_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatagArray_wxLua_wxXmlResource_constructor1 }}; // wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE, const wxString& domain = ""); static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L) --- 500,509 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_delete[] = { &g_wxluatype_wxXmlResource, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxXmlResource_delete }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_constructor1[] = { &g_wxluatype_TSTRING, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor1[1] = {{ wxLua_wxXmlResource_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatypeArray_wxLua_wxXmlResource_constructor1 }}; // wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE, const wxString& domain = ""); static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L) *************** *** 522,533 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxXmlResource, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor[1] = {{ wxLua_wxXmlResource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxXmlResource_constructor }}; // wxXmlResource(int flags = wxXRC_USE_LOCALE, const wxString& domain = ""); static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L) --- 522,533 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlResource); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxXmlResource_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor[1] = {{ wxLua_wxXmlResource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxXmlResource_constructor }}; // wxXmlResource(int flags = wxXRC_USE_LOCALE, const wxString& domain = ""); static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L) *************** *** 544,548 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxXmlResource, returns); return 1; --- 544,548 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlResource); return 1; *************** *** 558,566 **** #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadDialog1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog1 }, #endif // (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadDialog, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog }, #endif // (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) }; --- 558,566 ---- #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadDialog1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog1 }, #endif // (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadDialog, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadDialog }, #endif // (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) }; *************** *** 575,583 **** #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadMenuBar1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar1 }, #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadMenuBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar }, #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) }; --- 575,583 ---- #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadMenuBar1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar1 }, #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) ! { wxLua_wxXmlResource_LoadMenuBar, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadMenuBar }, #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) }; *************** *** 590,595 **** static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload[] = { ! { wxLua_wxXmlResource_LoadPanel1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel1 }, ! { wxLua_wxXmlResource_LoadPanel, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel }, }; static int s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload)/sizeof(wxLuaBindCFunc); --- 590,595 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload[] = { ! { wxLua_wxXmlResource_LoadPanel1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel1 }, ! { wxLua_wxXmlResource_LoadPanel, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxXmlResource_LoadPanel }, }; static int s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload)/sizeof(wxLuaBindCFunc); *************** *** 598,603 **** static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor_overload[] = { ! { wxLua_wxXmlResource_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatagArray_wxLua_wxXmlResource_constructor1 }, ! { wxLua_wxXmlResource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxXmlResource_constructor }, }; static int s_wxluafunc_wxLua_wxXmlResource_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_constructor_overload)/sizeof(wxLuaBindCFunc); --- 598,603 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor_overload[] = { ! { wxLua_wxXmlResource_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatypeArray_wxLua_wxXmlResource_constructor1 }, ! { wxLua_wxXmlResource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxXmlResource_constructor }, }; static int s_wxluafunc_wxLua_wxXmlResource_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_constructor_overload)/sizeof(wxLuaBindCFunc); Index: wxstc_stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_stc.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxstc_stc.cpp 20 Dec 2007 02:26:57 -0000 1.10 --- wxstc_stc.cpp 22 Dec 2007 06:07:15 -0000 1.11 *************** *** 25,33 **** // Lua MetaTable Tag for Class 'wxStyledTextCtrl' ! int s_wxluatag_wxStyledTextCtrl = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_AddRefDocument[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_LightUserData, NULL }; static int LUACALL wxLua_wxStyledTextCtrl_AddRefDocument(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextCtrl_AddRefDocument[1] = {{ wxLua_wxStyledTextCtrl_AddRefDocument, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStyledTextCtrl_AddRefDocument }}; // void AddRefDocument(void* docPointer); static int LUACALL wxLua_wxStyledTextCtrl_AddRefDocument(lua_State *L) --- 25,33 ---- [...14188 lines suppressed...] ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextEvent_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxStyledTextEvent_delete }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxStyledTextEvent_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxStyledTextEvent_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextEvent_constructor[1] = {{ wxLua_wxStyledTextEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxStyledTextEvent_constructor }}; // wxStyledTextEvent(wxEventType commandType = 0, int id = 0) static int LUACALL wxLua_wxStyledTextEvent_constructor(lua_State *L) *************** *** 8680,8684 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxStyledTextEvent, returns); return 1; --- 8680,8684 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxStyledTextEvent); return 1; Index: wxnet_net.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_net.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxnet_net.cpp 20 Dec 2007 02:26:57 -0000 1.8 --- wxnet_net.cpp 22 Dec 2007 06:07:14 -0000 1.9 *************** *** 27,40 **** // Lua MetaTable Tag for Class 'wxSocketBase' ! int s_wxluatag_wxSocketBase = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketBase_Close[] = { &s_wxluatag_wxSocketBase, NULL }; static int LUACALL wxLua_wxSocketBase_Close(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketBase_Close[1] = {{ wxLua_wxSocketBase_Close, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxSocketBase_Close }}; // void Close() static int LUACALL wxLua_wxSocketBase_Close(lua_State *L) { [...3800 lines suppressed...] ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxURL); return 1; *************** *** 2687,2693 **** #if ((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS) ! { wxLua_wxURL_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxURL_constructor1 }, #endif // ((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS) ! { wxLua_wxURL_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxURL_constructor }, }; static int s_wxluafunc_wxLua_wxURL_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxURL_constructor_overload)/sizeof(wxLuaBindCFunc); --- 2687,2693 ---- #if ((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS) ! { wxLua_wxURL_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatypeArray_wxLua_wxURL_constructor1 }, #endif // ((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS) ! { wxLua_wxURL_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatypeArray_wxLua_wxURL_constructor }, }; static int s_wxluafunc_wxLua_wxURL_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxURL_constructor_overload)/sizeof(wxLuaBindCFunc); Index: wxhtml_html.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxhtml_html.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxhtml_html.cpp 20 Dec 2007 02:26:57 -0000 1.9 --- wxhtml_html.cpp 22 Dec 2007 06:07:14 -0000 1.10 *************** *** 27,36 **** // Lua MetaTable Tag for Class 'wxHtmlCell' ! int s_wxluatag_wxHtmlCell = -1; #if (wxLUA_USE_wxArrayInt) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlCell_AdjustPagebreak[] = { &s_wxluatag_wxHtmlCell, &s_wxluaarg_Number, &s_wxluatag_wxArrayInt, NULL }; static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxHtmlCell_AdjustPagebreak[1] = {{ wxLua_wxHtmlCell_AdjustPagebreak, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxHtmlCell_AdjustPagebreak }}; // %override wxLua_wxHtmlCell_AdjustPagebreak // virtual bool AdjustPagebreak(int * pagebreak) [...6486 lines suppressed...] ! { wxLua_wxHtmlHelpController_AddBook1, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxHtmlHelpController_AddBook1 }, #endif // ((wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxHtmlHe... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-12-22 06:07:49
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/docs Modified Files: FAQ.html changelog.txt wxlua.html wxluaref.html Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** wxluaref.html 18 Dec 2007 01:03:32 -0000 1.44 --- wxluaref.html 22 Dec 2007 06:07:09 -0000 1.45 *************** *** 3964,3968 **** --- 3964,3973 ---- static void ClearTraceMasks()<br> static const <a href="#wxArrayString">wxArrayString</a> GetTraceMasks()<br> + <br> + <font color=#BB0055> <font color=#009900>// <i>%override</i> static void wxLog::SetTimestamp(const <a href="#wxString">wxString</a>& ts)</font></font><br> + <font color=#009900>// Allows an input of "nil" or no value to disable time stamping.</font><br> + <font color=#009900>// C++ Func: static void wxLog::SetTimestamp(const wxChar* ts)</font><br> static void SetTimestamp(const <a href="#wxString">wxString</a>& ts)<br> + <br> static bool GetVerbose()<br> static wxTraceMask GetTraceMask()<br> *************** *** 7786,7790 **** <br> bool Arrange(int flag = wxLIST_ALIGN_DEFAULT)<br> ! void AssignImageList(<a href="#wxImageList">wxImageList</a> *imageList, int which)<br> void ClearAll()<br> bool DeleteAllItems()<br> --- 7791,7795 ---- <br> bool Arrange(int flag = wxLIST_ALIGN_DEFAULT)<br> ! void AssignImageList(<i>%ungc</i> <a href="#wxImageList">wxImageList</a> *imageList, int which)<br> void ClearAll()<br> bool DeleteAllItems()<br> *************** *** 8441,8446 **** <a href="#wxTreeItemId">wxTreeItemId</a> AppendItem(const <a href="#wxTreeItemId">wxTreeItemId</a>& parent, const <a href="#wxString">wxString</a>& text, int image = -1, int selImage = -1, <a href="#wxTreeItemData">wxTreeItemData</a>* data = NULL)<br> <font color=#009900>//void AssignButtonsImageList(<a href="#wxImageList">wxImageList</a>* imageList)</font><br> ! void AssignImageList(<a href="#wxImageList">wxImageList</a>* imageList)<br> ! void AssignStateImageList(<a href="#wxImageList">wxImageList</a>* imageList)<br> void Collapse(const <a href="#wxTreeItemId">wxTreeItemId</a>& item)<br> void CollapseAndReset(const <a href="#wxTreeItemId">wxTreeItemId</a>& item)<br> --- 8446,8451 ---- <a href="#wxTreeItemId">wxTreeItemId</a> AppendItem(const <a href="#wxTreeItemId">wxTreeItemId</a>& parent, const <a href="#wxString">wxString</a>& text, int image = -1, int selImage = -1, <a href="#wxTreeItemData">wxTreeItemData</a>* data = NULL)<br> <font color=#009900>//void AssignButtonsImageList(<a href="#wxImageList">wxImageList</a>* imageList)</font><br> ! void AssignImageList(<i>%ungc</i> <a href="#wxImageList">wxImageList</a>* imageList)<br> ! void AssignStateImageList(<i>%ungc</i> <a href="#wxImageList">wxImageList</a>* imageList)<br> void Collapse(const <a href="#wxTreeItemId">wxTreeItemId</a>& item)<br> void CollapseAndReset(const <a href="#wxTreeItemId">wxTreeItemId</a>& item)<br> *************** *** 11786,11790 **** <br> int GetCap() const<br> ! <a href="#wxColour">wxColour</a>& GetColour() const<br> <font color=#009900>// int GetDashes(wxDash** dashes) const</font><br> int GetJoin() const<br> --- 11791,11795 ---- <br> int GetCap() const<br> ! <a href="#wxColour">wxColour</a> GetColour() const <font color=#009900>// not wxColur& so we allocate a new one</font><br> <font color=#009900>// int GetDashes(wxDash** dashes) const</font><br> int GetJoin() const<br> *************** *** 24508,24514 **** <br> WXLUAMETHOD_STATIC <font color=#009900>// Class member function is static</font><br> - WXLUAMETHOD_OVERLOAD <font color=#009900>// This is an overload function that will call others</font><br> - <font color=#009900>// and the min/maxargs for it are not valid,</font><br> - <font color=#009900>// but are the min and max of all functions</font><br> <br> WXLUAMETHOD_DELETE <font color=#009900>// This is the delete function that wxLua has generated</font><br> --- 24513,24516 ---- *************** *** 24516,24537 **** <font color=#009900>// original class.</font><br> <br> ! WXLUAMETHOD_OVERLOAD_BASE <font color=#009900>// Class method has been checked to see if it is</font><br> ! <font color=#009900>// overloaded from the base class.</font><br> ! <font color=#009900>// Check WXLUAMETHOD::basemethod and if !NULL</font><br> ! <font color=#009900>// this method is an overload from the base class</font><br> </font> </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <font color=#006666><i>%define</i> WXLUAARG_None</font><br> ! <font color=#006666><i>%define</i> WXLUAARG_Nil</font><br> ! <font color=#006666><i>%define</i> WXLUAARG_Boolean</font><br> ! <font color=#006666><i>%define</i> WXLUAARG_LightUserData</font><br> ! <font color=#006666><i>%define</i> WXLUAARG_Number</font><br> ! <font color=#006666><i>%define</i> WXLUAARG_String</font><br> ! <font color=#006666><i>%define</i> WXLUAARG_Table</font><br> ! <font color=#006666><i>%define</i> WXLUAARG_Function</font><br> ! <font color=#006666><i>%define</i> WXLUAARG_UserData</font><br> ! <font color=#006666><i>%define</i> WXLUAARG_Thread</font><br> ! <font color=#006666><i>%define</i> WXLUAARG_Integer</font><br> <br> <font color=#006666><i>%define</i> LUA_TNONE <font color=#009900>// (-1)</font></font><br> --- 24518,24540 ---- <font color=#009900>// original class.</font><br> <br> ! WXLUAMETHOD_CHECKED_OVERLOAD <font color=#009900>// Class method has been checked to see if it is</font><br> ! <font color=#009900>// overloaded from the base class.</font><br> ! <font color=#009900>// Check WXLUAMETHOD::basemethod and if !NULL</font><br> ! <font color=#009900>// this method is an overload from the base class</font><br> </font> </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <font color=#006666><i>%define</i> WXLUA_TNONE</font><br> ! <font color=#006666><i>%define</i> WXLUA_TNIL</font><br> ! <font color=#006666><i>%define</i> WXLUA_TBOOLEAN</font><br> ! <font color=#006666><i>%define</i> WXLUA_TLIGHTUSERDATA</font><br> ! <font color=#006666><i>%define</i> WXLUA_TNUMBER</font><br> ! <font color=#006666><i>%define</i> WXLUA_TSTRING</font><br> ! <font color=#006666><i>%define</i> WXLUA_TTABLE</font><br> ! <font color=#006666><i>%define</i> WXLUA_TFUNCTION</font><br> ! <font color=#006666><i>%define</i> WXLUA_TUSERDATA</font><br> ! <font color=#006666><i>%define</i> WXLUA_TTHREAD</font><br> ! <font color=#006666><i>%define</i> WXLUA_TINTEGER</font><br> ! <font color=#006666><i>%define</i> WXLUA_TCFUNCTION</font><br> <br> <font color=#006666><i>%define</i> LUA_TNONE <font color=#009900>// (-1)</font></font><br> *************** *** 24549,24556 **** <font color=#990099><i>%rename</i> iswxluatype <i>%function</i> int wxlua_iswxluatype(int luatype, int wxluaarg_tag)</font><br> <br> ! <font color=#BB0055><font color=#009900>// <i>%override</i> [wxlua_typename, wxlua_type#, lua_typename, lua_type#] type(void* object)</font></font><br> <font color=#009900>// Given any type of object, returns four values:</font><br> ! <font color=#009900>// wxlua name of the type - wxLuaState::GetLuaTagName(wxlua_type)</font><br> ! <font color=#009900>// wxlua number of the type - wxlua_getwxluatype(lua_type(L, stack_idx)) or wxluaT_tag</font><br> <font color=#009900>// lua name of the type - lua_typename(L, lua_type(L, stack_idx))</font><br> <font color=#009900>// lua number of the type - lua_type(L, stack_idx)</font><br> --- 24552,24559 ---- <font color=#990099><i>%rename</i> iswxluatype <i>%function</i> int wxlua_iswxluatype(int luatype, int wxluaarg_tag)</font><br> <br> ! <font color=#BB0055><font color=#009900>// <i>%override</i> [wxlua_typename, wxlua_type#, lua_typename, lua_type#] type(any object)</font></font><br> <font color=#009900>// Given any type of object, returns four values:</font><br> ! <font color=#009900>// wxlua name of the type - wxluaT_gettypename(L, stack_idx)</font><br> ! <font color=#009900>// wxlua number of the type - wxluaT_type(L, stack_idx)</font><br> <font color=#009900>// lua name of the type - lua_typename(L, lua_type(L, stack_idx))</font><br> <font color=#009900>// lua number of the type - lua_type(L, stack_idx)</font><br> *************** *** 24590,24594 **** <br> int GetClassCount<br> ! int GetDefineCount<br> int GetStringCount<br> int GetEventCount<br> --- 24593,24597 ---- <br> int GetClassCount<br> ! int GetNumberCount<br> int GetStringCount<br> int GetEventCount<br> *************** *** 24598,24605 **** {wxLuaBindClass*} GetClassArray<br> {wxLuaBindMethod*} GetFunctionArray<br> ! {name, value} GetDefineArray<br> {name, value} GetStringArray<br> ! {name, eventType, class_tag} GetEventArray<br> ! {name, object, class_tag} GetObjectArray<br> <br> </font></blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><font color=#888888><br> --- 24601,24608 ---- {wxLuaBindClass*} GetClassArray<br> {wxLuaBindMethod*} GetFunctionArray<br> ! {name, value} GetNumberArray<br> {name, value} GetStringArray<br> ! {name, eventType, wxluatype} GetEventArray<br> ! {name, object, wxluatype} GetObjectArray<br> <br> </font></blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><font color=#888888><br> *************** *** 24610,24617 **** <br> <a href="#wxString">wxString</a> name<br> ! {wxLuaBindMethod*} methods<br> ! int methods_n<br> <a href="#wxClassInfo">wxClassInfo</a>* classInfo<br> ! int class_tag<br> <a href="#wxString">wxString</a> baseclassName<br> wxLuaBindClass* baseclass<br> --- 24613,24620 ---- <br> <a href="#wxString">wxString</a> name<br> ! {wxLuaBindMethod*} wxluamethods<br> ! int wxluamethods_n<br> <a href="#wxClassInfo">wxClassInfo</a>* classInfo<br> ! int wxluatype<br> <a href="#wxString">wxString</a> baseclassName<br> wxLuaBindClass* baseclass<br> *************** *** 24626,24632 **** <br> <a href="#wxString">wxString</a> name<br> ! int type<br> ! {wxLuaBindCFunc*} funcs<br> ! int funcs_n<br> wxLuaBindMethod* basemethod<br> <br> --- 24629,24635 ---- <br> <a href="#wxString">wxString</a> name<br> ! int method_type<br> ! {wxLuaBindCFunc*} wxluacfuncs<br> ! int wxluacfuncs_n<br> wxLuaBindMethod* basemethod<br> <br> *************** *** 24640,24648 **** <font color=#009900>// No constructor as this is read only</font><br> <br> ! cfunction func<br> ! int type<br> int minargs<br> int maxargs<br> ! {int} argtags<br> <br> <a href="#wxString">wxString</a> class_name <font color=#009900>// added, not in struct</font><br> --- 24643,24651 ---- <font color=#009900>// No constructor as this is read only</font><br> <br> ! cfunction lua_cfunc<br> ! int method_type<br> int minargs<br> int maxargs<br> ! {int} argtypes<br> <br> <a href="#wxString">wxString</a> class_name <font color=#009900>// added, not in struct</font><br> *************** *** 24679,24683 **** bool IsRunning() const<br> <br> - <a href="#wxString">wxString</a> GetLuaTagName(int tag) const<br> */</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> --- 24682,24685 ---- Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wxlua.html 4 Sep 2007 22:21:10 -0000 1.34 --- wxlua.html 22 Dec 2007 06:07:08 -0000 1.35 *************** *** 2,7 **** <html><head> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Documentation</title> ! <meta content="John Labenski" name="author"></head> ! <body><h2><u>wxLua Documentation</u></h2> <a href="http://wxlua.sourceforge.net">wxLua</a> is --- 2,10 ---- <html><head> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Documentation</title> ! [...3521 lines suppressed...] ! <ul> ! <li>Run ! a Lua file from disk.</li> ! <li>Returns Lua's error code ! LUA_ERRXXX or 0 on success</li> ! </ul> ! <li>int ! LuaPCall(int narg, int nresults)</li> ! <ul> ! <li>Uses lua_call to run a chunk on the stack, but sets ! things up for wxLua first.</li> ! <li>Returns Lua's error ! code LUA_ERRXXX or 0 on success</li> ! </ul> ! <li>There are many ! other functions which are documented in <span style="font-style: italic;">wxLua/modules/wxlua/include/wxlstate.h</span>.</li> ! </ul> ! </body></html> \ No newline at end of file Index: FAQ.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/FAQ.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FAQ.html 7 Aug 2007 19:09:55 -0000 1.5 --- FAQ.html 22 Dec 2007 06:07:08 -0000 1.6 *************** *** 1,182 **** <!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> ! ! ! <li><a href="#Why_do_the_samples_use_the_function">Why do the samples use the function main() and is it special to wxLua?</a></li> ! ! ! <li><a href="#Why_are_the_error_messages_for_a_class">Why ! are the error messages for class member function calls shifted ! +1?</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. </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, 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 for Lua + ~500Kb for the wxLua library.</li> ! ! ! <li>wxLua can be easily interfaced with C++ code making it a powerful extension language, 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 --- 1,86 ---- <!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="#How_to_Learn_wxLua">How to learn ! wxLua</a></li> ! <ol> ! <li><a href="#Read_the_wxLua_documentation">Read ! the wxLua documentation</a></li> ! <li><a href="#Read_the_C_wxWidgets_documentation">Read ! the C++ wxWidgets documentation</a></li> ! <li><a href="#Run_and_trace_through_the_samples">Run ! and trace through the samples</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() and is it special to wxLua?</a></li> ! <li><a href="#Why_are_the_error_messages_for_a_class">Why ! are the arguments shifted +1 for error messages from class member ! function calls?</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. </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, 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> ! <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 for Lua + ~500Kb for the wxLua library.</li> ! <li>wxLua can be easily interfaced with C++ code making it a powerful extension language, 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 *************** *** 184,336 **** 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. </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... </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 if 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 subsection "C++ Classes ! CLASS_NAME" of the "Programming in wxLua" section of the wxlua.html manual.</li> ! ! ! <li>In short, all objects that you create that deal with graphics should be delete()ed as soon as they're no longer used. Functions that take a --- 88,205 ---- 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. </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... </li> ! <li>You may create as many wxLua interpreters in a single program as you like.</li> ! </ul> ! </ol> ! <li> ! <h3><a name="How_to_Learn_wxLua"></a>How ! to Learn wxLua</h3> ! </li> ! <ol> ! <li> ! <h4><a name="Read_the_wxLua_documentation"></a>Read ! the wxLua documentation</h4> ! </li> ! <ul> ! <li>wxlua.html is the manual for wxLua that describes the ! Lua language as well as where the wxWidgets C++ are placed in Lua and ! how to use them.</li> ! <li>wxluaref.html is an autogenerated document that can be ! thought of as a reference manual of what wxLua binds from wxWidgets. It ! also has usage notes for the cases where wxLua differs from C++ ! wxWidgets.</li> ! <li>binding.html describes how to write your own bindings ! for a C or C++ library, but people who will only write Lua code should ! also read it to be able to interpret the wxluaref.html document.</li> ! </ul> ! <li> ! <h4><a name="Read_the_C_wxWidgets_documentation"></a>Read ! the C++ wxWidgets documentation</h4> ! </li> ! <ul> ! <li>wxLua is mapped very closely to wxWidgets ! which means that descriptions for the functions and values there also ! apply to wxLua. See the wxluaref.html document to verify that this is ! the case and any non typical behavior will be clearly marked.</li> ! <li>See the wxWidgets Wiki for examples of ! code, beginner howtos, and other useful bits of information ! that might be useful.</li> ! <li>See wxPython documentation and their Wiki, but note ! that wxLua follows the C++ notation a little closer than wxPython does.</li> ! </ul> ! <li> ! <h4><a name="Run_and_trace_through_the_samples"></a>Run ! and trace through the samples</h4> ! </li> ! <ul> ! <li>The samples try to show off various classes and their ! usage.</li> ! <li>unittest.wx.lua is used to confirm that wxLua is ! operating properly, however it provides a wealth of information about ! what is allowed in terms of calling functions, casting classes to other ! classes, using virtual functions, and derived functions.</li> ! <li>binding.wx.lua traverses the C structs that store the ! data used for wxLua and it's worth taking the time to browse them to ! see how it all fits together.</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 if 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 subsection "C++ Classes ! CLASS_NAME" of the "Programming in wxLua" section of the wxlua.html ! manual.</li> ! <li>In short, all objects that you create that deal with graphics should be delete()ed as soon as they're no longer used. Functions that take a *************** *** 341,354 **** refed copy of them and so you may 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 your program.</li> ! ! ! <li>Class objects that have the <i>%delete</i> tag in their declaration (see wxluaref.html) will be automatically ! garbage collected or can be delete()ed with a wxLua added function for the class. There are, of course, exceptions and these occur when you pass the object to a function with the <i>%ungc</i> tag on --- 210,221 ---- refed copy of them and so you may delete them.</li> ! <li>Use ! the function "table = wxlua.GetGCUserdataInfo()" to get a table of ! items that are tracked and either have an active variable pointing to ! them or are waiting to be garbage collected.</li> ! <li>Class objects that have the <i>%delete</i> tag in their declaration (see wxluaref.html) will be automatically ! garbage collected or can be delete()ed with the wxLua added function ! for the class. There are, of course, exceptions and these occur when you pass the object to a function with the <i>%ungc</i> tag on *************** *** 356,473 **** specifies that the object is now owned by something else and you can no longer delete it in wxLua.</li> ! ! ! <li>Bottom line - don't worry about delete()ing anything ! except:</li><ul><li>Graphics objects (for MSW really).</li><li>Classes that specifically state (in wxluaref.html) that you should delete() them because the ! garbage collector may not do so soon enough.</li><li>Objects that may be very large, like a wxImage(1000, 1000).</li></ul> ! ! ! ! </ul> ! ! ! <li> ! ! <h4><a name="Why_do_the_samples_use_the_function"></a>Why do the samples use the function main() and 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> ! ! ! <li> ! ! <h4><a name="Why_are_the_error_messages_for_a_class"></a>Why ! are the error messages for class member function calls shifted ! +1?</h4> ! ! ! </li> ! ! ! ! <ul> ! ! ! <li>Because the ':' calling convention is syntaxic sugar for putting the 'self' as the first parameter.</li> ! ! ! <li><i>s = wx.wxSize(1, 2); s:Set(3, 4)</i> is the same as <i>s.Set(s, 3, 4)</i> and the first parameter is always the self, therefore <i>s.Set(s, ! "hello", 4)</i> will give an error that parameter 2 is not a number.</li> ! ! ! <li>Unfortunately there is no way to tell whether the user has used the '.' or ':' calling convention and so the error message ! cannot be tailored for both static and nonstatic member functions. Just remember that the first parameter for nonstatic class ! member functions called using the ':' notation is the 'self'.</li> ! ! ! ! </ul> ! ! ! ! </ol> ! ! ! ! <ol> ! ! ! ! <ol> ! ! ! ! </ol> ! ! ! ! </ol> ! ! ! ! <ul> ! ! ! ! </ul> ! ! </ol> - - </body></html> \ No newline at end of file --- 223,277 ---- specifies that the object is now owned by something else and you can no longer delete it in wxLua.</li> ! <li>Bottom line - don't worry about delete()ing anything ! except:</li> ! <ul> ! <li>Graphics objects (for MSW really).</li> ! <li>Classes that specifically state (in wxluaref.html) that you should delete() them because the ! garbage collector may not do so soon enough.</li> ! <li>Objects that may be very large, like a wxImage(1000, ! 1000).</li> ! </ul> ! </ul> ! <li> ! <h4><a name="Why_do_the_samples_use_the_function"></a>Why do the samples use the function main() and 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> ! <li> ! <h4><a name="Why_are_the_error_messages_for_a_class"></a>Why ! are the arguments shifted +1 for error messages from class member ! function calls?</h4> ! </li> ! <ul> ! <li>Because the ':' calling convention is syntaxic sugar for putting the 'self' as the first parameter.</li> ! <li><i>s = wx.wxSize(1, 2); s:Set(3, 4)</i> is the same as <i>s.Set(s, 3, 4)</i> and the first parameter is always the self, therefore <i>s.Set(s, ! "hello", 4)</i> or <i>s:Set("hello", 4)</i> will ! give an error that parameter 2 is not a number.</li> ! <li>Unfortunately there is no way to tell whether the user has used the '.' or ':' calling convention and so the error message ! cannot be tailored for both static and nonstatic member functions. Just remember that the first parameter for nonstatic class ! member functions called using the ':' notation is the 'self'.</li> ! </ul> ! </ol> </ol> </body></html> \ No newline at end of file Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** changelog.txt 20 Dec 2007 02:26:55 -0000 1.54 --- changelog.txt 22 Dec 2007 06:07:08 -0000 1.55 *************** *** 85,88 **** --- 85,107 ---- and call the generic overload function or just the single function. + * Updated the naming conventions of the wxLua C/C++ functions to get rid of + the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but + rather metatables to attach functions to userdata in Lua. + The new term for the C++ objects that wxLua wraps in Lua userdata and + assigns a metatable to are wxLua types. + wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. + wxLua types > 0 are types from the bindings and denote a class or struct. + - Most notably for people who have written their own overrides for their + bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). + Those two functions existed before, but basically did the same thing. + The calling arguments of PushUserTag() were taken however and were the + reverse of what PushUserDataType() had. + - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and + wxluaT_type() where the latter works just like lua_type(), but returns + one of the wxLua types. + + - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the + %ungc tag to release wxLua from deleting the input wxImageList. + version 2.8.4.2 -------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-12-22 06:07:49
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/modules/wxbind/include Modified Files: wxadv_bind.h wxaui_bind.h wxbase_bind.h wxcore_bind.h wxgl_bind.h wxhtml_bind.h wxmedia_bind.h wxnet_bind.h wxrichtext_bind.h wxstc_bind.h wxxml_bind.h wxxrc_bind.h Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxadv_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxadv_bind.h 20 Dec 2007 02:26:55 -0000 1.8 --- wxadv_bind.h 22 Dec 2007 06:07:11 -0000 1.9 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- *************** *** 113,117 **** extern wxLuaBindClass *wxLuaGetClassList_wxadv(size_t &count); ! extern wxLuaBindDefine *wxLuaGetDefineList_wxadv(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxadv(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxadv(size_t &count); --- 113,117 ---- extern wxLuaBindClass *wxLuaGetClassList_wxadv(size_t &count); ! extern wxLuaBindNumber *wxLuaGetDefineList_wxadv(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxadv(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxadv(size_t &count); *************** *** 124,128 **** #if (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxWave; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWave_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWave_methodCount; --- 124,128 ---- #if (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxWave; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWave_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWave_methodCount; *************** *** 130,134 **** #if (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxSound; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSound_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSound_methodCount; --- 130,134 ---- #if (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxSound; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSound_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSound_methodCount; *************** *** 136,143 **** #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxAnimation; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAnimation_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAnimation_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxAnimationCtrl; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAnimationCtrl_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAnimationCtrl_methodCount; --- 136,143 ---- #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxAnimation; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAnimation_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAnimation_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxAnimationCtrl; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAnimationCtrl_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAnimationCtrl_methodCount; *************** *** 145,149 **** #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxAboutDialogInfo; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAboutDialogInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAboutDialogInfo_methodCount; --- 145,149 ---- #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxAboutDialogInfo; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxAboutDialogInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxAboutDialogInfo_methodCount; *************** *** 151,158 **** #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxHyperlinkCtrl; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxHyperlinkCtrl_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxHyperlinkCtrl_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxHyperlinkEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxHyperlinkEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxHyperlinkEvent_methodCount; --- 151,158 ---- #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxHyperlinkCtrl; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxHyperlinkCtrl_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxHyperlinkCtrl_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxHyperlinkEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxHyperlinkEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxHyperlinkEvent_methodCount; *************** *** 160,164 **** #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxBitmapComboBox; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxBitmapComboBox_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxBitmapComboBox_methodCount; --- 160,164 ---- #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxBitmapComboBox; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxBitmapComboBox_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxBitmapComboBox_methodCount; *************** *** 166,179 **** #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxCalendarCtrl; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarCtrl_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarCtrl_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxCalendarDateAttr; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarDateAttr_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarDateAttr_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxCalendarEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxDateEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxDateEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxDateEvent_methodCount; --- 166,179 ---- #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxCalendarCtrl; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarCtrl_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarCtrl_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxCalendarDateAttr; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarDateAttr_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarDateAttr_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxCalendarEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalendarEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalendarEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxDateEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxDateEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxDateEvent_methodCount; *************** *** 181,270 **** #if wxLUA_USE_wxGrid && wxUSE_GRID ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGrid; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGrid_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGrid_methodCount; ! extern WXDLLIMPEXP_BINDWXADV wxLuaBindDefine wxGrid_enums[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGrid_enumCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellAttr; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAttr_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttr_methodCount; ! extern WXDLLIMPEXP_BINDWXADV wxLuaBindDefine wxGridCellAttr_enums[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttr_enumCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellAttrProvider; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAttrProvider_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttrProvider_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellAutoWrapStringEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAutoWrapStringEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAutoWrapStringEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellAutoWrapStringRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAutoWrapStringRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAutoWrapStringRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellBoolEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellBoolEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellBoolEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellBoolRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellBoolRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellBoolRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellChoiceEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellChoiceEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellChoiceEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellCoords; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellCoords_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellCoords_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellDateTimeRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellDateTimeRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellDateTimeRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellEnumEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEnumEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEnumEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellEnumRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEnumRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEnumRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellFloatEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellFloatEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellFloatEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellFloatRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellFloatRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellFloatRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellNumberEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellNumberEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellNumberEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellNumberRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellNumberRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellNumberRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellStringRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellStringRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellStringRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellTextEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellTextEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellTextEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridCellWorker; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellWorker_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellWorker_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridEditorCreatedEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridEditorCreatedEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridEditorCreatedEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridRangeSelectEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridRangeSelectEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridRangeSelectEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridSizeEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridSizeEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridSizeEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridStringTable; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridStringTable_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridStringTable_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridTableBase; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridTableBase_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridTableBase_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxGridTableMessage; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridTableMessage_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridTableMessage_methodCount; --- 181,270 ---- #if wxLUA_USE_wxGrid && wxUSE_GRID ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGrid; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGrid_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGrid_methodCount; ! extern WXDLLIMPEXP_BINDWXADV wxLuaBindNumber wxGrid_enums[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGrid_enumCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellAttr; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAttr_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttr_methodCount; ! extern WXDLLIMPEXP_BINDWXADV wxLuaBindNumber wxGridCellAttr_enums[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttr_enumCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellAttrProvider; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAttrProvider_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAttrProvider_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellAutoWrapStringEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAutoWrapStringEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAutoWrapStringEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellAutoWrapStringRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellAutoWrapStringRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellAutoWrapStringRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellBoolEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellBoolEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellBoolEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellBoolRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellBoolRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellBoolRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellChoiceEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellChoiceEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellChoiceEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellCoords; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellCoords_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellCoords_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellDateTimeRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellDateTimeRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellDateTimeRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellEnumEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEnumEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEnumEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellEnumRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellEnumRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellEnumRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellFloatEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellFloatEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellFloatEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellFloatRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellFloatRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellFloatRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellNumberEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellNumberEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellNumberEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellNumberRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellNumberRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellNumberRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellStringRenderer; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellStringRenderer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellStringRenderer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellTextEditor; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellTextEditor_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellTextEditor_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridCellWorker; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridCellWorker_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridCellWorker_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridEditorCreatedEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridEditorCreatedEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridEditorCreatedEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridRangeSelectEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridRangeSelectEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridRangeSelectEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridSizeEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridSizeEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridSizeEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridStringTable; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridStringTable_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridStringTable_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridTableBase; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridTableBase_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridTableBase_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxGridTableMessage; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxGridTableMessage_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxGridTableMessage_methodCount; *************** *** 272,279 **** #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxJoystick; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxJoystick_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxJoystick_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxJoystickEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxJoystickEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxJoystickEvent_methodCount; --- 272,279 ---- #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxJoystick; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxJoystick_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxJoystick_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxJoystickEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxJoystickEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxJoystickEvent_methodCount; *************** *** 281,300 **** #if wxLUA_USE_wxSashWindow && wxUSE_SASH ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxCalculateLayoutEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalculateLayoutEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalculateLayoutEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxLayoutAlgorithm; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxLayoutAlgorithm_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxLayoutAlgorithm_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxQueryLayoutInfoEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxQueryLayoutInfoEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxQueryLayoutInfoEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxSashEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxSashLayoutWindow; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashLayoutWindow_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashLayoutWindow_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxSashWindow; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashWindow_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashWindow_methodCount; --- 281,300 ---- #if wxLUA_USE_wxSashWindow && wxUSE_SASH ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxCalculateLayoutEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxCalculateLayoutEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxCalculateLayoutEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxLayoutAlgorithm; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxLayoutAlgorithm_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxLayoutAlgorithm_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxQueryLayoutInfoEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxQueryLayoutInfoEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxQueryLayoutInfoEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxSashEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxSashLayoutWindow; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashLayoutWindow_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashLayoutWindow_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxSashWindow; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSashWindow_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSashWindow_methodCount; *************** *** 302,309 **** #if wxLUA_USE_wxSplashScreen ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxSplashScreen; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSplashScreen_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSplashScreen_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxSplashScreenWindow; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSplashScreenWindow_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSplashScreenWindow_methodCount; --- 302,309 ---- #if wxLUA_USE_wxSplashScreen ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxSplashScreen; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSplashScreen_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSplashScreen_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxSplashScreenWindow; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxSplashScreenWindow_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxSplashScreenWindow_methodCount; *************** *** 311,318 **** #if wxLUA_USE_wxTaskBarIcon && defined (wxHAS_TASK_BAR_ICON ) ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxTaskBarIcon; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxTaskBarIcon_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxTaskBarIcon_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxTaskBarIconEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxTaskBarIconEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxTaskBarIconEvent_methodCount; --- 311,318 ---- #if wxLUA_USE_wxTaskBarIcon && defined (wxHAS_TASK_BAR_ICON ) ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxTaskBarIcon; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxTaskBarIcon_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxTaskBarIcon_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxTaskBarIconEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxTaskBarIconEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxTaskBarIconEvent_methodCount; *************** *** 320,333 **** #if wxUSE_WIZARDDLG && wxLUA_USE_wxWizard ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxWizard; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizard_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizard_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxWizardEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxWizardPage; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardPage_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardPage_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) s_wxluatag_wxWizardPageSimple; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardPageSimple_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardPageSimple_methodCount; --- 320,333 ---- #if wxUSE_WIZARDDLG && wxLUA_USE_wxWizard ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxWizard; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizard_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizard_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxWizardEvent; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxWizardPage; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardPage_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardPage_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXADV(int) g_wxluatype_wxWizardPageSimple; extern WXDLLIMPEXP_BINDWXADV wxLuaBindMethod wxWizardPageSimple_methods[]; extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxWizardPageSimple_methodCount; Index: wxcore_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxcore_bind.h 20 Dec 2007 02:26:55 -0000 1.8 --- wxcore_bind.h 22 Dec 2007 06:07:11 -0000 1.9 *************** *** 38,44 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- --- 38,44 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' [...2692 lines suppressed...] extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxProgressDialog_methodCount; *************** *** 1811,1818 **** #if wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) s_wxluatag_wxPasswordEntryDialog; extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxPasswordEntryDialog_methods[]; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxPasswordEntryDialog_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) s_wxluatag_wxTextEntryDialog; extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxTextEntryDialog_methods[]; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxTextEntryDialog_methodCount; --- 1811,1818 ---- #if wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) g_wxluatype_wxPasswordEntryDialog; extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxPasswordEntryDialog_methods[]; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxPasswordEntryDialog_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXCORE(int) g_wxluatype_wxTextEntryDialog; extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxTextEntryDialog_methods[]; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxTextEntryDialog_methodCount; Index: wxrichtext_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxrichtext_bind.h 20 Dec 2007 02:26:55 -0000 1.8 --- wxrichtext_bind.h 22 Dec 2007 06:07:11 -0000 1.9 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- *************** *** 56,60 **** extern wxLuaBindClass *wxLuaGetClassList_wxrichtext(size_t &count); ! extern wxLuaBindDefine *wxLuaGetDefineList_wxrichtext(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxrichtext(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxrichtext(size_t &count); --- 56,60 ---- extern wxLuaBindClass *wxLuaGetClassList_wxrichtext(size_t &count); ! extern wxLuaBindNumber *wxLuaGetDefineList_wxrichtext(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxrichtext(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxrichtext(size_t &count); Index: wxxrc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxxrc_bind.h 20 Dec 2007 02:26:55 -0000 1.8 --- wxxrc_bind.h 22 Dec 2007 06:07:11 -0000 1.9 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- *************** *** 60,64 **** extern wxLuaBindClass *wxLuaGetClassList_wxxrc(size_t &count); ! extern wxLuaBindDefine *wxLuaGetDefineList_wxxrc(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxxrc(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxxrc(size_t &count); --- 60,64 ---- extern wxLuaBindClass *wxLuaGetClassList_wxxrc(size_t &count); ! extern wxLuaBindNumber *wxLuaGetDefineList_wxxrc(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxxrc(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxxrc(size_t &count); *************** *** 71,75 **** #if wxLUA_USE_wxXRC && wxUSE_XRC ! extern WXDLLIMPEXP_DATA_BINDWXXRC(int) s_wxluatag_wxXmlResource; extern WXDLLIMPEXP_BINDWXXRC wxLuaBindMethod wxXmlResource_methods[]; extern WXDLLIMPEXP_DATA_BINDWXXRC(int) wxXmlResource_methodCount; --- 71,75 ---- #if wxLUA_USE_wxXRC && wxUSE_XRC ! extern WXDLLIMPEXP_DATA_BINDWXXRC(int) g_wxluatype_wxXmlResource; extern WXDLLIMPEXP_BINDWXXRC wxLuaBindMethod wxXmlResource_methods[]; extern WXDLLIMPEXP_DATA_BINDWXXRC(int) wxXmlResource_methodCount; Index: wxnet_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxnet_bind.h 20 Dec 2007 02:26:55 -0000 1.8 --- wxnet_bind.h 22 Dec 2007 06:07:11 -0000 1.9 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- *************** *** 77,81 **** extern wxLuaBindClass *wxLuaGetClassList_wxnet(size_t &count); ! extern wxLuaBindDefine *wxLuaGetDefineList_wxnet(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxnet(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxnet(size_t &count); --- 77,81 ---- extern wxLuaBindClass *wxLuaGetClassList_wxnet(size_t &count); ! extern wxLuaBindNumber *wxLuaGetDefineList_wxnet(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxnet(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxnet(size_t &count); *************** *** 88,92 **** #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) s_wxluatag_wxProtocol; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxProtocol_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxProtocol_methodCount; --- 88,92 ---- #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxProtocol; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxProtocol_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxProtocol_methodCount; *************** *** 94,106 **** #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) s_wxluatag_wxFTP; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxFTP_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxFTP_methodCount; ! extern WXDLLIMPEXP_BINDWXNET wxLuaBindDefine wxFTP_enums[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxFTP_enumCount; #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP) #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_HTTP) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) s_wxluatag_wxHTTP; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxHTTP_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxHTTP_methodCount; --- 94,106 ---- #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxFTP; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxFTP_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxFTP_methodCount; ! extern WXDLLIMPEXP_BINDWXNET wxLuaBindNumber wxFTP_enums[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxFTP_enumCount; #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_FTP) #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_HTTP) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxHTTP; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxHTTP_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxHTTP_methodCount; *************** *** 108,112 **** #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) s_wxluatag_wxURL; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxURL_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxURL_methodCount; --- 108,112 ---- #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL) ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxURL; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxURL_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxURL_methodCount; *************** *** 114,139 **** #if wxLUA_USE_wxSocket && wxUSE_SOCKETS ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) s_wxluatag_wxIPV4address; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxIPV4address_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxIPV4address_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) s_wxluatag_wxIPaddress; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxIPaddress_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxIPaddress_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) s_wxluatag_wxSockAddress; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSockAddress_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSockAddress_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) s_wxluatag_wxSocketBase; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketBase_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketBase_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) s_wxluatag_wxSocketClient; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketClient_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketClient_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) s_wxluatag_wxSocketEvent; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) s_wxluatag_wxSocketServer; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketServer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketServer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) s_wxluatag_wxURI; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxURI_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxURI_methodCount; --- 114,139 ---- #if wxLUA_USE_wxSocket && wxUSE_SOCKETS ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxIPV4address; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxIPV4address_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxIPV4address_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxIPaddress; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxIPaddress_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxIPaddress_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxSockAddress; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSockAddress_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSockAddress_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxSocketBase; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketBase_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketBase_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxSocketClient; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketClient_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketClient_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxSocketEvent; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketEvent_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketEvent_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxSocketServer; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxSocketServer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxSocketServer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXNET(int) g_wxluatype_wxURI; extern WXDLLIMPEXP_BINDWXNET wxLuaBindMethod wxURI_methods[]; extern WXDLLIMPEXP_DATA_BINDWXNET(int) wxURI_methodCount; Index: wxbase_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxbase_bind.h 20 Dec 2007 02:26:55 -0000 1.9 --- wxbase_bind.h 22 Dec 2007 06:07:11 -0000 1.10 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- *************** *** 160,164 **** extern wxLuaBindClass *wxLuaGetClassList_wxbase(size_t &count); ! extern wxLuaBindDefine *wxLuaGetDefineList_wxbase(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxbase(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxbase(size_t &count); --- 160,164 ---- extern wxLuaBindClass *wxLuaGetClassList_wxbase(size_t &count); ! extern wxLuaBindNumber *wxLuaGetDefineList_wxbase(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxbase(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxbase(size_t &count); *************** *** 170,229 **** // --------------------------------------------------------------------------- ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxClientData; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClientData_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClientData_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxClientDataContainer; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClientDataContainer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClientDataContainer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxDynamicLibrary; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibrary_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibrary_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxDynamicLibraryDetails; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibraryDetails_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibraryDetails_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxDynamicLibraryDetailsArray; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibraryDetailsArray_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibraryDetailsArray_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxFileType; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileType_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileType_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxFileType_MessageParameters; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileType_MessageParameters_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileType_MessageParameters_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxFileTypeInfo; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileTypeInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileTypeInfo_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxIconLocation; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxIconLocation_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxIconLocation_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxMimeTypesManager; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxMimeTypesManager_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxMimeTypesManager_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxPathList; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxPathList_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxPathList_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxPlatformInfo; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxPlatformInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxPlatformInfo_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxString; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxString_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxString_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxStringClientData; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStringClientData_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStringClientData_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxStringTokenizer; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStringTokenizer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStringTokenizer_methodCount; #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxStandardPaths; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStandardPaths_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStandardPaths_methodCount; ! extern WXDLLIMPEXP_BINDWXBASE wxLuaBindDefine wxStandardPaths_enums[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStandardPaths_enumCount; #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths #if wxLUA_USE_wxArrayInt ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxArrayInt; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxArrayInt_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxArrayInt_methodCount; --- 170,229 ---- // --------------------------------------------------------------------------- ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxClientData; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClientData_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClientData_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxClientDataContainer; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClientDataContainer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClientDataContainer_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxDynamicLibrary; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibrary_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibrary_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxDynamicLibraryDetails; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibraryDetails_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibraryDetails_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxDynamicLibraryDetailsArray; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxDynamicLibraryDetailsArray_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxDynamicLibraryDetailsArray_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxFileType; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileType_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileType_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxFileType_MessageParameters; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileType_MessageParameters_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileType_MessageParameters_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxFileTypeInfo; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileTypeInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileTypeInfo_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxIconLocation; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxIconLocation_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxIconLocation_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxMimeTypesManager; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxMimeTypesManager_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxMimeTypesManager_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxPathList; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxPathList_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxPathList_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxPlatformInfo; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxPlatformInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxPlatformInfo_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxString; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxString_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxString_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxStringClientData; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStringClientData_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStringClientData_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxStringTokenizer; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStringTokenizer_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStringTokenizer_methodCount; #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxStandardPaths; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxStandardPaths_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStandardPaths_methodCount; ! extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxStandardPaths_enums[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxStandardPaths_enumCount; #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths #if wxLUA_USE_wxArrayInt ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxArrayInt; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxArrayInt_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxArrayInt_methodCount; *************** *** 231,238 **** #if wxLUA_USE_wxArrayString ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxArrayString; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxArrayString_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxArrayString_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxSortedArrayString; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxSortedArrayString_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxSortedArrayString_methodCount; --- 231,238 ---- #if wxLUA_USE_wxArrayString ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxArrayString; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxArrayString_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxArrayString_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxSortedArrayString; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxSortedArrayString_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxSortedArrayString_methodCount; *************** *** 240,244 **** #if wxLUA_USE_wxClassInfo ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxClassInfo; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClassInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClassInfo_methodCount; --- 240,244 ---- #if wxLUA_USE_wxClassInfo ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxClassInfo; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClassInfo_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxClassInfo_methodCount; *************** *** 246,264 **** #if wxLUA_USE_wxConfig && wxUSE_CONFIG ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxConfig; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfig_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfig_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxConfigBase; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfigBase_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigBase_methodCount; ! extern WXDLLIMPEXP_BINDWXBASE wxLuaBindDefine wxConfigBase_enums[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigBase_enumCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxConfigPathChanger; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfigPathChanger_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigPathChanger_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxFileConfig; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileConfig_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileConfig_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxMemoryConfig; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxMemoryConfig_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxMemoryConfig_methodCount; --- 246,264 ---- #if wxLUA_USE_wxConfig && wxUSE_CONFIG ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxConfig; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfig_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfig_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxConfigBase; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfigBase_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigBase_methodCount; ! extern WXDLLIMPEXP_BINDWXBASE wxLuaBindNumber wxConfigBase_enums[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigBase_enumCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxConfigPathChanger; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxConfigPathChanger_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxConfigPathChanger_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxFileConfig; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileConfig_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileConfig_methodCount; ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) g_wxluatype_wxMemoryConfig; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxMemoryConfig_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxMemoryConfig_methodCount; *************** *** 266,270 **** #if wxLUA_USE_wxCriticalSection && wxUSE_THREADS ! extern WXDLLIMPEXP_DATA_BINDWXBASE(int) s_wxluatag_wxCriticalSection; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxCriticalSection_methods[]; extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxCriticalSection_methodCount; --- 266,270 ---- #if wxLUA_USE_wxCriticalSection && wxUSE_THREADS ! extern WXDLLIMPE... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-12-22 06:07:49
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/bindings/wxwidgets Modified Files: wxadv_override.hpp wxbase_base.i wxbase_override.hpp wxbase_rules.lua wxcore_controls.i wxcore_gdi.i wxcore_override.hpp wxhtml_override.hpp wxnet_override.hpp wxstc_override.hpp wxxml_override.hpp Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxcore_gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_gdi.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxcore_gdi.i 18 Dec 2007 01:03:32 -0000 1.2 --- wxcore_gdi.i 22 Dec 2007 06:07:08 -0000 1.3 *************** *** 630,634 **** int GetCap() const ! wxColour& GetColour() const // int GetDashes(wxDash** dashes) const int GetJoin() const --- 630,634 ---- int GetCap() const ! wxColour GetColour() const // not wxColur& so we allocate a new one // int GetDashes(wxDash** dashes) const int GetJoin() const Index: wxnet_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxnet_override.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxnet_override.hpp 7 Dec 2007 02:13:10 -0000 1.2 --- wxnet_override.hpp 22 Dec 2007 06:07:08 -0000 1.3 *************** *** 21,25 **** { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase); // call Peek self->Peek(buffer, nbytes); --- 21,25 ---- { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Peek self->Peek(buffer, nbytes); *************** *** 44,48 **** { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase); // call Peek self->Read(buffer, nbytes); --- 44,48 ---- { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Peek self->Read(buffer, nbytes); *************** *** 67,71 **** { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase); // call Peek self->ReadMsg(buffer, nbytes); --- 67,71 ---- { // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Peek self->ReadMsg(buffer, nbytes); *************** *** 90,94 **** unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase); // call Unread self->Unread(buffer, nbytes); --- 90,94 ---- unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Unread self->Unread(buffer, nbytes); *************** *** 109,113 **** unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase); // call Write self->Write(buffer, nbytes); --- 109,113 ---- unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call Write self->Write(buffer, nbytes); *************** *** 128,132 **** unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase); // call WriteMsg self->WriteMsg(buffer, nbytes); --- 128,132 ---- unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2)); // get this ! wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxSocketBase); // call WriteMsg self->WriteMsg(buffer, nbytes); Index: wxbase_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_rules.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxbase_rules.lua 5 Dec 2007 00:34:45 -0000 1.5 --- wxbase_rules.lua 22 Dec 2007 06:07:08 -0000 1.6 *************** *** 137,145 **** lua_State* L = wxlState.GetLuaState(); ! g_wxluatag_NULL = wxluaT_newtag(L); lua_pop(L, 1); // pop the table lua_pushlstring(L, "NULL", 4); ! wxluaT_pushusertag(L, NULL, g_wxluatag_NULL, true); lua_rawset(L, luaTable); // set t["NULL"] = userdata(NULL) w/ NULL tag ]] --- 137,145 ---- lua_State* L = wxlState.GetLuaState(); ! g_wxluatag_NULL = wxluaT_newmetatable(L); lua_pop(L, 1); // pop the table lua_pushlstring(L, "NULL", 4); ! wxluaT_pushuserdatatype(L, NULL, g_wxluatag_NULL, true, true); lua_rawset(L, luaTable); // set t["NULL"] = userdata(NULL) w/ NULL tag ]] Index: wxstc_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxstc_override.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxstc_override.hpp 18 Dec 2007 01:03:32 -0000 1.4 --- wxstc_override.hpp 22 Dec 2007 06:07:08 -0000 1.5 *************** *** 16,20 **** int linePos; // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); // call GetCurLine wxString returns = self->GetCurLine(&linePos); --- 16,20 ---- int linePos; // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxStyledTextCtrl); // call GetCurLine wxString returns = self->GetCurLine(&linePos); *************** *** 34,38 **** int startPos; // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); // call GetSelection self->GetSelection(&startPos, &endPos); --- 34,38 ---- int startPos; // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxStyledTextCtrl); // call GetSelection self->GetSelection(&startPos, &endPos); *************** *** 54,58 **** int length = (int)lua_tonumber(L, 2); // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); // call SetStyleBytes self->SetStyleBytes(length, styleBytes); --- 54,58 ---- int length = (int)lua_tonumber(L, 2); // get this ! wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxStyledTextCtrl); // call SetStyleBytes self->SetStyleBytes(length, styleBytes); Index: wxhtml_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxhtml_override.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxhtml_override.hpp 20 Dec 2007 02:26:55 -0000 1.6 --- wxhtml_override.hpp 22 Dec 2007 06:07:08 -0000 1.7 *************** *** 19,23 **** int pagebreak = (int)wxlua_getintegertype(L, 2); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlCell); // call AdjustPagebreak bool returns = self->AdjustPagebreak(&pagebreak); --- 19,23 ---- int pagebreak = (int)wxlua_getintegertype(L, 2); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlCell); // call AdjustPagebreak bool returns = self->AdjustPagebreak(&pagebreak); *************** *** 36,42 **** int pagebreak = (int)wxlua_getintegertype(L, 3); // wxArrayInt& known_pagebreaks ! wxArrayInt* known_pagebreaks = (wxArrayInt *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxArrayInt); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlCell); // call AdjustPagebreak bool returns = self->AdjustPagebreak(&pagebreak, *known_pagebreaks); --- 36,42 ---- int pagebreak = (int)wxlua_getintegertype(L, 3); // wxArrayInt& known_pagebreaks ! wxArrayInt* known_pagebreaks = (wxArrayInt *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxArrayInt); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlCell); // call AdjustPagebreak bool returns = self->AdjustPagebreak(&pagebreak, *known_pagebreaks); *************** *** 59,63 **** int condition = (int)wxlua_getintegertype(L, 2); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlCell); // call Find switch(lua_type(L, 3)) --- 59,63 ---- int condition = (int)wxlua_getintegertype(L, 2); // get this ! wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlCell); // call Find switch(lua_type(L, 3)) *************** *** 82,91 **** default: ! wxlua_error(L, "wxLua: Expected simple type for parameter 3."); break; } // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxHtmlCell, returns); // return the number of parameters return 1; --- 82,91 ---- default: ! wxlua_argerror(L, 3, wxT("a 'nil', 'string', or a 'number'")); break; } // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxHtmlCell); // return the number of parameters return 1; *************** *** 101,105 **** wxString par = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlTag); // call GetParamAsColour bool returns = self->GetParamAsColour(par, retColour); --- 101,105 ---- wxString par = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlTag); // call GetParamAsColour bool returns = self->GetParamAsColour(par, retColour); *************** *** 107,111 **** // push the result number lua_pushboolean(L, returns); ! wxluaT_pushuserdatatype(L, s_wxluatag_wxColour, retColour); // return the number of parameters return 2; --- 107,111 ---- // push the result number lua_pushboolean(L, returns); ! wxluaT_pushuserdatatype(L, retColour, g_wxluatype_wxColour); // return the number of parameters return 2; *************** *** 121,125 **** wxString par = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlTag); // call GetParamAsInt bool returns = self->GetParamAsInt(par, &value); --- 121,125 ---- wxString par = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlTag); // call GetParamAsInt bool returns = self->GetParamAsInt(par, &value); *************** *** 180,184 **** wxString normal_face = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlWinParser *self = (wxHtmlWinParser *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlWinParser); // call SetFonts self->SetFonts(normal_face, fixed_face, sizes); --- 180,184 ---- wxString normal_face = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlWinParser *self = (wxHtmlWinParser *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlWinParser); // call SetFonts self->SetFonts(normal_face, fixed_face, sizes); *************** *** 235,239 **** wxString normal_face = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlWindow *self = (wxHtmlWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlWindow); // call SetFonts self->SetFonts(normal_face, fixed_face, sizes); --- 235,239 ---- wxString normal_face = wxlua_getwxStringtype(L, 2); // get this ! wxHtmlWindow *self = (wxHtmlWindow *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxHtmlWindow); // call SetFonts self->SetFonts(normal_face, fixed_face, sizes); *************** *** 256,266 **** long style = (argCount >= 5 ? (long)wxlua_getintegertype(L, 5) : wxHW_SCROLLBAR_AUTO); // const wxSize size = wxDefaultSize ! const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, s_wxluatag_wxSize) : &wxDefaultSize); // const wxPoint pos = wxDefaultPosition ! const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getintegertype(L, 2) : -1); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor wxLuaHtmlWindow *returns = new wxLuaHtmlWindow(wxlState, parent, id, *pos, *size, style, name); --- 256,266 ---- long style = (argCount >= 5 ? (long)wxlua_getintegertype(L, 5) : wxHW_SCROLLBAR_AUTO); // const wxSize size = wxDefaultSize ! const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); // const wxPoint pos = wxDefaultPosition ! const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getintegertype(L, 2) : -1); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxWindow); // call constructor wxLuaHtmlWindow *returns = new wxLuaHtmlWindow(wxlState, parent, id, *pos, *size, style, name); *************** *** 269,273 **** wxluaW_addtrackedwindow(L, (wxWindow*)returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxLuaHtmlWindow, returns); return 1; --- 269,273 ---- wxluaW_addtrackedwindow(L, (wxWindow*)returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxLuaHtmlWindow); return 1; Index: wxcore_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxcore_override.hpp 20 Dec 2007 02:26:55 -0000 1.14 --- wxcore_override.hpp 22 Dec 2007 06:07:08 -0000 1.15 *************** *** 17,21 **** wxApp *returns = wxTheApp; // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxApp, returns); // return the number of parameters return 1; --- 17,21 ---- wxApp *returns = wxTheApp; // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxApp); // return the number of parameters [...2099 lines suppressed...] const wxString title = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxT("Printout"))); --- 2743,2747 ---- int argCount = lua_gettop(L); // wxLuaObject pObject = NULL ! wxLuaObject * pObject = (argCount >= 2 ? (wxLuaObject *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxLuaObject) : NULL); // const wxString title = "Printout" const wxString title = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxT("Printout"))); *************** *** 2754,2758 **** wxluaO_addgcobject(L, (wxLuaPrintout *)returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxLuaPrintout, returns); return 1; --- 2751,2755 ---- wxluaO_addgcobject(L, (wxLuaPrintout *)returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxLuaPrintout); return 1; Index: wxadv_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_override.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxadv_override.hpp 10 Dec 2007 05:39:05 -0000 1.3 --- wxadv_override.hpp 22 Dec 2007 06:07:08 -0000 1.4 *************** *** 15,21 **** { // const wxPoint pos ! const wxPoint * pos = (const wxPoint *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxPoint); // get this ! wxCalendarCtrl * self = (wxCalendarCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxCalendarCtrl); // call HitTest wxDateTime* date = new wxDateTime(); --- 15,21 ---- { // const wxPoint pos ! const wxPoint * pos = (const wxPoint *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxPoint); // get this ! wxCalendarCtrl * self = (wxCalendarCtrl *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxCalendarCtrl); // call HitTest wxDateTime* date = new wxDateTime(); *************** *** 25,29 **** // push the result number lua_pushnumber(L, returns); ! wxluaT_pushuserdatatype(L, s_wxluatag_wxDateTime, date); lua_pushnumber(L, wd); --- 25,29 ---- // push the result number lua_pushnumber(L, returns); ! wxluaT_pushuserdatatype(L, date, g_wxluatype_wxDateTime); lua_pushnumber(L, wd); *************** *** 44,48 **** // get this ! wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGridCellAttr); // call GetAlignment self->GetAlignment(&horz, &vert); --- 44,48 ---- // get this ! wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGridCellAttr); // call GetAlignment self->GetAlignment(&horz, &vert); *************** *** 63,67 **** // get this ! wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGridCellAttr); // call GetAlignment self->GetSize(&num_rows, &num_cols); --- 63,67 ---- // get this ! wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGridCellAttr); // call GetAlignment self->GetSize(&num_rows, &num_cols); *************** *** 81,85 **** int horz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid); // call GetRowLabelAlignment self->GetRowLabelAlignment(&horz, &vert); --- 81,85 ---- int horz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetRowLabelAlignment self->GetRowLabelAlignment(&horz, &vert); *************** *** 99,103 **** int horz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid); // call GetColLabelAlignment self->GetColLabelAlignment(&horz, &vert); --- 99,103 ---- int horz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetColLabelAlignment self->GetColLabelAlignment(&horz, &vert); *************** *** 117,121 **** int horiz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid); // call GetDefaultCellAlignment self->GetDefaultCellAlignment(&horiz, &vert); --- 117,121 ---- int horiz; // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetDefaultCellAlignment self->GetDefaultCellAlignment(&horiz, &vert); *************** *** 139,143 **** int row = (int)lua_tonumber(L, 2); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid); // call GetCellAlignment self->GetCellAlignment(row, col, &horiz, &vert); --- 139,143 ---- int row = (int)lua_tonumber(L, 2); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetCellAlignment self->GetCellAlignment(row, col, &horiz, &vert); *************** *** 161,165 **** int row = (int)lua_tonumber(L, 2); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid); // call GetCellAlignment self->GetCellAlignment(row, col, &num_rows, &num_cols); --- 161,165 ---- int row = (int)lua_tonumber(L, 2); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetCellAlignment self->GetCellAlignment(row, col, &num_rows, &num_cols); *************** *** 179,187 **** long width; // wxArrayString& lines ! wxArrayString *lines = (wxArrayString *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxArrayString); // wxDC& dc ! wxDC *dc = (wxDC *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxDC); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid); // call GetTextBoxSize self->GetTextBoxSize(*dc, *lines, &width, &height); --- 179,187 ---- long width; // wxArrayString& lines ! wxArrayString *lines = (wxArrayString *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxArrayString); // wxDC& dc ! wxDC *dc = (wxDC *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxDC); // get this ! wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGrid); // call GetTextBoxSize self->GetTextBoxSize(*dc, *lines, &width, &height); Index: wxbase_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxbase_override.hpp 20 Dec 2007 02:26:55 -0000 1.13 --- wxbase_override.hpp 22 Dec 2007 06:07:08 -0000 1.14 *************** *** 10,13 **** --- 10,33 ---- // ---------------------------------------------------------------------------- + + %override wxLua_wxLog_SetTimestamp + // static void SetTimestamp(const wxString& ts) + static int LUACALL wxLua_wxLog_SetTimestamp(lua_State *L) + { + // docs say that using NULL will disable time stamping. The actual arg is "const wxChar* ts" + if (lua_isnoneornil(L, 1)) + wxLog::SetTimestamp(NULL); + else + { + // const wxString ts + const wxString ts = wxlua_getwxStringtype(L, 1); + // call SetTimestamp + wxLog::SetTimestamp(ts); + } + + return 0; + } + %end + %override wxLua_function_wxGetOsVersion // %function int wxGetOsVersion(int *major = NULL, int *minor = NULL) *************** *** 52,56 **** wxStandardPathsBase *returns = &wxStandardPaths::Get(); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxStandardPaths, returns); return 1; --- 72,76 ---- wxStandardPathsBase *returns = &wxStandardPaths::Get(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxStandardPaths); return 1; *************** *** 71,75 **** size_t start = 0; // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call GetMatch bool returns = self->GetMatch(&start, &len, index); --- 91,95 ---- size_t start = 0; // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxRegEx); // call GetMatch bool returns = self->GetMatch(&start, &len, index); *************** *** 97,101 **** wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call Replace int returns = self->Replace(&text, replacement, maxMatches); --- 117,121 ---- wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxRegEx); // call Replace int returns = self->Replace(&text, replacement, maxMatches); *************** *** 118,122 **** wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call ReplaceAll int returns = self->ReplaceAll(&text, replacement); --- 138,142 ---- wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxRegEx); // call ReplaceAll int returns = self->ReplaceAll(&text, replacement); *************** *** 139,143 **** wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call ReplaceFirst int returns = self->ReplaceFirst(&text, replacement); --- 159,163 ---- wxString text = wxlua_getwxStringtype(L, 2); // get this ! wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxRegEx); // call ReplaceFirst int returns = self->ReplaceFirst(&text, replacement); *************** *** 160,164 **** { // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); if (wxConfigBase::Get(false) == self) // clear us from the wxConfigBase --- 180,184 ---- { // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); if (wxConfigBase::Get(false) == self) // clear us from the wxConfigBase *************** *** 186,190 **** wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); --- 206,210 ---- wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); *************** *** 210,214 **** wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); --- 230,234 ---- wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); *************** *** 234,238 **** wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); --- 254,258 ---- wxString key = wxlua_getwxStringtype(L, 2); // get this ! wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call Read bool ret = self->Read(key, &returns, defaultVal); *************** *** 256,260 **** wxString str = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString)); // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetFirstGroup bool returns = self->GetFirstGroup(str, index); --- 276,280 ---- wxString str = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString)); // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call GetFirstGroup bool returns = self->GetFirstGroup(str, index); *************** *** 280,284 **** wxString str = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString)); // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetFirstEntry bool returns = self->GetFirstEntry(str, index); --- 300,304 ---- wxString str = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString)); // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call GetFirstEntry bool returns = self->GetFirstEntry(str, index); *************** *** 302,306 **** wxString str; // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetNextGroup bool returns = self->GetNextGroup(str, index); --- 322,326 ---- wxString str; // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call GetNextGroup bool returns = self->GetNextGroup(str, index); *************** *** 324,328 **** wxString str; // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetNextEntry bool returns = self->GetNextEntry(str, index); --- 344,348 ---- wxString str; // get this ! wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxConfigBase); // call GetNextEntry bool returns = self->GetNextEntry(str, index); *************** *** 355,359 **** wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxString(returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxString, returns); return 1; --- 375,379 ---- wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxString(returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxString); return 1; *************** *** 370,374 **** wxClassInfo *returns = wxClassInfo::FindClass((wxChar *)name.c_str()); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxClassInfo, returns); // return the number of parameters return 1; --- 390,394 ---- wxClassInfo *returns = wxClassInfo::FindClass((wxChar *)name.c_str()); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxClassInfo); // return the number of parameters return 1; *************** *** 397,402 **** if (pObject->IsKindOf(pClass->classInfo)) { ! if (*pClass->class_tag != wxluaT_gettag(L, 1)) ! wxluaT_pushuserdatatype(L, *pClass->class_tag, pObject); else lua_pushvalue(L, 1); // return same userdata --- 417,422 ---- if (pObject->IsKindOf(pClass->classInfo)) { ! if (*pClass->wxluatype != wxluaT_type(L, 1)) ! wxluaT_pushuserdatatype(L, pObject, *pClass->wxluatype); else lua_pushvalue(L, 1); // return same userdata *************** *** 405,416 **** } else ! wxlua_error(L, "wxLua: DynamicCast: Unable to cast to a class of this type."); } if (iResult == 0) ! wxlua_error(L, "wxObject:DynamicCast: Class not found."); } else ! wxlua_error(L, "wxObject:DynamicCast: Expected a string name of the class for parameter 2."); return iResult; --- 425,438 ---- } else ! wxlua_argerrormsg(L, wxString::Format(wxT("wxLua: wxObject::DynamicCast() Unable to cast a '%s' to a '%s'."), ! pObject->GetClassInfo()->GetClassName(), lua2wx(className).c_str())); } if (iResult == 0) ! wxlua_argerrormsg(L, wxString::Format(wxT("wxLua: wxObject::DynamicCast() Invalid class to cast a '%s' to '%s'."), ! pObject->GetClassInfo()->GetClassName(), lua2wx(className).c_str())); } else ! wxlua_argerror(L, 2, wxT("a 'string name of the class'")); return iResult; *************** *** 422,426 **** static int LUACALL wxLua_wxArrayInt_ToLuaTable(lua_State *L) { ! wxArrayInt * self = (wxArrayInt *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxArrayInt); wxlua_pushwxArrayInttable(L, *self); return 1; --- 444,448 ---- static int LUACALL wxLua_wxArrayInt_ToLuaTable(lua_State *L) { ! wxArrayInt * self = (wxArrayInt *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxArrayInt); wxlua_pushwxArrayInttable(L, *self); return 1; *************** *** 432,436 **** static int LUACALL wxLua_wxArrayString_ToLuaTable(lua_State *L) { ! wxArrayString * self = (wxArrayString *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxArrayString); wxlua_pushwxArrayStringtable(L, *self); return 1; --- 454,458 ---- static int LUACALL wxLua_wxArrayString_ToLuaTable(lua_State *L) { ! wxArrayString * self = (wxArrayString *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxArrayString); wxlua_pushwxArrayStringtable(L, *self); return 1; *************** *** 463,467 **** // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxStringList, returns); // return the number of parameters return 1; --- 485,489 ---- // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxStringList); // return the number of parameters return 1; *************** *** 548,552 **** { // get this ! wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileName); // call GetDirs wxArrayString returns = self->GetDirs(); --- 570,574 ---- { // get this ! wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFileName); // call GetDirs wxArrayString returns = self->GetDirs(); *************** *** 566,570 **** wxDateTime *dtAccess= new wxDateTime(); // get this ! wxFileName *self = (wxFileName *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileName); // call GetTimes bool returns = self->GetTimes(dtAccess, dtMod, dtCreate); --- 588,592 ---- wxDateTime *dtAccess= new wxDateTime(); // get this ! wxFileName *self = (wxFileName *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFileName); // call GetTimes bool returns = self->GetTimes(dtAccess, dtMod, dtCreate); *************** *** 574,580 **** wxluaO_addgcobject(L, (void*)dtCreate, new wxLua_wxObject_wxDateTime(dtCreate)); // push the constructed class pointers ! wxluaT_pushuserdatatype(L, s_wxluatag_wxDateTime, dtAccess); ! wxluaT_pushuserdatatype(L, s_wxluatag_wxDateTime, dtMod); ! wxluaT_pushuserdatatype(L, s_wxluatag_wxDateTime, dtCreate); // push the result flag lua_pushboolean(L, returns); --- 596,602 ---- wxluaO_addgcobject(L, (void*)dtCreate, new wxLua_wxObject_wxDateTime(dtCreate)); // push the constructed class pointers ! wxluaT_pushuserdatatype(L, dtAccess, g_wxluatype_wxDateTime); ! wxluaT_pushuserdatatype(L, dtMod, g_wxluatype_wxDateTime); ! wxluaT_pushuserdatatype(L, dtCreate, g_wxluatype_wxDateTime); // push the result flag lua_pushboolean(L, returns); *************** *** 668,672 **** wxString filename; // get this ! wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDir); // call GetFirst bool returns = self->GetFirst(&filename, filespec, flags); --- 690,694 ---- wxString filename; // get this ! wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxDir); // call GetFirst bool returns = self->GetFirst(&filename, filespec, flags); *************** *** 686,690 **** wxString filename; // get this ! wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDir); // call GetNext bool returns = self->GetNext(&filename); --- 708,712 ---- wxString filename; // get this ! wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxDir); // call GetNext bool returns = self->GetNext(&filename); *************** *** 732,736 **** { // get this ! wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFile); // call Read unsigned int returns = self->Read(buffer, count); --- 754,758 ---- { // get this ! wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFile); // call Read unsigned int returns = self->Read(buffer, count); *************** *** 757,761 **** const void *buffer = (const void *)lua_tostring(L, 2); // get this ! wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFile); // call Write unsigned int returns = self->Write(buffer, nbytes); --- 779,783 ---- const void *buffer = (const void *)lua_tostring(L, 2); // get this ! wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFile); // call Write unsigned int returns = self->Write(buffer, nbytes); *************** *** 774,778 **** wxString desc; // = wxlua_getwxStringtype(L, 2); // get this ! wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileType); // call GetDescription bool returns = (self->GetDescription(&desc)); --- 796,800 ---- wxString desc; // = wxlua_getwxStringtype(L, 2); // get this ! wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFileType); // call GetDescription bool returns = (self->GetDescription(&desc)); *************** *** 790,798 **** { // const wxFileType::MessageParameters params ! const wxFileType::MessageParameters * params = (const wxFileType::MessageParameters *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxFileType_MessageParameters); // wxString printCmd wxString printCmd; // = wxlua_getwxStringtype(L, 2); // get this ! wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileType); // call GetPrintCommand bool returns = (self->GetPrintCommand(&printCmd, *params)); --- 812,820 ---- { // const wxFileType::MessageParameters params ! const wxFileType::MessageParameters * params = (const wxFileType::MessageParameters *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxFileType_MessageParameters); // wxString printCmd wxString printCmd; // = wxlua_getwxStringtype(L, 2); // get this ! wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxFileType); // call GetPrintCommand bool returns = (self->GetPrintCommand(&printCmd, *params)); *************** *** 814,818 **** void *buffer = malloc(size); // get this ! wxInputStream *self = (wxInputStream *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxInputStream); if (buffer != NULL) { --- 836,840 ---- void *buffer = malloc(size); // get this ! wxInputStream *self = (wxInputStream *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxInputStream); if (buffer != NULL) { *************** *** 821,825 **** self->Read(buffer, size); // only return the data that was read, they already have self ! //wxluaT_pushuserdatatype(L, s_wxluatag_wxInputStream, returns); lua_pushlstring(L, (const char *)buffer, size); free(buffer); --- 843,847 ---- self->Read(buffer, size); // only return the data that was read, they already have self ! //wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxInputStream); lua_pushlstring(L, (const char *)buffer, size); free(buffer); *************** *** 839,843 **** const char *buffer = (const char *)lua_tostring(L, 2); // get this ! wxInputStream *self = (wxInputStream *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxInputStream); // call Ungetch size_t returns = self->Ungetch(buffer, size); --- 861,865 ---- const char *buffer = (const char *)lua_tostring(L, 2); // get this ! wxInputStream *self = (wxInputStream *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxInputStream); // call Ungetch size_t returns = self->Ungetch(buffer, size); *************** *** 858,866 **** const void *buffer = (void *)lua_tostring(L, 2); // get this ! wxOutputStream *self = (wxOutputStream *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxOutputStream); // call Write wxOutputStream *returns = &self->Write(buffer, size); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxOutputStream, returns); // return the number of parameters return 1; --- 880,888 ---- const void *buffer = (void *)lua_tostring(L, 2); // get this ! wxOutputStream *self = (wxOutputStream *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxOutputStream); // call Write wxOutputStream *returns = &self->Write(buffer, size); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxOutputStream); // return the number of parameters return 1; *************** *** 882,886 **** wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxMemoryInputStream((wxMemoryInputStream*)returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxMemoryInputStream, returns); return 1; --- 904,908 ---- wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxMemoryInputStream((wxMemoryInputStream*)returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxMemoryInputStream); return 1; Index: wxbase_base.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_base.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxbase_base.i 18 Dec 2007 01:03:32 -0000 1.2 --- wxbase_base.i 22 Dec 2007 06:07:08 -0000 1.3 *************** *** 402,406 **** --- 402,411 ---- static void ClearTraceMasks() static const wxArrayString GetTraceMasks() + + // %override static void wxLog::SetTimestamp(const wxString& ts) + // Allows an input of "nil" or no value to disable time stamping. + // C++ Func: static void wxLog::SetTimestamp(const wxChar* ts) static void SetTimestamp(const wxString& ts) + static bool GetVerbose() static wxTraceMask GetTraceMask() Index: wxcore_controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_controls.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxcore_controls.i 18 Dec 2007 01:03:32 -0000 1.2 --- wxcore_controls.i 22 Dec 2007 06:07:08 -0000 1.3 *************** *** 384,388 **** bool Arrange(int flag = wxLIST_ALIGN_DEFAULT) ! void AssignImageList(wxImageList *imageList, int which) void ClearAll() bool DeleteAllItems() --- 384,388 ---- bool Arrange(int flag = wxLIST_ALIGN_DEFAULT) ! void AssignImageList(%ungc wxImageList *imageList, int which) void ClearAll() bool DeleteAllItems() *************** *** 1017,1022 **** wxTreeItemId AppendItem(const wxTreeItemId& parent, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) //void AssignButtonsImageList(wxImageList* imageList) ! void AssignImageList(wxImageList* imageList) ! void AssignStateImageList(wxImageList* imageList) void Collapse(const wxTreeItemId& item) void CollapseAndReset(const wxTreeItemId& item) --- 1017,1022 ---- wxTreeItemId AppendItem(const wxTreeItemId& parent, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) //void AssignButtonsImageList(wxImageList* imageList) ! void AssignImageList(%ungc wxImageList* imageList) ! void AssignStateImageList(%ungc wxImageList* imageList) void Collapse(const wxTreeItemId& item) void CollapseAndReset(const wxTreeItemId& item) Index: wxxml_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxxml_override.hpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxxml_override.hpp 20 Dec 2007 02:26:55 -0000 1.7 --- wxxml_override.hpp 22 Dec 2007 06:07:08 -0000 1.8 *************** *** 15,21 **** { // wxXmlNode next ! wxXmlNode * next = (wxXmlNode *)wxluaT_getuserdatatype(L, 6, s_wxluatag_wxXmlNode); // wxXmlProperty props ! wxXmlProperty * props = (wxXmlProperty *)wxluaT_getuserdatatype(L, 5, s_wxluatag_wxXmlProperty); // const wxString content const wxString content = wxlua_getwxStringtype(L, 4); --- 15,21 ---- { // wxXmlNode next ! wxXmlNode * next = (wxXmlNode *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxXmlNode); // wxXmlProperty props ! wxXmlProperty * props = (wxXmlProperty *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxXmlProperty); // const wxString content const wxString content = wxlua_getwxStringtype(L, 4); *************** *** 25,29 **** wxXmlNodeType type = (wxXmlNodeType)wxlua_getintegertype(L, 2); // wxXmlNode parent ! wxXmlNode * parent = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode); // call constructor wxXmlNode *returns = new wxXmlNode(parent, type, name, content, props, next); --- 25,29 ---- wxXmlNodeType type = (wxXmlNodeType)wxlua_getintegertype(L, 2); // wxXmlNode parent ! wxXmlNode * parent = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlNode); // call constructor wxXmlNode *returns = new wxXmlNode(parent, type, name, content, props, next); *************** *** 32,36 **** wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxXmlNode((wxXmlNode *)returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxXmlNode, returns); return 1; --- 32,36 ---- wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxXmlNode((wxXmlNode *)returns)); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxXmlNode); return 1; *************** *** 43,49 **** { // wxXmlNode child ! wxXmlNode * child = (wxXmlNode *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxXmlNode); // get this ! wxXmlNode * self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode); // call RemoveChild bool returns = (self->RemoveChild(child)); --- 43,49 ---- { // wxXmlNode child ! wxXmlNode * child = (wxXmlNode *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxXmlNode); // get this ! wxXmlNode * self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlNode); // call RemoveChild bool returns = (self->RemoveChild(child)); *************** *** 68,72 **** wxString propName = wxlua_getwxStringtype(L, 2); // get this ! wxXmlNode *self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode); // call GetPropVal bool returns = self->GetPropVal(propName, &value); --- 68,72 ---- wxString propName = wxlua_getwxStringtype(L, 2); // get this ! wxXmlNode *self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxXmlNode); // call GetPropVal bool returns = self->GetPropVal(propName, &value); |
|
From: John L. <jr...@us...> - 2007-12-22 06:07:43
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/bindings Modified Files: genwxbind.lua Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.156 retrieving revision 1.157 diff -C2 -d -r1.156 -r1.157 *** genwxbind.lua 20 Dec 2007 02:26:54 -0000 1.156 --- genwxbind.lua 22 Dec 2007 06:07:07 -0000 1.157 *************** *** 18,22 **** -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 20 -- 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 = 21 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h -- otherwise a compile time error will be generated. *************** *** 44,48 **** classBindingTable = {} enumClassBindingTable = {} -- table[classname][i] = { Map, Condition, ... } ! classTagBindingTable = {} classIncludeBindingTable = {} encapsulationBindingTable = {} --- 44,48 ---- classBindingTable = {} enumClassBindingTable = {} -- table[classname][i] = { Map, Condition, ... } ! classTypeBindingTable = {} classIncludeBindingTable = {} encapsulationBindingTable = {} *************** *** 575,581 **** elseif string.find(condition, "wxLUA_USE_", 1, 1) then ! print("WARNING: unknown wxLUA_USE_XXX tag, maybe a missing condition? '"..condition.."'") elseif string.find(condition, "wxUSE_", 1, 1) then ! print("WARNING: unknown wxUSE_XXX tag, maybe a missing condition? '"..condition.."'") elseif string.find(condition, "%wxchkver2", 1, 1) then --- 575,581 ---- elseif string.find(condition, "wxLUA_USE_", 1, 1) then ! print("WARNING: unknown wxLUA_USE_XXX condition? '"..condition.."'") elseif string.find(condition, "wxUSE_", 1, 1) then ! print("WARNING: unknown wxUSE_XXX condition? '"..condition.."'") elseif string.find(condition, "%wxchkver2", 1, 1) then *************** *** 2748,2753 **** table.insert(codeList, " wxLuaState wxlState(L);\n") CommentBindingTable(codeList, " // get this\n") ! table.insert(codeList, " "..parseObject.Name.." *self = ("..parseObject.Name.." *)wxluaT_getuserdatatype(L, 1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n") ! overload_argList = "&s_wxluatag_"..MakeClassVar(parseObject.Name)..", "..overload_argList if memberType == "wxString" then --- 2748,2753 ---- table.insert(codeList, " wxLuaState wxlState(L);\n") CommentBindingTable(codeList, " // get this\n") ! table.insert(codeList, " "..parseObject.Name.." *self = ("..parseObject.Name.." *)wxluaT_getuserdatatype(L, 1, g_wxluatype_"..MakeClassVar(parseObject.Name)..");\n") ! overload_argList = "&g_wxluatype_"..MakeClassVar(parseObject.Name)..", "..overload_argList if memberType == "wxString" then *************** *** 2758,2768 **** -- if string.find(member.Name, "::") then ! -- table.insert(codeList, " wxluaT_pushuserdatatype(L, s_wxluatag_"..MakeClassVar(memberType)..", "..member.Name..");\n") -- else ! table.insert(codeList, " wxluaT_pushuserdatatype(L, s_wxluatag_"..MakeClassVar(memberType)..", &self->"..member.Name..");\n") -- end elseif not numeric then CommentBindingTable(codeList, " // push the result datatype\n") ! table.insert(codeList, " wxluaT_pushuserdatatype(L, s_wxluatag_"..MakeClassVar(memberType)..", self->"..member.Name..");\n") elseif (memberType == "BOOL") or (memberType == "bool") then --- 2758,2768 ---- -- if string.find(member.Name, "::") then ! -- table.insert(codeList, " wxluaT_pushuserdatatype(L, "..member.Name..", g_wxluatype_"..MakeClassVar(memberType)..");\n") -- else ! table.insert(codeList, " wxluaT_pushuserdatatype(L, &self->"..member.Name..", g_wxluatype_"..MakeClassVar(memberType)..");\n") -- end elseif not numeric then CommentBindingTable(codeList, " // push the result datatype\n") ! table.insert(codeList, " wxluaT_pushuserdatatype(L, self->"..member.Name..", g_wxluatype_"..MakeClassVar(memberType)..");\n") elseif (memberType == "BOOL") or (memberType == "bool") then *************** *** 2779,2785 **** table.insert(codeList, "}\n") ! local overload_argListName = "s_wxluatagArray_"..funcName if overload_argList == "" then ! overload_argListName = "s_wxluaargArray_None" else overload_argList = "{ "..overload_argList.."NULL }" --- 2779,2785 ---- table.insert(codeList, "}\n") ! local overload_argListName = "s_wxluatypeArray_"..funcName if overload_argList == "" then ! overload_argListName = "g_wxluaargtypeArray_None" else overload_argList = "{ "..overload_argList.."NULL }" *************** *** 2839,2863 **** if memberType == "wxString" then ! overload_argList = overload_argList.."&s_wxluaarg_String, " CommentBindingTable(codeList, " // get the string value\n") table.insert(codeList, " wxString val = wxlua_getwxStringtype(L, 2);\n") elseif not numeric and (not memberPtr or (memberPtr == "&")) then ! overload_argList = overload_argList.."&s_wxluatag_"..MakeClassVar(memberType)..", " CommentBindingTable(codeList, " // get the data type value\n") ! table.insert(codeList, " "..memberType.."* val = ("..memberType.."*)wxluaT_getuserdatatype(L, 2, s_wxluatag_"..MakeClassVar(memberType)..");\n") elseif not numeric then ! overload_argList = overload_argList.."&s_wxluatag_"..MakeClassVar(memberType)..", " CommentBindingTable(codeList, " // get the data type value\n") ! table.insert(codeList, " "..memberType.."* val = ("..memberType.."*)wxluaT_getuserdatatype(L, 2, s_wxluatag_"..MakeClassVar(memberType)..");\n") elseif (memberType == "BOOL") or (memberType == "bool") then ! overload_argList = overload_argList.."&s_wxluaarg_Boolean, " CommentBindingTable(codeList, " // get the boolean value\n") table.insert(codeList, " bool val = wxlua_getbooleantype(L, 2);\n") elseif IsDataTypeEnum(memberType) then ! overload_argList = overload_argList.."&s_wxluaarg_Integer, " CommentBindingTable(codeList, " // get the number value\n") table.insert(codeList, " "..memberType.." val = ("..memberType..")wxlua_getintegertype(L, 2);\n") else ! overload_argList = overload_argList.."&s_wxluaarg_Number, " CommentBindingTable(codeList, " // get the number value\n") table.insert(codeList, " "..memberType.." val = ("..memberType..")wxlua_getnumbertype(L, 2);\n") --- 2839,2863 ---- if memberType == "wxString" then ! overload_argList = overload_argList.."&g_wxluatype_TSTRING, " CommentBindingTable(codeList, " // get the string value\n") table.insert(codeList, " wxString val = wxlua_getwxStringtype(L, 2);\n") elseif not numeric and (not memberPtr or (memberPtr == "&")) then ! overload_argList = overload_argList.."&g_wxluatype_"..MakeClassVar(memberType)..", " CommentBindingTable(codeList, " // get the data type value\n") ! table.insert(codeList, " "..memberType.."* val = ("..memberType.."*)wxluaT_getuserdatatype(L, 2, g_wxluatype_"..MakeClassVar(memberType)..");\n") elseif not numeric then ! overload_argList = overload_argList.."&g_wxluatype_"..MakeClassVar(memberType)..", " CommentBindingTable(codeList, " // get the data type value\n") ! table.insert(codeList, " "..memberType.."* val = ("..memberType.."*)wxluaT_getuserdatatype(L, 2, g_wxluatype_"..MakeClassVar(memberType)..");\n") elseif (memberType == "BOOL") or (memberType == "bool") then ! overload_argList = overload_argList.."&g_wxluatype_TBOOLEAN, " CommentBindingTable(codeList, " // get the boolean value\n") table.insert(codeList, " bool val = wxlua_getbooleantype(L, 2);\n") elseif IsDataTypeEnum(memberType) then ! overload_argList = overload_argList.."&g_wxluatype_TINTEGER, " CommentBindingTable(codeList, " // get the number value\n") table.insert(codeList, " "..memberType.." val = ("..memberType..")wxlua_getintegertype(L, 2);\n") else ! overload_argList = overload_argList.."&g_wxluatype_TNUMBER, " CommentBindingTable(codeList, " // get the number value\n") table.insert(codeList, " "..memberType.." val = ("..memberType..")wxlua_getnumbertype(L, 2);\n") *************** *** 2865,2870 **** CommentBindingTable(codeList, " // get this\n") ! table.insert(codeList, " "..parseObject.Name.." *self = ("..parseObject.Name.." *)wxluaT_getuserdatatype(L, 1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n") ! overload_argList = "&s_wxluatag_"..MakeClassVar(parseObject.Name)..", "..overload_argList if not numeric and (not memberPtr or (memberPtr == "&")) then --- 2865,2870 ---- CommentBindingTable(codeList, " // get this\n") ! table.insert(codeList, " "..parseObject.Name.." *self = ("..parseObject.Name.." *)wxluaT_getuserdatatype(L, 1, g_wxluatype_"..MakeClassVar(parseObject.Name)..");\n") ! overload_argList = "&g_wxluatype_"..MakeClassVar(parseObject.Name)..", "..overload_argList if not numeric and (not memberPtr or (memberPtr == "&")) then *************** *** 2878,2884 **** table.insert(codeList, "}\n") ! local overload_argListName = "s_wxluatagArray_".. funcName if overload_argList == "" then ! overload_argListName = "s_wxluaargArray_None" else overload_argList = "{ "..overload_argList.."NULL }" --- 2878,2884 ---- table.insert(codeList, "}\n") ! local overload_argListName = "s_wxluatypeArray_".. funcName if overload_argList == "" then ! overload_argListName = "g_wxluaargtypeArray_None" else overload_argList = "{ "..overload_argList.."NULL }" *************** *** 3021,3025 **** { LuaName = luaname, ! Map = " { \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", &"..member.Name..", NULL },\n", Condition = fullcondition } --- 3021,3025 ---- { LuaName = luaname, ! Map = " { \""..luaname.."\", &g_wxluatype_"..MakeClassVar(parseObject.Name)..", &"..member.Name..", NULL },\n", Condition = fullcondition } *************** *** 3036,3040 **** { LuaName = luaname, ! Map = " { \""..luaname.."\", &s_wxluatag_"..MakeClassVar(parseObject.Name)..", NULL, (const void **) &"..member.Name.." },\n", Condition = fullcondition } --- 3036,3040 ---- { LuaName = luaname, ! Map = " { \""..luaname.."\", &g_wxluatype_"..MakeClassVar(parseObject.Name)..", NULL, (const void **) &"..member.Name.." },\n", Condition = fullcondition } *************** *** 3051,3055 **** { LuaName = luaname, ! Map = " { \""..luaname.."\", &"..member.Name..", &s_wxluatag_"..MakeClassVar(parseObject.Name).." },\n", Condition = fullcondition } --- 3051,3055 ---- { LuaName = luaname, ! Map = " { \""..luaname.."\", &"..member.Name..", &g_wxluatype_"..MakeClassVar(parseObject.Name).." },\n", Condition = fullcondition } *************** *** 3144,3148 **** ((indirectionCount == 0) or ((indirectionCount == 1) and (argPtr == "&") and string.find(argTypeWithAttrib, "const", 1, 1)))) then ! overload_argList = overload_argList.."&s_wxluatag_wxArrayString, " argItem = "wxlua_getwxArrayString(L, "..argNum..")" declare = "wxLuaSmartwxArrayString" --- 3144,3148 ---- ((indirectionCount == 0) or ((indirectionCount == 1) and (argPtr == "&") and string.find(argTypeWithAttrib, "const", 1, 1)))) then ! overload_argList = overload_argList.."&g_wxluatype_wxArrayString, " argItem = "wxlua_getwxArrayString(L, "..argNum..")" declare = "wxLuaSmartwxArrayString" *************** *** 3150,3154 **** ((indirectionCount == 0) or ((indirectionCount == 1) and (argPtr == "&") and string.find(argTypeWithAttrib, "const", 1, 1)))) then ! overload_argList = overload_argList.."&s_wxluatag_wxSortedArrayString, " argItem = "wxlua_getwxSortedArrayString(L, "..argNum..")" declare = "wxLuaSmartwxSortedArrayString" --- 3150,3154 ---- ((indirectionCount == 0) or ((indirectionCount == 1) and (argPtr == "&") and string.find(argTypeWithAttrib, "const", 1, 1)))) then ! overload_argList = overload_argList.."&g_wxluatype_wxSortedArrayString, " argItem = "wxlua_getwxSortedArrayString(L, "..argNum..")" declare = "wxLuaSmartwxSortedArrayString" *************** *** 3156,3164 **** ((indirectionCount == 0) or ((indirectionCount == 1) and (argPtr == "&") and string.find(argTypeWithAttrib, "const", 1, 1)))) then ! overload_argList = overload_argList.."&s_wxluatag_wxArrayInt, " argItem = "wxlua_getwxArrayInt(L, "..argNum..")" declare = "wxLuaSmartwxArrayInt" elseif argType == "IntArray_FromLuaTable" then ! overload_argList = overload_argList.."&s_wxluaarg_Table, " argItem = "NULL; ptr = "..argName.." = wxlua_getintarray(L, "..argNum..", count_)" declare = "int count_ = 0; wxLuaSmartIntArray ptr; int*" --- 3156,3164 ---- ((indirectionCount == 0) or ((indirectionCount == 1) and (argPtr == "&") and string.find(argTypeWithAttrib, "const", 1, 1)))) then ! overload_argList = overload_argList.."&g_wxluatype_wxArrayInt, " argItem = "wxlua_getwxArrayInt(L, "..argNum..")" declare = "wxLuaSmartwxArrayInt" elseif argType == "IntArray_FromLuaTable" then ! overload_argList = overload_argList.."&g_wxluatype_TTABLE, " argItem = "NULL; ptr = "..argName.." = wxlua_getintarray(L, "..argNum..", count_)" declare = "int count_ = 0; wxLuaSmartIntArray ptr; int*" *************** *** 3167,3171 **** -- 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 " --- 3167,3171 ---- -- THIS MUST BE AN OVERRIDE AND HANDLED THERE, we just set overload_argList -- the code genererated here is nonsense ! overload_argList = overload_argList.."&g_wxluatype_TTABLE, " argItem = "YOU MUST OVERRIDE THIS FUNCTION " declare = "YOU MUST OVERRIDE THIS FUNCTION " *************** *** 3173,3177 **** -- 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 " --- 3173,3177 ---- -- THIS MUST BE AN OVERRIDE AND HANDLED THERE, we just set overload_argList -- the code genererated here is nonsense ! overload_argList = overload_argList.."&g_wxluatype_TFUNCTION, " argItem = "YOU MUST OVERRIDE THIS FUNCTION " declare = "YOU MUST OVERRIDE THIS FUNCTION " *************** *** 3186,3192 **** end ! overload_argList = overload_argList.."&s_wxluaarg_Table, " argItem = "wxlua_getwxStringarray("..argNum..", count)" - --declare = "int count = 0; wxLuaSmartStringArray ptr; "..argTypeWithAttrib.." "..argName.."; ptr = " declare = "int count = 0; wxLuaSmartStringArray " elseif argType == "int" then --- 3186,3191 ---- end ! overload_argList = overload_argList.."&g_wxluatype_TTABLE, " argItem = "wxlua_getwxStringarray("..argNum..", count)" declare = "int count = 0; wxLuaSmartStringArray " elseif argType == "int" then *************** *** 3196,3205 **** end ! overload_argList = overload_argList.."&s_wxluaarg_Table, " argItem = "wxlua_getintarray(L, "..argNum..", count)" - --declare = "int count = 0; wxLuaSmartIntArray ptr; "..argTypeWithAttrib.." "..argName.."; ptr = " declare = "int count = 0; wxLuaSmartIntArray " elseif not numeric then ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", s_wxluatag_"..MakeClassVar(argType)..")" else argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" --- 3195,3203 ---- end ! overload_argList = overload_argList.."&g_wxluatype_TTABLE, " argItem = "wxlua_getintarray(L, "..argNum..", count)" declare = "int count = 0; wxLuaSmartIntArray " elseif not numeric then ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", g_wxluatype_"..MakeClassVar(argType)..")" else argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" *************** *** 3207,3211 **** elseif (indirectionCount == 1) and (argPtr == "*") then if (argType == "wxString") or (argType == "wxChar") then ! overload_argList = overload_argList.."&s_wxluaarg_String, " argItem = "wxlua_getwxStringtype(L, "..argNum..")" --- 3205,3209 ---- elseif (indirectionCount == 1) and (argPtr == "*") then if (argType == "wxString") or (argType == "wxChar") then ! overload_argList = overload_argList.."&g_wxluatype_TSTRING, " argItem = "wxlua_getwxStringtype(L, "..argNum..")" *************** *** 3227,3231 **** elseif argType == "char" then ! overload_argList = overload_argList.."&s_wxluaarg_String, " argItem = "wxlua_getstringtype(L, "..argNum..")" --- 3225,3229 ---- elseif argType == "char" then ! overload_argList = overload_argList.."&g_wxluatype_TSTRING, " argItem = "wxlua_getstringtype(L, "..argNum..")" *************** *** 3240,3247 **** if not numeric then ! overload_argList = overload_argList.."&s_wxluatag_"..MakeClassVar(argType)..", " ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", s_wxluatag_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&s_wxluaarg_LightUserData, " argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" end --- 3238,3245 ---- if not numeric then ! overload_argList = overload_argList.."&g_wxluatype_"..MakeClassVar(argType)..", " ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", g_wxluatype_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&g_wxluatype_TLIGHTUSERDATA, " argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" end *************** *** 3260,3268 **** elseif (indirectionCount == 2) and (argPtr == "*") then if not numeric then ! overload_argList = overload_argList.."&s_wxluatag_"..MakeClassVar(argType)..", " argTypeWithAttrib = argTypeWithAttrib.." **" ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", s_wxluatag_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&s_wxluaarg_LightUserData, " argTypeWithAttrib = argTypeWithAttrib.." *" argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" --- 3258,3266 ---- elseif (indirectionCount == 2) and (argPtr == "*") then if not numeric then ! overload_argList = overload_argList.."&g_wxluatype_"..MakeClassVar(argType)..", " argTypeWithAttrib = argTypeWithAttrib.." **" ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", g_wxluatype_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&g_wxluatype_TLIGHTUSERDATA, " argTypeWithAttrib = argTypeWithAttrib.." *" argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" *************** *** 3270,3274 **** elseif (indirectionCount == 1) and (argPtr == "&") then if argType == "wxString" then ! overload_argList = overload_argList.."&s_wxluaarg_String, " argItem = "wxlua_getwxStringtype(L, "..argNum..")" --- 3268,3272 ---- elseif (indirectionCount == 1) and (argPtr == "&") then if argType == "wxString" then ! overload_argList = overload_argList.."&g_wxluatype_TSTRING, " argItem = "wxlua_getwxStringtype(L, "..argNum..")" *************** *** 3286,3293 **** argTypeWithAttrib = argTypeWithAttrib.." *" if not numeric then ! overload_argList = overload_argList.."&s_wxluatag_"..MakeClassVar(argType)..", " ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", s_wxluatag_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&s_wxluaarg_LightUserData, " argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" end --- 3284,3291 ---- argTypeWithAttrib = argTypeWithAttrib.." *" if not numeric then ! overload_argList = overload_argList.."&g_wxluatype_"..MakeClassVar(argType)..", " ! argItem = "("..argTypeWithAttrib..")wxluaT_getuserdatatype(L, "..argNum..", g_wxluatype_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&g_wxluatype_TLIGHTUSERDATA, " argItem = "("..argTypeWithAttrib..")wxlua_touserdata(L, "..argNum..")" end *************** *** 3300,3304 **** elseif indirectionCount == 0 then if argType == "wxString" then ! overload_argList = overload_argList.."&s_wxluaarg_String, " argItem = "wxlua_getwxStringtype(L, "..argNum..")" --- 3298,3302 ---- elseif indirectionCount == 0 then if argType == "wxString" then ! overload_argList = overload_argList.."&g_wxluatype_TSTRING, " argItem = "wxlua_getwxStringtype(L, "..argNum..")" *************** *** 3314,3327 **** end elseif (argType == "bool") or (argType == "BOOL") then ! overload_argList = overload_argList.."&s_wxluaarg_Boolean, " argItem = "wxlua_getbooleantype(L, "..argNum..")" elseif IsDataTypeEnum(argType) then ! overload_argList = overload_argList.."&s_wxluaarg_Integer, " argItem = "("..argType..")wxlua_getintegertype(L, "..argNum..")" elseif not numeric then ! overload_argList = overload_argList.."&s_wxluatag_"..MakeClassVar(argType)..", " ! argItem = "*("..argTypeWithAttrib.."*)wxluaT_getuserdatatype(L, "..argNum..", s_wxluatag_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&s_wxluaarg_Number, " argItem = "("..argType..")wxlua_getnumbertype(L, "..argNum..")" end --- 3312,3325 ---- end elseif (argType == "bool") or (argType == "BOOL") then ! overload_argList = overload_argList.."&g_wxluatype_TBOOLEAN, " argItem = "wxlua_getbooleantype(L, "..argNum..")" elseif IsDataTypeEnum(argType) then ! overload_argList = overload_argList.."&g_wxluatype_TINTEGER, " argItem = "("..argType..")wxlua_getintegertype(L, "..argNum..")" elseif not numeric then ! overload_argList = overload_argList.."&g_wxluatype_"..MakeClassVar(argType)..", " ! argItem = "*("..argTypeWithAttrib.."*)wxluaT_getuserdatatype(L, "..argNum..", g_wxluatype_"..MakeClassVar(argType)..")" else ! overload_argList = overload_argList.."&g_wxluatype_TNUMBER, " argItem = "("..argType..")wxlua_getnumbertype(L, "..argNum..")" end *************** *** 3570,3574 **** CommentBindingTable(codeList, " // push the constructed class pointer\n") ! table.insert(codeList, " wxluaT_pushuserdatatype(L, s_wxluatag_"..MakeClassVar(parseObject.Name)..", returns);\n") table.insert(codeList, "\n return 1;\n") --- 3568,3572 ---- CommentBindingTable(codeList, " // push the constructed class pointer\n") ! table.insert(codeList, " wxluaT_pushuserdatatype(L, returns, g_wxluatype_"..MakeClassVar(parseObject.Name)..");\n") table.insert(codeList, "\n return 1;\n") *************** *** 3583,3588 **** CommentBindingTable(codeList, " // get this\n") ! table.insert(codeList, " "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxluaT_getuserdatatype(L, 1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n") ! overload_argList = "&s_wxluatag_"..MakeClassVar(parseObject.Name)..", "..overload_argList if parseObject["%ungc_this"] then --- 3581,3586 ---- CommentBindingTable(codeList, " // get this\n") ! table.insert(codeList, " "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxluaT_getuserdatatype(L, 1, g_wxluatype_"..MakeClassVar(parseObject.Name)..");\n") ! overload_argList = "&g_wxluatype_"..MakeClassVar(parseObject.Name)..", "..overload_argList if parseObject["%ungc_this"] then *************** *** 3680,3684 **** elseif not numeric then CommentBindingTable(codeList, " // push the result datatype\n") ! table.insert(codeList, " wxluaT_pushuserdatatype(L, s_wxluatag_"..MakeClassVar(memberType)..", returns);\n") elseif (member.DataType == "BOOL") or (member.DataType == "bool") then CommentBindingTable(codeList, " // push the result flag\n") --- 3678,3682 ---- elseif not numeric then CommentBindingTable(codeList, " // push the result datatype\n") ! table.insert(codeList, " wxluaT_pushuserdatatype(L, returns, g_wxluatype_"..MakeClassVar(memberType)..");\n") elseif (member.DataType == "BOOL") or (member.DataType == "bool") then CommentBindingTable(codeList, " // push the result flag\n") *************** *** 3697,3703 **** end ! local overload_argListName = "s_wxluatagArray_".. funcName if overload_argList == "" then ! overload_argListName = "s_wxluaargArray_None" else overload_argList = "{ "..overload_argList.."NULL }" --- 3695,3701 ---- end ! local overload_argListName = "s_wxluatypeArray_".. funcName if overload_argList == "" then ! overload_argListName = "g_wxluaargtypeArray_None" else overload_argList = "{ "..overload_argList.."NULL }" *************** *** 3771,3779 **** local enumArrayName = MakeVar(parseObject.Name).."_enums" local enumArrayCountName = MakeVar(parseObject.Name).."_enumCount" ! local ExternEnumDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindDefine "..enumArrayName.."[];\n" local ExternEnumCountDeclaration = "extern "..MakeImpExpData("int").." "..enumArrayCountName..";\n" if enumClassBindingTable[MakeVar(parseObject.Name)] == nil then ! enumArrayName = "s_wxluadefineArray_None" enumArrayCountName = 0 ExternEnumDeclaration = "" --- 3769,3777 ---- local enumArrayName = MakeVar(parseObject.Name).."_enums" local enumArrayCountName = MakeVar(parseObject.Name).."_enumCount" ! local ExternEnumDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindNumber "..enumArrayName.."[];\n" local ExternEnumCountDeclaration = "extern "..MakeImpExpData("int").." "..enumArrayCountName..";\n" if enumClassBindingTable[MakeVar(parseObject.Name)] == nil then ! enumArrayName = "g_wxluanumberArray_None" enumArrayCountName = 0 ExternEnumDeclaration = "" *************** *** 3784,3790 **** -- Extern Class Tag Declaration local tagcondition = FixCondition(parseObject.Condition) ! local classTagBinding = { ! ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindMethod "..MakeVar(parseObject.Name).."_methods[];\n", ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", --- 3782,3788 ---- -- Extern Class Tag Declaration local tagcondition = FixCondition(parseObject.Condition) ! local classTypeBinding = { ! ExternDeclaration = "extern "..MakeImpExpData("int").." g_wxluatype_"..MakeClassVar(parseObject.Name)..";\n", ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." wxLuaBindMethod "..MakeVar(parseObject.Name).."_methods[];\n", ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", *************** *** 3794,3799 **** } ! if not classTagBindingTable[tagcondition] then classTagBindingTable[tagcondition] = {} end ! classTagBindingTable[tagcondition][parseObject.Name] = classTagBinding -- Class Tag Declaration --- 3792,3797 ---- } ! if not classTypeBindingTable[tagcondition] then classTypeBindingTable[tagcondition] = {} end ! classTypeBindingTable[tagcondition][parseObject.Name] = classTypeBinding -- Class Tag Declaration *************** *** 3802,3806 **** decl = decl.."// Lua MetaTable Tag for Class '"..parseObject.Name.."'\n" end ! decl = decl.."int s_wxluatag_"..MakeClassVar(parseObject.Name).." = -1;\n" interface.objectData[o].TagDeclaration = decl --- 3800,3804 ---- decl = decl.."// Lua MetaTable Tag for Class '"..parseObject.Name.."'\n" end ! decl = decl.."int g_wxluatype_"..MakeClassVar(parseObject.Name).." = -1;\n" interface.objectData[o].TagDeclaration = decl *************** *** 3830,3835 **** local funcMapName = "s_wxluafunc_"..funcName ! local overload_argListName = "s_wxluatagArray_".. funcName ! local overload_argList = "{ &s_wxluatag_"..MakeClassVar(parseObject.Name)..", NULL }" local condition = FixCondition(parseObject.Condition) --- 3828,3833 ---- local funcMapName = "s_wxluafunc_"..funcName ! local overload_argListName = "s_wxluatypeArray_".. funcName ! local overload_argList = "{ &g_wxluatype_"..MakeClassVar(parseObject.Name)..", NULL }" local condition = FixCondition(parseObject.Condition) *************** *** 3870,3874 **** ..MakeVar(parseObject.Name).."_methodCount, " ..classinfo..", " ! .."&s_wxluatag_"..MakeClassVar(parseObject.Name)..", " ..MakeVar(baseclass)..", " .."NULL ," --- 3868,3872 ---- ..MakeVar(parseObject.Name).."_methodCount, " ..classinfo..", " ! .."&g_wxluatype_"..MakeClassVar(parseObject.Name)..", " ..MakeVar(baseclass)..", " .."NULL ," *************** *** 4063,4067 **** table.insert(fileData, "extern wxLuaBindClass *"..hook_cpp_class_funcname.."(size_t &count);\n") ! table.insert(fileData, "extern wxLuaBindDefine *"..hook_cpp_define_funcname.."(size_t &count);\n") table.insert(fileData, "extern wxLuaBindString *"..hook_cpp_string_funcname.."(size_t &count);\n") table.insert(fileData, "extern wxLuaBindEvent *"..hook_cpp_event_funcname.."(size_t &count);\n") --- 4061,4065 ---- table.insert(fileData, "extern wxLuaBindClass *"..hook_cpp_class_funcname.."(size_t &count);\n") ! table.insert(fileData, "extern wxLuaBindNumber *"..hook_cpp_define_funcname.."(size_t &count);\n") table.insert(fileData, "extern wxLuaBindString *"..hook_cpp_string_funcname.."(size_t &count);\n") table.insert(fileData, "extern wxLuaBindEvent *"..hook_cpp_event_funcname.."(size_t &count);\n") *************** *** 4077,4081 **** table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") ! for condition, classTagBindingList in pairs_sort(classTagBindingTable) do local indent = "" --- 4075,4079 ---- table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") ! for condition, classTypeBindingList in pairs_sort(classTypeBindingTable) do local indent = "" *************** *** 4085,4095 **** end ! for idx, classTagBinding in pairs_sort(classTagBindingList) do ! table.insert(fileData, indent..classTagBinding.ExternDeclaration) ! table.insert(fileData, indent..classTagBinding.ExternMethodDeclaration) ! table.insert(fileData, indent..classTagBinding.ExternMethodCountDeclaration) ! if string.len(classTagBinding.ExternEnumCountDeclaration) > 0 then ! table.insert(fileData, indent..classTagBinding.ExternEnumDeclaration) ! table.insert(fileData, indent..classTagBinding.ExternEnumCountDeclaration) end end --- 4083,4093 ---- end ! for idx, classTypeBinding in pairs_sort(classTypeBindingList) do ! table.insert(fileData, indent..classTypeBinding.ExternDeclaration) ! table.insert(fileData, indent..classTypeBinding.ExternMethodDeclaration) ! table.insert(fileData, indent..classTypeBinding.ExternMethodCountDeclaration) ! if string.len(classTypeBinding.ExternEnumCountDeclaration) > 0 then ! table.insert(fileData, indent..classTypeBinding.ExternEnumDeclaration) ! table.insert(fileData, indent..classTypeBinding.ExternEnumCountDeclaration) end end *************** *** 4217,4221 **** table.insert(fileData, " m_nameSpace = wxT(\""..hook_lua_namespace.."\");\n") table.insert(fileData, " m_classArray = "..hook_cpp_class_funcname.."(m_classCount);\n") ! table.insert(fileData, " m_defineArray = "..hook_cpp_define_funcname.."(m_defineCount);\n") table.insert(fileData, " m_stringArray = "..hook_cpp_string_funcname.."(m_stringCount);\n") table.insert(fileData, " m_eventArray = "..hook_cpp_event_funcname.."(m_eventCount);\n") --- 4215,4219 ---- table.insert(fileData, " m_nameSpace = wxT(\""..hook_lua_namespace.."\");\n") table.insert(fileData, " m_classArray = "..hook_cpp_class_funcname.."(m_classCount);\n") ! table.insert(fileData, " m_numberArray = "..hook_cpp_define_funcname.."(m_numberCount);\n") table.insert(fileData, " m_stringArray = "..hook_cpp_string_funcname.."(m_stringCount);\n") table.insert(fileData, " m_eventArray = "..hook_cpp_event_funcname.."(m_eventCount);\n") *************** *** 4313,4320 **** table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") ! table.insert(fileData, "wxLuaBindDefine* "..hook_cpp_define_funcname.."(size_t &count)\n{\n") ! table.insert(fileData, " static wxLuaBindDefine defineList[] =\n {\n") ! -- mix the %define and %enums together since they're both in the same wxLuaBindDefine struct local namedBindingTable = {} GenerateLuaNameFromIndexedTable(defineBindingTable, namedBindingTable) --- 4311,4318 ---- table.insert(fileData, "// ---------------------------------------------------------------------------\n\n") ! table.insert(fileData, "wxLuaBindNumber* "..hook_cpp_define_funcname.."(size_t &count)\n{\n") ! table.insert(fileData, " static wxLuaBindNumber numberList[] =\n {\n") ! -- mix the %define and %enums together since they're both in the same wxLuaBindNumber struct local namedBindingTable = {} GenerateLuaNameFromIndexedTable(defineBindingTable, namedBindingTable) *************** *** 4328,4333 **** table.insert(fileData, " { 0, 0 },\n") table.insert(fileData, " };\n") ! table.insert(fileData, " count = sizeof(defineList)/sizeof(wxLuaBindDefine) - 1;\n") ! table.insert(fileData, " return defineList;\n") table.insert(fileData, "}\n\n") --- 4326,4331 ---- table.insert(fileData, " { 0, 0 },\n") table.insert(fileData, " };\n") ! table.insert(fileData, " count = sizeof(numberList)/sizeof(wxLuaBindNumber) - 1;\n") ! table.insert(fileData, " return numberList;\n") table.insert(fileData, "}\n\n") *************** *** 4446,4451 **** local function writeFunc(functionBinding) if functionBinding.Method then ! if functionBinding.ArgArrayName and (functionBinding.ArgArrayName ~= "s_wxluaargArray_None") then ! table.insert(fileData, "static wxLuaArgTag "..functionBinding.ArgArrayName.."[] = "..functionBinding.ArgArray..";\n") end --- 4444,4449 ---- local function writeFunc(functionBinding) if functionBinding.Method then ! if functionBinding.ArgArrayName and (functionBinding.ArgArrayName ~= "g_wxluaargtypeArray_None") then ! table.insert(fileData, "static wxLuaArgType "..functionBinding.ArgArrayName.."[] = "..functionBinding.ArgArray..";\n") end *************** *** 4545,4549 **** CommentBindingTable(funcMap, "// function overload table\n") table.insert(funcMap, "static wxLuaBindCFunc "..funcMapName.."[] =\n{\n") ! -- table.insert(funcMap, " { "..funcName..", WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, "..tostring(requiredParamCount)..", "..tostring(paramCount)..", s_wxluaargArray_None },\n") for i = 1, #methodBindings do if HasCondition(methodBindings[i].Condition) and (methodBindings[i].Condition ~= object.Condition) then --- 4543,4547 ---- CommentBindingTable(funcMap, "// function overload table\n") table.insert(funcMap, "static wxLuaBindCFunc "..funcMapName.."[] =\n{\n") ! -- table.insert(funcMap, " { "..funcName..", WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, "..tostring(requiredParamCount)..", "..tostring(paramCount)..", g_wxluaargtypeArray_None },\n") for i = 1, #methodBindings do if HasCondition(methodBindings[i].Condition) and (methodBindings[i].Condition ~= object.Condition) then *************** *** 4644,4649 **** table.insert(fileData, functionBinding.PreDefineCode) end ! if functionBinding.ArgArrayName and (functionBinding.ArgArrayName ~= "s_wxluaargArray_None") then ! table.insert(fileData, "static wxLuaArgTag "..functionBinding.ArgArrayName.."[] = "..functionBinding.ArgArray..";\n") end if functionBinding.FuncMapName then --- 4642,4647 ---- table.insert(fileData, functionBinding.PreDefineCode) end ! if functionBinding.ArgArrayName and (functionBinding.ArgArrayName ~= "g_wxluaargtypeArray_None") then ! table.insert(fileData, "static wxLuaArgType "..functionBinding.ArgArrayName.."[] = "..functionBinding.ArgArray..";\n") end if functionBinding.FuncMapName then *************** *** 4686,4690 **** if enumClassBindingTable[MakeClassVar(ObjectName)] then ! table.insert(fileData, "wxLuaBindDefine "..MakeClassVar(ObjectName).."_enums[] = {\n") local namedBindingTable = {} GenerateLuaNameFromIndexedTable(enumClassBindingTable[MakeClassVar(ObjectName)], namedBindingTable) --- 4684,4688 ---- if enumClassBindingTable[MakeClassVar(ObjectName)] then ! table.insert(fileData, "wxLuaBindNumber "..MakeClassVar(ObjectName).."_enums[] = {\n") local namedBindingTable = {} GenerateLuaNameFromIndexedTable(enumClassBindingTable[MakeClassVar(ObjectName)], namedBindingTable) *************** *** 4696,4700 **** -- since there may be conditions count them up afterwards ! table.insert(fileData, "int "..MakeVar(ObjectName).."_enumCount = sizeof("..MakeClassVar(ObjectName).."_enums)/sizeof(wxLuaBindDefine) - 1;\n") end --- 4694,4698 ---- -- since there may be conditions count them up afterwards ! table.insert(fileData, "int "..MakeVar(ObjectName).."_enumCount = sizeof("..MakeClassVar(ObjectName).."_enums)/sizeof(wxLuaBindNumber) - 1;\n") end |
|
From: John L. <jr...@us...> - 2007-12-22 06:07:43
|
Update of /cvsroot/wxlua/wxLua/bindings/wxlua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/bindings/wxlua Modified Files: override.hpp wxlua.i Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxlua.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/wxlua.i,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxlua.i 20 Dec 2007 02:26:55 -0000 1.13 --- wxlua.i 22 Dec 2007 06:07:08 -0000 1.14 *************** *** 64,71 **** // original class. ! WXLUAMETHOD_OVERLOAD_BASE // Class method has been checked to see if it is ! // overloaded from the base class. ! // Check WXLUAMETHOD::basemethod and if !NULL ! // this method is an overload from the base class %endenum --- 64,71 ---- // original class. ! WXLUAMETHOD_CHECKED_OVERLOAD // Class method has been checked to see if it is ! // overloaded from the base class. ! // Check WXLUAMETHOD::basemethod and if !NULL ! // this method is an overload from the base class %endenum *************** *** 97,104 **** %rename iswxluatype %function int wxlua_iswxluatype(int luatype, int wxluaarg_tag) ! // %override [wxlua_typename, wxlua_type#, lua_typename, lua_type#] type(void* object) // Given any type of object, returns four values: ! // wxlua name of the type - wxLuaState::GetLuaTagName(wxlua_type) ! // wxlua number of the type - wxlua_getwxluatype(lua_type(L, stack_idx)) or wxluaT_tag // lua name of the type - lua_typename(L, lua_type(L, stack_idx)) // lua number of the type - lua_type(L, stack_idx) --- 97,104 ---- %rename iswxluatype %function int wxlua_iswxluatype(int luatype, int wxluaarg_tag) ! // %override [wxlua_typename, wxlua_type#, lua_typename, lua_type#] type(any object) // Given any type of object, returns four values: ! // wxlua name of the type - wxluaT_gettypename(L, stack_idx) ! // wxlua number of the type - wxluaT_type(L, stack_idx) // lua name of the type - lua_typename(L, lua_type(L, stack_idx)) // lua number of the type - lua_type(L, stack_idx) *************** *** 137,141 **** int GetClassCount ! int GetDefineCount int GetStringCount int GetEventCount --- 137,141 ---- int GetClassCount ! int GetNumberCount int GetStringCount int GetEventCount *************** *** 145,152 **** {wxLuaBindClass*} GetClassArray {wxLuaBindMethod*} GetFunctionArray ! {name, value} GetDefineArray {name, value} GetStringArray ! {name, eventType, class_tag} GetEventArray ! {name, object, class_tag} GetObjectArray %endclass --- 145,152 ---- {wxLuaBindClass*} GetClassArray {wxLuaBindMethod*} GetFunctionArray ! {name, value} GetNumberArray {name, value} GetStringArray ! {name, eventType, wxluatype} GetEventArray ! {name, object, wxluatype} GetObjectArray %endclass *************** *** 156,163 **** wxString name ! {wxLuaBindMethod*} methods ! int methods_n wxClassInfo* classInfo ! int class_tag wxString baseclassName wxLuaBindClass* baseclass --- 156,163 ---- wxString name ! {wxLuaBindMethod*} wxluamethods ! int wxluamethods_n wxClassInfo* classInfo ! int wxluatype wxString baseclassName wxLuaBindClass* baseclass *************** *** 171,177 **** wxString name ! int type ! {wxLuaBindCFunc*} funcs ! int funcs_n wxLuaBindMethod* basemethod --- 171,177 ---- wxString name ! int method_type ! {wxLuaBindCFunc*} wxluacfuncs ! int wxluacfuncs_n wxLuaBindMethod* basemethod *************** *** 184,192 **** // No constructor as this is read only ! cfunction func ! int type int minargs int maxargs ! {int} argtags wxString class_name // added, not in struct --- 184,192 ---- // No constructor as this is read only ! cfunction lua_cfunc ! int method_type int minargs int maxargs ! {int} argtypes wxString class_name // added, not in struct *************** *** 222,226 **** bool IsRunning() const - wxString GetLuaTagName(int tag) const */ %endclass --- 222,225 ---- Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/override.hpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** override.hpp 20 Dec 2007 02:26:55 -0000 1.15 --- override.hpp 22 Dec 2007 06:07:08 -0000 1.16 *************** *** 76,94 **** const char* ltypename = lua_typename(L, ltype); ! int wxluaarg_tag = WXLUA_NOTAG; ! ! // this may a wxLua data ! if (ltype == LUA_TUSERDATA) ! wxluaarg_tag = wxluaT_gettag(L, 1); ! ! // I guess it wasn't or isn't a userdata ! if (wxluaarg_tag == WXLUA_NOTAG) ! wxluaarg_tag = wxlua_getwxluatype(ltype); ! ! wxString tagName = wxluaT_gettagname(L, wxluaarg_tag); //wxlua_getwxluatypename(wxluaarg_tag); // push the results ! lua_pushstring(L, wx2lua(tagName)); ! lua_pushnumber(L, wxluaarg_tag); lua_pushstring(L, ltypename); --- 76,85 ---- const char* ltypename = lua_typename(L, ltype); ! int wxl_type = wxluaT_type(L, 1); ! wxString wxltypeName = wxluaT_typename(L, wxl_type); // push the results ! lua_pushstring(L, wx2lua(wxltypeName)); ! lua_pushnumber(L, wxl_type); lua_pushstring(L, ltypename); *************** *** 103,111 **** static int LUACALL wxLua_function_typename(lua_State *L) { - wxString returns; // int wxluaarg_tag ! int wxluaarg_tag = (int)wxlua_getnumbertype(L, 1); // call wxlua_getwxluatypename ! returns = wxluaT_gettagname(L, wxluaarg_tag); //wxlua_getwxluatypename(wxluaarg_tag); // push the result string wxlua_pushwxString(L, returns); --- 94,101 ---- static int LUACALL wxLua_function_typename(lua_State *L) { // int wxluaarg_tag ! int wxl_type = (int)wxlua_getnumbertype(L, 1); // call wxlua_getwxluatypename ! wxString returns = wxluaT_typename(L, wxl_type); // push the result string wxlua_pushwxString(L, returns); *************** *** 172,183 **** const char* idx_str = lua_tostring(L, 2); ! if (strcmp(idx_str, "func") == 0) { ! lua_pushcfunction(L, wxlCFunc->func); return 1; } ! else if (strcmp(idx_str, "type") == 0) { ! lua_pushnumber(L, wxlCFunc->type); return 1; } --- 162,173 ---- const char* idx_str = lua_tostring(L, 2); ! if (strcmp(idx_str, "lua_cfunc") == 0) { ! lua_pushcfunction(L, wxlCFunc->lua_cfunc); return 1; } ! else if (strcmp(idx_str, "method_type") == 0) { ! lua_pushnumber(L, wxlCFunc->method_type); return 1; } *************** *** 192,204 **** return 1; } ! else if (strcmp(idx_str, "argtags") == 0) { size_t idx, count = wxlCFunc->maxargs; lua_createtable(L, count, 0); ! // check for terminating null argtag ! for (idx = 0; (idx < count) && wxlCFunc->argtags[idx]; ++idx) { ! lua_pushnumber(L, *wxlCFunc->argtags[idx]); lua_rawseti(L, -2, idx + 1); } --- 182,194 ---- return 1; } ! else if (strcmp(idx_str, "argtypes") == 0) { size_t idx, count = wxlCFunc->maxargs; lua_createtable(L, count, 0); ! // check for terminating null in argtypes ! for (idx = 0; (idx < count) && wxlCFunc->argtypes[idx]; ++idx) { ! lua_pushnumber(L, *wxlCFunc->argtypes[idx]); lua_rawseti(L, -2, idx + 1); } *************** *** 258,270 **** return 1; } ! else if (strcmp(idx_str, "type") == 0) { ! lua_pushnumber(L, wxlMethod->type); return 1; } ! else if (strcmp(idx_str, "funcs") == 0) { ! wxLuaBindCFunc* wxlCFunc = wxlMethod->funcs; ! size_t idx, count = wxlMethod->funcs_n; lua_createtable(L, count, 0); --- 248,260 ---- return 1; } ! else if (strcmp(idx_str, "method_type") == 0) { ! lua_pushnumber(L, wxlMethod->method_type); return 1; } ! else if (strcmp(idx_str, "wxluacfuncs") == 0) { ! wxLuaBindCFunc* wxlCFunc = wxlMethod->wxluacfuncs; ! size_t idx, count = wxlMethod->wxluacfuncs_n; lua_createtable(L, count, 0); *************** *** 285,291 **** return 1; } ! else if (strcmp(idx_str, "funcs_n") == 0) { ! lua_pushnumber(L, wxlMethod->funcs_n); return 1; } --- 275,281 ---- return 1; } ! else if (strcmp(idx_str, "wxluacfuncs_n") == 0) { ! lua_pushnumber(L, wxlMethod->wxluacfuncs_n); return 1; } *************** *** 360,376 **** return 1; } ! else if (strcmp(idx_str, "methods") == 0) { ! if (wxlClass->methods_n > 0) { ! wxLuaBindMethod* wxlMethod = wxlClass->methods; ! size_t idx, count = wxlClass->methods_n; lua_createtable(L, count, 0); for (idx = 0; idx < count; ++idx, ++wxlMethod) { - // Force the baseclass methods to be found - //wxLuaBinding::GetClassMethod(wxlClass, wxlMethod->name, true); FIXME - // Create table { wxLuaBindClass userdata } const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *)); --- 350,363 ---- return 1; } ! else if (strcmp(idx_str, "wxluamethods") == 0) { ! if (wxlClass->wxluamethods_n > 0) { ! wxLuaBindMethod* wxlMethod = wxlClass->wxluamethods; ! size_t idx, count = wxlClass->wxluamethods_n; lua_createtable(L, count, 0); for (idx = 0; idx < count; ++idx, ++wxlMethod) { // Create table { wxLuaBindClass userdata } const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *)); *************** *** 395,401 **** return 0; } ! else if (strcmp(idx_str, "methods_n") == 0) { ! lua_pushnumber(L, wxlClass->methods_n); return 1; } --- 382,388 ---- return 0; } ! else if (strcmp(idx_str, "wxluamethods_n") == 0) { ! lua_pushnumber(L, wxlClass->wxluamethods_n); return 1; } *************** *** 407,411 **** if (classInfoClass) { ! wxluaT_pushuserdatatype(L, *classInfoClass->class_tag, wxlClass->classInfo); return 1; } --- 394,398 ---- if (classInfoClass) { ! wxluaT_pushuserdatatype(L, wxlClass->classInfo, *classInfoClass->wxluatype); return 1; } *************** *** 414,420 **** return 0; } ! else if (strcmp(idx_str, "class_tag") == 0) { ! lua_pushnumber(L, *wxlClass->class_tag); return 1; } --- 401,407 ---- return 0; } ! else if (strcmp(idx_str, "wxluatype") == 0) { ! lua_pushnumber(L, *wxlClass->wxluatype); return 1; } *************** *** 446,462 **** if (wxlClass->enums_n > 0) { ! wxLuaBindDefine* wxlDefine = wxlClass->enums; size_t idx, count = wxlClass->enums_n; lua_createtable(L, count, 0); ! for (idx = 0; idx < count; ++idx, ++wxlDefine) { // Create table { name, value } lua_createtable(L, 0, 2); lua_pushstring(L, "name"); ! lua_pushstring(L, wxlDefine->name); lua_rawset(L, -3); lua_pushstring(L, "value"); ! lua_pushnumber(L, wxlDefine->value); lua_rawset(L, -3); --- 433,449 ---- if (wxlClass->enums_n > 0) { ! wxLuaBindNumber* wxlNumber = wxlClass->enums; size_t idx, count = wxlClass->enums_n; lua_createtable(L, count, 0); ! for (idx = 0; idx < count; ++idx, ++wxlNumber) { // Create table { name, value } lua_createtable(L, 0, 2); lua_pushstring(L, "name"); ! lua_pushstring(L, wxlNumber->name); lua_rawset(L, -3); lua_pushstring(L, "value"); ! lua_pushnumber(L, wxlNumber->value); lua_rawset(L, -3); *************** *** 513,519 **** return 1; } ! else if (strcmp(idx_str, "GetDefineCount") == 0) { ! lua_pushnumber(L, wxlBinding->GetDefineCount()); return 1; } --- 500,506 ---- return 1; } ! else if (strcmp(idx_str, "GetNumberCount") == 0) { ! lua_pushnumber(L, wxlBinding->GetNumberCount()); return 1; } *************** *** 584,602 **** return 1; } ! else if (strcmp(idx_str, "GetDefineArray") == 0) { ! wxLuaBindDefine* wxlDefine = wxlBinding->GetDefineArray(); ! size_t idx, count = wxlBinding->GetDefineCount(); lua_createtable(L, count, 0); ! for (idx = 0; idx < count; ++idx, ++wxlDefine) { // Create table { name, value } lua_createtable(L, 0, 2); lua_pushstring(L, "name"); ! lua_pushstring(L, wxlDefine->name); lua_rawset(L, -3); lua_pushstring(L, "value"); ! lua_pushnumber(L, wxlDefine->value); lua_rawset(L, -3); --- 571,589 ---- return 1; } ! else if (strcmp(idx_str, "GetNumberArray") == 0) { ! wxLuaBindNumber* wxlNumber = wxlBinding->GetNumberArray(); ! size_t idx, count = wxlBinding->GetNumberCount(); lua_createtable(L, count, 0); ! for (idx = 0; idx < count; ++idx, ++wxlNumber) { // Create table { name, value } lua_createtable(L, 0, 2); lua_pushstring(L, "name"); ! lua_pushstring(L, wxlNumber->name); lua_rawset(L, -3); lua_pushstring(L, "value"); ! lua_pushnumber(L, wxlNumber->value); lua_rawset(L, -3); *************** *** 636,640 **** for (idx = 0; idx < count; ++idx, ++wxlEvent) { ! // Create table { name, eventType, class_tag } lua_createtable(L, 0, 3); lua_pushstring(L, "name"); --- 623,627 ---- for (idx = 0; idx < count; ++idx, ++wxlEvent) { ! // Create table { name, eventType, wxluatype } lua_createtable(L, 0, 3); lua_pushstring(L, "name"); *************** *** 644,649 **** lua_pushnumber(L, *wxlEvent->eventType); lua_rawset(L, -3); ! lua_pushstring(L, "class_tag"); ! lua_pushnumber(L, *wxlEvent->class_tag); lua_rawset(L, -3); --- 631,636 ---- lua_pushnumber(L, *wxlEvent->eventType); lua_rawset(L, -3); ! lua_pushstring(L, "wxluatype"); ! lua_pushnumber(L, *wxlEvent->wxluatype); lua_rawset(L, -3); *************** *** 661,665 **** for (idx = 0; idx < count; ++idx, ++wxlObject) { ! // Create table { name, object, class_tag } lua_createtable(L, 0, 3); lua_pushstring(L, "name"); --- 648,652 ---- for (idx = 0; idx < count; ++idx, ++wxlObject) { ! // Create table { name, object, wxluatype } lua_createtable(L, 0, 3); lua_pushstring(L, "name"); *************** *** 669,679 **** lua_pushstring(L, "object"); if (wxlObject->objPtr != 0) ! wxluaT_pushusertag(L, wxlObject->objPtr, *wxlObject->class_tag, false); else ! wxluaT_pushusertag(L, *wxlObject->pObjPtr, *wxlObject->class_tag, false); lua_rawset(L, -3); ! lua_pushstring(L, "class_tag"); ! lua_pushnumber(L, *wxlObject->class_tag); lua_rawset(L, -3); --- 656,666 ---- lua_pushstring(L, "object"); if (wxlObject->objPtr != 0) ! wxluaT_pushuserdatatype(L, wxlObject->objPtr, *wxlObject->wxluatype, false); else ! wxluaT_pushuserdatatype(L, *wxlObject->pObjPtr, *wxlObject->wxluatype, false); lua_rawset(L, -3); ! lua_pushstring(L, "wxluatype"); ! lua_pushnumber(L, *wxlObject->wxluatype); lua_rawset(L, -3); *************** *** 706,710 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxLuaObject, returns); // return the number of parameters return 1; --- 693,697 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxLuaObject); // return the number of parameters return 1; *************** *** 717,721 **** { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaObject); // call SetObject self->SetObject(1); --- 704,708 ---- { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaObject); // call SetObject self->SetObject(1); *************** *** 730,734 **** { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaObject); // call GetObject that push the item onto the stack, or nil if (self->GetObject()) --- 717,721 ---- { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaObject); // call GetObject that push the item onto the stack, or nil if (self->GetObject()) |
|
From: John L. <jr...@us...> - 2007-12-22 06:07:42
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan.h wxluacan_bind.cpp Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wxluacan.cpp 20 Dec 2007 02:26:54 -0000 1.37 --- wxluacan.cpp 22 Dec 2007 06:07:07 -0000 1.38 *************** *** 25,40 **** // Lua MetaTable Tag for Class 'wxlCanObj' ! int s_wxluatag_wxlCanObj = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_AddObject[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_AddObject[1] = {{ wxLua_wxlCanObj_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_AddObject }}; // void AddObject( wxlCanObj *canobj ) static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L) { // wxlCanObj canobj ! wxlCanObj * canobj = (wxlCanObj *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxlCanObj); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObj); // call AddObject self->AddObject(canobj); --- 25,40 ---- // Lua MetaTable Tag for Class 'wxlCanObj' ! int g_wxluatype_wxlCanObj = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_AddObject[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_AddObject[1] = {{ wxLua_wxlCanObj_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObj_AddObject }}; // void AddObject( wxlCanObj *canobj ) static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L) { // wxlCanObj canobj ! wxlCanObj * canobj = (wxlCanObj *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxlCanObj); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj); // call AddObject self->AddObject(canobj); *************** *** 43,54 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_GetX[] = { &s_wxluatag_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetX[1] = {{ wxLua_wxlCanObj_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_GetX }}; // double GetX() static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L) { // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObj); // call GetX double returns = (self->GetX()); --- 43,54 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_GetX[] = { &g_wxluatype_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetX[1] = {{ wxLua_wxlCanObj_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCanObj_GetX }}; // double GetX() static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L) { // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj); // call GetX double returns = (self->GetX()); *************** *** 59,70 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_GetY[] = { &s_wxluatag_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetY[1] = {{ wxLua_wxlCanObj_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_GetY }}; // double GetY() static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L) { // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObj); // call GetY double returns = (self->GetY()); --- 59,70 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_GetY[] = { &g_wxluatype_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetY[1] = {{ wxLua_wxlCanObj_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCanObj_GetY }}; // double GetY() static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L) { // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj); // call GetY double returns = (self->GetY()); *************** *** 77,90 **** #if wxLUA_USE_wxColourPenBrush ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxBrush, NULL }; static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetBrush[1] = {{ wxLua_wxlCanObj_SetBrush, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }}; // void SetBrush( const wxBrush& brush ) static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L) { // const wxBrush brush ! const wxBrush * brush = (const wxBrush *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxBrush); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObj); // call SetBrush self->SetBrush(*brush); --- 77,90 ---- #if wxLUA_USE_wxColourPenBrush ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetBrush[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_wxBrush, NULL }; static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetBrush[1] = {{ wxLua_wxlCanObj_SetBrush, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObj_SetBrush }}; // void SetBrush( const wxBrush& brush ) static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L) { // const wxBrush brush ! const wxBrush * brush = (const wxBrush *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxBrush); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj); // call SetBrush self->SetBrush(*brush); *************** *** 93,106 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxPen, NULL }; static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPen[1] = {{ wxLua_wxlCanObj_SetPen, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPen }}; // void SetPen( const wxPen& pen ) static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L) { // const wxPen pen ! const wxPen * pen = (const wxPen *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxPen); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObj); // call SetPen self->SetPen(*pen); --- 93,106 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetPen[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_wxPen, NULL }; static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPen[1] = {{ wxLua_wxlCanObj_SetPen, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObj_SetPen }}; // void SetPen( const wxPen& pen ) static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L) { // const wxPen pen ! const wxPen * pen = (const wxPen *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxPen); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj); // call SetPen self->SetPen(*pen); *************** *** 111,117 **** #endif // wxLUA_USE_wxColourPenBrush ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPending[1] = {{ wxLua_wxlCanObj_SetPending, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPending }}; // void SetPending( bool pending = true ) static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L) --- 111,117 ---- #endif // wxLUA_USE_wxColourPenBrush ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetPending[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_TBOOLEAN, NULL }; static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPending[1] = {{ wxLua_wxlCanObj_SetPending, WXLUAMETHOD_METHOD, 1, 2, s_wxluatypeArray_wxLua_wxlCanObj_SetPending }}; // void SetPending( bool pending = true ) static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L) *************** *** 122,126 **** bool pending = (argCount >= 2 ? wxlua_getbooleantype(L, 2) : true); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObj); // call SetPending self->SetPending(pending); --- 122,126 ---- bool pending = (argCount >= 2 ? wxlua_getbooleantype(L, 2) : true); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj); // call SetPending self->SetPending(pending); *************** *** 129,135 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPos[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPos[1] = {{ wxLua_wxlCanObj_SetPos, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxlCanObj_SetPos }}; // void SetPos( double x, double y ) static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L) --- 129,135 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetPos[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPos[1] = {{ wxLua_wxlCanObj_SetPos, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxlCanObj_SetPos }}; // void SetPos( double x, double y ) static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L) *************** *** 140,144 **** double x = (double)wxlua_getnumbertype(L, 2); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObj); // call SetPos self->SetPos(x, y); --- 140,144 ---- double x = (double)wxlua_getnumbertype(L, 2); // get this ! wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj); // call SetPos self->SetPos(x, y); *************** *** 147,153 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_constructor[1] = {{ wxLua_wxlCanObj_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxlCanObj_constructor }}; // wxlCanObj( double x = 0, double y = 0 ) static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L) --- 147,153 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_constructor[1] = {{ wxLua_wxlCanObj_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxlCanObj_constructor }}; // wxlCanObj( double x = 0, double y = 0 ) static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L) *************** *** 162,166 **** wxlCanObj* returns = new wxlCanObj(x, y); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxlCanObj, returns); return 1; --- 162,166 ---- wxlCanObj* returns = new wxlCanObj(x, y); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObj); return 1; *************** *** 194,202 **** // Lua MetaTable Tag for Class 'wxlCanObjRect' ! int s_wxluatag_wxlCanObjRect = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjRect_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjRect_constructor[1] = {{ wxLua_wxlCanObjRect_constructor, WXLUAMETHOD_CONSTRUCTOR, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor }}; // wxlCanObjRect( double x, double y, double w, double h ) static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L) --- 194,202 ---- // Lua MetaTable Tag for Class 'wxlCanObjRect' ! int g_wxluatype_wxlCanObjRect = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjRect_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjRect_constructor[1] = {{ wxLua_wxlCanObjRect_constructor, WXLUAMETHOD_CONSTRUCTOR, 4, 4, s_wxluatypeArray_wxLua_wxlCanObjRect_constructor }}; // wxlCanObjRect( double x, double y, double w, double h ) static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L) *************** *** 213,217 **** wxlCanObjRect* returns = new wxlCanObjRect(x, y, w, h); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxlCanObjRect, returns); return 1; --- 213,217 ---- wxlCanObjRect* returns = new wxlCanObjRect(x, y, w, h); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObjRect); return 1; *************** *** 234,242 **** // Lua MetaTable Tag for Class 'wxlCanObjCircle' ! int s_wxluatag_wxlCanObjCircle = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjCircle_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjCircle_constructor[1] = {{ wxLua_wxlCanObjCircle_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor }}; // wxlCanObjCircle( double x, double y, double r ) static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L) --- 234,242 ---- // Lua MetaTable Tag for Class 'wxlCanObjCircle' ! int g_wxluatype_wxlCanObjCircle = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjCircle_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjCircle_constructor[1] = {{ wxLua_wxlCanObjCircle_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatypeArray_wxLua_wxlCanObjCircle_constructor }}; // wxlCanObjCircle( double x, double y, double r ) static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L) *************** *** 251,255 **** wxlCanObjCircle* returns = new wxlCanObjCircle(x, y, r); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxlCanObjCircle, returns); return 1; --- 251,255 ---- wxlCanObjCircle* returns = new wxlCanObjCircle(x, y, r); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObjCircle); return 1; *************** *** 272,280 **** // Lua MetaTable Tag for Class 'wxlCanObjScript' ! int s_wxluatag_wxlCanObjScript = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjScript_constructor[1] = {{ wxLua_wxlCanObjScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor }}; // wxlCanObjScript( double x, double y, const wxString& name ) static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L) --- 272,280 ---- // Lua MetaTable Tag for Class 'wxlCanObjScript' ! int g_wxluatype_wxlCanObjScript = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjScript_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjScript_constructor[1] = {{ wxLua_wxlCanObjScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatypeArray_wxLua_wxlCanObjScript_constructor }}; // wxlCanObjScript( double x, double y, const wxString& name ) static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L) *************** *** 289,293 **** wxlCanObjScript* returns = new wxlCanObjScript(x, y, name); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxlCanObjScript, returns); return 1; --- 289,293 ---- wxlCanObjScript* returns = new wxlCanObjScript(x, y, name); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObjScript); return 1; *************** *** 310,318 **** // Lua MetaTable Tag for Class 'wxlCanObjAddScript' ! int s_wxluatag_wxlCanObjAddScript = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript[] = { &s_wxluatag_wxlCanObjAddScript, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript[1] = {{ wxLua_wxlCanObjAddScript_SetScript, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }}; // void SetScript( const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L) --- 310,318 ---- // Lua MetaTable Tag for Class 'wxlCanObjAddScript' ! int g_wxluatype_wxlCanObjAddScript = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjAddScript_SetScript[] = { &g_wxluatype_wxlCanObjAddScript, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript[1] = {{ wxLua_wxlCanObjAddScript_SetScript, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObjAddScript_SetScript }}; // void SetScript( const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L) *************** *** 321,325 **** const wxString script = wxlua_getwxStringtype(L, 2); // get this ! wxlCanObjAddScript * self = (wxlCanObjAddScript *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObjAddScript); // call SetScript self->SetScript(script); --- 321,325 ---- const wxString script = wxlua_getwxStringtype(L, 2); // get this ! wxlCanObjAddScript * self = (wxlCanObjAddScript *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObjAddScript); // call SetScript self->SetScript(script); *************** *** 328,334 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_constructor[1] = {{ wxLua_wxlCanObjAddScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }}; // wxlCanObjAddScript( double x, double y, const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L) --- 328,334 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjAddScript_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_constructor[1] = {{ wxLua_wxlCanObjAddScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatypeArray_wxLua_wxlCanObjAddScript_constructor }}; // wxlCanObjAddScript( double x, double y, const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L) *************** *** 343,347 **** wxlCanObjAddScript* returns = new wxlCanObjAddScript(x, y, script); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxlCanObjAddScript, returns); return 1; --- 343,347 ---- wxlCanObjAddScript* returns = new wxlCanObjAddScript(x, y, script); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObjAddScript); return 1; *************** *** 365,380 **** // Lua MetaTable Tag for Class 'wxlCan' ! int s_wxluatag_wxlCan = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_AddObject[] = { &s_wxluatag_wxlCan, &s_wxluatag_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCan_AddObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_AddObject[1] = {{ wxLua_wxlCan_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCan_AddObject }}; // void AddObject( wxlCanObj *canobj ) static int LUACALL wxLua_wxlCan_AddObject(lua_State *L) { // wxlCanObj canobj ! wxlCanObj * canobj = (wxlCanObj *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxlCanObj); // get this ! wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCan); // call AddObject self->AddObject(canobj); --- 365,380 ---- // Lua MetaTable Tag for Class 'wxlCan' ! int g_wxluatype_wxlCan = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_AddObject[] = { &g_wxluatype_wxlCan, &g_wxluatype_wxlCanObj, NULL }; static int LUACALL wxLua_wxlCan_AddObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_AddObject[1] = {{ wxLua_wxlCan_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCan_AddObject }}; // void AddObject( wxlCanObj *canobj ) static int LUACALL wxLua_wxlCan_AddObject(lua_State *L) { // wxlCanObj canobj ! wxlCanObj * canobj = (wxlCanObj *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxlCanObj); // get this ! wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCan); // call AddObject self->AddObject(canobj); *************** *** 383,410 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_GetCmdh[] = { &s_wxluatag_wxlCan, NULL }; static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetCmdh[1] = {{ wxLua_wxlCan_GetCmdh, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCan_GetCmdh }}; // wxlLuaCanCmd* GetCmdh() static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L) { // get this ! wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCan); // call GetCmdh wxlLuaCanCmd* returns = (wxlLuaCanCmd*)self->GetCmdh(); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxlLuaCanCmd, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_GetYaxis[] = { &s_wxluatag_wxlCan, NULL }; static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetYaxis[1] = {{ wxLua_wxlCan_GetYaxis, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCan_GetYaxis }}; // bool GetYaxis() static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L) { // get this ! wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCan); // call GetYaxis bool returns = (self->GetYaxis()); --- 383,410 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_GetCmdh[] = { &g_wxluatype_wxlCan, NULL }; static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetCmdh[1] = {{ wxLua_wxlCan_GetCmdh, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCan_GetCmdh }}; // wxlLuaCanCmd* GetCmdh() static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L) { // get this ! wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCan); // call GetCmdh wxlLuaCanCmd* returns = (wxlLuaCanCmd*)self->GetCmdh(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlLuaCanCmd); return 1; } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_GetYaxis[] = { &g_wxluatype_wxlCan, NULL }; static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetYaxis[1] = {{ wxLua_wxlCan_GetYaxis, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCan_GetYaxis }}; // bool GetYaxis() static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L) { // get this ! wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCan); // call GetYaxis bool returns = (self->GetYaxis()); *************** *** 417,423 **** #if wxLUA_USE_wxPointSizeRect ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, NULL }; static int LUACALL wxLua_wxlCan_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_constructor[1] = {{ wxLua_wxlCan_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 4, s_wxluatagArray_wxLua_wxlCan_constructor }}; // wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) static int LUACALL wxLua_wxlCan_constructor(lua_State *L) --- 417,423 ---- #if wxLUA_USE_wxPointSizeRect ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_constructor[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, NULL }; static int LUACALL wxLua_wxlCan_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_constructor[1] = {{ wxLua_wxlCan_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 4, s_wxluatypeArray_wxLua_wxlCan_constructor }}; // wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) static int LUACALL wxLua_wxlCan_constructor(lua_State *L) *************** *** 426,440 **** int argCount = lua_gettop(L); // const wxSize size = wxDefaultSize ! const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, s_wxluatag_wxSize) : &wxDefaultSize); // const wxPoint pos = wxDefaultPosition ! const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getnumbertype(L, 2) : -1); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor wxlCan* returns = new wxlCan(parent, id, *pos, *size); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxlCan, returns); return 1; --- 426,440 ---- int argCount = lua_gettop(L); // const wxSize size = wxDefaultSize ! const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); // const wxPoint pos = wxDefaultPosition ! const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getnumbertype(L, 2) : -1); // wxWindow parent ! wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxWindow); // call constructor wxlCan* returns = new wxlCan(parent, id, *pos, *size); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCan); return 1; *************** *** 466,474 **** // Lua MetaTable Tag for Class 'wxlLuaCanCmd' ! int s_wxluatag_wxlLuaCanCmd = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &s_wxluatag_wxlLuaCanCmd, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject[1] = {{ wxLua_wxlLuaCanCmd_MoveObject, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }}; // void MoveObject( int index, double x, double y ) static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L) --- 466,474 ---- // Lua MetaTable Tag for Class 'wxlLuaCanCmd' ! int g_wxluatype_wxlLuaCanCmd = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &g_wxluatype_wxlLuaCanCmd, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject[1] = {{ wxLua_wxlLuaCanCmd_MoveObject, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxlLuaCanCmd_MoveObject }}; // void MoveObject( int index, double x, double y ) static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L) *************** *** 481,485 **** int index = (int)wxlua_getnumbertype(L, 2); // get this ! wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlLuaCanCmd); // call MoveObject self->MoveObject(index, x, y); --- 481,485 ---- int index = (int)wxlua_getnumbertype(L, 2); // get this ! wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlLuaCanCmd); // call MoveObject self->MoveObject(index, x, y); *************** *** 488,494 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor[] = { &s_wxluatag_wxlCan, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_constructor[1] = {{ wxLua_wxlLuaCanCmd_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }}; // wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L) --- 488,494 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxlLuaCanCmd_constructor[] = { &g_wxluatype_wxlCan, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_constructor[1] = {{ wxLua_wxlLuaCanCmd_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxlLuaCanCmd_constructor }}; // wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L) *************** *** 499,507 **** int maxCommands = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : -1); // wxlCan canvas ! wxlCan * canvas = (wxlCan *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCan); // call constructor wxlLuaCanCmd* returns = new wxlLuaCanCmd(canvas, maxCommands); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxlLuaCanCmd, returns); return 1; --- 499,507 ---- int maxCommands = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : -1); // wxlCan canvas ! wxlCan * canvas = (wxlCan *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCan); // call constructor wxlLuaCanCmd* returns = new wxlLuaCanCmd(canvas, maxCommands); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlLuaCanCmd); return 1; Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxluacan_bind.cpp 10 Dec 2007 05:39:04 -0000 1.27 --- wxluacan_bind.cpp 22 Dec 2007 06:07:07 -0000 1.28 *************** *** 39,51 **** // --------------------------------------------------------------------------- ! wxLuaBindDefine* wxLuaGetDefineList_wxluacan(size_t &count) { ! static wxLuaBindDefine defineList[] = { { 0, 0 }, }; ! count = sizeof(defineList)/sizeof(wxLuaBindDefine) - 1; ! return defineList; } --- 39,51 ---- // --------------------------------------------------------------------------- ! wxLuaBindNumber* wxLuaGetDefineList_wxluacan(size_t &count) { ! static wxLuaBindNumber numberList[] = { { 0, 0 }, }; ! count = sizeof(numberList)/sizeof(wxLuaBindNumber) - 1; ! return numberList; } *************** *** 91,99 **** wxlCan* returns = (wxlCan*)GetCan(); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxlCan, returns); return 1; } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCan[1] = {{ wxLua_function_GetCan, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; // %function wxlLuaCanCmd* GetCmdhMain() --- 91,99 ---- wxlCan* returns = (wxlCan*)GetCan(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCan); return 1; } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCan[1] = {{ wxLua_function_GetCan, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }}; // %function wxlLuaCanCmd* GetCmdhMain() *************** *** 103,111 **** wxlLuaCanCmd* returns = (wxlLuaCanCmd*)GetCmdhMain(); // push the result datatype ! wxluaT_pushuserdatatype(L, s_wxluatag_wxlLuaCanCmd, returns); return 1; } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCmdhMain[1] = {{ wxLua_function_GetCmdhMain, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; // --------------------------------------------------------------------------- --- 103,111 ---- wxlLuaCanCmd* returns = (wxlLuaCanCmd*)GetCmdhMain(); // push the result datatype ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlLuaCanCmd); return 1; } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCmdhMain[1] = {{ wxLua_function_GetCmdhMain, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }}; // --------------------------------------------------------------------------- *************** *** 136,146 **** static wxLuaBindClass classList[] = { ! { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &s_wxluatag_wxlCanObj, "wxObject", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor", NULL ,s_wxluadefineArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 136,146 ---- static wxLuaBindClass classList[] = { ! { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &g_wxluatype_wxlCan, "wxScrolledWindow", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &g_wxluatype_wxlCanObj, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &g_wxluatype_wxlCanObjAddScript, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &g_wxluatype_wxlCanObjCircle, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &g_wxluatype_wxlCanObjRect, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &g_wxluatype_wxlCanObjScript, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &g_wxluatype_wxlLuaCanCmd, "wxCommandProcessor", NULL ,g_wxluanumberArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, *************** *** 162,166 **** m_nameSpace = wxT("wxluacan"); m_classArray = wxLuaGetClassList_wxluacan(m_classCount); ! m_defineArray = wxLuaGetDefineList_wxluacan(m_defineCount); m_stringArray = wxLuaGetStringList_wxluacan(m_stringCount); m_eventArray = wxLuaGetEventList_wxluacan(m_eventCount); --- 162,166 ---- m_nameSpace = wxT("wxluacan"); m_classArray = wxLuaGetClassList_wxluacan(m_classCount); ! m_numberArray = wxLuaGetDefineList_wxluacan(m_numberCount); m_stringArray = wxLuaGetStringList_wxluacan(m_stringCount); m_eventArray = wxLuaGetEventList_wxluacan(m_eventCount); Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** wxluacan.h 20 Dec 2007 02:26:54 -0000 1.38 --- wxluacan.h 22 Dec 2007 06:07:07 -0000 1.39 *************** *** 18,24 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- --- 18,24 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- *************** *** 58,62 **** extern wxLuaBindClass *wxLuaGetClassList_wxluacan(size_t &count); ! extern wxLuaBindDefine *wxLuaGetDefineList_wxluacan(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxluacan(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxluacan(size_t &count); --- 58,62 ---- extern wxLuaBindClass *wxLuaGetClassList_wxluacan(size_t &count); ! extern wxLuaBindNumber *wxLuaGetDefineList_wxluacan(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxluacan(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxluacan(size_t &count); *************** *** 68,90 **** // --------------------------------------------------------------------------- ! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCan; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCan_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObj; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObj_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjAddScript; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjAddScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjCircle; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjCircle_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjRect; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjRect_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjScript; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlLuaCanCmd_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; --- 68,90 ---- // --------------------------------------------------------------------------- ! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCan; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCan_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObj; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObj_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObjAddScript; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjAddScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObjCircle; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjCircle_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObjRect; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjRect_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObjScript; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; ! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlLuaCanCmd; extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlLuaCanCmd_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; |
|
From: John L. <jr...@us...> - 2007-12-22 06:07:24
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/modules/wxluasocket/src Modified Files: wxldserv.cpp wxldtarg.cpp wxluasocket.cpp wxluasocket_bind.cpp Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxldtarg.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** wxldtarg.cpp 4 Dec 2007 05:20:29 -0000 1.43 --- wxldtarg.cpp 22 Dec 2007 06:07:17 -0000 1.44 *************** *** 573,577 **** wxLuaDebugData::GetTypeValue(m_wxlState, -1, &wxl_type, value); ! strResult = wxlua_getwxluatypename(wxl_type) + wxT(" : ") + value; lua_pop(L, 1); --- 573,577 ---- wxLuaDebugData::GetTypeValue(m_wxlState, -1, &wxl_type, value); ! strResult = wxluaT_typename(L, wxl_type) + wxT(" : ") + value; lua_pop(L, 1); Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxluasocket_bind.cpp 10 Dec 2007 05:39:10 -0000 1.24 --- wxluasocket_bind.cpp 22 Dec 2007 06:07:17 -0000 1.25 *************** *** 28,41 **** static wxLuaBindEvent eventList[] = { ! { "wxEVT_WXLUA_DEBUGGER_BREAK", &wxEVT_WXLUA_DEBUGGER_BREAK, &s_wxluatag_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED", &wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED, &s_wxluatag_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED", &wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, &s_wxluatag_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_ERROR", &wxEVT_WXLUA_DEBUGGER_ERROR, &s_wxluatag_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR", &wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, &s_wxluatag_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_EXIT", &wxEVT_WXLUA_DEBUGGER_EXIT, &s_wxluatag_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_PRINT", &wxEVT_WXLUA_DEBUGGER_PRINT, &s_wxluatag_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM", &wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM, &s_wxluatag_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_STACK_ENUM", &wxEVT_WXLUA_DEBUGGER_STACK_ENUM, &s_wxluatag_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_TABLE_ENUM", &wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, &s_wxluatag_wxLuaDebuggerEvent }, { 0, 0, 0 }, --- 28,41 ---- static wxLuaBindEvent eventList[] = { ! { "wxEVT_WXLUA_DEBUGGER_BREAK", &wxEVT_WXLUA_DEBUGGER_BREAK, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED", &wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED", &wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_ERROR", &wxEVT_WXLUA_DEBUGGER_ERROR, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR", &wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_EXIT", &wxEVT_WXLUA_DEBUGGER_EXIT, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_PRINT", &wxEVT_WXLUA_DEBUGGER_PRINT, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM", &wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_STACK_ENUM", &wxEVT_WXLUA_DEBUGGER_STACK_ENUM, &g_wxluatype_wxLuaDebuggerEvent }, ! { "wxEVT_WXLUA_DEBUGGER_TABLE_ENUM", &wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, &g_wxluatype_wxLuaDebuggerEvent }, { 0, 0, 0 }, *************** *** 49,61 **** // --------------------------------------------------------------------------- ! wxLuaBindDefine* wxLuaGetDefineList_wxluasocket(size_t &count) { ! static wxLuaBindDefine defineList[] = { { 0, 0 }, }; ! count = sizeof(defineList)/sizeof(wxLuaBindDefine) - 1; ! return defineList; } --- 49,61 ---- // --------------------------------------------------------------------------- ! wxLuaBindNumber* wxLuaGetDefineList_wxluasocket(size_t &count) { ! static wxLuaBindNumber numberList[] = { { 0, 0 }, }; ! count = sizeof(numberList)/sizeof(wxLuaBindNumber) - 1; ! return numberList; } *************** *** 107,111 **** } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_LuaStackDialog[1] = {{ wxLua_function_LuaStackDialog, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; // --------------------------------------------------------------------------- --- 107,111 ---- } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_LuaStackDialog[1] = {{ wxLua_function_LuaStackDialog, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }}; // --------------------------------------------------------------------------- *************** *** 135,140 **** static wxLuaBindClass classList[] = { ! { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &s_wxluatag_wxLuaDebuggerEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &s_wxluatag_wxLuaDebuggerServer, "wxEvtHandler", NULL ,s_wxluadefineArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 135,140 ---- static wxLuaBindClass classList[] = { ! { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &g_wxluatype_wxLuaDebuggerEvent, "wxEvent", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &g_wxluatype_wxLuaDebuggerServer, "wxEvtHandler", NULL ,g_wxluanumberArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, *************** *** 156,160 **** m_nameSpace = wxT("wxlua"); m_classArray = wxLuaGetClassList_wxluasocket(m_classCount); ! m_defineArray = wxLuaGetDefineList_wxluasocket(m_defineCount); m_stringArray = wxLuaGetStringList_wxluasocket(m_stringCount); m_eventArray = wxLuaGetEventList_wxluasocket(m_eventCount); --- 156,160 ---- m_nameSpace = wxT("wxlua"); m_classArray = wxLuaGetClassList_wxluasocket(m_classCount); ! m_numberArray = wxLuaGetDefineList_wxluasocket(m_numberCount); m_stringArray = wxLuaGetStringList_wxluasocket(m_stringCount); m_eventArray = wxLuaGetEventList_wxluasocket(m_eventCount); Index: wxldserv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** wxldserv.cpp 29 Nov 2007 23:35:54 -0000 1.48 --- wxldserv.cpp 22 Dec 2007 06:07:16 -0000 1.49 *************** *** 197,201 **** //wxPrintf(wxT("~wxLuaDebuggerBase the m_debuggeeProcess %p %d exists %d\n"), m_debuggeeProcess, m_debuggeeProcessID, wxProcess::Exists(m_debuggeeProcessID)); fflush(stdout); ! // we don't delete the the process, we kill it and it's OnTerminate deletes it if ((m_debuggeeProcess != NULL) && (m_debuggeeProcessID > 0) && wxProcess::Exists(m_debuggeeProcessID)) --- 197,201 ---- //wxPrintf(wxT("~wxLuaDebuggerBase the m_debuggeeProcess %p %d exists %d\n"), m_debuggeeProcess, m_debuggeeProcessID, wxProcess::Exists(m_debuggeeProcessID)); fflush(stdout); ! // we don't delete the the process, we kill it and its OnTerminate deletes it if ((m_debuggeeProcess != NULL) && (m_debuggeeProcessID > 0) && wxProcess::Exists(m_debuggeeProcessID)) Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** wxluasocket.cpp 20 Dec 2007 02:26:58 -0000 1.36 --- wxluasocket.cpp 22 Dec 2007 06:07:17 -0000 1.37 *************** *** 25,33 **** // Lua MetaTable Tag for Class 'wxLuaDebuggerServer' ! int s_wxluatag_wxLuaDebuggerServer = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_String, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_AddBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }}; // bool AddBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L) --- 25,33 ---- // Lua MetaTable Tag for Class 'wxLuaDebuggerServer' ! int g_wxluatype_wxLuaDebuggerServer = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_AddBreakPoint[] = { &g_wxluatype_wxLuaDebuggerServer, &g_wxluatype_TSTRING, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_AddBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }}; // bool AddBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L) *************** *** 38,42 **** const wxString fileName = wxlua_getwxStringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call AddBreakPoint bool returns = (self->AddBreakPoint(fileName, lineNumber)); --- 38,42 ---- const wxString fileName = wxlua_getwxStringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call AddBreakPoint bool returns = (self->AddBreakPoint(fileName, lineNumber)); *************** *** 47,58 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Break[1] = {{ wxLua_wxLuaDebuggerServer_Break, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break }}; // bool Break() static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Break bool returns = (self->Break()); --- 47,58 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Break[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Break[1] = {{ wxLua_wxLuaDebuggerServer_Break, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Break }}; // bool Break() static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call Break bool returns = (self->Break()); *************** *** 63,74 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[1] = {{ wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints }}; // bool ClearAllBreakPoints() static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call ClearAllBreakPoints bool returns = (self->ClearAllBreakPoints()); --- 63,74 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[1] = {{ wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints }}; // bool ClearAllBreakPoints() static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call ClearAllBreakPoints bool returns = (self->ClearAllBreakPoints()); *************** *** 79,90 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue[1] = {{ wxLua_wxLuaDebuggerServer_Continue, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue }}; // bool Continue() static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Continue bool returns = (self->Continue()); --- 79,90 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Continue[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue[1] = {{ wxLua_wxLuaDebuggerServer_Continue, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Continue }}; // bool Continue() static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call Continue bool returns = (self->Continue()); *************** *** 95,101 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluatag_wxWindow, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog[1] = {{ wxLua_wxLuaDebuggerServer_DisplayStackDialog, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }}; // void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY) static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L) --- 95,101 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &g_wxluatype_wxLuaDebuggerServer, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog[1] = {{ wxLua_wxLuaDebuggerServer_DisplayStackDialog, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }}; // void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY) static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L) *************** *** 106,112 **** wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : wxID_ANY); // wxWindow pParent ! wxWindow * pParent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call DisplayStackDialog self->DisplayStackDialog(pParent, id); --- 106,112 ---- wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : wxID_ANY); // wxWindow pParent ! wxWindow * pParent = (wxWindow *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxWindow); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call DisplayStackDialog self->DisplayStackDialog(pParent, id); *************** *** 115,121 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr[1] = {{ wxLua_wxLuaDebuggerServer_EvaluateExpr, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }}; // bool EvaluateExpr(int exprRef, const wxString &expr) static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L) --- 115,121 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_EvaluateExpr[] = { &g_wxluatype_wxLuaDebuggerServer, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr[1] = {{ wxLua_wxLuaDebuggerServer_EvaluateExpr, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }}; // bool EvaluateExpr(int exprRef, const wxString &expr) static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L) *************** *** 126,130 **** int exprRef = (int)wxlua_getnumbertype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call EvaluateExpr bool returns = (self->EvaluateExpr(exprRef, expr)); --- 126,130 ---- int exprRef = (int)wxlua_getnumbertype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call EvaluateExpr bool returns = (self->EvaluateExpr(exprRef, expr)); *************** *** 135,146 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[1] = {{ wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId }}; // long GetDebuggeeProcessId() const static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call GetDebuggeeProcessId long returns = (self->GetDebuggeeProcessId()); --- 135,146 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[1] = {{ wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId }}; // long GetDebuggeeProcessId() const static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call GetDebuggeeProcessId long returns = (self->GetDebuggeeProcessId()); *************** *** 152,156 **** static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName[1] = {{ wxLua_wxLuaDebuggerServer_GetNetworkName, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; // static wxString GetNetworkName() static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) --- 152,156 ---- static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName[1] = {{ wxLua_wxLuaDebuggerServer_GetNetworkName, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, g_wxluaargtypeArray_None }}; // static wxString GetNetworkName() static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) *************** *** 165,169 **** static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName[1] = {{ wxLua_wxLuaDebuggerServer_GetProgramName, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; // static wxString GetProgramName() static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) --- 165,169 ---- static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName[1] = {{ wxLua_wxLuaDebuggerServer_GetProgramName, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, g_wxluaargtypeArray_None }}; // static wxString GetProgramName() static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) *************** *** 177,188 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee[1] = {{ wxLua_wxLuaDebuggerServer_KillDebuggee, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee }}; // bool KillDebuggee() static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call KillDebuggee bool returns = (self->KillDebuggee()); --- 177,188 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_KillDebuggee[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee[1] = {{ wxLua_wxLuaDebuggerServer_KillDebuggee, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_KillDebuggee }}; // bool KillDebuggee() static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call KillDebuggee bool returns = (self->KillDebuggee()); *************** *** 193,199 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_String, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_RemoveBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }}; // bool RemoveBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L) --- 193,199 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[] = { &g_wxluatype_wxLuaDebuggerServer, &g_wxluatype_TSTRING, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_RemoveBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }}; // bool RemoveBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L) *************** *** 204,208 **** const wxString fileName = wxlua_getwxStringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call RemoveBreakPoint bool returns = (self->RemoveBreakPoint(fileName, lineNumber)); --- 204,208 ---- const wxString fileName = wxlua_getwxStringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call RemoveBreakPoint bool returns = (self->RemoveBreakPoint(fileName, lineNumber)); *************** *** 213,224 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset[1] = {{ wxLua_wxLuaDebuggerServer_Reset, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset }}; // bool Reset() static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Reset bool returns = (self->Reset()); --- 213,224 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Reset[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset[1] = {{ wxLua_wxLuaDebuggerServer_Reset, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Reset }}; // bool Reset() static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call Reset bool returns = (self->Reset()); *************** *** 229,235 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_String, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Run[1] = {{ wxLua_wxLuaDebuggerServer_Run, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }}; // bool Run(const wxString &file, const wxString &fileName) static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L) --- 229,235 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Run[] = { &g_wxluatype_wxLuaDebuggerServer, &g_wxluatype_TSTRING, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Run[1] = {{ wxLua_wxLuaDebuggerServer_Run, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Run }}; // bool Run(const wxString &file, const wxString &fileName) static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L) *************** *** 240,244 **** const wxString file = wxlua_getwxStringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Run bool returns = (self->Run(file, fileName)); --- 240,244 ---- const wxString file = wxlua_getwxStringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call Run bool returns = (self->Run(file, fileName)); *************** *** 249,260 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient[1] = {{ wxLua_wxLuaDebuggerServer_StartClient, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient }}; // long StartClient() static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StartClient long returns = (self->StartClient()); --- 249,260 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StartClient[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient[1] = {{ wxLua_wxLuaDebuggerServer_StartClient, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StartClient }}; // long StartClient() static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call StartClient long returns = (self->StartClient()); *************** *** 265,276 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer[1] = {{ wxLua_wxLuaDebuggerServer_StartServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer }}; // bool StartServer() static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StartServer bool returns = (self->StartServer()); --- 265,276 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StartServer[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer[1] = {{ wxLua_wxLuaDebuggerServer_StartServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StartServer }}; // bool StartServer() static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call StartServer bool returns = (self->StartServer()); *************** *** 281,292 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Step[1] = {{ wxLua_wxLuaDebuggerServer_Step, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step }}; // bool Step() static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Step bool returns = (self->Step()); --- 281,292 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Step[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Step[1] = {{ wxLua_wxLuaDebuggerServer_Step, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Step }}; // bool Step() static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call Step bool returns = (self->Step()); *************** *** 297,308 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut[1] = {{ wxLua_wxLuaDebuggerServer_StepOut, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut }}; // bool StepOut() static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StepOut bool returns = (self->StepOut()); --- 297,308 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StepOut[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut[1] = {{ wxLua_wxLuaDebuggerServer_StepOut, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StepOut }}; // bool StepOut() static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call StepOut bool returns = (self->StepOut()); *************** *** 313,324 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver[1] = {{ wxLua_wxLuaDebuggerServer_StepOver, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver }}; // bool StepOver() static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StepOver bool returns = (self->StepOver()); --- 313,324 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StepOver[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver[1] = {{ wxLua_wxLuaDebuggerServer_StepOver, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StepOver }}; // bool StepOver() static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call StepOver bool returns = (self->StepOver()); *************** *** 329,340 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer[1] = {{ wxLua_wxLuaDebuggerServer_StopServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer }}; // bool StopServer() static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StopServer bool returns = (self->StopServer()); --- 329,340 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StopServer[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer[1] = {{ wxLua_wxLuaDebuggerServer_StopServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_StopServer }}; // bool StopServer() static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L) { // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerServer); // call StopServer bool returns = (self->StopServer()); *************** *** 345,354 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_delete[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_delete }}; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor[1] = {{ wxLua_wxLuaDebuggerServer_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }}; // wxLuaDebuggerServer(int portNumber) static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L) --- 345,354 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_delete[] = { &g_wxluatype_wxLuaDebuggerServer, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_delete }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerServer_constructor[] = { &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor[1] = {{ wxLua_wxLuaDebuggerServer_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_constructor }}; // wxLuaDebuggerServer(int portNumber) static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L) *************** *** 361,365 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxLuaDebuggerServer, returns); return 1; --- 361,365 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxLuaDebuggerServer); return 1; *************** *** 402,415 **** // Lua MetaTable Tag for Class 'wxLuaDebuggerEvent' ! int s_wxluatag_wxLuaDebuggerEvent = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName[] = { &s_wxluatag_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName[1] = {{ wxLua_wxLuaDebuggerEvent_GetFileName, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName }}; // wxString GetFileName() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L) { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerEvent); // call GetFileName wxString returns = (self->GetFileName()); --- 402,415 ---- // Lua MetaTable Tag for Class 'wxLuaDebuggerEvent' ! int g_wxluatype_wxLuaDebuggerEvent = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetFileName[] = { &g_wxluatype_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName[1] = {{ wxLua_wxLuaDebuggerEvent_GetFileName, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetFileName }}; // wxString GetFileName() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L) { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerEvent); // call GetFileName wxString returns = (self->GetFileName()); *************** *** 420,431 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber[] = { &s_wxluatag_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber[1] = {{ wxLua_wxLuaDebuggerEvent_GetLineNumber, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber }}; // int GetLineNumber() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L) { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerEvent); // call GetLineNumber int returns = (self->GetLineNumber()); --- 420,431 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetLineNumber[] = { &g_wxluatype_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber[1] = {{ wxLua_wxLuaDebuggerEvent_GetLineNumber, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetLineNumber }}; // int GetLineNumber() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L) { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerEvent); // call GetLineNumber int returns = (self->GetLineNumber()); *************** *** 436,447 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage[] = { &s_wxluatag_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage[1] = {{ wxLua_wxLuaDebuggerEvent_GetMessage, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage }}; // wxString GetMessage() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L) { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerEvent); // call GetMessage wxString returns = (self->GetMessage()); --- 436,447 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetMessage[] = { &g_wxluatype_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage[1] = {{ wxLua_wxLuaDebuggerEvent_GetMessage, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetMessage }}; // wxString GetMessage() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L) { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerEvent); // call GetMessage wxString returns = (self->GetMessage()); *************** *** 452,463 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference[] = { &s_wxluatag_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference[1] = {{ wxLua_wxLuaDebuggerEvent_GetReference, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference }}; // int GetReference() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L) { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerEvent); // call GetReference int returns = (self->GetReference()); --- 452,463 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetReference[] = { &g_wxluatype_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference[1] = {{ wxLua_wxLuaDebuggerEvent_GetReference, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_GetReference }}; // int GetReference() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L) { // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaDebuggerEvent); // call GetReference int returns = (self->GetReference()); *************** *** 468,473 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_delete[] = { &s_wxluatag_wxLuaDebuggerEvent, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_delete }}; --- 468,473 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_delete[] = { &g_wxluatype_wxLuaDebuggerEvent, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLuaDebuggerEvent_delete }}; |
|
From: John L. <jr...@us...> - 2007-12-22 06:07:23
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/modules/wxluadebug/include Modified Files: wxldebug.h wxlstack.h Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxldebug.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** wxldebug.h 20 Dec 2007 02:26:58 -0000 1.49 --- wxldebug.h 22 Dec 2007 06:07:16 -0000 1.50 *************** *** 31,35 **** WXLUA_DEBUGITEM_EXPANDED = 0x0200, // for wxLuaStackDialog ! WXLUA_DEBUGITEM_IS_REFED = 0x1000, // This item was created with a new // wxluaR_ref() rather than using an existing one. WXLUA_DEBUGITEM_KEY_REF = 0x2000, // The ref is for the key --- 31,35 ---- WXLUA_DEBUGITEM_EXPANDED = 0x0200, // for wxLuaStackDialog ! WXLUA_DEBUGITEM_IS_REFED = 0x1000, // This item was created with a new // wxluaR_ref() rather than using an existing one. WXLUA_DEBUGITEM_KEY_REF = 0x2000, // The ref is for the key *************** *** 49,58 **** wxString GetKey() const { return m_itemKey; } int GetKeyType() const { return m_itemKeyType; } ! wxString GetKeyTypeString() const { return wxlua_getwxluatypename(m_itemKeyType); } // The value has the typical meaning of the value for the key in a Lua table wxString GetValue() const { return m_itemValue; } int GetValueType() const { return m_itemValueType; } ! wxString GetValueTypeString() const { return wxlua_getwxluatypename(m_itemValueType); } // The lua_Debug.source value when enumerating the stack or a stack item --- 49,58 ---- wxString GetKey() const { return m_itemKey; } int GetKeyType() const { return m_itemKeyType; } ! wxString GetKeyTypeString() const { return wxluaT_typename(NULL, m_itemKeyType); } // The value has the typical meaning of the value for the key in a Lua table wxString GetValue() const { return m_itemValue; } int GetValueType() const { return m_itemValueType; } ! wxString GetValueTypeString() const { return wxluaT_typename(NULL, m_itemValueType); } // The lua_Debug.source value when enumerating the stack or a stack item *************** *** 116,120 **** 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); } --- 116,120 ---- virtual ~wxLuaDebugData() {} // make gcc happy even though it's not used ! // Has this been created with its ref data? bool Ok() const { return (m_refData != NULL); } *************** *** 203,210 **** // Returns a string of all of the global variables and subtables with additional msg. wxString DumpGlobals(const wxString& msg = wxEmptyString); ! // Dump the table and it's subtables from the globals index with additional msg. // The name may be of the form "table1.subtable2.subtable3..." wxString DumpTable(const wxString& tableName, const wxString& msg = wxEmptyString); ! // Dump the table and it's subtables at the stack_idx with additional msg. wxString DumpTable(int stack_idx, const wxString& msg = wxEmptyString); --- 203,210 ---- // Returns a string of all of the global variables and subtables with additional msg. wxString DumpGlobals(const wxString& msg = wxEmptyString); ! // Dump the table and its subtables from the globals index with additional msg. // The name may be of the form "table1.subtable2.subtable3..." wxString DumpTable(const wxString& tableName, const wxString& msg = wxEmptyString); ! // Dump the table and its subtables at the stack_idx with additional msg. wxString DumpTable(int stack_idx, const wxString& msg = wxEmptyString); Index: wxlstack.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxlstack.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxlstack.h 20 Dec 2007 02:26:58 -0000 1.17 --- wxlstack.h 22 Dec 2007 06:07:16 -0000 1.18 *************** *** 203,209 **** // Expand a single list item bool ExpandItem(long lc_item); ! // Expand a list item and all it's children bool ExpandItemChildren(long lc_item); ! // Collapse an item and it's children bool CollapseItem(long lc_item); --- 203,209 ---- // Expand a single list item bool ExpandItem(long lc_item); ! // Expand a list item and all its children bool ExpandItemChildren(long lc_item); ! // Collapse an item and its children bool CollapseItem(long lc_item); |
|
From: John L. <jr...@us...> - 2007-12-22 06:07:23
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/samples Modified Files: auidemo.wx.lua bindings.wx.lua controls.wx.lua unittest.wx.lua Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: controls.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/controls.wx.lua,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** controls.wx.lua 18 Jul 2007 02:41:33 -0000 1.13 --- controls.wx.lua 22 Dec 2007 06:07:17 -0000 1.14 *************** *** 116,120 **** for i = 1, #wxEVT_Array do wxEVT_TableByType[wxEVT_Array[i].eventType] = wxEVT_Array[i] ! table.insert(wxEVT_List, {wxlua.typename(wxEVT_Array[i].class_tag), wxEVT_Array[i].name}) end table.sort(wxEVT_List, function(t1, t2) return t1[1] > t2[1] end) --- 116,120 ---- for i = 1, #wxEVT_Array do wxEVT_TableByType[wxEVT_Array[i].eventType] = wxEVT_Array[i] ! table.insert(wxEVT_List, {wxlua.typename(wxEVT_Array[i].wxluatype), wxEVT_Array[i].name}) end table.sort(wxEVT_List, function(t1, t2) return t1[1] > t2[1] end) *************** *** 326,330 **** function OnEvent(event) local skip = true ! local evtClassName = wxlua.typename(wxEVT_TableByType[event:GetEventType()].class_tag) local evtTypeStr = wxEVT_TableByType[event:GetEventType()].name --- 326,330 ---- function OnEvent(event) local skip = true ! local evtClassName = wxlua.typename(wxEVT_TableByType[event:GetEventType()].wxluatype) local evtTypeStr = wxEVT_TableByType[event:GetEventType()].name Index: auidemo.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/auidemo.wx.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** auidemo.wx.lua 25 Nov 2007 21:34:05 -0000 1.1 --- auidemo.wx.lua 22 Dec 2007 06:07:17 -0000 1.2 *************** *** 129,141 **** local m_mgr = mgr; ! this:Connect(wx.wxEVT_SIZE, function(event) this:Refresh(); end) ! ! this:Connect(wx.wxEVT_ERASE_BACKGROUND, function(event) --// intentionally empty end) ! ! this:Connect(wx.wxEVT_PAINT, function(event) local dc = wx.wxPaintDC(this) local sizex,sizey = this:GetClientSizeWH(); --- 129,141 ---- local m_mgr = mgr; ! this:Connect(wx.wxEVT_SIZE, function(event) this:Refresh(); end) ! ! this:Connect(wx.wxEVT_ERASE_BACKGROUND, function(event) --// intentionally empty end) ! ! this:Connect(wx.wxEVT_PAINT, function(event) local dc = wx.wxPaintDC(this) local sizex,sizey = this:GetClientSizeWH(); *************** *** 155,159 **** dc:DrawLine(0, sizey, sizex, 0); dc:DrawText(s, (sizex-w)/2, ((sizey-(height*5))/2)); ! if (m_mgr) then local pi = m_mgr:GetPane(this); --- 155,159 ---- dc:DrawLine(0, sizey, sizex, 0); dc:DrawText(s, (sizex-w)/2, ((sizey-(height*5))/2)); ! if (m_mgr) then local pi = m_mgr:GetPane(this); *************** *** 191,195 **** local this = self.this ! this:Connect(wx.wxEVT_SIZE, function(event) self:OnSize(event) end) this:Connect(wx.wxEVT_PAINT, function(event) self:OnPaint(event) end) --- 191,195 ---- local this = self.this ! this:Connect(wx.wxEVT_SIZE, function(event) self:OnSize(event) end) this:Connect(wx.wxEVT_PAINT, function(event) self:OnPaint(event) end) *************** *** 218,222 **** dc:DrawLine(0, sizey, sizex, 0); dc:DrawText(s, (sizex-w)/2, ((sizey-(height*5))/2)); ! local m_mgr = self.m_mgr if (m_mgr) then --- 218,222 ---- dc:DrawLine(0, sizey, sizex, 0); dc:DrawText(s, (sizex-w)/2, ((sizey-(height*5))/2)); ! local m_mgr = self.m_mgr if (m_mgr) then *************** *** 297,303 **** local s1 = wx.wxBoxSizer(wx.wxHORIZONTAL); ! self.m_border_size = wx.wxSpinCtrl(this, self.ID_PaneBorderSize, string.format(wxT("%d"), ! frame:GetDockArt():GetMetric(wxaui.wxAUI_DOCKART_PANE_BORDER_SIZE)), ! wx.wxDefaultPosition, wx.wxSize(50,20), wx.wxSP_ARROW_KEYS, 0, 100, frame:GetDockArt():GetMetric(wxaui.wxAUI_DOCKART_PANE_BORDER_SIZE)); s1:Add(1, 1, 1, wx.wxEXPAND); --- 297,303 ---- local s1 = wx.wxBoxSizer(wx.wxHORIZONTAL); ! self.m_border_size = wx.wxSpinCtrl(this, self.ID_PaneBorderSize, string.format(wxT("%d"), ! frame:GetDockArt():GetMetric(wxaui.wxAUI_DOCKART_PANE_BORDER_SIZE)), ! wx.wxDefaultPosition, wx.wxSize(50,20), wx.wxSP_ARROW_KEYS, 0, 100, frame:GetDockArt():GetMetric(wxaui.wxAUI_DOCKART_PANE_BORDER_SIZE)); s1:Add(1, 1, 1, wx.wxEXPAND); *************** *** 309,315 **** local s2 = wx.wxBoxSizer(wx.wxHORIZONTAL); ! self.m_sash_size = wx.wxSpinCtrl(this, self.ID_SashSize, string.format(wxT("%d"), ! frame:GetDockArt():GetMetric(wxaui.wxAUI_DOCKART_SASH_SIZE)), ! wx.wxDefaultPosition, wx.wxSize(50,20), wx.wxSP_ARROW_KEYS, 0, 100, frame:GetDockArt():GetMetric(wxaui.wxAUI_DOCKART_SASH_SIZE)); s2:Add(1, 1, 1, wx.wxEXPAND); --- 309,315 ---- local s2 = wx.wxBoxSizer(wx.wxHORIZONTAL); ! self.m_sash_size = wx.wxSpinCtrl(this, self.ID_SashSize, string.format(wxT("%d"), ! frame:GetDockArt():GetMetric(wxaui.wxAUI_DOCKART_SASH_SIZE)), ! wx.wxDefaultPosition, wx.wxSize(50,20), wx.wxSP_ARROW_KEYS, 0, 100, frame:GetDockArt():GetMetric(wxaui.wxAUI_DOCKART_SASH_SIZE)); s2:Add(1, 1, 1, wx.wxEXPAND); *************** *** 321,327 **** local s3 = wx.wxBoxSizer(wx.wxHORIZONTAL); ! self.m_caption_size = wx.wxSpinCtrl(this, self.ID_CaptionSize, string.format(wxT("%d"), ! frame:GetDockArt():GetMetric(wxaui.wxAUI_DOCKART_CAPTION_SIZE)), ! wx.wxDefaultPosition, wx.wxSize(50,20), wx.wxSP_ARROW_KEYS, 0, 100, frame:GetDockArt():GetMetric(wxaui.wxAUI_DOCKART_CAPTION_SIZE)); s3:Add(1, 1, 1, wx.wxEXPAND); --- 321,327 ---- local s3 = wx.wxBoxSizer(wx.wxHORIZONTAL); ! self.m_caption_size = wx.wxSpinCtrl(this, self.ID_CaptionSize, string.format(wxT("%d"), ! frame:GetDockArt():GetMetric(wxaui.wxAUI_DOCKART_CAPTION_SIZE)), ! wx.wxDefaultPosition, wx.wxSize(50,20), wx.wxSP_ARROW_KEYS, 0, 100, frame:GetDockArt():GetMetric(wxaui.wxAUI_DOCKART_CAPTION_SIZE)); s3:Add(1, 1, 1, wx.wxEXPAND); *************** *** 530,544 **** local id = event:GetId() ! if id == self.ID_BackgroundColor then var = wxaui.wxAUI_DOCKART_BACKGROUND_COLOUR; ! elseif id == self.ID_SashColor then var = wxaui.wxAUI_DOCKART_SASH_COLOUR; ! elseif id == self.ID_InactiveCaptionColor then var = wxaui.wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR; ! elseif id == self.ID_InactiveCaptionGradientColor then var = wxaui.wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR; ! elseif id == self.ID_InactiveCaptionTextColor then var = wxaui.wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR; ! elseif id == self.ID_ActiveCaptionColor then var = wxaui.wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR; ! elseif id == self.ID_ActiveCaptionGradientColor then var = wxaui.wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR; ! elseif id == self.ID_ActiveCaptionTextColor then var = wxaui.wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR; ! elseif id == self.ID_BorderColor then var = wxaui.wxAUI_DOCKART_BORDER_COLOUR; ! elseif id == self.ID_GripperColor then var = wxaui.wxAUI_DOCKART_GRIPPER_COLOUR; ! else return; end --- 530,544 ---- local id = event:GetId() ! if id == self.ID_BackgroundColor then var = wxaui.wxAUI_DOCKART_BACKGROUND_COLOUR; ! elseif id == self.ID_SashColor then var = wxaui.wxAUI_DOCKART_SASH_COLOUR; ! elseif id == self.ID_InactiveCaptionColor then var = wxaui.wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR; ! elseif id == self.ID_InactiveCaptionGradientColor then var = wxaui.wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR; ! elseif id == self.ID_InactiveCaptionTextColor then var = wxaui.wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR; ! elseif id == self.ID_ActiveCaptionColor then var = wxaui.wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR; ! elseif id == self.ID_ActiveCaptionGradientColor then var = wxaui.wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR; ! elseif id == self.ID_ActiveCaptionTextColor then var = wxaui.wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR; ! elseif id == self.ID_BorderColor then var = wxaui.wxAUI_DOCKART_BORDER_COLOUR; ! elseif id == self.ID_GripperColor then var = wxaui.wxAUI_DOCKART_GRIPPER_COLOUR; ! else return; end *************** *** 993,999 **** local id = event:GetId() ! if id == self.ID_NoGradient then gradient = wxaui.wxAUI_GRADIENT_NONE; ! elseif id == self.ID_VerticalGradient then gradient = wxaui.wxAUI_GRADIENT_VERTICAL; ! elseif id == self.ID_HorizontalGradient then gradient = wxaui.wxAUI_GRADIENT_HORIZONTAL; end --- 993,999 ---- local id = event:GetId() ! if id == self.ID_NoGradient then gradient = wxaui.wxAUI_GRADIENT_NONE; ! elseif id == self.ID_VerticalGradient then gradient = wxaui.wxAUI_GRADIENT_VERTICAL; ! elseif id == self.ID_HorizontalGradient then gradient = wxaui.wxAUI_GRADIENT_HORIZONTAL; end *************** *** 1022,1026 **** id == self.ID_NoHint) then local flags = self.m_mgr:GetFlags(); ! --[[hd.FIXME --flags &= ~wxAUI_MGR_TRANSPARENT_HINT; --- 1022,1026 ---- id == self.ID_NoHint) then local flags = self.m_mgr:GetFlags(); ! --[[hd.FIXME --flags &= ~wxAUI_MGR_TRANSPARENT_HINT; *************** *** 1031,1046 **** flags = bit.band(flags, bit.bnot(wxaui.wxAUI_MGR_VENETIAN_BLINDS_HINT)); flags = bit.band(flags, bit.bnot(wxaui.wxAUI_MGR_RECTANGLE_HINT)); ! self.m_mgr:SetFlags(flags); end ! if id == self.ID_AllowFloating then flag = wxaui.wxAUI_MGR_ALLOW_FLOATING; ! elseif id == self.ID_TransparentDrag then flag = wxaui.wxAUI_MGR_TRANSPARENT_DRAG; ! elseif id == self.ID_HintFade then flag = wxaui.wxAUI_MGR_HINT_FADE; ! elseif id == self.ID_NoVenetianFade then flag = wxaui.wxAUI_MGR_NO_VENETIAN_BLINDS_FADE; ! elseif id == self.ID_AllowActivePane then flag = wxaui.wxAUI_MGR_ALLOW_ACTIVE_PANE; ! elseif id == self.ID_TransparentHint then flag = wxaui.wxAUI_MGR_TRANSPARENT_HINT; ! elseif id == self.ID_VenetianBlindsHint then flag = wxaui.wxAUI_MGR_VENETIAN_BLINDS_HINT; ! elseif id == self.ID_RectangleHint then flag = wxaui.wxAUI_MGR_RECTANGLE_HINT; end --- 1031,1046 ---- flags = bit.band(flags, bit.bnot(wxaui.wxAUI_MGR_VENETIAN_BLINDS_HINT)); flags = bit.band(flags, bit.bnot(wxaui.wxAUI_MGR_RECTANGLE_HINT)); ! self.m_mgr:SetFlags(flags); end ! if id == self.ID_AllowFloating then flag = wxaui.wxAUI_MGR_ALLOW_FLOATING; ! elseif id == self.ID_TransparentDrag then flag = wxaui.wxAUI_MGR_TRANSPARENT_DRAG; ! elseif id == self.ID_HintFade then flag = wxaui.wxAUI_MGR_HINT_FADE; ! elseif id == self.ID_NoVenetianFade then flag = wxaui.wxAUI_MGR_NO_VENETIAN_BLINDS_FADE; ! elseif id == self.ID_AllowActivePane then flag = wxaui.wxAUI_MGR_ALLOW_ACTIVE_PANE; ! elseif id == self.ID_TransparentHint then flag = wxaui.wxAUI_MGR_TRANSPARENT_HINT; ! elseif id == self.ID_VenetianBlindsHint then flag = wxaui.wxAUI_MGR_VENETIAN_BLINDS_HINT; ! elseif id == self.ID_RectangleHint then flag = wxaui.wxAUI_MGR_RECTANGLE_HINT; end *************** *** 1079,1086 **** case ID_NotebookCloseButtonActive: m_notebook_style |= wxAUI_NB_CLOSE_ON_ACTIVE_TAB; break; --]] ! if id == self.ID_NotebookNoCloseButton then ! elseif id == self.ID_NotebookCloseButton then self.m_notebook_style = bit.bor(self.m_notebook_style, wxaui.wxAUI_NB_CLOSE_BUTTON); ! elseif id == self.ID_NotebookCloseButtonAll then self.m_notebook_style = bit.bor(self.m_notebook_style, wxaui.wxAUI_NB_CLOSE_ON_ALL_TABS); ! elseif id == self.ID_NotebookCloseButtonActive then self.m_notebook_style = bit.bor(self.m_notebook_style, wxaui.wxAUI_NB_CLOSE_ON_ACTIVE_TAB); end --- 1079,1086 ---- case ID_NotebookCloseButtonActive: m_notebook_style |= wxAUI_NB_CLOSE_ON_ACTIVE_TAB; break; --]] ! if id == self.ID_NotebookNoCloseButton then ! elseif id == self.ID_NotebookCloseButton then self.m_notebook_style = bit.bor(self.m_notebook_style, wxaui.wxAUI_NB_CLOSE_BUTTON); ! elseif id == self.ID_NotebookCloseButtonAll then self.m_notebook_style = bit.bor(self.m_notebook_style, wxaui.wxAUI_NB_CLOSE_ON_ALL_TABS); ! elseif id == self.ID_NotebookCloseButtonActive then self.m_notebook_style = bit.bor(self.m_notebook_style, wxaui.wxAUI_NB_CLOSE_ON_ACTIVE_TAB); end *************** *** 1440,1445 **** imglist:Add(wx.wxArtProvider.GetBitmap(wx.wxART_FOLDER, wx.wxART_OTHER, wx.wxSize(16,16))); imglist:Add(wx.wxArtProvider.GetBitmap(wx.wxART_NORMAL_FILE, wx.wxART_OTHER, wx.wxSize(16,16))); ! --hd.FIXME crashes upon exit tree:AssignImageList(imglist); ! tree:SetImageList(imglist); local root = tree:AddRoot(wxT("wxAUI Project"), 0); --- 1440,1444 ---- imglist:Add(wx.wxArtProvider.GetBitmap(wx.wxART_FOLDER, wx.wxART_OTHER, wx.wxSize(16,16))); imglist:Add(wx.wxArtProvider.GetBitmap(wx.wxART_NORMAL_FILE, wx.wxART_OTHER, wx.wxSize(16,16))); ! tree:AssignImageList(imglist); local root = tree:AddRoot(wxT("wxAUI Project"), 0); *************** *** 1560,1565 **** <h3>Welcome to wxAUI</h3> <br/><b>Overview</b><br/> ! <p>wxAUI is an Advanced User Interface library for the wxWidgets toolkit ! that allows developers to create high-quality, cross-platform user interfaces quickly and easily.</p> <p><b>Features</b></p> --- 1559,1564 ---- <h3>Welcome to wxAUI</h3> <br/><b>Overview</b><br/> ! <p>wxAUI is an Advanced User Interface library for the wxWidgets toolkit ! that allows developers to create high-quality, cross-platform user interfaces quickly and easily.</p> <p><b>Features</b></p> Index: bindings.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/bindings.wx.lua,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** bindings.wx.lua 20 Dec 2007 02:26:58 -0000 1.18 --- bindings.wx.lua 22 Dec 2007 06:07:17 -0000 1.19 *************** *** 60,64 **** print("GetClassCount : "..tostring(binding.GetClassCount)) ! print("GetDefineCount : "..tostring(binding.GetDefineCount)) print("GetStringCount : "..tostring(binding.GetStringCount)) print("GetEventCount : "..tostring(binding.GetEventCount)) --- 60,64 ---- print("GetClassCount : "..tostring(binding.GetClassCount)) ! print("GetNumberCount : "..tostring(binding.GetNumberCount)) print("GetStringCount : "..tostring(binding.GetStringCount)) print("GetEventCount : "..tostring(binding.GetEventCount)) *************** *** 68,72 **** if true then print("\nDUMPING binding.GetClassArray ==================================\n") ! local keys = { "name", "methods", "methods_n", "classInfo", "class_tag", "baseclassName", "baseclass", "enums", "enums_n" } ColumnDumpTable(binding.GetClassArray, keys) end --- 68,72 ---- if true then print("\nDUMPING binding.GetClassArray ==================================\n") ! local keys = { "name", "wxluamethods", "wxluamethods_n", "classInfo", "wxluatype", "baseclassName", "baseclass", "enums", "enums_n" } ColumnDumpTable(binding.GetClassArray, keys) end *************** *** 74,85 **** if true then print("\nDUMPING binding.GetFunctionArray ==================================\n") ! local keys = { "name", "type", "funcs", "funcs_n", "basemethod" } ColumnDumpTable(binding.GetFunctionArray, keys) end if true then ! print("\nDUMPING binding.GetDefineArray ==================================\n") local keys = { "name", "value" } ! ColumnDumpTable(binding.GetDefineArray, keys) end --- 74,85 ---- if true then print("\nDUMPING binding.GetFunctionArray ==================================\n") ! local keys = { "name", "type", "wxluacfuncs", "wxluacfuncs_n", "basemethod" } ColumnDumpTable(binding.GetFunctionArray, keys) end if true then ! print("\nDUMPING binding.GetNumberArray ==================================\n") local keys = { "name", "value" } ! ColumnDumpTable(binding.GetNumberArray, keys) end *************** *** 92,96 **** if true then print("\nDUMPING binding.GetEventArray ==================================\n") ! local keys = { "name", "eventType", "class_tag" } ColumnDumpTable(binding.GetEventArray, keys) end --- 92,96 ---- if true then print("\nDUMPING binding.GetEventArray ==================================\n") ! local keys = { "name", "eventType", "wxluatype" } ColumnDumpTable(binding.GetEventArray, keys) end *************** *** 98,102 **** if true then print("\nDUMPING binding.GetObjectArray ==================================\n") ! local keys = { "name", "object", "class_tag" } ColumnDumpTable(binding.GetObjectArray, keys) end --- 98,102 ---- if true then print("\nDUMPING binding.GetObjectArray ==================================\n") ! local keys = { "name", "object", "wxluatype" } ColumnDumpTable(binding.GetObjectArray, keys) end *************** *** 289,293 **** -- subtract values from high to low value ! t = HasBit(t, wxlua.WXLUAMETHOD_OVERLOAD_BASE, nil, nil) -- nobody should care about this t = HasBit(t, wxlua.WXLUAMETHOD_DELETE, s, "Delete") t = HasBit(t, wxlua.WXLUAMETHOD_STATIC, s, "Static") --- 289,293 ---- -- subtract values from high to low value ! t = HasBit(t, wxlua.WXLUAMETHOD_CHECKED_OVERLOAD, nil, nil) -- nobody should care about this t = HasBit(t, wxlua.WXLUAMETHOD_DELETE, s, "Delete") t = HasBit(t, wxlua.WXLUAMETHOD_STATIC, s, "Static") *************** *** 301,305 **** -- remove this, nobody should care and it'll probably be confusing ! t = HasBit(t_, wxlua.WXLUAMETHOD_OVERLOAD_BASE, nil, nil) return string.format("0x%04X (%s)", t, table.concat(s, ", ")) --- 301,305 ---- -- remove this, nobody should care and it'll probably be confusing ! t = HasBit(t_, wxlua.WXLUAMETHOD_CHECKED_OVERLOAD, nil, nil) return string.format("0x%04X (%s)", t, table.concat(s, ", ")) *************** *** 307,311 **** -- ---------------------------------------------------------------------------- ! -- Convert the argtags table into a readable string -- ---------------------------------------------------------------------------- function CreateArgTagsString(args_table, wxlua_type) --- 307,311 ---- -- ---------------------------------------------------------------------------- ! -- Convert the argtypes table into a readable string -- ---------------------------------------------------------------------------- function CreateArgTagsString(args_table, wxlua_type) *************** *** 340,344 **** -- items in table from binding.GetClassArray are these ! -- { "name", "methods", "methods_n", "classInfo", "class_tag", "baseclassName", "baseclass", "enums", "enums_n" } local function GetClassInfoStr(classInfo) --- 340,344 ---- -- items in table from binding.GetClassArray are these ! -- { "name", "wxluamethods", "wxluamethods_n", "classInfo", "wxluatype", "baseclassName", "baseclass", "enums", "enums_n" } local function GetClassInfoStr(classInfo) *************** *** 366,376 **** t.col_numbers[6] = true ! --{ "name"[data], "methods_n", "classInfo", "class_tag", "baseclassName"[data], "enums_n"[data] } for i = 1, #tbl do local item = { tbl[i].name, ! tbl[i].methods_n, GetClassInfoStr(tbl[i].classInfo), ! tbl[i].class_tag, tbl[i].baseclassName or "", tbl[i].enums_n, --- 366,376 ---- t.col_numbers[6] = true ! --{ "name"[data], "wxluamethods_n", "classInfo", "wxluatype", "baseclassName"[data], "enums_n"[data] } for i = 1, #tbl do local item = { tbl[i].name, ! tbl[i].wxluamethods_n, GetClassInfoStr(tbl[i].classInfo), ! tbl[i].wxluatype, tbl[i].baseclassName or "", tbl[i].enums_n, *************** *** 380,386 **** -- This class has methods and can be expanded ! if (type(tbl[i].methods) == "table") then item.icon = list_images.folder ! item.data[1] = tbl[i].methods end --- 380,386 ---- -- This class has methods and can be expanded ! if (type(tbl[i].wxluamethods) == "table") then item.icon = list_images.folder ! item.data[1] = tbl[i].wxluamethods end *************** *** 398,402 **** -- 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 --- 398,402 ---- -- some sanity checks to make sure the bindings are working ! if (tbl[i].wxluamethods_n > 0) and (type(tbl[i].wxluamethods) ~= "table") then print(tbl[i].name, "is missing methods table, please report this.") end *************** *** 420,429 **** local t = { {"..", ["icon"] = list_images.folder}, ! ["col_labels"] = { "name", "type", "funcs_n", "basemethod", "minargs", "maxargs", "argtag_names", "argtags" }, ["object_type"] = "wxLuaBindMethod" } -- items in table are ! -- { "name", "type", "funcs", "funcs_n", "basemethod" } t.col_numbers = {} --- 420,429 ---- local t = { {"..", ["icon"] = list_images.folder}, ! ["col_labels"] = { "name", "method_type", "wxluacfuncs_n", "basemethod", "minargs", "maxargs", "argtype_names", "argtypes" }, ["object_type"] = "wxLuaBindMethod" } -- items in table are ! -- { "name", "type", "wxluacfuncs", "wxluacfuncs_n", "basemethod" } t.col_numbers = {} *************** *** 438,443 **** local item = { class_name..tbl[i].name, ! CreatewxLuaMethod_TypeString(tbl[i].type), ! tbl[i].funcs_n, "", "", --- 438,443 ---- local item = { class_name..tbl[i].name, ! CreatewxLuaMethod_TypeString(tbl[i].method_type), ! tbl[i].wxluacfuncs_n, "", "", *************** *** 462,471 **** -- Add in the CFuncs ! item.data[1] = tbl[i].funcs item.color = wx.wxBLUE table.insert(t, item) ! -- keys for CFunc = { "func", "type", "minargs", "maxargs", "argtag_names", "argtags" } ! local cfunc_t = CreatewxLuaBindCFunc(tbl[i].funcs) for j = 2, #cfunc_t do local cft = {item[1].." func "..j-1, cfunc_t[j][2], "", "", cfunc_t[j][3], cfunc_t[j][4], cfunc_t[j][5], cfunc_t[j][6]} --- 462,471 ---- -- Add in the CFuncs ! item.data[1] = tbl[i].wxluacfuncs item.color = wx.wxBLUE table.insert(t, item) ! -- keys for CFunc = { "lua_cfunc", "type", "minargs", "maxargs", "argtype_names", "argtypes" } ! local cfunc_t = CreatewxLuaBindCFunc(tbl[i].wxluacfuncs) for j = 2, #cfunc_t do local cft = {item[1].." func "..j-1, cfunc_t[j][2], "", "", cfunc_t[j][3], cfunc_t[j][4], cfunc_t[j][5], cfunc_t[j][6]} *************** *** 479,487 **** -- ---------------------------------------------------------------------------- ! -- Create a list table from a wxLuaBindDefine struct table -- ---------------------------------------------------------------------------- ! function CreatewxLuaBindDefine(tbl) local keys = { "name", "value" } ! local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindDefine") t.col_numbers = {} --- 479,487 ---- -- ---------------------------------------------------------------------------- ! -- Create a list table from a wxLuaBindNumber struct table -- ---------------------------------------------------------------------------- ! function CreatewxLuaBindNumber(tbl) local keys = { "name", "value" } ! local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindNumber") t.col_numbers = {} *************** *** 510,514 **** -- ---------------------------------------------------------------------------- function CreatewxLuaBindEvent(tbl) ! local keys = { "name", "eventType", "class_tag" } local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindEvent") --- 510,514 ---- -- ---------------------------------------------------------------------------- function CreatewxLuaBindEvent(tbl) ! local keys = { "name", "eventType", "wxluatype" } local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindEvent") *************** *** 529,533 **** -- ---------------------------------------------------------------------------- function CreatewxLuaBindObject(tbl) ! local keys = { "name", "object", "class_tag" } local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindObject") --- 529,533 ---- -- ---------------------------------------------------------------------------- function CreatewxLuaBindObject(tbl) ! local keys = { "name", "object", "wxluatype" } local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindObject") *************** *** 544,552 **** -- ---------------------------------------------------------------------------- function CreatewxLuaBindCFunc(tbl) ! local keys = { "func", "type", "minargs", "maxargs", "argtags" } local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindCFunc") ! t.col_labels[5] ="argtags_names" -- swap these two ! t.col_labels[6] ="argtags" t.col_numbers = {} --- 544,552 ---- -- ---------------------------------------------------------------------------- function CreatewxLuaBindCFunc(tbl) ! local keys = { "lua_cfunc", "method_type", "minargs", "maxargs", "argtypes" } local t = CreatewxLuaBindTable(tbl, keys, "wxLuaBindCFunc") ! t.col_labels[5] ="argtype_names" -- swap these two ! t.col_labels[6] ="argtypes" t.col_numbers = {} *************** *** 757,761 **** {"GetClassArray", "GetClassCount : "..tostring(binding.GetClassCount), ["icon"] = list_images.folder}, {"GetFunctionArray", "GetFunctionCount : "..tostring(binding.GetFunctionCount), ["icon"] = list_images.folder}, ! {"GetDefineArray", "GetDefineCount : "..tostring(binding.GetDefineCount), ["icon"] = list_images.folder}, {"GetStringArray", "GetStringCount : "..tostring(binding.GetStringCount), ["icon"] = list_images.folder}, {"GetEventArray", "GetEventCount : "..tostring(binding.GetEventCount), ["icon"] = list_images.folder}, --- 757,761 ---- {"GetClassArray", "GetClassCount : "..tostring(binding.GetClassCount), ["icon"] = list_images.folder}, {"GetFunctionArray", "GetFunctionCount : "..tostring(binding.GetFunctionCount), ["icon"] = list_images.folder}, ! {"GetNumberArray", "GetNumberCount : "..tostring(binding.GetNumberCount), ["icon"] = list_images.folder}, {"GetStringArray", "GetStringCount : "..tostring(binding.GetStringCount), ["icon"] = list_images.folder}, {"GetEventArray", "GetEventCount : "..tostring(binding.GetEventCount), ["icon"] = list_images.folder}, *************** *** 778,783 **** elseif (itemText == "GetFunctionArray") then t = CreatewxLuaBindMethod(binding.GetFunctionArray) ! elseif (itemText == "GetDefineArray") then ! t = CreatewxLuaBindDefine(binding.GetDefineArray) elseif (itemText == "GetStringArray") then t = CreatewxLuaBindString(binding.GetStringArray) --- 778,783 ---- elseif (itemText == "GetFunctionArray") then t = CreatewxLuaBindMethod(binding.GetFunctionArray) ! elseif (itemText == "GetNumberArray") then ! t = CreatewxLuaBindNumber(binding.GetNumberArray) elseif (itemText == "GetStringArray") then t = CreatewxLuaBindString(binding.GetStringArray) *************** *** 802,806 **** 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 --- 802,806 ---- local c = data[data_index].data[5] while type(c) == "userdata" do ! local tt = CreatewxLuaBindMethod(c.wxluamethods, c.name) for i = 2, #tt do -- skip ".." if not (string.find(tt[i][2], "Constructor", 1, 1) or *************** *** 816,820 **** t = CreatewxLuaBindClass({data[data_index].data[col+1]}) elseif (col == 5) and (type(data[data_index].data[col+1]) == "table") then ! t = CreatewxLuaBindDefine(data[data_index].data[col+1]) end --- 816,820 ---- t = CreatewxLuaBindClass({data[data_index].data[col+1]}) elseif (col == 5) and (type(data[data_index].data[col+1]) == "table") then ! t = CreatewxLuaBindNumber(data[data_index].data[col+1]) end *************** *** 1150,1165 **** for i = 1, #classTable do ! local methods = classTable[i].methods -- some classes don't have methods, wxBestHelpController for example ! 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 --- 1150,1165 ---- for i = 1, #classTable do ! local wxluamethods = classTable[i].wxluamethods -- some classes don't have methods, wxBestHelpController for example ! for j = 1, classTable[i].wxluamethods_n do ! local m = wxluamethods[j] local m_table = {m.name} while m do ! local wxluacfuncs = m.wxluacfuncs local s = "" ! for f = 1, m.wxluacfuncs_n do ! s = s.."("..CreateArgTagsString(wxluacfuncs[f].argtypes, wxluacfuncs[f].method_type)..") " end Index: unittest.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/unittest.wx.lua,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** unittest.wx.lua 20 Dec 2007 02:26:59 -0000 1.19 --- unittest.wx.lua 22 Dec 2007 06:07:17 -0000 1.20 *************** *** 235,254 **** a = wx.wxCommandEvent() b = a:DynamicCast("wxObject") ! PrintOk((a ~= b) and string.find(tostring(a), "wxCommandEvent", 1, 1) and string.find(tostring(b), "wxObject", 1, 1), "wxObject::DynamicCast a wxCommandEvent to a wxObject") b = b:DynamicCast("wxCommandEvent") ! PrintOk((a == b) and string.find(tostring(a), "wxCommandEvent", 1, 1) and string.find(tostring(b), "wxCommandEvent", 1, 1), "wxObject::DynamicCast the wxObject back to a wxCommandEvent to get original userdata back") ! b = b:DynamicCast("wxCommandEvent") ! PrintOk((a == b) and string.find(tostring(a), "wxCommandEvent", 1, 1) and string.find(tostring(b), "wxCommandEvent", 1, 1), "wxObject::DynamicCast a wxCommandEvent to a wxCommandEvent to get same userdata back") b = b:DynamicCast("wxEvent") b:delete() ! PrintOk((a ~= b) and not (string.find(tostring(a), "wx", 1, 1) or string.find(tostring(b), "wx", 1, 1)), "wxObject::DynamicCast a wxCommandEvent to a wxEvent then delete the wxEvent, both should be deleted") -- --------------------------------------------------------------------------- print("\nTest adding a methods to a class object userdata.\n") --- 235,272 ---- a = wx.wxCommandEvent() b = a:DynamicCast("wxObject") ! ! print(a, b) ! ! PrintOk((a ~= b) and string.find(tostring(a), "wxCommandEvent", 1, 1) and string.find(tostring(b), "wxObject", 1, 1), "wxObject::DynamicCast a wxCommandEvent to a wxObject") + PrintOk((a ~= b) and (string.match(tostring(a), "%([abcdefx%d]*") == string.match(tostring(b), "%([abcdefx%d]*")), + "wxObject::DynamicCast a wxCommandEvent to a wxObject the object pointer stays the same") b = b:DynamicCast("wxCommandEvent") ! PrintOk((a == b) and string.find(tostring(a), "wxCommandEvent", 1, 1) and string.find(tostring(b), "wxCommandEvent", 1, 1), "wxObject::DynamicCast the wxObject back to a wxCommandEvent to get original userdata back") + PrintOk((a == b) and (string.match(tostring(a), "%([abcdefx%d]*") == string.match(tostring(b), "%([abcdefx%d]*")), + "wxObject::DynamicCast the wxObject back to a wxCommandEvent the object pointer stays the same") ! b = b:DynamicCast("wxCommandEvent") -- should do nothing ! PrintOk((a == b) and string.find(tostring(a), "wxCommandEvent", 1, 1) and string.find(tostring(b), "wxCommandEvent", 1, 1), "wxObject::DynamicCast a wxCommandEvent to a wxCommandEvent to get same userdata back") + PrintOk((a == b) and (string.match(tostring(a), "%([abcdefx%d]*") == string.match(tostring(b), "%([abcdefx%d]*")), + "wxObject::DynamicCast a wxCommandEvent to a wxCommandEvent the object pointer stays the same") b = b:DynamicCast("wxEvent") b:delete() ! PrintOk((a ~= b) and not (string.find(tostring(a), "wx", 1, 1) or string.find(tostring(b), "wx", 1, 1)), "wxObject::DynamicCast a wxCommandEvent to a wxEvent then delete the wxEvent, both should be deleted") + -- NOTE! It is probably a mistake in wxWidgets that there are two functions with + -- the same name, but it's good dynamic casting test for wxLua. + -- wxBookCtrlBaseEvent::GetSelection() returns its int m_nSel + -- wxCommandEvent::GetSelection() return its int m_commandInt + a = wx.wxBookCtrlBaseEvent(wx.wxEVT_NULL, 5, 10, 11) + b = a:DynamicCast("wxCommandEvent") + PrintOk((a ~= b) and (a:GetSelection() == 10) and (b:GetSelection() == 0), + "wxObject::DynamicCast a wxBookCtrlBaseEvent to a wxCommandEvent and compare the two GetSelection() functions which use different member vars") + -- --------------------------------------------------------------------------- print("\nTest adding a methods to a class object userdata.\n") *************** *** 294,299 **** --- 312,322 ---- o = wxlua.wxLuaObject("hello"); b = o:GetObject() PrintOk((b == "hello") and (a ~= b), "Test wxLuaObject::GetObject(string).") + o = wxlua.wxLuaObject(10); b = o:GetObject() PrintOk(b == 10, "Test wxLuaObject::GetObject(number).") + + o = wxlua.wxLuaObject(true); b = o:GetObject() + PrintOk(b == true, "Test wxLuaObject::GetObject(boolean).") + a = {"hello"}; o = wxlua.wxLuaObject(a); b = o:GetObject() PrintOk((a == b) and (b[1] == "hello"), "Test wxLuaObject::GetObject(table).") |
|
From: John L. <jr...@us...> - 2007-12-22 06:07:23
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlcallb.cpp wxlstate.cpp wxlua.cpp wxlua_bind.cpp Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxlua.cpp 20 Dec 2007 02:26:58 -0000 1.9 --- wxlua.cpp 22 Dec 2007 06:07:16 -0000 1.10 *************** *** 31,38 **** // Lua MetaTable Tag for Class 'wxLuaState' ! int s_wxluatag_wxLuaState = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaState_delete[] = { &s_wxluatag_wxLuaState, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaState_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLuaState_delete }}; --- 31,38 ---- // Lua MetaTable Tag for Class 'wxLuaState' ! int g_wxluatype_wxLuaState = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaState_delete[] = { &g_wxluatype_wxLuaState, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaState_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLuaState_delete }}; *************** *** 52,65 **** // Lua MetaTable Tag for Class 'wxLuaObject' ! int s_wxluatag_wxLuaObject = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_GetAllocationFlag[] = { &s_wxluatag_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_GetAllocationFlag(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlag[1] = {{ wxLua_wxLuaObject_GetAllocationFlag, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_GetAllocationFlag }}; // int GetAllocationFlag() const static int LUACALL wxLua_wxLuaObject_GetAllocationFlag(lua_State *L) { // get this ! wxLuaObject * self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaObject); // call GetAllocationFlag int returns = (self->GetAllocationFlag()); --- 52,65 ---- // Lua MetaTable Tag for Class 'wxLuaObject' ! int g_wxluatype_wxLuaObject = -1; ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_GetAllocationFlag[] = { &g_wxluatype_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_GetAllocationFlag(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlag[1] = {{ wxLua_wxLuaObject_GetAllocationFlag, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaObject_GetAllocationFlag }}; // int GetAllocationFlag() const static int LUACALL wxLua_wxLuaObject_GetAllocationFlag(lua_State *L) { // get this ! wxLuaObject * self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaObject); // call GetAllocationFlag int returns = (self->GetAllocationFlag()); *************** *** 70,76 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_GetObject[] = { &s_wxluatag_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_GetObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_GetObject[1] = {{ wxLua_wxLuaObject_GetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_GetObject }}; // %override wxLua_wxLuaObject_GetObject // void *GetObject() const --- 70,76 ---- } ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_GetObject[] = { &g_wxluatype_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_GetObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_GetObject[1] = {{ wxLua_wxLuaObject_GetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaObject_GetObject }}; // %override wxLua_wxLuaObject_GetObject // void *GetObject() const *************** *** 78,82 **** { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaObject); // call GetObject that push the item onto the stack, or nil if (self->GetObject()) --- 78,82 ---- { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaObject); // call GetObject that push the item onto the stack, or nil if (self->GetObject()) *************** *** 87,93 **** ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetObject[] = { &s_wxluatag_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_SetObject }}; // %override wxLua_wxLuaObject_SetObject // void SetObject(void *object) --- 87,93 ---- ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_SetObject[] = { &g_wxluatype_wxLuaObject, NULL }; static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxLuaObject_SetObject }}; // %override wxLua_wxLuaObject_SetObject // void SetObject(void *object) *************** *** 95,99 **** { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaObject); // call SetObject self->SetObject(1); --- 95,99 ---- { // get this ! wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxLuaObject); // call SetObject self->SetObject(1); *************** *** 103,111 **** ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_delete[] = { &s_wxluatag_wxLuaObject, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_delete }}; static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_constructor[1] = {{ wxLua_wxLuaObject_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxLuaObject_constructor // wxLuaObject(void *object) --- 103,111 ---- ! static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_delete[] = { &g_wxluatype_wxLuaObject, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLuaObject_delete }}; static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaObject_constructor[1] = {{ wxLua_wxLuaObject_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }}; // %override wxLua_wxLuaObject_constructor // wxLuaObject(void *object) *************** *** 120,124 **** wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxLuaObject, returns); // return the number of parameters return 1; --- 120,124 ---- wxluaO_addgcobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxLuaObject); // return the number of parameters return 1; Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.155 retrieving revision 1.156 diff -C2 -d -r1.155 -r1.156 *** wxlstate.cpp 20 Dec 2007 02:26:58 -0000 1.155 --- wxlstate.cpp 22 Dec 2007 06:07:16 -0000 1.156 *************** *** 25,29 **** //#include "wxluadebug/include/wxldebug.h" // for debugging only ! const char* wxlua_lreg_tags_key = "wxLua metatable class tags"; const char* wxlua_lreg_refs_key = "wxLua object references"; const char* wxlua_lreg_debug_refs_key = "wxLuaDebugData references"; --- 25,29 ---- //#include "wxluadebug/include/wxldebug.h" // for debugging only ! const char* wxlua_lreg_types_key = "wxLua metatable class types"; const char* wxlua_lreg_refs_key = "wxLua object references"; [...1264 lines suppressed...] *************** *** 3148,3155 **** } ! wxString wxLuaState::GetLuaTagName(int tag) const { wxCHECK_MSG(Ok(), wxEmptyString, wxT("Invalid wxLuaState")); ! return wxluaT_gettagname(M_WXLSTATEDATA->m_lua_State, tag); } --- 3133,3140 ---- } ! wxString wxLuaState::GetwxLuaTypeName(int wxl_type) const { wxCHECK_MSG(Ok(), wxEmptyString, wxT("Invalid wxLuaState")); ! return wxluaT_typename(M_WXLSTATEDATA->m_lua_State, wxl_type); } Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** wxlbind.cpp 20 Dec 2007 02:26:58 -0000 1.109 --- wxlbind.cpp 22 Dec 2007 06:07:15 -0000 1.110 *************** *** 25,299 **** WX_DEFINE_LIST(wxLuaBindingList); ! wxLuaArgTag s_wxluaargArray_None[1] = {0}; ! wxLuaBindDefine s_wxluadefineArray_None[1] = {{0, 0}}; ! ! int s_wxluaarg_None = WXLUA_TNONE; ! int s_wxluaarg_Nil = WXLUA_TNIL; ! int s_wxluaarg_Boolean = WXLUA_TBOOLEAN; ! int s_wxluaarg_LightUserData = WXLUA_TLIGHTUSERDATA; // raw data ! int s_wxluaarg_Number = WXLUA_TNUMBER; [...1930 lines suppressed...] sm_bindingList_initialized = true; } + + bool wxLuaBinding::SetBaseClass(wxLuaBindClass *wxlClass) + { + if (!wxlClass->baseclassName) // check if there is a baseclassName at all + return false; + + wxLuaBindClass* baseClass = m_classArray; // potential base class + for (size_t n = 0; n < m_classCount; ++n, ++baseClass) + { + if (strcmp(baseClass->name, wxlClass->baseclassName) == 0) + { + wxlClass->baseclass = baseClass; + return true; + } + } + + return false; + } Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** wxlcallb.cpp 15 Dec 2007 16:56:41 -0000 1.52 --- wxlcallb.cpp 22 Dec 2007 06:07:15 -0000 1.53 *************** *** 116,125 **** wxLuaState wxlState(m_wxlState); ! int event_tag = 0; // If !m_wxlBindEvent, we would have errored in the constructor, but... if (m_wxlBindEvent != NULL) { ! event_tag = *m_wxlBindEvent->class_tag; // These wxEventTypes can be wxScrollEvents or wxSpinEvents --- 116,125 ---- wxLuaState wxlState(m_wxlState); ! int event_wxl_type = 0; // If !m_wxlBindEvent, we would have errored in the constructor, but... if (m_wxlBindEvent != NULL) { ! event_wxl_type = *m_wxlBindEvent->wxluatype; // These wxEventTypes can be wxScrollEvents or wxSpinEvents *************** *** 131,144 **** const wxLuaBindClass *wxlClass = wxlState.GetBindClass("wxSpinEvent"); if (wxlClass != NULL) ! event_tag = *wxlClass->class_tag; else ! event_tag = g_wxluatag_wxEvent; // get the s_wxluatag_wxEvent } } else ! event_tag = g_wxluatag_wxEvent; // get the s_wxluatag_wxEvent // Should never get here, but error out in case we do ! wxCHECK_RET(event_tag != WXLUA_NOTAG, wxT("Unknown wxEvent wxLua tag for : ") + wxString(event->GetClassInfo()->GetClassName())); wxlState.lua_CheckStack(LUA_MINSTACK); --- 131,144 ---- const wxLuaBindClass *wxlClass = wxlState.GetBindClass("wxSpinEvent"); if (wxlClass != NULL) ! event_wxl_type = *wxlClass->wxluatype; else ! event_wxl_type = g_wxluatag_wxEvent; // get the s_wxluatag_wxEvent } } else ! event_wxl_type = g_wxluatag_wxEvent; // get the s_wxluatag_wxEvent // Should never get here, but error out in case we do ! wxCHECK_RET(event_wxl_type != WXLUA_TUNKNOWN, wxT("Unknown wxEvent wxLua tag for : ") + wxString(event->GetClassInfo()->GetClassName())); wxlState.lua_CheckStack(LUA_MINSTACK); *************** *** 152,156 **** // Tracking this causes clashes in the object registry table // since many can be created and deleted and the mem address is resused by C++. ! wxlState.wxluaT_PushUserTag(event, event_tag, false); wxlState.LuaPCall(1, 0); } --- 152,156 ---- // Tracking this causes clashes in the object registry table // since many can be created and deleted and the mem address is resused by C++. ! wxlState.wxluaT_PushUserDataType(event, event_wxl_type, false); wxlState.LuaPCall(1, 0); } Index: wxlua_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxlua_bind.cpp 20 Dec 2007 02:26:58 -0000 1.18 --- wxlua_bind.cpp 22 Dec 2007 06:07:16 -0000 1.19 *************** *** 45,51 **** // --------------------------------------------------------------------------- ! wxLuaBindDefine* wxLuaGetDefineList_wxlua(size_t &count) { ! static wxLuaBindDefine defineList[] = { { "LUA_TBOOLEAN", LUA_TBOOLEAN }, --- 45,51 ---- // --------------------------------------------------------------------------- ! wxLuaBindNumber* wxLuaGetDefineList_wxlua(size_t &count) { ! static wxLuaBindNumber numberList[] = { { "LUA_TBOOLEAN", LUA_TBOOLEAN }, *************** *** 60,68 **** { "LUA_TUSERDATA", LUA_TUSERDATA }, { "WXLUAMETHOD_CFUNCTION", WXLUAMETHOD_CFUNCTION }, { "WXLUAMETHOD_CONSTRUCTOR", WXLUAMETHOD_CONSTRUCTOR }, { "WXLUAMETHOD_DELETE", WXLUAMETHOD_DELETE }, { "WXLUAMETHOD_GETPROP", WXLUAMETHOD_GETPROP }, { "WXLUAMETHOD_METHOD", WXLUAMETHOD_METHOD }, - { "WXLUAMETHOD_OVERLOAD_BASE", WXLUAMETHOD_OVERLOAD_BASE }, { "WXLUAMETHOD_SETPROP", WXLUAMETHOD_SETPROP }, { "WXLUAMETHOD_STATIC", WXLUAMETHOD_STATIC }, --- 60,68 ---- { "LUA_TUSERDATA", LUA_TUSERDATA }, { "WXLUAMETHOD_CFUNCTION", WXLUAMETHOD_CFUNCTION }, + { "WXLUAMETHOD_CHECKED_OVERLOAD", WXLUAMETHOD_CHECKED_OVERLOAD }, { "WXLUAMETHOD_CONSTRUCTOR", WXLUAMETHOD_CONSTRUCTOR }, { "WXLUAMETHOD_DELETE", WXLUAMETHOD_DELETE }, { "WXLUAMETHOD_GETPROP", WXLUAMETHOD_GETPROP }, { "WXLUAMETHOD_METHOD", WXLUAMETHOD_METHOD }, { "WXLUAMETHOD_SETPROP", WXLUAMETHOD_SETPROP }, { "WXLUAMETHOD_STATIC", WXLUAMETHOD_STATIC }, *************** *** 91,96 **** { 0, 0 }, }; ! count = sizeof(defineList)/sizeof(wxLuaBindDefine) - 1; ! return defineList; } --- 91,96 ---- { 0, 0 }, }; ! count = sizeof(numberList)/sizeof(wxLuaBindNumber) - 1; ! return numberList; } *************** *** 131,135 **** // --------------------------------------------------------------------------- ! static wxLuaArgTag s_wxluatagArray_wxLua_function_CompileLuaScript[] = { &s_wxluaarg_String, &s_wxluaarg_String, NULL }; // %override wxLua_function_CompileLuaScript // %function int CompileLuaScript(const wxString& luaScript, const wxString& fileName) --- 131,135 ---- // --------------------------------------------------------------------------- ! static wxLuaArgType s_wxluatypeArray_wxLua_function_CompileLuaScript[] = { &g_wxluatype_TSTRING, &g_wxluatype_TSTRING, NULL }; // %override wxLua_function_CompileLuaScript // %function int CompileLuaScript(const wxString& luaScript, const wxString& fileName) *************** *** 152,156 **** } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_CompileLuaScript[1] = {{ wxLua_function_CompileLuaScript, WXLUAMETHOD_CFUNCTION, 2, 2, s_wxluatagArray_wxLua_function_CompileLuaScript }}; // %override wxLua_function_GetBindings --- 152,156 ---- } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_CompileLuaScript[1] = {{ wxLua_function_CompileLuaScript, WXLUAMETHOD_CFUNCTION, 2, 2, s_wxluatypeArray_wxLua_function_CompileLuaScript }}; // %override wxLua_function_GetBindings *************** *** 208,219 **** const char* idx_str = lua_tostring(L, 2); ! if (strcmp(idx_str, "func") == 0) { ! lua_pushcfunction(L, wxlCFunc->func); return 1; } ! else if (strcmp(idx_str, "type") == 0) { ! lua_pushnumber(L, wxlCFunc->type); return 1; } --- 208,219 ---- const char* idx_str = lua_tostring(L, 2); ! if (strcmp(idx_str, "lua_cfunc") == 0) { ! lua_pushcfunction(L, wxlCFunc->lua_cfunc); return 1; } ! else if (strcmp(idx_str, "method_type") == 0) { ! lua_pushnumber(L, wxlCFunc->method_type); return 1; } *************** *** 228,240 **** return 1; } ! else if (strcmp(idx_str, "argtags") == 0) { size_t idx, count = wxlCFunc->maxargs; lua_createtable(L, count, 0); ! // check for terminating null argtag ! for (idx = 0; (idx < count) && wxlCFunc->argtags[idx]; ++idx) { ! lua_pushnumber(L, *wxlCFunc->argtags[idx]); lua_rawseti(L, -2, idx + 1); } --- 228,240 ---- return 1; } ! else if (strcmp(idx_str, "argtypes") == 0) { size_t idx, count = wxlCFunc->maxargs; lua_createtable(L, count, 0); ! // check for terminating null in argtypes ! for (idx = 0; (idx < count) && wxlCFunc->argtypes[idx]; ++idx) { ! lua_pushnumber(L, *wxlCFunc->argtypes[idx]); lua_rawseti(L, -2, idx + 1); } *************** *** 294,306 **** return 1; } ! else if (strcmp(idx_str, "type") == 0) { ! lua_pushnumber(L, wxlMethod->type); return 1; } ! else if (strcmp(idx_str, "funcs") == 0) { ! wxLuaBindCFunc* wxlCFunc = wxlMethod->funcs; ! size_t idx, count = wxlMethod->funcs_n; lua_createtable(L, count, 0); --- 294,306 ---- return 1; } ! else if (strcmp(idx_str, "method_type") == 0) { ! lua_pushnumber(L, wxlMethod->method_type); return 1; } ! else if (strcmp(idx_str, "wxluacfuncs") == 0) { ! wxLuaBindCFunc* wxlCFunc = wxlMethod->wxluacfuncs; ! size_t idx, count = wxlMethod->wxluacfuncs_n; lua_createtable(L, count, 0); *************** *** 321,327 **** return 1; } ! else if (strcmp(idx_str, "funcs_n") == 0) { ! lua_pushnumber(L, wxlMethod->funcs_n); return 1; } --- 321,327 ---- return 1; } ! else if (strcmp(idx_str, "wxluacfuncs_n") == 0) { ! lua_pushnumber(L, wxlMethod->wxluacfuncs_n); return 1; } *************** *** 396,412 **** return 1; } ! else if (strcmp(idx_str, "methods") == 0) { ! if (wxlClass->methods_n > 0) { ! wxLuaBindMethod* wxlMethod = wxlClass->methods; ! size_t idx, count = wxlClass->methods_n; lua_createtable(L, count, 0); for (idx = 0; idx < count; ++idx, ++wxlMethod) { - // Force the baseclass methods to be found - //wxLuaBinding::GetClassMethod(wxlClass, wxlMethod->name, true); FIXME - // Create table { wxLuaBindClass userdata } const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *)); --- 396,409 ---- return 1; } ! else if (strcmp(idx_str, "wxluamethods") == 0) { ! if (wxlClass->wxluamethods_n > 0) { ! wxLuaBindMethod* wxlMethod = wxlClass->wxluamethods; ! size_t idx, count = wxlClass->wxluamethods_n; lua_createtable(L, count, 0); for (idx = 0; idx < count; ++idx, ++wxlMethod) { // Create table { wxLuaBindClass userdata } const void **ptr = (const void **)lua_newuserdata(L, sizeof(void *)); *************** *** 431,437 **** return 0; } ! else if (strcmp(idx_str, "methods_n") == 0) { ! lua_pushnumber(L, wxlClass->methods_n); return 1; } --- 428,434 ---- return 0; } ! else if (strcmp(idx_str, "wxluamethods_n") == 0) { ! lua_pushnumber(L, wxlClass->wxluamethods_n); return 1; } *************** *** 443,447 **** if (classInfoClass) { ! wxluaT_pushuserdatatype(L, *classInfoClass->class_tag, wxlClass->classInfo); return 1; } --- 440,444 ---- if (classInfoClass) { ! wxluaT_pushuserdatatype(L, wxlClass->classInfo, *classInfoClass->wxluatype); return 1; } *************** *** 450,456 **** return 0; } ! else if (strcmp(idx_str, "class_tag") == 0) { ! lua_pushnumber(L, *wxlClass->class_tag); return 1; } --- 447,453 ---- return 0; } ! else if (strcmp(idx_str, "wxluatype") == 0) { ! lua_pushnumber(L, *wxlClass->wxluatype); return 1; } *************** *** 482,498 **** if (wxlClass->enums_n > 0) { ! wxLuaBindDefine* wxlDefine = wxlClass->enums; size_t idx, count = wxlClass->enums_n; lua_createtable(L, count, 0); ! for (idx = 0; idx < count; ++idx, ++wxlDefine) { // Create table { name, value } lua_createtable(L, 0, 2); lua_pushstring(L, "name"); ! lua_pushstring(L, wxlDefine->name); lua_rawset(L, -3); lua_pushstring(L, "value"); ! lua_pushnumber(L, wxlDefine->value); lua_rawset(L, -3); --- 479,495 ---- if (wxlClass->enums_n > 0) { ! wxLuaBindNumber* wxlNumber = wxlClass->enums; size_t idx, count = wxlClass->enums_n; lua_createtable(L, count, 0); ! for (idx = 0; idx < count; ++idx, ++wxlNumber) { // Create table { name, value } lua_createtable(L, 0, 2); lua_pushstring(L, "name"); ! lua_pushstring(L, wxlNumber->name); lua_rawset(L, -3); lua_pushstring(L, "value"); ! lua_pushnumber(L, wxlNumber->value); lua_rawset(L, -3); *************** *** 549,555 **** return 1; } ! else if (strcmp(idx_str, "GetDefineCount") == 0) { ! lua_pushnumber(L, wxlBinding->GetDefineCount()); return 1; } --- 546,552 ---- return 1; } ! else if (strcmp(idx_str, "GetNumberCount") == 0) { ! lua_pushnumber(L, wxlBinding->GetNumberCount()); return 1; } *************** *** 620,638 **** return 1; } ! else if (strcmp(idx_str, "GetDefineArray") == 0) { ! wxLuaBindDefine* wxlDefine = wxlBinding->GetDefineArray(); ! size_t idx, count = wxlBinding->GetDefineCount(); lua_createtable(L, count, 0); ! for (idx = 0; idx < count; ++idx, ++wxlDefine) { // Create table { name, value } lua_createtable(L, 0, 2); lua_pushstring(L, "name"); ! lua_pushstring(L, wxlDefine->name); lua_rawset(L, -3); lua_pushstring(L, "value"); ! lua_pushnumber(L, wxlDefine->value); lua_rawset(L, -3); --- 617,635 ---- return 1; } ! else if (strcmp(idx_str, "GetNumberArray") == 0) { ! wxLuaBindNumber* wxlNumber = wxlBinding->GetNumberArray(); ! size_t idx, count = wxlBinding->GetNumberCount(); lua_createtable(L, count, 0); ! for (idx = 0; idx < count; ++idx, ++wxlNumber) { // Create table { name, value } lua_createtable(L, 0, 2); lua_pushstring(L, "name"); ! lua_pushstring(L, wxlNumber->name); lua_rawset(L, -3); lua_pushstring(L, "value"); ! lua_pushnumber(L, wxlNumber->value); lua_rawset(L, -3); *************** *** 672,676 **** for (idx = 0; idx < count; ++idx, ++wxlEvent) { ! // Create table { name, eventType, class_tag } lua_createtable(L, 0, 3); lua_pushstring(L, "name"); --- 669,673 ---- for (idx = 0; idx < count; ++idx, ++wxlEvent) { ! // Create table { name, eventType, wxluatype } lua_createtable(L, 0, 3); lua_pushstring(L, "name"); *************** *** 680,685 **** lua_pushnumber(L, *wxlEvent->eventType); lua_rawset(L, -3); ! lua_pushstring(L, "class_tag"); ! lua_pushnumber(L, *wxlEvent->class_tag); lua_rawset(L, -3); --- 677,682 ---- lua_pushnumber(L, *wxlEvent->eventType); lua_rawset(L, -3); ! lua_pushstring(L, "wxluatype"); ! lua_pushnumber(L, *wxlEvent->wxluatype); lua_rawset(L, -3); *************** *** 697,701 **** for (idx = 0; idx < count; ++idx, ++wxlObject) { ! // Create table { name, object, class_tag } lua_createtable(L, 0, 3); lua_pushstring(L, "name"); --- 694,698 ---- for (idx = 0; idx < count; ++idx, ++wxlObject) { ! // Create table { name, object, wxluatype } lua_createtable(L, 0, 3); lua_pushstring(L, "name"); *************** *** 705,715 **** lua_pushstring(L, "object"); if (wxlObject->objPtr != 0) ! wxluaT_pushusertag(L, wxlObject->objPtr, *wxlObject->class_tag, false); else ! wxluaT_pushusertag(L, *wxlObject->pObjPtr, *wxlObject->class_tag, false); lua_rawset(L, -3); ! lua_pushstring(L, "class_tag"); ! lua_pushnumber(L, *wxlObject->class_tag); lua_rawset(L, -3); --- 702,712 ---- lua_pushstring(L, "object"); if (wxlObject->objPtr != 0) ! wxluaT_pushuserdatatype(L, wxlObject->objPtr, *wxlObject->wxluatype, false); else ! wxluaT_pushuserdatatype(L, *wxlObject->pObjPtr, *wxlObject->wxluatype, false); lua_rawset(L, -3); ! lua_pushstring(L, "wxluatype"); ! lua_pushnumber(L, *wxlObject->wxluatype); lua_rawset(L, -3); *************** *** 725,729 **** ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetBindings[1] = {{ wxLua_function_GetBindings, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; // %override wxLua_function_GetGCUserdataInfo --- 722,726 ---- ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetBindings[1] = {{ wxLua_function_GetBindings, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }}; // %override wxLua_function_GetGCUserdataInfo *************** *** 735,739 **** } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetGCUserdataInfo[1] = {{ wxLua_function_GetGCUserdataInfo, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; // %override wxLua_function_GetTrackedEventCallbackInfo --- 732,736 ---- } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetGCUserdataInfo[1] = {{ wxLua_function_GetGCUserdataInfo, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }}; // %override wxLua_function_GetTrackedEventCallbackInfo *************** *** 746,750 **** } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedEventCallbackInfo[1] = {{ wxLua_function_GetTrackedEventCallbackInfo, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; // %override wxLua_function_GetTrackedWinDestroyCallbackInfo --- 743,747 ---- } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedEventCallbackInfo[1] = {{ wxLua_function_GetTrackedEventCallbackInfo, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }}; // %override wxLua_function_GetTrackedWinDestroyCallbackInfo *************** *** 757,761 **** } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedWinDestroyCallbackInfo[1] = {{ wxLua_function_GetTrackedWinDestroyCallbackInfo, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; // %override wxLua_function_GetTrackedWindowInfo --- 754,758 ---- } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedWinDestroyCallbackInfo[1] = {{ wxLua_function_GetTrackedWinDestroyCallbackInfo, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }}; // %override wxLua_function_GetTrackedWindowInfo *************** *** 767,773 **** } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedWindowInfo[1] = {{ wxLua_function_GetTrackedWindowInfo, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; ! static wxLuaArgTag s_wxluatagArray_wxLua_function_iswxluatype[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; // %rename iswxluatype %function int wxlua_iswxluatype(int luatype, int wxluaarg_tag) static int LUACALL wxLua_function_iswxluatype(lua_State *L) --- 764,770 ---- } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetTrackedWindowInfo[1] = {{ wxLua_function_GetTrackedWindowInfo, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_iswxluatype[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; // %rename iswxluatype %function int wxlua_iswxluatype(int luatype, int wxluaarg_tag) static int LUACALL wxLua_function_iswxluatype(lua_State *L) *************** *** 784,790 **** return 1; } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_iswxluatype[1] = {{ wxLua_function_iswxluatype, WXLUAMETHOD_CFUNCTION, 2, 2, s_wxluatagArray_wxLua_function_iswxluatype }}; ! static wxLuaArgTag s_wxluatagArray_wxLua_function_type[] = { &s_wxluaarg_LightUserData, NULL }; // %override wxLua_function_type // %function int type(int wxluaarg_tag) --- 781,787 ---- return 1; } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_iswxluatype[1] = {{ wxLua_function_iswxluatype, WXLUAMETHOD_CFUNCTION, 2, 2, s_wxluatypeArray_wxLua_function_iswxluatype }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_type[] = { &g_wxluatype_TLIGHTUSERDATA, NULL }; // %override wxLua_function_type // %function int type(int wxluaarg_tag) *************** *** 794,812 **** const char* ltypename = lua_typename(L, ltype); ! int wxluaarg_tag = WXLUA_NOTAG; ! ! // this may a wxLua data ! if (ltype == LUA_TUSERDATA) ! wxluaarg_tag = wxluaT_gettag(L, 1); ! ! // I guess it wasn't or isn't a userdata ! if (wxluaarg_tag == WXLUA_NOTAG) ! wxluaarg_tag = wxlua_getwxluatype(ltype); ! ! wxString tagName = wxluaT_gettagname(L, wxluaarg_tag); //wxlua_getwxluatypename(wxluaarg_tag); // push the results ! lua_pushstring(L, wx2lua(tagName)); ! lua_pushnumber(L, wxluaarg_tag); lua_pushstring(L, ltypename); --- 791,800 ---- const char* ltypename = lua_typename(L, ltype); ! int wxl_type = wxluaT_type(L, 1); ! wxString wxltypeName = wxluaT_typename(L, wxl_type); // push the results ! lua_pushstring(L, wx2lua(wxltypeName)); ! lua_pushnumber(L, wxl_type); lua_pushstring(L, ltypename); *************** *** 816,831 **** } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_type[1] = {{ wxLua_function_type, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatagArray_wxLua_function_type }}; ! static wxLuaArgTag s_wxluatagArray_wxLua_function_typename[] = { &s_wxluaarg_Number, NULL }; // %override wxLua_function_typename // %function wxString typename(int wxluaarg_tag) static int LUACALL wxLua_function_typename(lua_State *L) { - wxString returns; // int wxluaarg_tag ! int wxluaarg_tag = (int)wxlua_getnumbertype(L, 1); // call wxlua_getwxluatypename ! returns = wxluaT_gettagname(L, wxluaarg_tag); //wxlua_getwxluatypename(wxluaarg_tag); // push the result string wxlua_pushwxString(L, returns); --- 804,818 ---- } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_type[1] = {{ wxLua_function_type, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatypeArray_wxLua_function_type }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_typename[] = { &g_wxluatype_TNUMBER, NULL }; // %override wxLua_function_typename // %function wxString typename(int wxluaarg_tag) static int LUACALL wxLua_function_typename(lua_State *L) { // int wxluaarg_tag ! int wxl_type = (int)wxlua_getnumbertype(L, 1); // call wxlua_getwxluatypename ! wxString returns = wxluaT_typename(L, wxl_type); // push the result string wxlua_pushwxString(L, returns); *************** *** 834,840 **** } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_typename[1] = {{ wxLua_function_typename, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatagArray_wxLua_function_typename }}; ! static wxLuaArgTag s_wxluatagArray_wxLua_function_wxLUA_CHECK_VERSION[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; // %function bool wxLUA_CHECK_VERSION(int major, int minor, int release) // actually a define static int LUACALL wxLua_function_wxLUA_CHECK_VERSION(lua_State *L) --- 821,827 ---- } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_typename[1] = {{ wxLua_function_typename, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatypeArray_wxLua_function_typename }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxLUA_CHECK_VERSION[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; // %function bool wxLUA_CHECK_VERSION(int major, int minor, int release) // actually a define static int LUACALL wxLua_function_wxLUA_CHECK_VERSION(lua_State *L) *************** *** 853,859 **** return 1; } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxLUA_CHECK_VERSION[1] = {{ wxLua_function_wxLUA_CHECK_VERSION, WXLUAMETHOD_CFUNCTION, 3, 3, s_wxluatagArray_wxLua_function_wxLUA_CHECK_VERSION }}; ! static wxLuaArgTag s_wxluatagArray_wxLua_function_wxLUA_CHECK_VERSION_FULL[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; // %function bool wxLUA_CHECK_VERSION_FULL(int major, int minor, int release, int subrel) // actually a define static int LUACALL wxLua_function_wxLUA_CHECK_VERSION_FULL(lua_State *L) --- 840,846 ---- return 1; } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxLUA_CHECK_VERSION[1] = {{ wxLua_function_wxLUA_CHECK_VERSION, WXLUAMETHOD_CFUNCTION, 3, 3, s_wxluatypeArray_wxLua_function_wxLUA_CHECK_VERSION }}; ! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxLUA_CHECK_VERSION_FULL[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL }; // %function bool wxLUA_CHECK_VERSION_FULL(int major, int minor, int release, int subrel) // actually a define static int LUACALL wxLua_function_wxLUA_CHECK_VERSION_FULL(lua_State *L) *************** *** 874,878 **** return 1; } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxLUA_CHECK_VERSION_FULL[1] = {{ wxLua_function_wxLUA_CHECK_VERSION_FULL, WXLUAMETHOD_CFUNCTION, 4, 4, s_wxluatagArray_wxLua_function_wxLUA_CHECK_VERSION_FULL }}; // --------------------------------------------------------------------------- --- 861,865 ---- return 1; } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxLUA_CHECK_VERSION_FULL[1] = {{ wxLua_function_wxLUA_CHECK_VERSION_FULL, WXLUAMETHOD_CFUNCTION, 4, 4, s_wxluatypeArray_wxLua_function_wxLUA_CHECK_VERSION_FULL }}; // --------------------------------------------------------------------------- *************** *** 912,917 **** static wxLuaBindClass classList[] = { ! { "wxLuaObject", wxLuaObject_methods, wxLuaObject_methodCount, CLASSINFO(wxLuaObject), &s_wxluatag_wxLuaObject, "wxObject", NULL ,s_wxluadefineArray_None, 0, }, ! { "wxLuaState", wxLuaState_methods, wxLuaState_methodCount, CLASSINFO(wxLuaState), &s_wxluatag_wxLuaState, "wxObject", NULL ,s_wxluadefineArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, --- 899,904 ---- static wxLuaBindClass classList[] = { ! { "wxLuaObject", wxLuaObject_methods, wxLuaObject_methodCount, CLASSINFO(wxLuaObject), &g_wxluatype_wxLuaObject, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, ! { "wxLuaState", wxLuaState_methods, wxLuaState_methodCount, CLASSINFO(wxLuaState), &g_wxluatype_wxLuaState, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, { 0, 0, 0, 0, 0, 0, 0 }, *************** *** 933,937 **** m_nameSpace = wxT("wxlua"); m_classArray = wxLuaGetClassList_wxlua(m_classCount); ! m_defineArray = wxLuaGetDefineList_wxlua(m_defineCount); m_stringArray = wxLuaGetStringList_wxlua(m_stringCount); m_eventArray = wxLuaGetEventList_wxlua(m_eventCount); --- 920,924 ---- m_nameSpace = wxT("wxlua"); m_classArray = wxLuaGetClassList_wxlua(m_classCount); ! m_numberArray = wxLuaGetDefineList_wxlua(m_numberCount); m_stringArray = wxLuaGetStringList_wxlua(m_stringCount); m_eventArray = wxLuaGetEventList_wxlua(m_eventCount); |
|
From: John L. <jr...@us...> - 2007-12-22 06:07:22
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/modules/wxluasocket/include Modified Files: wxluasocket_bind.h Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wxluasocket_bind.h 20 Dec 2007 02:26:58 -0000 1.30 --- wxluasocket_bind.h 22 Dec 2007 06:07:16 -0000 1.31 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 21 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 21 // --------------------------------------------------------------------------- *************** *** 62,66 **** extern wxLuaBindClass *wxLuaGetClassList_wxluasocket(size_t &count); ! extern wxLuaBindDefine *wxLuaGetDefineList_wxluasocket(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxluasocket(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxluasocket(size_t &count); --- 62,66 ---- extern wxLuaBindClass *wxLuaGetClassList_wxluasocket(size_t &count); ! extern wxLuaBindNumber *wxLuaGetDefineList_wxluasocket(size_t &count); extern wxLuaBindString *wxLuaGetStringList_wxluasocket(size_t &count); extern wxLuaBindEvent *wxLuaGetEventList_wxluasocket(size_t &count); *************** *** 72,79 **** // --------------------------------------------------------------------------- ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerEvent; extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindMethod wxLuaDebuggerEvent_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerServer; extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindMethod wxLuaDebuggerServer_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount; --- 72,79 ---- // --------------------------------------------------------------------------- ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) g_wxluatype_wxLuaDebuggerEvent; extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindMethod wxLuaDebuggerEvent_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) g_wxluatype_wxLuaDebuggerServer; extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindMethod wxLuaDebuggerServer_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount; |
|
From: John L. <jr...@us...> - 2007-12-22 06:07:22
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/modules/wxluadebug/src Modified Files: wxldebug.cpp Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxldebug.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** wxldebug.cpp 20 Dec 2007 02:26:58 -0000 1.61 --- wxldebug.cpp 22 Dec 2007 06:07:16 -0000 1.62 *************** *** 160,164 **** if (ret == 0) ! ret = int(elem2->GetFlagBit(WXLUA_DEBUGITEM_KEY_REF)) - int(elem1->GetFlagBit(WXLUA_DEBUGITEM_KEY_REF)); } --- 160,164 ---- if (ret == 0) ! ret = int(elem2->GetFlagBit(WXLUA_DEBUGITEM_KEY_REF)) - int(elem1->GetFlagBit(WXLUA_DEBUGITEM_KEY_REF)); } *************** *** 261,269 **** { wxCHECK_MSG(wxlClass, wxEmptyString, wxT("Invalid wxLuaBindClass")); ! return wxString::Format(wxT(" (%s, tag=%d, classinfo=%s, baseclass=%s, methods=%d, enums=%d)"), ! lua2wx(wxlClass->name).c_str(), *wxlClass->class_tag, wxString(wxlClass->classInfo ? wxlClass->classInfo->GetClassName() : wxEmptyString).c_str(), lua2wx(wxlClass->baseclassName).c_str(), ! wxlClass->methods_n, wxlClass->enums_n); } --- 261,269 ---- { wxCHECK_MSG(wxlClass, wxEmptyString, wxT("Invalid wxLuaBindClass")); ! return wxString::Format(wxT(" (%s, wxluatype=%d, classinfo=%s, baseclass=%s, methods=%d, enums=%d)"), ! lua2wx(wxlClass->name).c_str(), *wxlClass->wxluatype, wxString(wxlClass->classInfo ? wxlClass->classInfo->GetClassName() : wxEmptyString).c_str(), lua2wx(wxlClass->baseclassName).c_str(), ! wxlClass->wxluamethods_n, wxlClass->enums_n); } *************** *** 358,364 **** if (lightuserdata_reg_key != NULL) { ! if (lightuserdata_reg_key == &wxlua_lreg_tags_key) { ! value += wxT(" (") + wxluaT_gettagname(L, (int)lua_tonumber(L, -2)) + wxT(")"); } else if (lightuserdata_reg_key == &wxlua_lreg_classes_key) --- 358,364 ---- if (lightuserdata_reg_key != NULL) { ! if (lightuserdata_reg_key == &wxlua_lreg_types_key) { ! value += wxT(" (") + wxluaT_typename(L, (int)lua_tonumber(L, -2)) + wxT(")"); } else if (lightuserdata_reg_key == &wxlua_lreg_classes_key) *************** *** 404,410 **** void* key = lua_touserdata(L, -2); ! if (key == &wxlua_metatable_tag_key) { ! value += wxT(" (") + wxluaT_gettagname(L, (int)lua_tonumber(L, -1)) + wxT(")"); } else if (key == &wxlua_metatable_wxluabindclass_key) --- 404,410 ---- void* key = lua_touserdata(L, -2); ! if (key == &wxlua_metatable_type_key) { ! value += wxT(" (") + wxluaT_typename(L, (int)lua_tonumber(L, -1)) + wxT(")"); } else if (key == &wxlua_metatable_wxluabindclass_key) *************** *** 434,438 **** // only add the key if we refed it so it can be viewed in the stack dialog ! if (key_flag_type != 0) { Add(new wxLuaDebugItem(name, wxl_keytype, value, wxl_valuetype, wxT(""), key_ref, nIndex, key_flag_type)); --- 434,438 ---- // only add the key if we refed it so it can be viewed in the stack dialog ! if (key_flag_type != 0) { Add(new wxLuaDebugItem(name, wxl_keytype, value, wxl_valuetype, wxT(""), key_ref, nIndex, key_flag_type)); *************** *** 501,505 **** lua_State* L = wxlState.GetLuaState(); int l_type = lua_type(L, stack_idx); ! int wxl_type = wxlua_getwxluatype(l_type); if (wxl_type_) *wxl_type_ = wxl_type; --- 501,505 ---- lua_State* L = wxlState.GetLuaState(); int l_type = lua_type(L, stack_idx); ! int wxl_type = wxlua_luatowxluatype(l_type); if (wxl_type_) *wxl_type_ = wxl_type; *************** *** 582,588 **** lua_State* L = wxlState.GetLuaState(); ! int nTag = wxluaT_gettag(L, stack_idx); ! int nItems = luaL_getn(L, stack_idx); ! const void *pItem = lua_topointer(L, stack_idx); wxString s(wxString::Format(wxT("%p"), pItem)); --- 582,588 ---- lua_State* L = wxlState.GetLuaState(); ! int wxl_type = wxluaT_type(L, stack_idx); ! int nItems = luaL_getn(L, stack_idx); ! const void *pItem = lua_topointer(L, stack_idx); wxString s(wxString::Format(wxT("%p"), pItem)); *************** *** 591,596 **** s += wxString::Format(wxT(" (approx %d items)"), nItems); ! if (nTag != WXLUA_NOTAG) ! s += wxString::Format(wxT(" (tag %d)"), nTag); return s; --- 591,596 ---- s += wxString::Format(wxT(" (approx %d items)"), nItems); ! if (wxlua_iswxuserdatatype(wxl_type)) ! s += wxString::Format(wxT(" (wxltype %d)"), wxl_type); return s; *************** *** 609,613 **** { // Convert our known keys to something more readable ! if ((udata == &wxlua_lreg_tags_key) || (udata == &wxlua_lreg_refs_key) || (udata == &wxlua_lreg_debug_refs_key) || --- 609,613 ---- { // Convert our known keys to something more readable ! if ((udata == &wxlua_lreg_types_key) || (udata == &wxlua_lreg_refs_key) || (udata == &wxlua_lreg_debug_refs_key) || *************** *** 624,628 **** (udata == &wxlua_lreg_regtable_key) || ! (udata == &wxlua_metatable_tag_key) || (udata == &wxlua_lreg_topwindows_key) || (udata == &wxlua_metatable_wxluabindclass_key)) --- 624,628 ---- (udata == &wxlua_lreg_regtable_key) || ! (udata == &wxlua_metatable_type_key) || (udata == &wxlua_lreg_topwindows_key) || (udata == &wxlua_metatable_wxluabindclass_key)) *************** *** 634,646 **** else // is full userdata { ! int nTag = wxluaT_gettag(L, stack_idx); ! if (nTag != WXLUA_NOTAG) { ! s += wxString::Format(wxT(" (tag %d)"), nTag); ! wxString tagName(wxlState.GetLuaTagName(nTag)); ! if (!tagName.IsEmpty()) ! s += wxString::Format(wxT(" '%s'"), tagName.c_str()); } } --- 634,646 ---- else // is full userdata { ! int wxl_type = wxluaT_type(L, stack_idx); ! if (wxlua_iswxuserdatatype(wxl_type)) { ! s += wxString::Format(wxT(" (wxltype %d)"), wxl_type); ! wxString wxltypeName(wxluaT_typename(L, wxl_type)); ! if (!wxltypeName.IsEmpty()) ! s += wxString::Format(wxT(" '%s'"), wxltypeName.c_str()); } } *************** *** 702,706 **** str.Printf(wxT(" idx %d: l_type = %d, wxl_type = %d : '%s'='%s'\n"), ! i, l_type, wxl_type, wxlua_getwxluatypename(wxl_type).c_str(), value.c_str()); retStr += str; OutputMsg(str); --- 702,706 ---- str.Printf(wxT(" idx %d: l_type = %d, wxl_type = %d : '%s'='%s'\n"), ! i, l_type, wxl_type, wxluaT_typename(L, wxl_type).c_str(), value.c_str()); retStr += str; OutputMsg(str); *************** *** 814,818 **** wxString info = wxString::Format(wxT("%s%-32s\t%-16s\t%-20s\t%-16s\n"), ! indentStr.c_str(), key.c_str(), wxlua_getwxluatypename(keyType).c_str(), value.c_str(), wxlua_getwxluatypename(valueType).c_str()); s += info; OutputMsg(info); --- 814,818 ---- wxString info = wxString::Format(wxT("%s%-32s\t%-16s\t%-20s\t%-16s\n"), ! indentStr.c_str(), key.c_str(), wxluaT_typename(L, keyType).c_str(), value.c_str(), wxluaT_typename(L, valueType).c_str()); s += info; OutputMsg(info); |
|
From: John L. <jr...@us...> - 2007-12-22 06:07:21
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxlcallb.h wxldefs.h wxlstate.h wxlua_bind.h Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxlcallb.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxlcallb.h 15 Dec 2007 16:56:41 -0000 1.25 --- wxlcallb.h 22 Dec 2007 06:07:15 -0000 1.26 *************** *** 68,72 **** protected: int m_routine; // ref to the Lua routine to call in the wxlua_lreg_refs_key registry table ! wxLuaState m_wxlState; // store it since we're added to a list of it's callbacks. wxEvtHandler* m_evtHandler; wxWindowID m_id; --- 68,72 ---- protected: int m_routine; // ref to the Lua routine to call in the wxlua_lreg_refs_key registry table ! wxLuaState m_wxlState; // store it since we're added to a list of its callbacks. wxEvtHandler* m_evtHandler; wxWindowID m_id; *************** *** 116,120 **** protected: ! wxLuaState m_wxlState; // store it since we're added to a list of it's callbacks. wxWindow* m_window; --- 116,120 ---- protected: ! wxLuaState m_wxlState; // store it since we're added to a list of its callbacks. wxWindow* m_window; Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wxldefs.h 20 Dec 2007 02:26:57 -0000 1.39 --- wxldefs.h 22 Dec 2007 06:07:15 -0000 1.40 *************** *** 67,71 **** //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 20 // ---------------------------------------------------------------------------- --- 67,71 ---- //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 21 // ---------------------------------------------------------------------------- *************** *** 112,117 **** // ---------------------------------------------------------------------------- - #define WXLUA_NOTAG 0 // an invalid tag, all tags are initialized to 0 - // initializes a lua_debug by nulling everything before use since the // functions that take it do not initialize it properly --- 112,115 ---- Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** wxlbind.h 20 Dec 2007 02:26:57 -0000 1.74 --- wxlbind.h 22 Dec 2007 06:07:15 -0000 1.75 *************** *** 20,53 **** // ---------------------------------------------------------------------------- ! // C functions for the metatable for wxLua userdata installed by the wxLuaBinding ! // ---------------------------------------------------------------------------- ! ! // Generic delete function for userdata binding objects ! WXDLLIMPEXP_WXLUA int LUACALL wxlua_userdata_delete(lua_State *L); ! ! // memory deallocation function for created wxLuaBindClass defined objects, Lua's __gc metatable index ! WXDLLIMPEXP_WXLUA int LUACALL wxlua_wxLuaBindClass__gc(lua_State *L); ! // Lua 'set table' function for created wxLuaBindClass defined objects, Lua's __newindex metatable index ! WXDLLIMPEXP_WXLUA int LUACALL wxlua_wxLuaBindClass__newindex(lua_State *L); ! // Lua 'get table' function for created wxLuaBindClass defined objects, Lua's __index metatable index ! WXDLLIMPEXP_WXLUA int LUACALL wxlua_wxLuaBindClass__index(lua_State *L); ! // Lua 'tostring' function for created wxLuaBindClass defined objects, Lua's __tostring metatable index ! WXDLLIMPEXP_WXLUA int LUACALL wxlua_wxLuaBindClass__tostring(lua_State *L); ! ! // ---------------------------------------------------------------------------- ! // wxLua binding enums and structs // ---------------------------------------------------------------------------- ! // Binding tags are generated as positive tag id automatically when bound ! // so we set the inbuilt Lua arg tags to negative values // ! // note that -1 is use as initialiser for class tags ! // and 0 is used as an end marker for the wxLuaArgTag array that ! // represents function prototype argument types. ! ! // Note: WXLUA_TXXX = -1*LUA_TXXX - 2 ! ! // wxlua arg tags for common Lua types #define WXLUA_TUNKNOWN 0 // unset and invalid, not a LUA_TXXX #define WXLUA_TNONE -1 // LUA_TNONE -1 --- 20,37 ---- // ---------------------------------------------------------------------------- ! // wxLua binding defines, enums, and structs // ---------------------------------------------------------------------------- ! // Binding wxLua types are positive integers generated automatically when initialized ! // so the inbuilt wxLua types (WXLUA_TXXX) corresponding to Lua types ! // (LUA_TXXX) are negative values. ! // *Use the function bool wxlua_iswxuserdatatype(wxl_type) if you want to ! // differentiate between the two. // ! // Note that WXLUA_TUNKNOWN is use as initialiser for class types ! // and is used as an end marker for the wxLuaArgType array that ! // represents function prototype argument types in the wxLuaBindCFunc struct. + // wxLua types for Lua types #define WXLUA_TUNKNOWN 0 // unset and invalid, not a LUA_TXXX #define WXLUA_TNONE -1 // LUA_TNONE -1 *************** *** 67,97 **** #define WXLUA_T_MIN -12 // Min of the WXLUA_TXXX values ! // Blindly convert the lua_type to the wxlua_type, see wxlua_getwxluatype() for better function #define LUAT_TO_WXLUAT(luatype) (-1*(luatype) - 2) ! // Variables used in the wxLuaArgTag member of the wxLuaBindCFunc for ! // common types. The binding generator will use these and generate others ! // as specified in the bindings. ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_None; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Nil; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Boolean; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LightUserData; ! 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; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_CFunction; ! // copies of wxlua arg tags for binding types that are used very often ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_NULL; // The Lua tag for NULL pointer ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxEvent; // The Lua tag for wxEvents ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxWindow; // The Lua tag for wxWindows ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxString; // The Lua tag for wxStrings ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxArrayString; // The Lua tag for wxArrayString ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxSortedArrayString; // The Lua tag for wxSortedArrayString ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxArrayInt; // The Lua tag for wxArrayInt // ---------------------------------------------------------------------------- --- 51,82 ---- #define WXLUA_T_MIN -12 // Min of the WXLUA_TXXX values ! // Blindly convert the lua_type to the wxlua_type. Note: WXLUA_TXXX = -1*LUA_TXXX - 2 ! // *** See wxlua_luatowxluatype() for better function *** #define LUAT_TO_WXLUAT(luatype) (-1*(luatype) - 2) ! // Variables used in the wxLuaArgType member of the wxLuaBindCFunc for ! // Lua types. The binding generator will use these and generate new ones for ! // classes and structs as specified in the bindings. ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TNONE; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TNIL; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TBOOLEAN; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TLIGHTUSERDATA; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TNUMBER; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TSTRING; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TTABLE; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TFUNCTION; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TUSERDATA; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TTHREAD; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TINTEGER; ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatype_TCFUNCTION; ! // copies of wxLua types for binding types that are used very often ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_NULL; // wxLua type for NULL pointer ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxEvent; // wxLua type for wxEvents ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxWindow; // wxLua type for wxWindows ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxString; // wxLua type for wxStrings ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxArrayString; // wxLua type for wxArrayString ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxSortedArrayString; // wxLua type for wxSortedArrayString ! extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxArrayInt; // wxLua type for wxArrayInt // ---------------------------------------------------------------------------- *************** *** 99,106 **** // ---------------------------------------------------------------------------- ! typedef int* wxLuaArgTag; // address of class tag (a pointer to it) ! extern WXDLLIMPEXP_DATA_WXLUA(wxLuaArgTag) s_wxluaargArray_None[1]; // = {0} ! enum wxLuaMethod_Type // The type of a Lua method { WXLUAMETHOD_CONSTRUCTOR = 0x0001, // constructor --- 84,92 ---- // ---------------------------------------------------------------------------- ! typedef int* wxLuaArgType; // address of wxLua class type (a pointer to it) ! extern WXDLLIMPEXP_DATA_WXLUA(wxLuaArgType) g_wxluaargtypeArray_None[1]; // = {0} ! // Values for the wxLuaBindMethod::type and wxLuaBindCFunc::type ! enum wxLuaMethod_Type { WXLUAMETHOD_CONSTRUCTOR = 0x0001, // constructor *************** *** 116,136 **** // original class. ! WXLUAMETHOD_OVERLOAD_BASE = 0x10000, // Class method has been checked to see if it is ! // overloaded from the base class by the function ! // wxLuaState::RegisterBindings() ! // Check wxLuaBindMethod::basemethod and if !NULL ! // this method is an overload from the base class }; struct WXDLLIMPEXP_WXLUA wxLuaBindCFunc { ! lua_CFunction func; // C function that implements the method or property ! int type; // wxLuaMethod_Type flags for this function ! int minargs; // min number of required args ! int maxargs; // total number of args allowed ! wxLuaArgTag* argtags; // array of Lua tags representing each argument, zero terminated ! // NOTE: there may be less argtags than minargs if this is an ! // overloaded function since the argtags == s_wxluaargArray_None ! // but the minargs are the min of minargs of all the overloaded functions }; --- 102,122 ---- // original class. ! WXLUAMETHOD_CHECKED_OVERLOAD = 0x10000, // Class method has been checked to see if it is ! // overloaded function from the base class by ! // wxLuaBinding::InitAllBindings(). ! // wxLuaBindMethod::basemethod is !NULL ! // if an overloaded function was found. ! ! WXLUAMETHOD_SEARCH_MASK = 0xFFFF, // Helper for wxLuaBinding::GetClassMethod(), ignore WXLUAMETHOD_CHECKED_OVERLOAD ! WXLUAMETHOD_SORT_MASK = 0xFFFF, // Helper for wxLuaBinding::InitAllBindings(), ignore WXLUAMETHOD_CHECKED_OVERLOAD }; struct WXDLLIMPEXP_WXLUA wxLuaBindCFunc { ! lua_CFunction lua_cfunc; // C function that implements the method or property ! int method_type; // enum wxLuaMethod_Type flags for this function ! int minargs; // Min number of required args ! int maxargs; // Total number of args allowed ! wxLuaArgType* argtypes; // Array of wxLua types representing each argument, zero terminated. }; *************** *** 141,184 **** struct WXDLLIMPEXP_WXLUA wxLuaBindMethod { ! const char *name; // name of the method or property ! int type; // wxLuaMethod_Type flags for this method ! // note each func has own type, this is ored values of them ! wxLuaBindCFunc *funcs; // array of C functions for this method ! int funcs_n; // number of C functions (overloaded > 1) for this method ! wxLuaBindMethod *basemethod; // overloaded methods from base class, else NULL ! // see comments for WXLUAMETHOD_OVERLOAD_BASE }; // ---------------------------------------------------------------------------- ! // wxLuaBindDefine - Defines a numeric define for wxLua // ---------------------------------------------------------------------------- ! struct WXDLLIMPEXP_WXLUA wxLuaBindDefine { ! const char *name; // name double value; // numeric value }; ! extern WXDLLIMPEXP_DATA_WXLUA(wxLuaBindDefine) s_wxluadefineArray_None[1]; // = {{0,0}} // ---------------------------------------------------------------------------- ! // wxLuaBindString - Defines a wxWidgets wxString for wxLua // ---------------------------------------------------------------------------- struct WXDLLIMPEXP_WXLUA wxLuaBindString { ! const char *name; // name ! const wxChar *value; // string value }; // ---------------------------------------------------------------------------- ! // wxLuaBindEvent - Defines a wxWidgets wxEvent for wxLua // ---------------------------------------------------------------------------- struct WXDLLIMPEXP_WXLUA wxLuaBindEvent { ! const char *name; // name of the event, e.g. "wxEVT_COMMAND_MENU_SELECTED" ! const wxEventType *eventType; // wxWidgets event type, e.g. &wxEVT_COMMAND_MENU_SELECTED ! int *class_tag; // Lua class tag, e.g. &s_wxluatag_wxCommandEvent }; --- 127,171 ---- struct WXDLLIMPEXP_WXLUA wxLuaBindMethod { ! const char* name; // Name of the method or property ! int method_type; // enum wxLuaMethod_Type flags for this method. ! // Note that each func has own type, this is ored values of them. ! wxLuaBindCFunc* wxluacfuncs; // Array of C functions for this method ! int wxluacfuncs_n; // Number of C functions (overloaded > 1) for this method ! wxLuaBindMethod* basemethod; // Overloaded method from the base class, else NULL. ! // See comments for WXLUAMETHOD_CHECKED_OVERLOAD }; // ---------------------------------------------------------------------------- ! // wxLuaBindNumber - Defines a numeric value for wxLua // ---------------------------------------------------------------------------- ! struct WXDLLIMPEXP_WXLUA wxLuaBindNumber { ! const char* name; // name double value; // numeric value }; ! extern WXDLLIMPEXP_DATA_WXLUA(wxLuaBindNumber) g_wxluanumberArray_None[1]; // = {{0,0}} // ---------------------------------------------------------------------------- ! // wxLuaBindString - Defines a wxWidgets wxChar* string for wxLua // ---------------------------------------------------------------------------- struct WXDLLIMPEXP_WXLUA wxLuaBindString { ! const char* name; // name ! const wxChar* value; // string value }; // ---------------------------------------------------------------------------- ! // wxLuaBindEvent - Defines a wxWidgets wxEventType for wxLua // ---------------------------------------------------------------------------- struct WXDLLIMPEXP_WXLUA wxLuaBindEvent { ! const char* name; // Name of the wxEventType, e.g. "wxEVT_COMMAND_MENU_SELECTED" ! const wxEventType* eventType; // wxWidgets event type, e.g. &wxEVT_COMMAND_MENU_SELECTED ! int* wxluatype; // wxLua class type that wxWidgets uses for this wxEventType, ! // e.g. &g_wxluatype_wxCommandEvent }; *************** *** 189,196 **** struct WXDLLIMPEXP_WXLUA wxLuaBindObject { ! const char *name; // the name of the object or pointer ! int *class_tag; // Lua class tag of the object or pointer. ! const void *objPtr; // pointer to the object, e.g. &wxDefaultPosition ! const void **pObjPtr; // pointer to the object pointer, e.g. (const void **)&wxThePenList }; --- 176,183 ---- struct WXDLLIMPEXP_WXLUA wxLuaBindObject { ! const char* name; // Name of the object or pointer ! int* wxluatype; // wxLua class type of the object or pointer. ! const void* objPtr; // Pointer to the object, e.g. &wxDefaultPosition ! const void** pObjPtr; // Pointer to the object pointer, e.g. (const void **)&wxThePenList }; *************** *** 201,234 **** struct WXDLLIMPEXP_WXLUA wxLuaBindClass { ! const char *name; // name of the class ! wxLuaBindMethod *methods; // pointer to methods for this class ! int methods_n; // number of methods ! wxClassInfo *classInfo; // pointer to the wxClassInfo associated with this class ! int *class_tag; // Lua tag for user data allocated by ourselves ! const char *baseclassName; // name of base class ! wxLuaBindClass *baseclass; // Pointer to the base class or NULL for none. // This member is set after all the bindings are // registered since the base class may be from // a different module (a library perhaps). ! // See wxLuaBinding::SetBaseClass ! wxLuaBindDefine* enums; // Class member enums (if any) int enums_n; // number of enums }; // ---------------------------------------------------------------------------- // Central function to call for overloaded functions // ---------------------------------------------------------------------------- ! // Redirect Lua function call to 1 method from a list of overloaded functions ! // if the 1st upvalue is a wxLuaBindMethod. int LUACALL wxlua_callOverloadedFunction(lua_State* L); ! // Redirect Lua function call to 1 method from a list of overloaded functions declared ! // in the wxLuaBindMethod. WXDLLIMPEXP_WXLUA int LUACALL wxlua_callOverloadedFunction(lua_State* L, struct wxLuaBindMethod* wxlMethod); // Get a human readable string of the Lua args (items on the stack) for a function call WXDLLIMPEXP_WXLUA wxString wxlua_getLuaArgsMsg(lua_State* L, int start_stack_idx, int end_stack_idx); ! // Get a human readable wxArrayString of the wxLua args for the functions in the method ! WXDLLIMPEXP_WXLUA wxArrayString wxlua_getBindMethodArgsMsg(lua_State* L, struct wxLuaBindMethod* method); // ---------------------------------------------------------------------------- --- 188,237 ---- struct WXDLLIMPEXP_WXLUA wxLuaBindClass { ! const char* name; // Name of the class ! wxLuaBindMethod* wxluamethods; // Pointer to methods for this class ! int wxluamethods_n; // Number of methods ! wxClassInfo* classInfo; // Pointer to the wxClassInfo associated with this class or NULL. ! int* wxluatype; // wxLua class type for userdata ! const char* baseclassName; // Name of base class, or NULL if none. ! wxLuaBindClass* baseclass; // Pointer to the base class or NULL for none. // This member is set after all the bindings are // registered since the base class may be from // a different module (a library perhaps). ! // See wxLuaBinding::SetBaseClass() ! wxLuaBindNumber* enums; // Class member enums or NULL if none int enums_n; // number of enums }; // ---------------------------------------------------------------------------- + // C functions for the metatable for wxLua userdata installed by the wxLuaBinding + // ---------------------------------------------------------------------------- + + // Generic delete function for userdata binding objects + WXDLLIMPEXP_WXLUA int LUACALL wxlua_userdata_delete(lua_State *L); + + // memory deallocation function for created wxLuaBindClass defined objects, Lua's __gc metatable index + WXDLLIMPEXP_WXLUA int LUACALL wxlua_wxLuaBindClass__gc(lua_State *L); + // Lua 'set table' function for created wxLuaBindClass defined objects, Lua's __newindex metatable index + WXDLLIMPEXP_WXLUA int LUACALL wxlua_wxLuaBindClass__newindex(lua_State *L); + // Lua 'get table' function for created wxLuaBindClass defined objects, Lua's __index metatable index + WXDLLIMPEXP_WXLUA int LUACALL wxlua_wxLuaBindClass__index(lua_State *L); + // Lua 'tostring' function for created wxLuaBindClass defined objects, Lua's __tostring metatable index + WXDLLIMPEXP_WXLUA int LUACALL wxlua_wxLuaBindClass__tostring(lua_State *L); + + // ---------------------------------------------------------------------------- // Central function to call for overloaded functions // ---------------------------------------------------------------------------- ! // Redirect a Lua function call to 1 wxLuaBindCFunc from a list of overloaded functions. ! // The 1st upvalue must be a wxLuaBindMethod. int LUACALL wxlua_callOverloadedFunction(lua_State* L); ! // Redirect a Lua function call to 1 wxLuaBindCFunc from a list of overloaded functions ! // declared in the wxLuaBindMethod. WXDLLIMPEXP_WXLUA int LUACALL wxlua_callOverloadedFunction(lua_State* L, struct wxLuaBindMethod* wxlMethod); // Get a human readable string of the Lua args (items on the stack) for a function call WXDLLIMPEXP_WXLUA wxString wxlua_getLuaArgsMsg(lua_State* L, int start_stack_idx, int end_stack_idx); ! // Get a human readable wxString of the wxLuaArgType arrays for the functions in the method ! WXDLLIMPEXP_WXLUA wxString wxlua_getBindMethodArgsMsg(lua_State* L, struct wxLuaBindMethod* wxlMethod); // ---------------------------------------------------------------------------- *************** *** 263,267 **** bool GetObject(); // Remove any existing reference and allocate another. ! // You cannot call this after calling GetXXXPtr() however only if this wraps a // stack item. void SetObject(int stack_idx = 1); --- 266,270 ---- bool GetObject(); // Remove any existing reference and allocate another. ! // You cannot call this after calling GetXXXPtr(), but only if this wraps a // stack item. void SetObject(int stack_idx = 1); *************** *** 285,289 **** private: ! wxLuaState* m_wxlState; // a pointer due to include recursion. int m_reference; // reference in wxlua_lreg_refs_key registry table --- 288,292 ---- private: ! wxLuaState* m_wxlState; // a pointer due to #include recursion. int m_reference; // reference in wxlua_lreg_refs_key registry table *************** *** 481,486 **** wxLuaBindClass* GetClassArray() { return m_classArray; } ! size_t GetDefineCount() const { return m_defineCount; } ! wxLuaBindDefine* GetDefineArray() { return m_defineArray; } size_t GetStringCount() const { return m_stringCount; } --- 484,489 ---- wxLuaBindClass* GetClassArray() { return m_classArray; } ! size_t GetNumberCount() const { return m_numberCount; } ! wxLuaBindNumber* GetNumberArray() { return m_numberArray; } size_t GetStringCount() const { return m_stringCount; } *************** *** 496,507 **** wxLuaBindMethod* GetFunctionArray() { return m_functionArray; } ! // Is this tag defined as something in this binding? ! bool HasTag(int tag) const { return (tag >= m_start_tag) && (tag <= m_last_tag); } ! ! // Look for the base class of the input wxLuaBindClass in this binding using the ! // baseclassName of the input and if found, set the wxLuaBindClass::baseclass ! // member of the input. ! // This is called by the wxLuaState during creation and should not be called afterwards. ! bool SetBaseClass(wxLuaBindClass *pClass); // ----------------------------------------------------------------------- --- 499,504 ---- wxLuaBindMethod* GetFunctionArray() { return m_functionArray; } ! // Is this wxLua type defined in this binding? ! bool HaswxLuaType(int wxl_type) const { return (wxl_type >= m_first_wxluatype) && (wxl_type <= m_last_wxluatype); } // ----------------------------------------------------------------------- *************** *** 510,522 **** // Find the wxLuaBindEvent with the wxEventType, returns NULL if not found. const wxLuaBindEvent* GetBindEvent(wxEventType eventType) const; ! // Look up the event type name as a string, from the wxEventType number // in the wxLuaBindEvent* struct list of this binding. wxString GetEventTypeName(wxEventType eventType) const; ! // Get the wxLuaBindClass that has this tag, or NULL if none ! const wxLuaBindClass* GetBindClass(int class_tag) const; // Get the first wxLuaBindClass that has this wxLuaBindMethod const wxLuaBindClass* GetBindClass(const wxLuaBindMethod* wxlMethod) const; // Get the first wxLuaBindClass that has this wxLuaBindCFunc ! const wxLuaBindClass* GetBindClass(const wxLuaBindCFunc* wxlMethod_cfunc) const; // ----------------------------------------------------------------------- --- 507,521 ---- // Find the wxLuaBindEvent with the wxEventType, returns NULL if not found. const wxLuaBindEvent* GetBindEvent(wxEventType eventType) const; ! // Look up the wxEventType name as a string, from the wxEventType number // in the wxLuaBindEvent* struct list of this binding. wxString GetEventTypeName(wxEventType eventType) const; ! // Get the wxLuaBindClass that has this wxLua type, or NULL if none ! const wxLuaBindClass* GetBindClass(int wxl_type) const; ! // Get the wxLuaBindClass that has this name, or NULL if none ! const wxLuaBindClass* GetBindClass(const char* className) const; // Get the first wxLuaBindClass that has this wxLuaBindMethod const wxLuaBindClass* GetBindClass(const wxLuaBindMethod* wxlMethod) const; // Get the first wxLuaBindClass that has this wxLuaBindCFunc ! const wxLuaBindClass* GetBindClass(const wxLuaBindCFunc* wxlCFunc) const; // ----------------------------------------------------------------------- *************** *** 528,566 **** static wxLuaBinding* GetLuaBinding(const wxString& bindingName, const wxLuaBindingList* bindingList); ! // Get wxLuaBindClass for given Lua Tag using wxLuaBindClass::class_tag, // returns NULL on failure. ! static const wxLuaBindClass* GetBindClass(int class_tag, const wxLuaBindingList* bindingList); // Get the first wxLuaBindClass that has this particular wxLuaBindMethod // returns NULL on failure. ! static const wxLuaBindClass* GetBindClass(const wxLuaBindMethod* method, const wxLuaBindingList* bindingList); ! // Get the first wxLuaBindClass that has this particular wxLuaBindCFunc in it's methods // returns NULL on failure. ! static const wxLuaBindClass* GetBindClass(const wxLuaBindCFunc* method_cfunc, const wxLuaBindingList* bindingList); // Get wxLuaBindEvent for given wxEventType (wxEvent::GetEventType()) by finding // the matching wxLuaBindEvent::eventType. // returns NULL on failure. ! static const wxLuaBindEvent* GetBindEvent(wxEventType eventType_, const wxLuaBindingList* bindingList); ! // Get the wxLuaBinding that has this wxLuaBindMethod in it's wxLuaBinding::GetFunctionArray(). // returns NULL on failure. ! static wxLuaBinding* GetFunctionBinding(const wxLuaBindMethod* method, const wxLuaBindingList* bindingList); // ----------------------------------------------------------------------- // These functions search through the input struct ! // Lookup a Lua method or get property called methodName in the wxLuaBindClass array wxlClass. ! // Ensure that the lookup is of WXLUAMETHOD_METHOD|WXLUAMETHOD_GETPROP type. ! // If the Lua method cannot be found on the current class recurse through base classes ! // Return a pointer to the wxLuaBindMethod that corresponds to the method name, ! // else return NULL; ! static wxLuaBindMethod* GetClassMethod(const wxLuaBindClass *wxlClass, const char *methodName, bool search_baseclasses = true); ! // Lookup a Lua property function named propName in the wxLuaBindClass wxlClass ! // Ensure that the lookup is of WXLUAMETHOD_GETPROP|WXLUAMETHOD_SETPROP type. ! // If the Lua property cannot be found on the current class recurse through base classes ! // Return a pointer to the wxLuaBindMethod that corresponds to the property name, ! // else return NULL; ! // Find 'Set' properties if isLuaSetProp else return 'WXLUAMETHOD_GETPROP' property ! static wxLuaBindMethod* GetClassProperty(const wxLuaBindClass *wxlClass, const char *propName, bool isLuaSetProp); // ----------------------------------------------------------------------- --- 527,559 ---- static wxLuaBinding* GetLuaBinding(const wxString& bindingName, const wxLuaBindingList* bindingList); ! // Get wxLuaBindClass for given wxLua type using wxLuaBindClass::wxluatype, // returns NULL on failure. ! static const wxLuaBindClass* GetBindClass(int wxl_type, const wxLuaBindingList* bindingList); // Get the first wxLuaBindClass that has this particular wxLuaBindMethod // returns NULL on failure. ! static const wxLuaBindClass* GetBindClass(const wxLuaBindMethod* wxlMethod, const wxLuaBindingList* bindingList); ! // Get the first wxLuaBindClass that has this particular wxLuaBindCFunc in its methods // returns NULL on failure. ! static const wxLuaBindClass* GetBindClass(const wxLuaBindCFunc* wxlCFunc, const wxLuaBindingList* bindingList); // Get wxLuaBindEvent for given wxEventType (wxEvent::GetEventType()) by finding // the matching wxLuaBindEvent::eventType. // returns NULL on failure. ! static const wxLuaBindEvent* GetBindEvent(wxEventType eventType, const wxLuaBindingList* bindingList); ! // Get the wxLuaBinding that has this wxLuaBindMethod in its wxLuaBinding::GetFunctionArray(). // returns NULL on failure. ! static wxLuaBinding* GetFunctionBinding(const wxLuaBindMethod* wxlMethod, const wxLuaBindingList* bindingList); // ----------------------------------------------------------------------- // These functions search through the input struct ! // Lookup a wxLuaBindMethod function or property called methodName in the wxLuaBindClass ! // that is also of the wxLuaMethod_Type method_type. The method_type may be ! // ored values and the first match found is returned or NULL if not found. ! // If the wxLuaBindMethod cannot be found on the current class recurse through base classes ! // if search_baseclasses. ! static wxLuaBindMethod* GetClassMethod(const wxLuaBindClass *wxlClass, const char *methodName, ! int method_type, bool search_baseclasses); // ----------------------------------------------------------------------- *************** *** 569,573 **** // function wxLuaBinding_[binding name]_init(). // You can adjust the list *only* if you do not have any wxLuaStates ! // created, otherwise the tags will be out of sync. static wxLuaBindingList* GetBindingList() { return &sm_bindingList; } --- 562,566 ---- // function wxLuaBinding_[binding name]_init(). // You can adjust the list *only* if you do not have any wxLuaStates ! // created, otherwise the wxLua types will be out of sync. static wxLuaBindingList* GetBindingList() { return &sm_bindingList; } *************** *** 576,582 **** // Initialize all of the bindings by iterating the GetBindingList() and // setting the base classes and base class functions. This function ! // is automatically run by the wxLuaState and should not ever need to be called. static void InitAllBindings(bool force_update = false); protected: void InitBinding(); // must called after subclassed version is created --- 569,581 ---- // Initialize all of the bindings by iterating the GetBindingList() and // setting the base classes and base class functions. This function ! // is automatically run by the wxLuaState and should not need to be called. static void InitAllBindings(bool force_update = false); + // Look for the base class of the input wxLuaBindClass in this binding using the + // baseclassName of the input and if found, set the wxLuaBindClass::baseclass + // member of the input. + // This is called by InitAllBindings() by the wxLuaState and should not be called afterwards. + bool SetBaseClass(wxLuaBindClass* wxlClass); + protected: void InitBinding(); // must called after subclassed version is created *************** *** 584,601 **** // Register the classes, defines, strings, events, objects, and functions generated by the binding ! virtual void DoRegisterBinding(const wxLuaState& wxlState, int tableOffset); // Before registering anything from this binding this function is called // at the beginning of RegisterBinding(...) ! virtual void PreRegister(const wxLuaState& WXUNUSED(wxlState), int WXUNUSED(luaTable)) {} // After registering everything from this binding this function is called // at the end of RegisterBinding(...) ! virtual void PostRegister(const wxLuaState& WXUNUSED(wxlState), int WXUNUSED(luaTable)) {} // binding objects size_t m_classCount; wxLuaBindClass* m_classArray; ! size_t m_defineCount; ! wxLuaBindDefine* m_defineArray; size_t m_stringCount; wxLuaBindString* m_stringArray; --- 583,600 ---- // Register the classes, defines, strings, events, objects, and functions generated by the binding ! virtual void DoRegisterBinding(const wxLuaState& wxlState, int bind_table_idx); // Before registering anything from this binding this function is called // at the beginning of RegisterBinding(...) ! virtual void PreRegister(const wxLuaState& WXUNUSED(wxlState), int WXUNUSED(bind_table_idx)) {} // After registering everything from this binding this function is called // at the end of RegisterBinding(...) ! virtual void PostRegister(const wxLuaState& WXUNUSED(wxlState), int WXUNUSED(bind_table_idx)) {} // binding objects size_t m_classCount; wxLuaBindClass* m_classArray; ! size_t m_numberCount; ! wxLuaBindNumber* m_numberArray; size_t m_stringCount; wxLuaBindString* m_stringArray; *************** *** 610,615 **** wxString m_nameSpace; // Lua table namespace e.g. "wx" bool m_bindings_registered; // Is the binding registered ! int m_start_tag; // The first wxLua allocated Lua tag ! int m_last_tag; // The last wxLua Lua tag of registered classes int m_luaTable_ref; // The Lua ref for the wxLua private tables --- 609,614 ---- wxString m_nameSpace; // Lua table namespace e.g. "wx" bool m_bindings_registered; // Is the binding registered ! int m_first_wxluatype; // The first wxLua type allocated for a class ! int m_last_wxluatype; // The last wxLua type of registered classes int m_luaTable_ref; // The Lua ref for the wxLua private tables Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** wxlstate.h 20 Dec 2007 02:26:57 -0000 1.111 --- wxlstate.h 22 Dec 2007 06:07:15 -0000 1.112 *************** *** 77,90 **** // ---------------------------------------------------------------------------- ! // Light user data used as keys in the Lua LUA_REGISTRYINDEX table for wxLua items. ! // Note that even though these have values, they're not used, just the memory address. // The key in the LUA_REGISTRYINDEX table that is a table indexed ! // on the "tags" and each item is a metatable for a C++ class. ! // LUA_REGISTRYINDEX[&wxlua_lreg_tags_key][tag number] = { metatable for a C++ class } ! extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_tags_key; // The key in the LUA_REGISTRYINDEX table that is a numerically keyed table // with references to Lua objects we want to keep a handle to. The object could be ! // anything, a table, function, userdata... // LUA_REGISTRYINDEX[&wxlua_lreg_refs_key][ref number] = Lua object extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_refs_key; --- 77,93 ---- // ---------------------------------------------------------------------------- ! // Light userdata used as keys in the Lua LUA_REGISTRYINDEX table for wxLua items. ! // Note that even though these keys have values, they're not used, just the memory address. // The key in the LUA_REGISTRYINDEX table that is a table indexed ! // on the wxLua types where each item is a userdata metatable for a C++ class. ! // Note: The wxLua types WXLUA_TXXX that correspond to the Lua LUA_TXXX types ! // are not stored in this table since they do not use our metatables. ! // The keys in this table are all > 1. ! // LUA_REGISTRYINDEX[&wxlua_lreg_types_key][wxLua type number] = { metatable for a C++ class } ! extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_types_key; // The key in the LUA_REGISTRYINDEX table that is a numerically keyed table // with references to Lua objects we want to keep a handle to. The object could be ! // anything, a table, function, number, string, userdata... // LUA_REGISTRYINDEX[&wxlua_lreg_refs_key][ref number] = Lua object extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_refs_key; *************** *** 108,116 **** extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_wxluastate_key; // The key in the LUA_REGISTRYINDEX table that is table of all ! // objects that we've pushed into Lua using wxluaT_pushusertag(). ! // Note: A single object like a wxWindow may be pushed with multiple tags. // e.g. wxWindow* w = wx.wxWindow() retrieve the window later from wxObject* wxEvent:GetEventObject() // LUA_REGISTRYINDEX[&wxlua_lreg_weakobjects_key][lightuserdata(obj_ptr)] = ! // { tag1 = weak fulluserdata, tag2 = weak fulluserdata... } extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_weakobjects_key; // The key in the LUA_REGISTRYINDEX table that is table of all --- 111,119 ---- extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_wxluastate_key; // The key in the LUA_REGISTRYINDEX table that is table of all ! // objects that we've pushed into Lua using wxluaT_pushuserdatatype(). ! // Note: A single object like a wxWindow may be pushed with multiple wxLua types. // e.g. wxWindow* w = wx.wxWindow() retrieve the window later from wxObject* wxEvent:GetEventObject() // LUA_REGISTRYINDEX[&wxlua_lreg_weakobjects_key][lightuserdata(obj_ptr)] = ! // { wxLua type1 = weak fulluserdata, wxLua type2 = weak fulluserdata... } extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_weakobjects_key; // The key in the LUA_REGISTRYINDEX table that is table of all *************** *** 118,122 **** // Note that non wxObject classes use wxLUA_DECLARE_ENCAPSULATION so // the key is the object pointer and the value is the wxObject encapsulation. ! // If not encapsulated both the key and the value are the same. // LUA_REGISTRYINDEX[&wxlua_lreg_gcobjects_key][lightuserdata(obj_ptr)] = // lightuserdata(wxObject derived class) --- 121,125 ---- // Note that non wxObject classes use wxLUA_DECLARE_ENCAPSULATION so // the key is the object pointer and the value is the wxObject encapsulation. ! // Both the key and the value are the same if not encapsulated . // LUA_REGISTRYINDEX[&wxlua_lreg_gcobjects_key][lightuserdata(obj_ptr)] = // lightuserdata(wxObject derived class) *************** *** 135,139 **** extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_windestroycallbacks_key; // The key in the LUA_REGISTRYINDEX table that is table of all ! // top level windows that we've created and need to destroy when closed. // LUA_REGISTRYINDEX[&wxlua_lreg_topwindows_key][lightuserdata(&wxWindow)] = 1 extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_topwindows_key; --- 138,142 ---- extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_windestroycallbacks_key; // The key in the LUA_REGISTRYINDEX table that is table of all ! // top level wxWindows that we've created and need to destroy when closed. // LUA_REGISTRYINDEX[&wxlua_lreg_topwindows_key][lightuserdata(&wxWindow)] = 1 extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_topwindows_key; *************** *** 159,178 **** extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_regtable_key; ! // Light user data used as keys in the metatables created for the class userdata objects. ! // Note that even though these have values, they're not used, just the memory address. ! // wxLua metatable structure: // { ! // lightuserdata(&wxlua_metatable_tag_key) = tag number in wxlua_lreg_tags_key table // lightuserdata(&wxlua_metatable_wxluabindclass_key) = lightuserdata(&wxLuaBindClass) ! // __gc = function(wxluabind__gc_wxLuaBindClass) ! // __index = function(wxluabind__index_wxLuaBindClass) ! // __newindex = function(wxluabind__newindex_wxLuaBindClass) ! // __tostring = function(wxluabind__tostring_wxLuaBindClass) // } ! // The key of a metatable used for wxLua userdata that is the tag number in the ! // wxlua_lreg_tags_key table this metatable is for. ! extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_metatable_tag_key; // The key of a metatable used for wxLua userdata that stores a lightuserdata // of the wxLuaBindClass struct for this class. --- 162,181 ---- extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_regtable_key; ! // Light userdata used as keys in the metatables created for the class userdata objects. ! // Note that even though these keys have values, they're not used, just the memory address. ! // wxLua userdata metatable structure: // { ! // lightuserdata(&wxlua_metatable_type_key) = wxLua type number in wxlua_lreg_types_key table // lightuserdata(&wxlua_metatable_wxluabindclass_key) = lightuserdata(&wxLuaBindClass) ! // __gc = function(wxlua_wxLuaBindClass__gc) ! // __index = function(wxlua_wxLuaBindClass__index) ! // __newindex = function(wxlua_wxLuaBindClass__newindex) ! // __tostring = function(wxlua_wxLuaBindClass__tostring) // } ! // The key of a metatable used for wxLua userdata that is the wxLua type number in the ! // wxlua_lreg_types_key table this metatable is for. ! extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_metatable_type_key; // The key of a metatable used for wxLua userdata that stores a lightuserdata // of the wxLuaBindClass struct for this class. *************** *** 181,189 **** // ---------------------------------------------------------------------------- // Create one of the wxlua_lreg_XXX_key tables in the LUA_REGISTRYINDEX and ! // properly set the wxlua_lreg_regtablekey_key key too. WXDLLIMPEXP_WXLUA void wxlua_lreg_createtable(lua_State* L, void* lightuserdata_reg_key, int narr = 0, int nrec = 0); // ---------------------------------------------------------------------------- ! // Lua C helper functions - These functions are also part of the wxLuaState // and you are recommended to use those if the wxLuaState is required. However // in some cases it may not be necessary to create a wxLuaState and just --- 184,192 ---- // ---------------------------------------------------------------------------- // Create one of the wxlua_lreg_XXX_key tables in the LUA_REGISTRYINDEX and ! // properly set the wxlua_lreg_regtablekey_key too. WXDLLIMPEXP_WXLUA void wxlua_lreg_createtable(lua_State* L, void* lightuserdata_reg_key, int narr = 0, int nrec = 0); // ---------------------------------------------------------------------------- ! // The functions below are Lua C helper functions that are also part of the wxLuaState // and you are recommended to use those if the wxLuaState is required. However // in some cases it may not be necessary to create a wxLuaState and just *************** *** 192,202 **** // ---------------------------------------------------------------------------- ! // Push the errorMsg on the stack and call luaL_error WXDLLIMPEXP_WXLUA void LUACALL wxlua_error(lua_State* L, const char* errorMsg); wxLUA_UNICODE_ONLY(WXDLLIMPEXP_WXLUA inline void LUACALL wxlua_error(lua_State* L, const wxString& errorMsg) { wxlua_error(L, wx2lua(errorMsg)); }) ! // Create an error message that the item at the stack_idx is not of the type wxl_tag ! // and call wxlua_error(). WXDLLIMPEXP_WXLUA void LUACALL wxlua_argerror(lua_State *L, int stack_idx, const wxString& expectedType); // Get the userdata at the stack index, if null_ptr then set the pointer wrapped --- 195,217 ---- // ---------------------------------------------------------------------------- ! // Push the errorMsg on the stack and call luaL_error() WXDLLIMPEXP_WXLUA void LUACALL wxlua_error(lua_State* L, const char* errorMsg); wxLUA_UNICODE_ONLY(WXDLLIMPEXP_WXLUA inline void LUACALL wxlua_error(lua_State* L, const wxString& errorMsg) { wxlua_error(L, wx2lua(errorMsg)); }) ! // Create an error message that the item at the stack_idx is not correct for a ! // function call and call wxlua_argerrormsg(). ! // The expectedType string should tell the user what is valid input and is a ! // string to be flexible for multiple valid types. ! // The error message format is: ! // "wxLua: Expected %s for parameter %d, but got a '%s'.", expectedType.c_str(), stack_idx, argType.c_str() ! // Typical expectedType strings would be wxT("a 'number'") WXDLLIMPEXP_WXLUA void LUACALL wxlua_argerror(lua_State *L, int stack_idx, const wxString& expectedType); + // Create an error message for an incorrect function call and call wxlua_error(). + // The message created has this format: + // msg + // "functionNameCalled(argName1, argName2, ...)" <-- from wxlua_getLuaArgsMsg() + // "01. functionName(validArgName1, validArgName2, ...)" <-- from wxlua_getBindMethodArgsMsg() + // "02. ..." + WXDLLIMPEXP_WXLUA void LUACALL wxlua_argerrormsg(lua_State *L, const wxString& msg); // Get the userdata at the stack index, if null_ptr then set the pointer wrapped *************** *** 210,214 **** // // Possible values for the "void* lightuserdata_reg_key" are ! // wxlua_lreg_tags_key, wxlua_lreg_refs_key, wxlua_lreg_debug_refs_key // unless you are using these functions for your own table in the LUA_REGISTRYINDEX. //---------------------------------------------------------------------------- --- 225,229 ---- // // Possible values for the "void* lightuserdata_reg_key" are ! // wxlua_lreg_types_key, wxlua_lreg_refs_key, wxlua_lreg_debug_refs_key // unless you are using these functions for your own table in the LUA_REGISTRYINDEX. //---------------------------------------------------------------------------- *************** *** 223,283 **** // Push onto the top of the stack the object at the index in a table with the key // lightuserdata_reg_key in the LUA_REGISTRYINDEX table, if the index is LUA_REFNIL or the ! // value is nil return false and don't leave anything on the stack. WXDLLIMPEXP_WXLUA bool LUACALL wxluaR_getref(lua_State* L, int wxlref_idx, const void* lightuserdata_reg_key); // Is the item at the stack_idx in the table with the key lightuserdata_reg_key ! // in the LUA_REGISTRYINDEX table. Returns the tag or LUA_NOREF if it's not. WXDLLIMPEXP_WXLUA int LUACALL wxluaR_isrefed(lua_State* L, int stack_idx, const void* lightuserdata_reg_key); //---------------------------------------------------------------------------- - // wxluaT_XXX - functions operate on the "tags" which are a numerical indexes - // in the wxlua_lreg_tags_key table in Lua's LUA_REGISTRYINDEX to determine - // the C++ class type for a Lua userdata. - //---------------------------------------------------------------------------- - - // Allocate a new table (metatable) with a wxlua_metatable_tag_key key equal - // to the number from wxluaR_ref() and store it in the wxlua_lreg_tags_key LUA_REGISTRYINDEX table. - // Returns the index into the tags table, the return value from wxluaR_ref(). - // Leaves the new table on the top of the stack. - WXDLLIMPEXP_WXLUA int LUACALL wxluaT_newtag(lua_State* L); - // Get the numeric tag of the userdata at the stack index using the metatable's wxlua_metatable_tag_key key. - // Returns WXLUA_NOTAG if the metatable of the userdata doesn't have a wxlua_metatable_tag_key - // key or it isn't a number. The tag is presumedly the index into the wxlua_lreg_tags_key - // LUA_REGISTRYINDEX table and denotes what type of C++ object this is. - WXDLLIMPEXP_WXLUA int LUACALL wxluaT_gettag(lua_State* L, int stack_idx); - // Set the metatable of the userdata at top of stack to the table stored in the - // wxlua_lreg_tags_key LUA_REGISTRYINDEX table using wxluaR_getref(L, wxl_tag). - WXDLLIMPEXP_WXLUA bool LUACALL wxluaT_settag(lua_State* L, int wxl_tag); - - // Get the wxLuaBindClass* for this wxl_tag or NULL if the tag is invalid. - // Gets the wxLuaBindClass from the metatable stored in the wxlua_lreg_tags_key registry table - // for the classes that have been installed into Lua. - WXDLLIMPEXP_WXLUA const wxLuaBindClass* LUACALL wxluaT_getclass(lua_State* L, int wxl_tag); - // Get the wxLuaBindClass* for this class_name or NULL if the name is invalid. - // Gets the wxLuaBindClass from the wxlua_lreg_classes_key table in the LUA_REGISTRYINDEX. - WXDLLIMPEXP_WXLUA const wxLuaBindClass* LUACALL wxluaT_getclass(lua_State* L, const char* class_name); - // Get the name of the class with this wxl_tag. - WXDLLIMPEXP_WXLUA wxString LUACALL wxluaT_gettagname(lua_State* L, int wxl_tag); - // Get the tag for the class with the given name - WXDLLIMPEXP_WXLUA int LUACALL wxluaT_gettag(lua_State* L, const char* name); - // Is the item at stack_idx of the userdata type with or derived from the the given tag. - WXDLLIMPEXP_WXLUA bool wxluaT_isuserdatatype(lua_State* L, int stack_idx, int wxl_tag); - - // Get the userdata object at the stack_idx that is of the class type tag or a - // class derived from the tag. If the userdata does not have the correct tag, - // or if the parameter isn't a userdata then wxlua_error() is called and NULL is returned. - WXDLLIMPEXP_WXLUA void* LUACALL wxluaT_getuserdatatype(lua_State* L, int stack_idx, int wxl_tag); - // Push the obj_ptr onto the top of the stack wrapped in a newuserdata - // with it's metatable set to the table from wxluaR_getref(L, tag, &wxlua_lreg_tags_key). - // Returns true if the tag is known and the metatable was set. - // If track=true then push the obj_ptr as a lightuser data key into the - // wxlua_lreg_weakobjects_key table of the Lua LUA_REGISTRYINDEX table so - // that if we need to push it again we just push the already created full userdata value. - WXDLLIMPEXP_WXLUA bool LUACALL wxluaT_pushusertag(lua_State* L, const void* obj_ptr, int wxl_tag, bool track); - // Push a data type onto the stack and set its tag by calling wxluaT_pushusertag() - // after checking if the object is a wxWindow and adding it to the - // wxlua_lreg_windestroycallbacks_key table if it is. - WXDLLIMPEXP_WXLUA void LUACALL wxluaT_pushuserdatatype(lua_State* L, int wxl_tag, const void *obj_ptr); - - //---------------------------------------------------------------------------- // wxluaO_XXX - functions operate on wxLua "Objects" which are userdata wrapping // C++ class objects and are stored in the wxlua_lreg_weakobjects_key --- 238,248 ---- // Push onto the top of the stack the object at the index in a table with the key // lightuserdata_reg_key in the LUA_REGISTRYINDEX table, if the index is LUA_REFNIL or the ! // value is nil it returns false and doesn't leave anything on the stack. WXDLLIMPEXP_WXLUA bool LUACALL wxluaR_getref(lua_State* L, int wxlref_idx, const void* lightuserdata_reg_key); // Is the item at the stack_idx in the table with the key lightuserdata_reg_key ! // in the LUA_REGISTRYINDEX table. Returns the ref index or LUA_NOREF if it's not. WXDLLIMPEXP_WXLUA int LUACALL wxluaR_isrefed(lua_State* L, int stack_idx, const void* lightuserdata_reg_key); //---------------------------------------------------------------------------- // wxluaO_XXX - functions operate on wxLua "Objects" which are userdata wrapping // C++ class objects and are stored in the wxlua_lreg_weakobjects_key *************** *** 319,336 **** WXDLLIMPEXP_WXLUA wxArrayString LUACALL wxluaO_getgcobjectinfo(lua_State *L); ! // Track the obj_ptr and it's Lua userdata at udata_stack_idx in the ! // wxlua_lreg_weakobjects_key table of the LUA_REGISTRYINDEX so we can push ! // it again if needed. ! WXDLLIMPEXP_WXLUA void LUACALL wxluaO_trackweakobject(lua_State *L, int udata_stack_idx, void *obj_ptr, int tag); // Remove the obj_ptr key from the wxlua_lreg_weakobjects_key table of // the LUA_REGISTRYINDEX. It removes the metatable for the single Lua userdata, // "udata", since this function is called before the object is deleted. ! // e.g. p1 = wx.wxPoint(); p2 = p1; p2:delete(); p1:SetX(5) errors, but doesn't segfault // If udata == NULL it removes ALL tracked userdata for this obj_ptr and clears // all of their metatables. WXDLLIMPEXP_WXLUA int LUACALL wxluaO_untrackweakobject(lua_State *L, void* udata, void *obj_ptr); ! // Check if this object with the given tag is in the wxlua_lreg_weakobjects_key ! // table of the LUA_REGISTRYINDEX. If push_on_stack then push on top of the stack. ! WXDLLIMPEXP_WXLUA bool LUACALL wxluaO_istrackedweakobject(lua_State *L, void *obj_ptr, int tag, bool push_on_stack); //---------------------------------------------------------------------------- --- 284,304 ---- WXDLLIMPEXP_WXLUA wxArrayString LUACALL wxluaO_getgcobjectinfo(lua_State *L); ! // Track the obj_ptr and its Lua userdata at udata_stack_idx which is of the ! // wxLua type in the wxlua_lreg_weakobjects_key table of the ! // LUA_REGISTRYINDEX so we can push it again if needed. ! WXDLLIMPEXP_WXLUA void LUACALL wxluaO_trackweakobject(lua_State *L, int udata_stack_idx, void *obj_ptr, int wxl_type); // Remove the obj_ptr key from the wxlua_lreg_weakobjects_key table of // the LUA_REGISTRYINDEX. It removes the metatable for the single Lua userdata, // "udata", since this function is called before the object is deleted. ! // e.g. p1 = wx.wxPoint(); p2 = p1; p2:delete(); p1:SetX(5) errors, but doesn't segfault. // If udata == NULL it removes ALL tracked userdata for this obj_ptr and clears // all of their metatables. WXDLLIMPEXP_WXLUA int LUACALL wxluaO_untrackweakobject(lua_State *L, void* udata, void *obj_ptr); ! // Check if this object with the given wxLua type is in the wxlua_lreg_weakobjects_key ! // table of the LUA_REGISTRYINDEX. ! // If the object is found with the right wxLua type and push_on_stack is true ! // the Lua userdata for the object is pushed on top of the stack. If it's not ! // found then it returns false and nothing is left on the stack. ! WXDLLIMPEXP_WXLUA bool LUACALL wxluaO_istrackedweakobject(lua_State *L, void *obj_ptr, int wxl_type, bool push_on_stack); //---------------------------------------------------------------------------- *************** *** 346,350 **** // LUA_REGISTRYINDEX table. WXDLLIMPEXP_WXLUA void LUACALL wxluaW_removetrackedwindow(lua_State *L, wxWindow* win); ! // Is this wxWindow or one of it's parents already added to the // wxlua_lreg_topwindows_key table of the LUA_REGISTRYINDEX table? WXDLLIMPEXP_WXLUA bool LUACALL wxluaW_istrackedwindow(lua_State *L, wxWindow* win, bool check_parents); --- 314,318 ---- // LUA_REGISTRYINDEX table. WXDLLIMPEXP_WXLUA void LUACALL wxluaW_removetrackedwindow(lua_State *L, wxWindow* win); ! // Is this wxWindow or one of its parents already added to the // wxlua_lreg_topwindows_key table of the LUA_REGISTRYINDEX table? WXDLLIMPEXP_WXLUA bool LUACALL wxluaW_istrackedwindow(lua_State *L, wxWindow* win, bool check_parents); *************** *** 353,388 **** WXDLLIMPEXP_WXLUA wxArrayString LUACALL wxluaW_gettrackedwindowinfo(lua_State *L); // ---------------------------------------------------------------------------- ! // Functions to get info about the tags or the args wxLua uses to determine ! // the lua_type() or C++ class type. // Used to determine what to expect for a function call in the bindings. // ---------------------------------------------------------------------------- ! // Is a class with the wxl_tag equal to or derived from a class with the base_wxl_tag. // 0 means same class, +1 means base is parent, +2 base is grandparent, ... ! // returns -1 if the class_tag is not derived from the base class ! WXDLLIMPEXP_WXLUA int LUACALL wxlua_isderivedclass(lua_State* L, int wxl_tag, int base_wxl_tag); // Same as above, but works directly with the wxLuaBindClasses. ! WXDLLIMPEXP_WXLUA int LUACALL wxlua_isderivedclass(const wxLuaBindClass* wxlClass, const wxLuaBindClass* base_wxlClass); // Verify if the luatype = lua_type(L, stack_idx) is valid for the ! // wxluaarg_tag which is one of the predefined WXLUA_T... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-12-20 02:27:29
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8597/wxLua/modules/wxbind/include Modified Files: wxadv_bind.h wxaui_bind.h wxbase_bind.h wxcore_bind.h wxgl_bind.h wxhtml_bind.h wxmedia_bind.h wxnet_bind.h wxrichtext_bind.h wxstc_bind.h wxxml_bind.h wxxrc_bind.h Log Message: - Removed wxluabind_removetableforcall(L) used in the bindings to determine if the function was called from the tables used for class constructors. It makes more sense to call an intermediatary function to remove the table before calling the real function. - Removed the wxLuaFunction class since we no longer need it. It was a userdata with a __call metatable to call the real function we want. We now push the actual function or an overload function helper with the wxLuaBindMethod struct as an upvalue to give better error messages. The new way should be faster since it doesn't generate as much garbage. - Added wxlua_argerror(L, stack_idx, type_str) to give a far more informative message from the bindings when the wrong type is an arg to a function. - Renamed WXLUAARG_XXX to WXLUA_TXXX to match LUA_TXXX. * Do not create a separate overload function in the bindings since we can just as easily check for multiple functions using the wxLuaBindMethod and call the generic overload function or just the single function. Index: wxadv_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxadv_bind.h 10 Dec 2007 05:39:06 -0000 1.7 --- wxadv_bind.h 20 Dec 2007 02:26:55 -0000 1.8 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 19 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 19 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- Index: wxcore_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxcore_bind.h 10 Dec 2007 05:39:06 -0000 1.7 --- wxcore_bind.h 20 Dec 2007 02:26:55 -0000 1.8 *************** *** 38,44 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 19 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 19 // --------------------------------------------------------------------------- --- 38,44 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- Index: wxrichtext_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxrichtext_bind.h 10 Dec 2007 05:39:06 -0000 1.7 --- wxrichtext_bind.h 20 Dec 2007 02:26:55 -0000 1.8 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 19 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 19 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- Index: wxxrc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxxrc_bind.h 10 Dec 2007 05:39:06 -0000 1.7 --- wxxrc_bind.h 20 Dec 2007 02:26:55 -0000 1.8 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 19 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 19 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- Index: wxnet_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxnet_bind.h 10 Dec 2007 05:39:06 -0000 1.7 --- wxnet_bind.h 20 Dec 2007 02:26:55 -0000 1.8 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 19 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 19 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- Index: wxbase_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxbase_bind.h 18 Dec 2007 01:03:33 -0000 1.8 --- wxbase_bind.h 20 Dec 2007 02:26:55 -0000 1.9 *************** *** 20,26 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 19 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 19 // --------------------------------------------------------------------------- --- 20,26 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- Index: wxmedia_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxmedia_bind.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxmedia_bind.h 10 Dec 2007 05:39:06 -0000 1.7 --- wxmedia_bind.h 20 Dec 2007 02:26:55 -0000 1.8 *************** *** 22,28 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 19 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 19 // --------------------------------------------------------------------------- --- 22,28 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- Index: wxgl_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxgl_bind.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxgl_bind.h 10 Dec 2007 05:39:06 -0000 1.7 --- wxgl_bind.h 20 Dec 2007 02:26:55 -0000 1.8 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 19 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 19 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- Index: wxstc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxstc_bind.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxstc_bind.h 10 Dec 2007 05:39:06 -0000 1.7 --- wxstc_bind.h 20 Dec 2007 02:26:55 -0000 1.8 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 19 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 19 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- Index: wxaui_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxaui_bind.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxaui_bind.h 10 Dec 2007 05:39:06 -0000 1.8 --- wxaui_bind.h 20 Dec 2007 02:26:55 -0000 1.9 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 19 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 19 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- Index: wxhtml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxhtml_bind.h 10 Dec 2007 05:39:06 -0000 1.7 --- wxhtml_bind.h 20 Dec 2007 02:26:55 -0000 1.8 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 19 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 19 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- Index: wxxml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxml_bind.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxxml_bind.h 10 Dec 2007 05:39:06 -0000 1.7 --- wxxml_bind.h 20 Dec 2007 02:26:55 -0000 1.8 *************** *** 21,27 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 19 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 19 // --------------------------------------------------------------------------- --- 21,27 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-12-20 02:27:28
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8597/wxLua/bindings/wxwidgets Modified Files: wxbase_override.hpp wxcore_override.hpp wxhtml_override.hpp wxxml_override.hpp Log Message: - Removed wxluabind_removetableforcall(L) used in the bindings to determine if the function was called from the tables used for class constructors. It makes more sense to call an intermediatary function to remove the table before calling the real function. - Removed the wxLuaFunction class since we no longer need it. It was a userdata with a __call metatable to call the real function we want. We now push the actual function or an overload function helper with the wxLuaBindMethod struct as an upvalue to give better error messages. The new way should be faster since it doesn't generate as much garbage. - Added wxlua_argerror(L, stack_idx, type_str) to give a far more informative message from the bindings when the wrong type is an arg to a function. - Renamed WXLUAARG_XXX to WXLUA_TXXX to match LUA_TXXX. * Do not create a separate overload function in the bindings since we can just as easily check for multiple functions using the wxLuaBindMethod and call the generic overload function or just the single function. Index: wxhtml_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxhtml_override.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxhtml_override.hpp 10 Dec 2007 05:39:05 -0000 1.5 --- wxhtml_override.hpp 20 Dec 2007 02:26:55 -0000 1.6 *************** *** 248,252 **** static int LUACALL wxLua_wxLuaHtmlWindow_constructor(lua_State *L) { - wxluabind_removetableforcall(L); wxLuaState wxlState(L); // get number of arguments --- 248,251 ---- Index: wxbase_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxbase_override.hpp 18 Dec 2007 01:03:32 -0000 1.12 --- wxbase_override.hpp 20 Dec 2007 02:26:55 -0000 1.13 *************** *** 346,351 **** static int LUACALL wxLua_wxString_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // get number of arguments int argCount = lua_gettop(L); --- 346,349 ---- *************** *** 367,372 **** static int LUACALL wxLua_wxClassInfo_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // const wxString &name wxString name = wxlua_getwxStringtype(L, 1); --- 365,368 ---- *************** *** 446,451 **** static int LUACALL wxLua_wxStringList_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // call constructor wxStringList *returns = new wxStringList(); --- 442,445 ---- *************** *** 879,883 **** static int LUACALL wxLua_wxMemoryInputStream_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // size_t length size_t length = (size_t)wxlua_getnumbertype(L, 2); --- 873,876 ---- Index: wxcore_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxcore_override.hpp 18 Dec 2007 01:03:32 -0000 1.13 --- wxcore_override.hpp 20 Dec 2007 02:26:55 -0000 1.14 *************** *** 65,69 **** static int LUACALL wxLua_wxAcceleratorTable_constructor(lua_State *L) { - wxluabind_removetableforcall(L); wxAcceleratorEntry *pItems = NULL; int nItems = 0; --- 65,68 ---- *************** *** 640,645 **** static int LUACALL wxLua_wxTextValidator_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - wxTextValidator *returns; // get number of arguments --- 639,642 ---- *************** *** 668,673 **** static int LUACALL wxLua_wxGenericValidatorBool_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // wxLuaObject *boolPtr wxLuaObject *boolPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaObject); --- 665,668 ---- *************** *** 687,692 **** static int LUACALL wxLua_wxGenericValidatorString_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // wxLuaObject *valPtr wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaObject); --- 682,685 ---- *************** *** 706,711 **** static int LUACALL wxLua_wxGenericValidatorInt_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // wxLuaObject *valPtr wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaObject); --- 699,702 ---- *************** *** 725,730 **** static int LUACALL wxLua_wxGenericValidatorArrayInt_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // wxLuaObject *valPtr wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaObject); --- 716,719 ---- *************** *** 884,889 **** static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // get number of arguments int argCount = lua_gettop(L); --- 873,876 ---- *************** *** 980,985 **** static int LUACALL wxLua_wxSingleChoiceDialog_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // get number of arguments int argCount = lua_gettop(L); --- 967,970 ---- *************** *** 1472,1477 **** static int LUACALL wxLua_wxBitmapFromBits_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // get number of arguments int argCount = lua_gettop(L); --- 1457,1460 ---- *************** *** 1500,1505 **** static int LUACALL wxLua_wxBitmapFromData_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // get number of arguments int argCount = lua_gettop(L); --- 1483,1486 ---- *************** *** 1530,1535 **** static int LUACALL wxLua_wxBitmapFromXPMData_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - int count = 0; --- 1511,1514 ---- *************** *** 1720,1725 **** static int LUACALL wxLua_wxImageFromData_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // get number of arguments int argCount = lua_gettop(L); --- 1699,1702 ---- *************** *** 1747,1752 **** static int LUACALL wxLua_wxImageFromBitmap_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // const wxBitmap& bitmap const wxBitmap *bitmap = (wxBitmap *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxBitmap); --- 1724,1727 ---- *************** *** 1991,1995 **** static int LUACALL wxLua_wxLuaArtProvider_constructor(lua_State *L) { - wxluabind_removetableforcall(L); wxLuaState wxlState(L); --- 1966,1969 ---- *************** *** 2118,2123 **** static int LUACALL wxLua_wxCreateMenu_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // get number of arguments int argCount = lua_gettop(L); --- 2092,2095 ---- *************** *** 2239,2244 **** static int LUACALL wxLua_wxMenuItem_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // get number of arguments int argCount = lua_gettop(L); --- 2211,2214 ---- *************** *** 2396,2401 **** static int LUACALL wxLua_wxPrintPreview_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // get number of arguments int argCount = lua_gettop(L); --- 2366,2369 ---- *************** *** 2773,2777 **** static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L) { - wxluabind_removetableforcall(L); wxLuaState wxlState(L); --- 2741,2744 ---- Index: wxxml_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxxml_override.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxxml_override.hpp 13 Dec 2007 00:47:48 -0000 1.6 --- wxxml_override.hpp 20 Dec 2007 02:26:55 -0000 1.7 *************** *** 14,19 **** static int LUACALL wxLua_wxXmlNode_constructor2(lua_State *L) { - wxluabind_removetableforcall(L); - // wxXmlNode next wxXmlNode * next = (wxXmlNode *)wxluaT_getuserdatatype(L, 6, s_wxluatag_wxXmlNode); --- 14,17 ---- |
|
From: John L. <jr...@us...> - 2007-12-20 02:27:28
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8597/wxLua/docs Modified Files: changelog.txt Log Message: - Removed wxluabind_removetableforcall(L) used in the bindings to determine if the function was called from the tables used for class constructors. It makes more sense to call an intermediatary function to remove the table before calling the real function. - Removed the wxLuaFunction class since we no longer need it. It was a userdata with a __call metatable to call the real function we want. We now push the actual function or an overload function helper with the wxLuaBindMethod struct as an upvalue to give better error messages. The new way should be faster since it doesn't generate as much garbage. - Added wxlua_argerror(L, stack_idx, type_str) to give a far more informative message from the bindings when the wrong type is an arg to a function. - Renamed WXLUAARG_XXX to WXLUA_TXXX to match LUA_TXXX. * Do not create a separate overload function in the bindings since we can just as easily check for multiple functions using the wxLuaBindMethod and call the generic overload function or just the single function. Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** changelog.txt 15 Dec 2007 16:56:40 -0000 1.53 --- changelog.txt 20 Dec 2007 02:26:55 -0000 1.54 *************** *** 55,59 **** have their metatables cleared for safety. ! Functions renamed since they didn't do the same thing or behave the same. wxluaO_istrackedobject -> wxluaO_isgcobject wxluaO_addtrackedobject -> wxluaO_addgcobject --- 55,59 ---- have their metatables cleared for safety. ! Functions renamed since they don't do the same thing or behave the same. wxluaO_istrackedobject -> wxluaO_isgcobject wxluaO_addtrackedobject -> wxluaO_addgcobject *************** *** 61,65 **** - Created a central luauserdata:delete() function for the bindings to reduce ! code. wxLua_wxluabind_delete(L) * Changed signature of the function wxLuaState::SetLuaDebugHook() so that the inputs to lua_sethook() are together and in the same order. --- 61,65 ---- - Created a central luauserdata:delete() function for the bindings to reduce ! code. wxLua_userdata_delete(L) * Changed signature of the function wxLuaState::SetLuaDebugHook() so that the inputs to lua_sethook() are together and in the same order. *************** *** 67,70 **** --- 67,88 ---- it is a callback for the wxEvents using wxEvtHandlers. + - Removed wxluabind_removetableforcall(L) used in the bindings to determine + if the function was called from the tables used for class constructors. + It makes more sense to call an intermediatary function to remove + the table before calling the real function. + - Removed the wxLuaFunction class since we no longer need it. It was a + userdata with a __call metatable to call the real function we want. + We now push the actual function or an overload function helper with the + wxLuaBindMethod struct as an upvalue to give better error messages. + The new way should be faster since it doesn't generate as much garbage. + - Added wxlua_argerror(L, stack_idx, type_str) to give a far more + informative message from the bindings when the wrong type is an arg to + a function. + - Renamed WXLUAARG_XXX to WXLUA_TXXX to match LUA_TXXX. + + * Do not create a separate overload function in the bindings since we can + just as easily check for multiple functions using the wxLuaBindMethod + and call the generic overload function or just the single function. + version 2.8.4.2 -------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-12-20 02:27:28
|
Update of /cvsroot/wxlua/wxLua/bindings/wxlua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8597/wxLua/bindings/wxlua Modified Files: override.hpp wxlua.i Log Message: - Removed wxluabind_removetableforcall(L) used in the bindings to determine if the function was called from the tables used for class constructors. It makes more sense to call an intermediatary function to remove the table before calling the real function. - Removed the wxLuaFunction class since we no longer need it. It was a userdata with a __call metatable to call the real function we want. We now push the actual function or an overload function helper with the wxLuaBindMethod struct as an upvalue to give better error messages. The new way should be faster since it doesn't generate as much garbage. - Added wxlua_argerror(L, stack_idx, type_str) to give a far more informative message from the bindings when the wrong type is an arg to a function. - Renamed WXLUAARG_XXX to WXLUA_TXXX to match LUA_TXXX. * Do not create a separate overload function in the bindings since we can just as easily check for multiple functions using the wxLuaBindMethod and call the generic overload function or just the single function. Index: wxlua.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/wxlua.i,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxlua.i 15 Dec 2007 16:56:40 -0000 1.12 --- wxlua.i 20 Dec 2007 02:26:55 -0000 1.13 *************** *** 59,65 **** WXLUAMETHOD_STATIC // Class member function is static - WXLUAMETHOD_OVERLOAD // This is an overload function that will call others - // and the min/maxargs for it are not valid, - // but are the min and max of all functions WXLUAMETHOD_DELETE // This is the delete function that wxLua has generated --- 59,62 ---- *************** *** 73,87 **** %endenum ! %define WXLUAARG_None ! %define WXLUAARG_Nil ! %define WXLUAARG_Boolean ! %define WXLUAARG_LightUserData ! %define WXLUAARG_Number ! %define WXLUAARG_String ! %define WXLUAARG_Table ! %define WXLUAARG_Function ! %define WXLUAARG_UserData ! %define WXLUAARG_Thread ! %define WXLUAARG_Integer %define LUA_TNONE // (-1) --- 70,85 ---- %endenum ! %define WXLUA_TNONE ! %define WXLUA_TNIL ! %define WXLUA_TBOOLEAN ! %define WXLUA_TLIGHTUSERDATA ! %define WXLUA_TNUMBER ! %define WXLUA_TSTRING ! %define WXLUA_TTABLE ! %define WXLUA_TFUNCTION ! %define WXLUA_TUSERDATA ! %define WXLUA_TTHREAD ! %define WXLUA_TINTEGER ! %define WXLUA_TCFUNCTION %define LUA_TNONE // (-1) Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/override.hpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** override.hpp 15 Dec 2007 16:56:40 -0000 1.14 --- override.hpp 20 Dec 2007 02:26:55 -0000 1.15 *************** *** 698,702 **** static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L) { - wxluabind_removetableforcall(L); wxLuaState wxlState(L); --- 698,701 ---- |
|
From: John L. <jr...@us...> - 2007-12-20 02:27:28
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8597/wxLua/bindings Modified Files: genwxbind.lua Log Message: - Removed wxluabind_removetableforcall(L) used in the bindings to determine if the function was called from the tables used for class constructors. It makes more sense to call an intermediatary function to remove the table before calling the real function. - Removed the wxLuaFunction class since we no longer need it. It was a userdata with a __call metatable to call the real function we want. We now push the actual function or an overload function helper with the wxLuaBindMethod struct as an upvalue to give better error messages. The new way should be faster since it doesn't generate as much garbage. - Added wxlua_argerror(L, stack_idx, type_str) to give a far more informative message from the bindings when the wrong type is an arg to a function. - Renamed WXLUAARG_XXX to WXLUA_TXXX to match LUA_TXXX. * Do not create a separate overload function in the bindings since we can just as easily check for multiple functions using the wxLuaBindMethod and call the generic overload function or just the single function. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.155 retrieving revision 1.156 diff -C2 -d -r1.155 -r1.156 *** genwxbind.lua 13 Dec 2007 06:23:53 -0000 1.155 --- genwxbind.lua 20 Dec 2007 02:26:54 -0000 1.156 *************** *** 18,22 **** -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 19 -- 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 = 20 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h -- otherwise a compile time error will be generated. *************** *** 3435,3442 **** CommentBindingTable(codeList, "// "..interface.lineData[member.LineNumber].LineText.."\n") table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n{\n") - if member.IsConstructor then - table.insert(codeList, " wxluabind_removetableforcall(L);\n") - end - table.insert(codeList, " wxLuaState wxlState(L);\n") -- See if we're supposed to track or untrack the return value --- 3435,3438 ---- *************** *** 3829,3833 **** if not overrideTable[funcName] then ! funcName_ = "wxLua_wxluabind_delete" end --- 3825,3829 ---- if not overrideTable[funcName] then ! funcName_ = "wxlua_userdata_delete" end *************** *** 4549,4553 **** CommentBindingTable(funcMap, "// function overload table\n") table.insert(funcMap, "static wxLuaBindCFunc "..funcMapName.."[] =\n{\n") ! table.insert(funcMap, " { "..funcName..", WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, "..tostring(requiredParamCount)..", "..tostring(paramCount)..", s_wxluaargArray_None },\n") for i = 1, #methodBindings do if HasCondition(methodBindings[i].Condition) and (methodBindings[i].Condition ~= object.Condition) then --- 4545,4549 ---- CommentBindingTable(funcMap, "// function overload table\n") table.insert(funcMap, "static wxLuaBindCFunc "..funcMapName.."[] =\n{\n") ! -- table.insert(funcMap, " { "..funcName..", WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, "..tostring(requiredParamCount)..", "..tostring(paramCount)..", s_wxluaargArray_None },\n") for i = 1, #methodBindings do if HasCondition(methodBindings[i].Condition) and (methodBindings[i].Condition ~= object.Condition) then *************** *** 4563,4567 **** table.insert(funcMap, "};\n") ! table.insert(funcMap, "static int "..funcMapName.."_count = sizeof("..funcMapName..")/sizeof(wxLuaBindCFunc);\n") local methodMap = " { \""..methodBindings[1].LuaName.."\", "..funcType..", "..funcMapName..", "..funcMapName.."_count, 0 }" --- 4559,4563 ---- table.insert(funcMap, "};\n") ! table.insert(funcMap, "static int "..funcMapName.."_count = sizeof("..funcMapName..")/sizeof(wxLuaBindCFunc);\n\n") local methodMap = " { \""..methodBindings[1].LuaName.."\", "..funcType..", "..funcMapName..", "..funcMapName.."_count, 0 }" *************** *** 4569,4578 **** local codeList = {} ! CommentBindingTable(codeList, "// Overloaded function for "..methodBindings[1].ClassName.."::"..methodBindings[1].LuaName.."\n") ! table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n{\n") ! table.insert(codeList, " static wxLuaBindMethod overload_method = \n") ! table.insert(codeList, " "..methodMap..";\n") ! table.insert(codeList, " return wxlua_CallOverloadedFunction(L, &overload_method);\n") ! table.insert(codeList, "}\n") local methodBinding = --- 4565,4574 ---- local codeList = {} ! -- CommentBindingTable(codeList, "// Overloaded function for "..methodBindings[1].ClassName.."::"..methodBindings[1].LuaName.."\n") ! -- table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n{\n") ! -- table.insert(codeList, " static wxLuaBindMethod overload_method = \n") ! -- table.insert(codeList, " "..methodMap..";\n") ! -- table.insert(codeList, " return wxlua_CallOverloadedFunction(L, &overload_method);\n") ! -- table.insert(codeList, "}\n") local methodBinding = *************** *** 4652,4656 **** end if functionBinding.FuncMapName then ! if functionBinding.CFunctionName ~= "wxLua_wxluabind_delete" then table.insert(fileData, "static int LUACALL "..functionBinding.CFunctionName.."(lua_State *L);\n") end --- 4648,4652 ---- end if functionBinding.FuncMapName then ! if functionBinding.CFunctionName ~= "wxlua_userdata_delete" then table.insert(fileData, "static int LUACALL "..functionBinding.CFunctionName.."(lua_State *L);\n") end *************** *** 4670,4674 **** local function writeFunc(functionBinding) if functionBinding.IsOverload then ! table.insert(fileData, "static int LUACALL "..functionBinding.CFunctionName.."(lua_State *L);\n") table.insert(fileData, table.concat(functionBinding.FuncMap)) table.insert(fileData, table.concat(functionBinding.Method)) --- 4666,4670 ---- local function writeFunc(functionBinding) if functionBinding.IsOverload then ! -- table.insert(fileData, "static int LUACALL "..functionBinding.CFunctionName.."(lua_State *L);\n") table.insert(fileData, table.concat(functionBinding.FuncMap)) table.insert(fileData, table.concat(functionBinding.Method)) |
|
From: John L. <jr...@us...> - 2007-12-20 02:27:27
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8597/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan.h Log Message: - Removed wxluabind_removetableforcall(L) used in the bindings to determine if the function was called from the tables used for class constructors. It makes more sense to call an intermediatary function to remove the table before calling the real function. - Removed the wxLuaFunction class since we no longer need it. It was a userdata with a __call metatable to call the real function we want. We now push the actual function or an overload function helper with the wxLuaBindMethod struct as an upvalue to give better error messages. The new way should be faster since it doesn't generate as much garbage. - Added wxlua_argerror(L, stack_idx, type_str) to give a far more informative message from the bindings when the wrong type is an arg to a function. - Renamed WXLUAARG_XXX to WXLUA_TXXX to match LUA_TXXX. * Do not create a separate overload function in the bindings since we can just as easily check for multiple functions using the wxLuaBindMethod and call the generic overload function or just the single function. Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** wxluacan.cpp 10 Dec 2007 05:39:03 -0000 1.36 --- wxluacan.cpp 20 Dec 2007 02:26:54 -0000 1.37 *************** *** 153,157 **** static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 153,156 ---- *************** *** 203,207 **** static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // double h double h = (double)wxlua_getnumbertype(L, 4); --- 202,205 ---- *************** *** 244,248 **** static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // double r double r = (double)wxlua_getnumbertype(L, 3); --- 242,245 ---- *************** *** 283,287 **** static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // const wxString name const wxString name = wxlua_getwxStringtype(L, 3); --- 280,283 ---- *************** *** 338,342 **** static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // const wxString script const wxString script = wxlua_getwxStringtype(L, 3); --- 334,337 ---- *************** *** 428,432 **** static int LUACALL wxLua_wxlCan_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 423,426 ---- *************** *** 500,504 **** static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 494,497 ---- Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wxluacan.h 10 Dec 2007 05:39:04 -0000 1.37 --- wxluacan.h 20 Dec 2007 02:26:54 -0000 1.38 *************** *** 18,24 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 19 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 19 // --------------------------------------------------------------------------- --- 18,24 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 20 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 20 // --------------------------------------------------------------------------- |
