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-29 01:39:05
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28032/wxLua/modules/wxlua/src Modified Files: Makefile wxlua_bind.cpp Removed Files: wxlua.cpp Log Message: Try to speed up the build process by having only one cpp file for the smaller bindings using output_single_cpp_binding_file in the rules file. --- wxlua.cpp DELETED --- Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/Makefile,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile 16 Jul 2007 19:35:30 -0000 1.16 --- Makefile 29 Jan 2008 01:39:01 -0000 1.17 *************** *** 33,38 **** wxlcallb.cpp \ wxlstate.cpp \ ! wxlua_bind.cpp \ ! wxlua.cpp OBJECTS=$(SOURCES:.cpp=.o) --- 33,37 ---- wxlcallb.cpp \ wxlstate.cpp \ ! wxlua_bind.cpp OBJECTS=$(SOURCES:.cpp=.o) Index: wxlua_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxlua_bind.cpp 29 Jan 2008 00:49:16 -0000 1.25 --- wxlua_bind.cpp 29 Jan 2008 01:39:01 -0000 1.26 *************** *** 1,3 **** --- 1,147 ---- // --------------------------------------------------------------------------- + // ../modules/wxlua/src/wxlua.cpp was generated by genwxbind.lua + // + // Any changes made to this file will be lost when the file is regenerated. + // --------------------------------------------------------------------------- + + #ifdef __BORLANDC__ + #pragma hdrstop + #endif + + #include "wx/wxprec.h" + + + #ifndef WX_PRECOMP + #include "wx/wx.h" + #endif + + #include "wxlua/include/wxlstate.h" + #include "wxlua/include/wxlua_bind.h" + #ifdef Above + #undef Above + #endif + #ifdef Below + #undef Below + #endif + + + // --------------------------------------------------------------------------- + // Bind class wxLuaState + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxLuaState' + int wxluatype_wxLuaState = WXLUA_TUNKNOWN; + + static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaState_delete[] = { &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 }}; + + + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxLuaState_methods[] = { + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLuaState_delete, 1, NULL }, + { 0, 0, 0, 0 }, + }; + + int wxLuaState_methodCount = sizeof(wxLuaState_methods)/sizeof(wxLuaBindMethod) - 1; + + + // --------------------------------------------------------------------------- + // Bind class wxLuaObject + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxLuaObject' + int wxluatype_wxLuaObject = WXLUA_TUNKNOWN; + + static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_GetAllocationFlag[] = { &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, wxluatype_wxLuaObject); + // call GetAllocationFlag + int returns = (self->GetAllocationFlag()); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_GetObject[] = { &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 + static int LUACALL wxLua_wxLuaObject_GetObject(lua_State *L) + { + // get this + wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); + // call GetObject that push the item onto the stack, or nil + if (self->GetObject()) + return 1; + + return 0; + } + + + static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_SetObject[] = { &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) + static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L) + { + // get this + wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); + // call SetObject + self->SetObject(1); + // return the number of parameters + return 0; + } + + + static wxLuaArgType s_wxluatypeArray_wxLua_wxLuaObject_delete[] = { &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) + static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L) + { + wxLuaState wxlState(L); + + wxLuaObject *returns; + // call constructor + returns = new wxLuaObject(wxlState, 1); + // add to tracked memory list + wxluaO_addgcobject(L, returns); + // push the constructed class pointer + wxluaT_pushuserdatatype(L, returns, wxluatype_wxLuaObject); + // return the number of parameters + return 1; + } + + + + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxLuaObject_methods[] = { + { "GetAllocationFlag", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlag, 1, NULL }, + { "GetObject", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaObject_GetObject, 1, NULL }, + { "SetObject", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaObject_SetObject, 1, NULL }, + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLuaObject_delete, 1, NULL }, + { "wxLuaObject", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxLuaObject_constructor, 1, NULL }, + { 0, 0, 0, 0 }, + }; + + int wxLuaObject_methodCount = sizeof(wxLuaObject_methods)/sizeof(wxLuaBindMethod) - 1; + + + + + // --------------------------------------------------------------------------- // ../modules/wxlua/src/wxlua_bind.cpp was generated by genwxbind.lua // |
|
From: John L. <jr...@us...> - 2008-01-29 00:49:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/wxLua/modules/wxbind/include Modified Files: wxadv_bind.h wxaui_bind.h wxbase_bind.h wxcore_bind.h wxcore_wxlcore.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: FIX mistake in making wxLuaState::LuaPCall() clear the stack. Cleanup to the *.i files, add output_single_cpp_binding_file to have only one cpp file generated. Add wxFileSystem and it's handlers. Index: wxadv_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxadv_bind.h 25 Jan 2008 23:50:51 -0000 1.12 --- wxadv_bind.h 29 Jan 2008 00:49:11 -0000 1.13 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxadv.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxadv.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- *************** *** 12,16 **** #include "wxluasetup.h" #include "wxbind/include/wxcore_bind.h" - #include "wxbind/include/wxadv_bind.h" #include "wxlua/include/wxlstate.h" --- 12,15 ---- Index: wxcore_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxcore_bind.h 25 Jan 2008 23:50:51 -0000 1.13 --- wxcore_bind.h 29 Jan 2008 00:49:11 -0000 1.14 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxcore.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxcore.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- *************** *** 12,33 **** #include "wxluasetup.h" #include "wxbind/include/wxbase_bind.h" - #include "wxbind/include/wxcore_bind.h" - - // ---------------------------------------------------------------------------- - // wxLuaTreeItemData - our treeitem data that allows us to get/set an index - // ---------------------------------------------------------------------------- - #include "wx/treectrl.h" - - class WXDLLIMPEXP_BINDWXCORE wxLuaTreeItemData : public wxTreeItemData - { - public: - wxLuaTreeItemData(double value = 0) : m_value(value) {} - double GetValue() const { return m_value; } - void SetValue(double value) { m_value = value; } - - private: - double m_value; - }; - #include "wxlua/include/wxlstate.h" --- 12,15 ---- *************** *** 497,500 **** --- 479,483 ---- #if wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL #include "wx/treectrl.h" + #include "wxbind/include/wxcore_wxlcore.h" #endif // wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL *************** *** 516,519 **** --- 499,506 ---- #endif // wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog + #if wxUSE_STREAMS && wxUSE_FILESYSTEM + #include "wx/fs_mem.h" + #endif // wxUSE_STREAMS && wxUSE_FILESYSTEM + // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class *************** *** 1794,1797 **** --- 1781,1790 ---- #endif // wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog + #if wxUSE_STREAMS && wxUSE_FILESYSTEM + extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxMemoryFSHandler; + extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxMemoryFSHandler_methods[]; + extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxMemoryFSHandler_methodCount; + #endif // wxUSE_STREAMS && wxUSE_FILESYSTEM + #if wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxPasswordEntryDialog; Index: wxrichtext_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxrichtext_bind.h 25 Jan 2008 23:50:51 -0000 1.12 --- wxrichtext_bind.h 29 Jan 2008 00:49:11 -0000 1.13 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxrichtext.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxrichtext.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- *************** *** 12,16 **** #include "wxluasetup.h" #include "wxbind/include/wxcore_bind.h" - #include "wxbind/include/wxrichtext_bind.h" #include "wxlua/include/wxlstate.h" --- 12,15 ---- Index: wxxrc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxxrc_bind.h 25 Jan 2008 23:50:51 -0000 1.12 --- wxxrc_bind.h 29 Jan 2008 00:49:11 -0000 1.13 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxxrc.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxxrc.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- *************** *** 12,16 **** #include "wxluasetup.h" #include "wxbind/include/wxcore_bind.h" - #include "wxbind/include/wxxrc_bind.h" #include "wxlua/include/wxlstate.h" --- 12,15 ---- Index: wxnet_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxnet_bind.h 25 Jan 2008 23:50:51 -0000 1.12 --- wxnet_bind.h 29 Jan 2008 00:49:11 -0000 1.13 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxnet.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxnet.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- *************** *** 12,16 **** #include "wxluasetup.h" #include "wxbind/include/wxcore_bind.h" - #include "wxbind/include/wxnet_bind.h" #include "wxlua/include/wxlstate.h" --- 12,15 ---- Index: wxbase_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxbase_bind.h 25 Jan 2008 23:50:51 -0000 1.13 --- wxbase_bind.h 29 Jan 2008 00:49:11 -0000 1.14 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxbase.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxbase.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- *************** *** 11,15 **** #include "wxbind/include/wxbinddefs.h" #include "wxluasetup.h" - #include "wxbind/include/wxbase_bind.h" #include "wxlua/include/wxlstate.h" --- 11,14 ---- *************** *** 45,48 **** --- 44,57 ---- // --------------------------------------------------------------------------- + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + #include "wx/filesys.h" + #include "wx/fs_arc.h" + #include "wx/fs_filter.h" + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) + #include "wx/fs_inet.h" + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) + #include "sys/stat.h" #include "wx/dynlib.h" *************** *** 154,157 **** --- 163,193 ---- // --------------------------------------------------------------------------- + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxArchiveFSHandler; + extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxArchiveFSHandler_methods[]; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxArchiveFSHandler_methodCount; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFSFile; + extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFSFile_methods[]; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFSFile_methodCount; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileSystem; + extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileSystem_methods[]; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileSystem_methodCount; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileSystemHandler; + extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFileSystemHandler_methods[]; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFileSystemHandler_methodCount; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFilterFSHandler; + extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxFilterFSHandler_methods[]; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxFilterFSHandler_methodCount; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxLocalFSHandler; + extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxLocalFSHandler_methods[]; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxLocalFSHandler_methodCount; + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxInternetFSHandler; + extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxInternetFSHandler_methods[]; + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxInternetFSHandler_methodCount; + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) + extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxClientData; extern WXDLLIMPEXP_BINDWXBASE wxLuaBindMethod wxClientData_methods[]; *************** *** 528,532 **** --- 564,570 ---- wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxFileInputStream, wxFileInputStream) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxFileOutputStream, wxFileOutputStream) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxInputStream, wxInputStream) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxMemoryInputStream, wxMemoryInputStream) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_BINDWXBASE, wxOutputStream, wxOutputStream) #endif // wxUSE_STREAMS Index: wxmedia_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxmedia_bind.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxmedia_bind.h 25 Jan 2008 23:50:51 -0000 1.12 --- wxmedia_bind.h 29 Jan 2008 00:49:11 -0000 1.13 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxmedia.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxmedia.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- *************** *** 13,17 **** #include "wxbind/include/wxcore_bind.h" #include "wxbind/include/wxnet_bind.h" - #include "wxbind/include/wxmedia_bind.h" #include "wxlua/include/wxlstate.h" --- 13,16 ---- Index: wxgl_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxgl_bind.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxgl_bind.h 25 Jan 2008 23:50:51 -0000 1.12 --- wxgl_bind.h 29 Jan 2008 00:49:11 -0000 1.13 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxgl.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxgl.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- *************** *** 12,16 **** #include "wxluasetup.h" #include "wxbind/include/wxcore_bind.h" - #include "wxbind/include/wxgl_bind.h" #include "wxlua/include/wxlstate.h" --- 12,15 ---- Index: wxstc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxstc_bind.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxstc_bind.h 25 Jan 2008 23:50:51 -0000 1.12 --- wxstc_bind.h 29 Jan 2008 00:49:11 -0000 1.13 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxstc.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxstc.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- *************** *** 12,16 **** #include "wxluasetup.h" #include "wxbind/include/wxcore_bind.h" - #include "wxbind/include/wxstc_bind.h" #include "wxlua/include/wxlstate.h" --- 12,15 ---- Index: wxaui_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxaui_bind.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxaui_bind.h 25 Jan 2008 23:50:51 -0000 1.13 --- wxaui_bind.h 29 Jan 2008 00:49:11 -0000 1.14 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxaui.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxaui.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- *************** *** 12,16 **** #include "wxluasetup.h" #include "wxbind/include/wxcore_bind.h" - #include "wxbind/include/wxaui_bind.h" #include "wxlua/include/wxlstate.h" --- 12,15 ---- Index: wxhtml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxhtml_bind.h 25 Jan 2008 23:50:51 -0000 1.13 --- wxhtml_bind.h 29 Jan 2008 00:49:11 -0000 1.14 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxhtml.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxhtml.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- *************** *** 12,16 **** #include "wxluasetup.h" #include "wxbind/include/wxcore_bind.h" - #include "wxbind/include/wxhtml_bind.h" #include "wxlua/include/wxlstate.h" --- 12,15 ---- Index: wxxml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxml_bind.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxxml_bind.h 25 Jan 2008 23:50:51 -0000 1.12 --- wxxml_bind.h 29 Jan 2008 00:49:11 -0000 1.13 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxxml.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxxml.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- *************** *** 12,16 **** #include "wxluasetup.h" #include "wxbind/include/wxbase_bind.h" - #include "wxbind/include/wxxml_bind.h" #include "wxlua/include/wxlstate.h" --- 12,15 ---- Index: wxcore_wxlcore.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_wxlcore.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_wxlcore.h 10 Jan 2008 23:06:27 -0000 1.1 --- wxcore_wxlcore.h 29 Jan 2008 00:49:11 -0000 1.2 *************** *** 10,25 **** #define WX_LUA_WXLCORE_H - #include "wx/print.h" - #include "wxbind/include/wxbinddefs.h" #include "wxluasetup.h" - #if wxLUA_USE_wxLuaPrintout - class WXDLLIMPEXP_WXLUA wxLuaObject; // ---------------------------------------------------------------------------- // wxLuaPrintout // ---------------------------------------------------------------------------- class WXDLLIMPEXP_BINDWXCORE wxLuaPrintout : public wxPrintout --- 10,25 ---- #define WX_LUA_WXLCORE_H #include "wxbind/include/wxbinddefs.h" #include "wxluasetup.h" class WXDLLIMPEXP_WXLUA wxLuaObject; + // ---------------------------------------------------------------------------- // wxLuaPrintout // ---------------------------------------------------------------------------- + #if wxLUA_USE_wxLuaPrintout + + #include "wx/print.h" class WXDLLIMPEXP_BINDWXCORE wxLuaPrintout : public wxPrintout *************** *** 61,65 **** #endif //wxLUA_USE_wxLuaPrintout ! #if wxLUA_USE_wxArtProvider --- 61,67 ---- #endif //wxLUA_USE_wxLuaPrintout ! // ---------------------------------------------------------------------------- ! // wxLuaArtProvider ! // ---------------------------------------------------------------------------- #if wxLUA_USE_wxArtProvider *************** *** 87,89 **** --- 89,114 ---- #endif // wxLUA_USE_wxArtProvider + + // ---------------------------------------------------------------------------- + // wxLuaTreeItemData - our treeitem data that allows us to get/set an index + // ---------------------------------------------------------------------------- + #if wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL + + #include "wx/treectrl.h" + + class WXDLLIMPEXP_BINDWXCORE wxLuaTreeItemData : public wxTreeItemData + { + public: + wxLuaTreeItemData(double value = 0) : m_value(value) {} + double GetValue() const { return m_value; } + void SetValue(double value) { m_value = value; } + + private: + double m_value; + }; + + #endif //wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL + + #endif //WX_LUA_WXLCORE_H + |
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/wxLua/bindings/wxwidgets Modified Files: wx_datatypes.lua wxadv_rules.lua wxaui_rules.lua wxbase_file.i wxbase_override.hpp wxbase_rules.lua wxcore_controls.i wxcore_core.i wxcore_rules.lua wxdatatypes_rules.lua wxgl_rules.lua wxhtml_rules.lua wxmedia_rules.lua wxnet_rules.lua wxrichtext_rules.lua wxstc_rules.lua wxxml_rules.lua wxxrc_rules.lua Log Message: FIX mistake in making wxLuaState::LuaPCall() clear the stack. Cleanup to the *.i files, add output_single_cpp_binding_file to have only one cpp file generated. Add wxFileSystem and it's handlers. Index: wxcore_core.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_core.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxcore_core.i 18 Dec 2007 01:03:32 -0000 1.2 --- wxcore_core.i 29 Jan 2008 00:49:11 -0000 1.3 *************** *** 278,279 **** --- 278,311 ---- %endif //wxLUA_USE_wxGenericValidator %endif //wxLUA_USE_wxValidator && wxUSE_VALIDATORS + + + // --------------------------------------------------------------------------- + // wxMemoryFSHandler - See also wxbase_file.i for other wxFileSystemHandlers + + %if wxUSE_STREAMS && wxUSE_FILESYSTEM + + %include "wx/fs_mem.h" + + %class %noclassinfo %delete wxMemoryFSHandler, wxFileSystemHandler + wxMemoryFSHandler() + + // Remove file from memory FS and free occupied memory + static void RemoveFile(const wxString& filename); + + static void AddFile(const wxString& filename, const wxString& textdata); + //static void AddFile(const wxString& filename, const void *binarydata, size_t size) + + %if %wxchkver_2_8_5 + static void AddFileWithMimeType(const wxString& filename, const wxString& textdata, const wxString& mimetype); + //static void AddFileWithMimeType(const wxString& filename, const void *binarydata, size_t size, const wxString& mimetype) + %endif // %wxchkver_2_8_5 + + %if wxUSE_IMAGE + static void AddFile(const wxString& filename, const wxImage& image, long type); + static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type); + %endif // wxUSE_IMAGE + + %endclass + + + %endif // wxUSE_STREAMS && wxUSE_FILESYSTEM Index: wxbase_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxbase_override.hpp 23 Jan 2008 06:43:34 -0000 1.16 --- wxbase_override.hpp 29 Jan 2008 00:49:11 -0000 1.17 *************** *** 511,515 **** wxDos2UnixFilename((wxChar*)str.GetData()); // push the result string ! lua_pushstring(L, wx2lua(str)); return 1; --- 511,515 ---- wxDos2UnixFilename((wxChar*)str.GetData()); // push the result string ! wxlua_pushwxString(L, str); return 1; *************** *** 529,533 **** wxUnix2DosFilename((wxChar*)str.GetData()); // push the result string ! lua_pushstring(L, wx2lua(str)); return 1; --- 529,533 ---- wxUnix2DosFilename((wxChar*)str.GetData()); // push the result string ! wxlua_pushwxString(L, str); return 1; *************** *** 546,550 **** wxString returns = wxGetTempFileName(prefix, NULL); // push the result number ! lua_pushstring(L, wx2lua(returns)); // return the number of parameters return 1; --- 546,550 ---- wxString returns = wxGetTempFileName(prefix, NULL); // push the result number ! wxlua_pushwxString(L, returns); // return the number of parameters return 1; *************** *** 806,810 **** // push the result flag lua_pushboolean(L, returns); ! lua_pushstring(L, wx2lua(desc)); return 2; --- 806,810 ---- // push the result flag lua_pushboolean(L, returns); ! wxlua_pushwxString(L, desc); return 2; *************** *** 826,830 **** // push the result flag lua_pushboolean(L, returns); ! lua_pushstring(L, wx2lua(printCmd)); return 2; --- 826,830 ---- // push the result flag lua_pushboolean(L, returns); ! wxlua_pushwxString(L, printCmd); return 2; *************** *** 851,855 **** lua_pushlstring(L, (const char *)buffer, size); free(buffer); ! return 2; } return 0; --- 851,855 ---- lua_pushlstring(L, (const char *)buffer, size); free(buffer); ! return 1; } return 0; *************** *** 914,915 **** --- 914,938 ---- } %end + + + %override wxLua_wxFileSystem_FindFileInPath + // bool FindFileInPath(wxString *pStr, const wxChar *path, const wxChar *file); + // bool FindFileInPath(const wxString& path, const wxString& file); + static int LUACALL wxLua_wxFileSystem_FindFileInPath(lua_State *L) + { + // const wxString file + const wxString file_ = wxlua_getwxStringtype(L, 3); + // const wxString path + const wxString path = wxlua_getwxStringtype(L, 2); + // get this + wxFileSystem * self = (wxFileSystem *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileSystem); + // call FindFileInPath + wxString str; + bool returns = (self->FindFileInPath(&str, path, file_)); + // push the result flag + lua_pushboolean(L, returns); + wxlua_pushwxString(L, str); + + return 2; + } + %end Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** wx_datatypes.lua 17 Jan 2008 18:26:27 -0000 1.91 --- wx_datatypes.lua 29 Jan 2008 00:49:10 -0000 1.92 *************** *** 1,6 **** -- --------------------------------------------------------------------------- ! -- This file was generated by genwxbind.lua -- ! -- Any changes made to this file may be lost when file is regenerated -- --------------------------------------------------------------------------- --- 1,6 ---- -- --------------------------------------------------------------------------- ! -- ../bindings/wxwidgets/wx_datatypes.lua was generated by genwxbind.lua -- ! -- Any changes made to this file will be lost when the file is regenerated -- --------------------------------------------------------------------------- *************** *** 269,272 **** --- 269,279 ---- ValueType = "enum", }, + wxArchiveFSHandler = { + BaseClass = "wxFileSystemHandler", + Condition = "(wxUSE_STREAMS) && (wxUSE_FILESYSTEM)", + IsNumber = false, + Name = "wxArchiveFSHandler", + ValueType = "class", + }, wxArrayInt = { ["%encapsulate"] = true, *************** *** 1348,1351 **** --- 1355,1365 ---- ValueType = "class", }, + wxFSFile = { + BaseClass = "wxObject", + Condition = "(wxUSE_STREAMS) && (wxUSE_FILESYSTEM)", + IsNumber = false, + Name = "wxFSFile", + ValueType = "class", + }, wxFTP = { BaseClass = "wxProtocol", *************** *** 1465,1468 **** --- 1479,1496 ---- ValueType = "class", }, + wxFileSystem = { + BaseClass = "wxObject", + Condition = "(wxUSE_STREAMS) && (wxUSE_FILESYSTEM)", + IsNumber = false, + Name = "wxFileSystem", + ValueType = "class", + }, + wxFileSystemHandler = { + BaseClass = "wxObject", + Condition = "(wxUSE_STREAMS) && (wxUSE_FILESYSTEM)", + IsNumber = false, + Name = "wxFileSystemHandler", + ValueType = "class", + }, wxFileType = { ["%encapsulate"] = true, *************** *** 1483,1486 **** --- 1511,1521 ---- ValueType = "class", }, + wxFilterFSHandler = { + BaseClass = "wxFileSystemHandler", + Condition = "(wxUSE_STREAMS) && (wxUSE_FILESYSTEM)", + IsNumber = false, + Name = "wxFilterFSHandler", + ValueType = "class", + }, wxFindDialogEvent = { BaseClass = "wxCommandEvent", *************** *** 2258,2261 **** --- 2293,2297 ---- }, wxInputStream = { + ["%encapsulate"] = true, BaseClass = "wxStreamBase", Condition = "wxUSE_STREAMS", *************** *** 2284,2287 **** --- 2320,2330 ---- ValueType = "number", }, + wxInternetFSHandler = { + BaseClass = "wxFileSystemHandler", + Condition = "(wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS)", + IsNumber = false, + Name = "wxInternetFSHandler", + ValueType = "class", + }, wxItemKind = { Condition = "wxLUA_USE_wxMenu && wxUSE_MENUS", *************** *** 2454,2457 **** --- 2497,2507 ---- ValueType = "class", }, + wxLocalFSHandler = { + BaseClass = "wxFileSystemHandler", + Condition = "(wxUSE_STREAMS) && (wxUSE_FILESYSTEM)", + IsNumber = false, + Name = "wxLocalFSHandler", + ValueType = "class", + }, wxLocale = { ["%encapsulate"] = true, *************** *** 2664,2667 **** --- 2714,2724 ---- ValueType = "class", }, + wxMemoryFSHandler = { + BaseClass = "wxFileSystemHandler", + Condition = "wxUSE_STREAMS && wxUSE_FILESYSTEM", + IsNumber = false, + Name = "wxMemoryFSHandler", + ValueType = "class", + }, wxMemoryInputStream = { ["%encapsulate"] = true, *************** *** 2872,2875 **** --- 2929,2933 ---- }, wxOutputStream = { + ["%encapsulate"] = true, BaseClass = "wxStreamBase", Condition = "wxUSE_STREAMS", Index: wxrichtext_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxrichtext_rules.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxrichtext_rules.lua 25 Jan 2008 23:50:49 -0000 1.3 --- wxrichtext_rules.lua 29 Jan 2008 00:49:11 -0000 1.4 *************** *** 1,26 **** ! ------------------------------------------------------------------------------- -- Rules to build wxWidgets' wxRichText binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! ------------------------------------------------------------------------------- ! ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! --============================================================================= ! -- Set the lua namespace (lua table) that the bindings will be placed into. ! -- eg. wx.wxWindow(...) hook_lua_namespace = "wx" ! -- Set the C++ "namespace" that the bindings will be placed. ! -- i.e. cpp function names contain this to prevent duplicate function names hook_cpp_namespace = "wxrichtext" ! --============================================================================= -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxbind/include" output_cpp_filepath = wxlua_dir.."modules/wxbind/src" ! --============================================================================= -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros --- 1,27 ---- ! -- ---------------------------------------------------------------------------- -- Rules to build wxWidgets' wxRichText binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! -- ---------------------------------------------------------------------------- ! -- ---------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! -- ============================================================================ ! -- Set the Lua namespace (Lua table) that the bindings will be placed into. ! -- See wxLuaBinding::GetLuaNamespace(); eg. wx.wxWindow(...) hook_lua_namespace = "wx" ! -- Set the unique C++ "namespace" for the bindings, not a real namespace, but ! -- a string used in declared C++ objects to prevent duplicate names. ! -- See wxLuaBinding::GetBindingName(). hook_cpp_namespace = "wxrichtext" ! -- ============================================================================ -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxbind/include" output_cpp_filepath = wxlua_dir.."modules/wxbind/src" ! -- ============================================================================ -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros *************** *** 29,33 **** output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_BINDWXRICHTEXT" ! ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in --- 30,34 ---- output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_BINDWXRICHTEXT" ! -- ---------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in *************** *** 35,39 **** hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ! ------------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be --- 36,40 ---- hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ! -- ---------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be *************** *** 41,49 **** hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ! ------------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ! ------------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. --- 42,56 ---- hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ! -- ---------------------------------------------------------------------------- ! -- Generate only a single output C++ binding source file with the name of ! -- hook_cpp_binding_filename, as opposed to generating a single cpp file ! -- for each *.i file plus the hook_cpp_binding_filename file. ! output_single_cpp_binding_file = false ! ! -- ---------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ! -- ---------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. *************** *** 55,69 **** hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none hook_cpp_binding_post_includes = "" ! ------------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file. -- This code will be place directly after any #includes at the top of the file --- 62,76 ---- hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none hook_cpp_binding_post_includes = "" ! -- ---------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file. -- This code will be place directly after any #includes at the top of the file *************** *** 71,87 **** "#include \"wxbind/include/wxbinddefs.h\"\n".. "#include \"wxluasetup.h\"\n".. ! "#include \"wxbind/include/wxcore_bind.h\"\n".. ! "#include \""..hook_cpp_header_filename.."\"\n" ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = "" ! --============================================================================= -- Set the bindings directory that contains the *.i interface files interface_filepath = wxlua_dir.."bindings/wxwidgets" ! ------------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. --- 78,93 ---- "#include \"wxbind/include/wxbinddefs.h\"\n".. "#include \"wxluasetup.h\"\n".. ! "#include \"wxbind/include/wxcore_bind.h\"\n" ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = "" ! -- ============================================================================ -- Set the bindings directory that contains the *.i interface files interface_filepath = wxlua_dir.."bindings/wxwidgets" ! -- ---------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. *************** *** 92,96 **** } ! ------------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. --- 98,102 ---- } ! -- ---------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. *************** *** 98,102 **** --override_fileTable = { "override.hpp" } ! --============================================================================= -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper --- 104,108 ---- --override_fileTable = { "override.hpp" } ! -- ============================================================================ -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper *************** *** 108,112 **** datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxcore_datatypes.lua" } ! ------------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this --- 114,118 ---- datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxcore_datatypes.lua" } ! -- ---------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this *************** *** 115,119 **** datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" ! --============================================================================= -- Declare functions or member variables for the derived wxLuaBinding class -- that will be generated for this binding. The string will be copied verbatim --- 121,125 ---- datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" ! -- ============================================================================ -- Declare functions or member variables for the derived wxLuaBinding class -- that will be generated for this binding. The string will be copied verbatim *************** *** 124,128 **** --wxLuaBinding_class_declaration = nothing to do here ! ------------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the --- 130,134 ---- --wxLuaBinding_class_declaration = nothing to do here ! -- ---------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the *************** *** 132,144 **** --wxLuaBinding_class_implementation = nothing to do here ! --============================================================================= -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! ------------------------------------------------------------------------------- -- Add additional data types here -- example: AllocDataType("wxArrayInt", "class",false) ! --============================================================================= -- Generate comments into binding C++ code comment_cpp_binding_code = true --- 138,150 ---- --wxLuaBinding_class_implementation = nothing to do here ! -- ============================================================================ -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! -- ---------------------------------------------------------------------------- -- Add additional data types here -- example: AllocDataType("wxArrayInt", "class",false) ! -- ============================================================================ -- Generate comments into binding C++ code comment_cpp_binding_code = true Index: wxadv_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_rules.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxadv_rules.lua 25 Jan 2008 23:50:47 -0000 1.3 --- wxadv_rules.lua 29 Jan 2008 00:49:10 -0000 1.4 *************** *** 1,26 **** ! ------------------------------------------------------------------------------- -- Rules to build wxWidgets' wxAdv binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! ------------------------------------------------------------------------------- ! ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! --============================================================================= ! -- Set the lua namespace (lua table) that the bindings will be placed into. ! -- eg. wx.wxWindow(...) hook_lua_namespace = "wx" ! -- Set the C++ "namespace" that the bindings will be placed. ! -- i.e. cpp function names contain this to prevent duplicate function names hook_cpp_namespace = "wxadv" ! --============================================================================= -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxbind/include" output_cpp_filepath = wxlua_dir.."modules/wxbind/src" ! --============================================================================= -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros --- 1,27 ---- ! -- ---------------------------------------------------------------------------- -- Rules to build wxWidgets' wxAdv binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! -- ---------------------------------------------------------------------------- ! -- ---------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! -- ============================================================================ ! -- Set the Lua namespace (Lua table) that the bindings will be placed into. ! -- See wxLuaBinding::GetLuaNamespace(); eg. wx.wxWindow(...) hook_lua_namespace = "wx" ! -- Set the unique C++ "namespace" for the bindings, not a real namespace, but ! -- a string used in declared C++ objects to prevent duplicate names. ! -- See wxLuaBinding::GetBindingName(). hook_cpp_namespace = "wxadv" ! -- ============================================================================ -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxbind/include" output_cpp_filepath = wxlua_dir.."modules/wxbind/src" ! -- ============================================================================ -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros *************** *** 29,33 **** output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_BINDWXADV" ! ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in --- 30,34 ---- output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_BINDWXADV" ! -- ---------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in *************** *** 35,39 **** hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ! ------------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be --- 36,40 ---- hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ! -- ---------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be *************** *** 41,49 **** hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ! ------------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ! ------------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. --- 42,56 ---- hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ! -- ---------------------------------------------------------------------------- ! -- Generate only a single output C++ binding source file with the name of ! -- hook_cpp_binding_filename, as opposed to generating a single cpp file ! -- for each *.i file plus the hook_cpp_binding_filename file. ! output_single_cpp_binding_file = false ! ! -- ---------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ! -- ---------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. *************** *** 55,69 **** hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none hook_cpp_binding_post_includes = "" ! ------------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file. -- This code will be place directly after any #includes at the top of the file --- 62,76 ---- hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none hook_cpp_binding_post_includes = "" ! -- ---------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file. -- This code will be place directly after any #includes at the top of the file *************** *** 71,87 **** "#include \"wxbind/include/wxbinddefs.h\"\n".. "#include \"wxluasetup.h\"\n".. ! "#include \"wxbind/include/wxcore_bind.h\"\n".. ! "#include \""..hook_cpp_header_filename.."\"\n" ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = "" ! --============================================================================= -- Set the bindings directory that contains the *.i interface files interface_filepath = wxlua_dir.."bindings/wxwidgets" ! ------------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. --- 78,93 ---- "#include \"wxbind/include/wxbinddefs.h\"\n".. "#include \"wxluasetup.h\"\n".. ! "#include \"wxbind/include/wxcore_bind.h\"\n" ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = "" ! -- ============================================================================ -- Set the bindings directory that contains the *.i interface files interface_filepath = wxlua_dir.."bindings/wxwidgets" ! -- ---------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. *************** *** 93,97 **** } ! ------------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. --- 99,103 ---- } ! -- ---------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. *************** *** 99,103 **** override_fileTable = { "wxadv_override.hpp" } ! --============================================================================= -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper --- 105,109 ---- override_fileTable = { "wxadv_override.hpp" } ! -- ============================================================================ -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper *************** *** 109,113 **** datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxcore_datatypes.lua" } ! ------------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this --- 115,119 ---- datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxcore_datatypes.lua" } ! -- ---------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this *************** *** 116,120 **** datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" ! --============================================================================= -- Declare functions or member variables for the derived wxLuaBinding class -- that will be generated for this binding. The string will be copied verbatim --- 122,126 ---- datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" ! -- ============================================================================ -- Declare functions or member variables for the derived wxLuaBinding class -- that will be generated for this binding. The string will be copied verbatim *************** *** 125,129 **** --wxLuaBinding_class_declaration = nothing to do here ! ------------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the --- 131,135 ---- --wxLuaBinding_class_declaration = nothing to do here ! -- ---------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the *************** *** 133,145 **** --wxLuaBinding_class_implementation = nothing to do here ! --============================================================================= -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! ------------------------------------------------------------------------------- -- Add additional data types here -- example: AllocDataType("wxArrayInt", "class",false) ! --============================================================================= -- Generate comments into binding C++ code comment_cpp_binding_code = true --- 139,151 ---- --wxLuaBinding_class_implementation = nothing to do here ! -- ============================================================================ -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! -- ---------------------------------------------------------------------------- -- Add additional data types here -- example: AllocDataType("wxArrayInt", "class",false) ! -- ============================================================================ -- Generate comments into binding C++ code comment_cpp_binding_code = true Index: wxbase_file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_file.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxbase_file.i 18 Dec 2007 01:03:32 -0000 1.3 --- wxbase_file.i 29 Jan 2008 00:49:11 -0000 1.4 *************** *** 699,703 **** // wxInputStream ! %class %noclassinfo wxInputStream, wxStreamBase // wxInputStream() this is only a base class --- 699,703 ---- // wxInputStream ! %class %noclassinfo %encapsulate wxInputStream, wxStreamBase // wxInputStream() this is only a base class *************** *** 726,730 **** // wxOutputStream ! %class %noclassinfo wxOutputStream, wxStreamBase // wxOutputStream() this is only a base class --- 726,730 ---- // wxOutputStream ! %class %noclassinfo %encapsulate wxOutputStream, wxStreamBase // wxOutputStream() this is only a base class *************** *** 876,878 **** --- 876,1054 ---- + + // --------------------------------------------------------------------------- + // --------------------------------------------------------------------------- + // wxFSFile + + %if wxUSE_FILESYSTEM // already has wxUSE_STREAMS + + %include "wx/filesys.h" + + + %class %delete wxFSFile, wxObject + wxFSFile(%ungc wxInputStream *stream, const wxString& loc, const wxString& mimetype, const wxString& anchor, wxDateTime modif) + + // returns stream. This doesn't give away ownership of the stream object. + wxInputStream *GetStream() const + // gives away the ownership of the current stream. + %gc wxInputStream *DetachStream() + // deletes the current stream and takes ownership of another. + void SetStream(%ungc wxInputStream *stream) + + // returns file's mime type + wxString GetMimeType() const + // returns the original location (aka filename) of the file + wxString GetLocation() const + wxString GetAnchor() const + wxDateTime GetModificationTime() const + + %endclass + + + // --------------------------------------------------------------------------- + // wxFileSystemHandler + + %class %delete wxFileSystemHandler, wxObject + // wxFileSystemHandler() // no constructor since it has abstract functions + + // returns true if this handler is able to open given location + virtual bool CanOpen(const wxString& location) //= 0; + + // opens given file and returns pointer to input stream. + // Returns NULL if opening failed. + // The location is always absolute path. + virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) //= 0; + + // Finds first/next file that matches spec wildcard. flags can be wxDIR for restricting + // the query to directories or wxFILE for files only or 0 for either. + // Returns filename or empty string if no more matching file exists + virtual wxString FindFirst(const wxString& spec, int flags = 0); + virtual wxString FindNext(); + %endclass + + + // --------------------------------------------------------------------------- + // wxLocalFSHandler + + + %class %delete wxLocalFSHandler, wxFileSystemHandler + wxLocalFSHandler() + + // wxLocalFSHandler will prefix all filenames with 'root' before accessing + // files on disk. This effectively makes 'root' the top-level directory + // and prevents access to files outside this directory. + // (This is similar to Unix command 'chroot'.) + static void Chroot(const wxString& root) + + %endclass + + + // --------------------------------------------------------------------------- + // wxFileSystem + + %enum + wxFS_READ // Open for reading + wxFS_SEEKABLE // Returned stream will be seekable + %endenum + + %class %noclassinfo %delete wxFileSystem, wxObject + wxFileSystem() + + // sets the current location. Every call to OpenFile is + // relative to this location. + // NOTE !! + // unless is_dir = true 'location' is *not* the directory but + // file contained in this directory + // (so ChangePathTo("dir/subdir/xh.htm") sets m_Path to "dir/subdir/") + void ChangePathTo(const wxString& location, bool is_dir = false); + + wxString GetPath() const + + // opens given file and returns pointer to input stream. + // Returns NULL if opening failed. + // It first tries to open the file in relative scope + // (based on ChangePathTo()'s value) and then as an absolute + // path. + wxFSFile* OpenFile(const wxString& location, int flags = wxFS_READ); + + // Finds first/next file that matches spec wildcard. flags can be wxDIR for restricting + // the query to directories or wxFILE for files only or 0 for either. + // Returns filename or empty string if no more matching file exists + wxString FindFirst(const wxString& spec, int flags = 0); + wxString FindNext(); + + // find a file in a list of directories, returns false if not found + // %override [bool, Lua string full_path] bool FindFileInPath(const wxString& path, const wxString& file); + // C++ Func: bool FindFileInPath(wxString *pStr, const wxChar *path, const wxChar *file); + bool FindFileInPath(const wxString& path, const wxString& file); + + // Adds FS handler. + // In fact, this class is only front-end to the FS handlers :-) + static void AddHandler(wxFileSystemHandler *handler); + + // Removes FS handler + static wxFileSystemHandler* RemoveHandler(wxFileSystemHandler *handler); + + // Returns true if there is a handler which can open the given location. + static bool HasHandlerForPath(const wxString& location); + + // remove all items from the m_Handlers list + static void CleanUpHandlers(); + + // Returns the native path for a file URL + static wxFileName URLToFileName(const wxString& url); + + // Returns the file URL for a native path + static wxString FileNameToURL(const wxFileName& filename); + %endclass + + + // --------------------------------------------------------------------------- + // wxArchiveFSHandler + + %include "wx/fs_arc.h" + + %class %delete wxArchiveFSHandler, wxFileSystemHandler + wxArchiveFSHandler() + + %endclass + + // --------------------------------------------------------------------------- + // wxZipFSHandler - is just a typedef to wxArchiveFSHandler + + //%include "wx/fs_zip.h" + + //%if wxUSE_FS_ZIP + // typedef wxArchiveFSHandler wxZipFSHandler; + //%endif + + // --------------------------------------------------------------------------- + // wxFilterFSHandler + + %include "wx/fs_filter.h" + + %class %delete wxFilterFSHandler, wxFileSystemHandler + wxFilterFSHandler() + + %endclass + + // --------------------------------------------------------------------------- + // wxInternetFSHandler + + %if wxUSE_FS_INET && wxUSE_SOCKETS // already has wxUSE_STREAMS && wxUSE_FILESYSTEM + %include "wx/fs_inet.h" + + %class %delete wxInternetFSHandler, wxFileSystemHandler + wxInternetFSHandler() + + %endclass + %endif //wxUSE_FS_INET && wxUSE_SOCKETS + + // --------------------------------------------------------------------------- + // wxMemoryFSHandler - See wxcore_core.i for this since it requires wxImage & wxBitmap. + + + %endif // wxUSE_FILESYSTEM + + %endif // wxUSE_STREAMS Index: wxbase_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_rules.lua,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxbase_rules.lua 25 Jan 2008 23:50:48 -0000 1.8 --- wxbase_rules.lua 29 Jan 2008 00:49:11 -0000 1.9 *************** *** 1,26 **** ! ------------------------------------------------------------------------------- -- Rules to build the wxWidgets binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! ------------------------------------------------------------------------------- ! ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! --============================================================================= ! -- Set the lua namespace (lua table) that the bindings will be placed into. ! -- eg. wx.wxWindow(...) hook_lua_namespace = "wx" ! -- Set the C++ "namespace" that the bindings will be placed. ! -- i.e. cpp function names contain this to prevent duplicate function names hook_cpp_namespace = "wxbase" ! --============================================================================= -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxbind/include" output_cpp_filepath = wxlua_dir.."modules/wxbind/src" ! --============================================================================= -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros --- 1,27 ---- ! -- ---------------------------------------------------------------------------- -- Rules to build the wxWidgets binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! -- ---------------------------------------------------------------------------- ! -- ---------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! -- ============================================================================ ! -- Set the Lua namespace (Lua table) that the bindings will be placed into. ! -- See wxLuaBinding::GetLuaNamespace(); eg. wx.wxWindow(...) hook_lua_namespace = "wx" ! -- Set the unique C++ "namespace" for the bindings, not a real namespace, but ! -- a string used in declared C++ objects to prevent duplicate names. ! -- See wxLuaBinding::GetBindingName(). hook_cpp_namespace = "wxbase" ! -- ============================================================================ -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxbind/include" output_cpp_filepath = wxlua_dir.."modules/wxbind/src" ! -- ============================================================================ -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros *************** *** 29,33 **** output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_BINDWXBASE" ! ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in --- 30,34 ---- output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_BINDWXBASE" ! -- ---------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in *************** *** 35,39 **** hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ! ------------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be --- 36,40 ---- hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ! -- ---------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be *************** *** 41,49 **** hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ! ------------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ! ------------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. --- 42,56 ---- hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ! -- ---------------------------------------------------------------------------- ! -- Generate only a single output C++ binding source file with the name of ! -- hook_cpp_binding_filename, as opposed to generating a single cpp file ! -- for each *.i file plus the hook_cpp_binding_filename file. ! output_single_cpp_binding_file = false ! ! -- ---------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ! -- ---------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. *************** *** 55,64 **** hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none --- 62,71 ---- hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none *************** *** 68,72 **** "#ifdef Below\n #undef Below\n#endif\n" ! ------------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file, -- hook_cpp_header_filename. --- 75,79 ---- "#ifdef Below\n #undef Below\n#endif\n" ! -- ---------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file, -- hook_cpp_header_filename. *************** *** 74,90 **** hook_cpp_binding_header_includes = "#include \"wxbind/include/wxbinddefs.h\"\n".. ! "#include \"wxluasetup.h\"\n".. ! "#include \""..hook_cpp_header_filename.."\"\n" ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = "" ! --============================================================================= -- Set the bindings directory that contains the *.i interface files interface_filepath = wxlua_dir.."bindings/wxwidgets" ! ------------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. --- 81,96 ---- hook_cpp_binding_header_includes = "#include \"wxbind/include/wxbinddefs.h\"\n".. ! "#include \"wxluasetup.h\"\n" ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = "" ! -- ============================================================================ -- Set the bindings directory that contains the *.i interface files interface_filepath = wxlua_dir.."bindings/wxwidgets" ! -- ---------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. *************** *** 99,103 **** } ! ------------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. --- 105,109 ---- } ! -- ---------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. *************** *** 105,109 **** override_fileTable = { "wxbase_override.hpp" } ! --============================================================================= -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper --- 111,115 ---- override_fileTable = { "wxbase_override.hpp" } ! -- ============================================================================ -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper *************** *** 115,119 **** --datatype_cache_input_fileTable = { "wxwidgets/wx_datatypes.lua" } ! ------------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this --- 121,125 ---- --datatype_cache_input_fileTable = { "wxwidgets/wx_datatypes.lua" } ! -- ---------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this *************** *** 122,126 **** datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" ! --============================================================================= -- Declare functions or member variables for the derived wxLuaBinding class -- that will be generated for this binding. The string will be copied verbatim --- 128,132 ---- datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" ! -- ============================================================================ -- Declare functions or member variables for the derived wxLuaBinding class -- that will be generated for this binding. The string will be copied verbatim *************** *** 134,138 **** ]] ! ------------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the --- 140,144 ---- ]] ! -- ---------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the *************** *** 162,174 **** ]] ! --============================================================================= -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! ------------------------------------------------------------------------------- -- Add additional data types here AllocDataType("wxLuaObject", "class", false) ! --============================================================================= -- Generate comments into binding C++ code comment_cpp_binding_code = true --- 168,180 ---- ]] ! -- ============================================================================ -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! -- ---------------------------------------------------------------------------- -- Add additional data types here AllocDataType("wxLuaObject", "class", false) ! -- ============================================================================ -- Generate comments into binding C++ code comment_cpp_binding_code = true Index: wxdatatypes_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxdatatypes_rules.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxdatatypes_rules.lua 25 Jan 2008 23:50:48 -0000 1.2 --- wxdatatypes_rules.lua 29 Jan 2008 00:49:11 -0000 1.3 *************** *** 1,26 **** ! ------------------------------------------------------------------------------- -- Rules to build the wxWidgets datatypes for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! ------------------------------------------------------------------------------- ! ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! --============================================================================= ! -- Set the lua namespace (lua table) that the bindings will be placed into. ! -- eg. wx.wxWindow(...) hook_lua_namespace = "" ! -- Set the C++ "namespace" that the bindings will be placed. ! -- i.e. cpp function names contain this to prevent duplicate function names hook_cpp_namespace = "wx" ! --============================================================================= -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = "" output_cpp_filepath = "" ! --============================================================================= -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros --- 1,27 ---- ! -- ---------------------------------------------------------------------------- -- Rules to build the wxWidgets datatypes for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! -- ---------------------------------------------------------------------------- ! -- ---------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! -- ============================================================================ ! -- Set the Lua namespace (Lua table) that the bindings will be placed into. ! -- See wxLuaBinding::GetLuaNamespace(); eg. wx.wxWindow(...) hook_lua_namespace = "" ... [truncated message content] |
|
From: John L. <jr...@us...> - 2008-01-29 00:49:44
|
Update of /cvsroot/wxlua/wxLua/bindings/wxlua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/wxLua/bindings/wxlua Modified Files: wxlua_rules.lua Log Message: FIX mistake in making wxLuaState::LuaPCall() clear the stack. Cleanup to the *.i files, add output_single_cpp_binding_file to have only one cpp file generated. Add wxFileSystem and it's handlers. Index: wxlua_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/wxlua_rules.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxlua_rules.lua 25 Jan 2008 23:50:47 -0000 1.4 --- wxlua_rules.lua 29 Jan 2008 00:49:10 -0000 1.5 *************** *** 1,26 **** ! ------------------------------------------------------------------------------- -- Rules to build the wxLua binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! ------------------------------------------------------------------------------- ! ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! --============================================================================= ! -- Set the lua namespace (lua table) that the bindings will be placed into. ! -- eg. wx.wxWindow(...) hook_lua_namespace = "wxlua" ! -- Set the C++ "namespace" that the bindings will be placed. ! -- i.e. cpp function names contain this to prevent duplicate function names hook_cpp_namespace = "wxlua" ! --============================================================================= -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxlua/include" output_cpp_filepath = wxlua_dir.."modules/wxlua/src" ! --============================================================================= -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros --- 1,27 ---- ! -- ---------------------------------------------------------------------------- -- Rules to build the wxLua binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! -- ---------------------------------------------------------------------------- ! -- ---------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! -- ============================================================================ ! -- Set the Lua namespace (Lua table) that the bindings will be placed into. ! -- See wxLuaBinding::GetLuaNamespace(); eg. wx.wxWindow(...) hook_lua_namespace = "wxlua" ! -- Set the unique C++ "namespace" for the bindings, not a real namespace, but ! -- a string used in declared C++ objects to prevent duplicate names. ! -- See wxLuaBinding::GetBindingName(). hook_cpp_namespace = "wxlua" ! -- ============================================================================ -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxlua/include" output_cpp_filepath = wxlua_dir.."modules/wxlua/src" ! -- ============================================================================ -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros *************** *** 29,33 **** output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXLUA" ! ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in --- 30,34 ---- output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXLUA" ! -- ---------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in *************** *** 35,39 **** hook_cpp_header_filename = "wxlua/include/"..hook_cpp_namespace.."_bind.h" ! ------------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be --- 36,40 ---- hook_cpp_header_filename = "wxlua/include/"..hook_cpp_namespace.."_bind.h" ! -- ---------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be *************** *** 41,49 **** hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ! ------------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ! ------------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. --- 42,56 ---- hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ! -- ---------------------------------------------------------------------------- ! -- Generate only a single output C++ binding source file with the name of ! -- hook_cpp_binding_filename, as opposed to generating a single cpp file ! -- for each *.i file plus the hook_cpp_binding_filename file. ! output_single_cpp_binding_file = false ! ! -- ---------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ! -- ---------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. *************** *** 55,64 **** hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none --- 62,71 ---- hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none *************** *** 68,72 **** "#ifdef Below\n #undef Below\n#endif\n" ! ------------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file, -- hook_cpp_header_filename. --- 75,79 ---- "#ifdef Below\n #undef Below\n#endif\n" ! -- ---------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file, -- hook_cpp_header_filename. *************** *** 74,87 **** --hook_cpp_binding_header_includes = ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = nil ! --============================================================================= -- Set the bindings directory that contains the *.i interface files interface_filepath = wxlua_dir.."bindings/wxlua" ! ------------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. --- 81,94 ---- --hook_cpp_binding_header_includes = ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = nil ! -- ============================================================================ -- Set the bindings directory that contains the *.i interface files interface_filepath = wxlua_dir.."bindings/wxlua" ! -- ---------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. *************** *** 92,96 **** } ! ------------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. --- 99,103 ---- } ! -- ---------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. *************** *** 98,102 **** override_fileTable = { "override.hpp" } ! --============================================================================= -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper --- 105,109 ---- override_fileTable = { "override.hpp" } ! -- ============================================================================ -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper *************** *** 108,112 **** datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxbase_datatypes.lua" } ! ------------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this --- 115,119 ---- datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxbase_datatypes.lua" } ! -- ---------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this *************** *** 115,119 **** datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" ! --============================================================================= -- Declare functions or member variables for the derived wxLuaBinding class -- that will be generated for this binding. The string will be copied verbatim --- 122,126 ---- datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" ! -- ============================================================================ -- Declare functions or member variables for the derived wxLuaBinding class -- that will be generated for this binding. The string will be copied verbatim *************** *** 127,131 **** ]] ! ------------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the --- 134,138 ---- ]] ! -- ---------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the *************** *** 149,161 **** ]] ! --============================================================================= -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! ------------------------------------------------------------------------------- -- Add additional data types here -- example: AllocDataType("wxArrayInt", "class",false) ! --============================================================================= -- Generate comments into binding C++ code comment_cpp_binding_code = true --- 156,168 ---- ]] ! -- ============================================================================ -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! -- ---------------------------------------------------------------------------- -- Add additional data types here -- example: AllocDataType("wxArrayInt", "class",false) ! -- ============================================================================ -- Generate comments into binding C++ code comment_cpp_binding_code = true |
|
From: John L. <jr...@us...> - 2008-01-29 00:49:44
|
Update of /cvsroot/wxlua/wxLua/bindings/wxluasocket In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/wxLua/bindings/wxluasocket Modified Files: wxluasocket_rules.lua Log Message: FIX mistake in making wxLuaState::LuaPCall() clear the stack. Cleanup to the *.i files, add output_single_cpp_binding_file to have only one cpp file generated. Add wxFileSystem and it's handlers. Index: wxluasocket_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/wxluasocket_rules.lua,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxluasocket_rules.lua 25 Jan 2008 23:50:47 -0000 1.7 --- wxluasocket_rules.lua 29 Jan 2008 00:49:10 -0000 1.8 *************** *** 1,26 **** ! ------------------------------------------------------------------------------- -- Rules to build wxWidgets' wxStyledTextCtrl binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! ------------------------------------------------------------------------------- ! ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! --============================================================================= ! -- Set the lua namespace (lua table) that the bindings will be placed into. ! -- eg. wx.wxWindow(...) hook_lua_namespace = "wxlua" ! -- Set the C++ "namespace" that the bindings will be placed. ! -- i.e. cpp function names contain this to prevent duplicate function names hook_cpp_namespace = "wxluasocket" ! --============================================================================= -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxluasocket/include" output_cpp_filepath = wxlua_dir.."modules/wxluasocket/src" ! --============================================================================= -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros --- 1,27 ---- ! -- ---------------------------------------------------------------------------- -- Rules to build wxWidgets' wxStyledTextCtrl binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! -- ---------------------------------------------------------------------------- ! -- ---------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! -- ============================================================================ ! -- Set the Lua namespace (Lua table) that the bindings will be placed into. ! -- See wxLuaBinding::GetLuaNamespace(); eg. wx.wxWindow(...) hook_lua_namespace = "wxlua" ! -- Set the unique C++ "namespace" for the bindings, not a real namespace, but ! -- a string used in declared C++ objects to prevent duplicate names. ! -- See wxLuaBinding::GetBindingName(). hook_cpp_namespace = "wxluasocket" ! -- ============================================================================ -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxluasocket/include" output_cpp_filepath = wxlua_dir.."modules/wxluasocket/src" ! -- ============================================================================ -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros *************** *** 29,33 **** output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXLUASOCKET" ! ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in --- 30,34 ---- output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXLUASOCKET" ! -- ---------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in *************** *** 35,39 **** hook_cpp_header_filename = "wxluasocket/include/"..hook_cpp_namespace.."_bind.h" ! ------------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be --- 36,40 ---- hook_cpp_header_filename = "wxluasocket/include/"..hook_cpp_namespace.."_bind.h" ! -- ---------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be *************** *** 41,49 **** hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ! ------------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ! ------------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. --- 42,56 ---- hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ! -- ---------------------------------------------------------------------------- ! -- Generate only a single output C++ binding source file with the name of ! -- hook_cpp_binding_filename, as opposed to generating a single cpp file ! -- for each *.i file plus the hook_cpp_binding_filename file. ! output_single_cpp_binding_file = false ! ! -- ---------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ! -- ---------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. *************** *** 55,69 **** hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none hook_cpp_binding_post_includes = "" ! ------------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file. -- This code will be place directly after any #includes at the top of the file --- 62,76 ---- hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none hook_cpp_binding_post_includes = "" ! -- ---------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file. -- This code will be place directly after any #includes at the top of the file *************** *** 71,87 **** "#include \"wx/defs.h\"\n".. "#include \"wxluasocket/include/wxluasocketdefs.h\"\n".. ! "#include \"wxbind/include/wxcore_bind.h\"\n".. ! "#include \"wxluasocket/include/wxluasocket_bind.h\"\n" ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = "" ! --============================================================================= -- Set the bindings directory that contains the *.i interface files interface_filepath = wxlua_dir.."bindings/wxluasocket" ! ------------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. --- 78,93 ---- "#include \"wx/defs.h\"\n".. "#include \"wxluasocket/include/wxluasocketdefs.h\"\n".. ! "#include \"wxbind/include/wxcore_bind.h\"\n" ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = "" ! -- ============================================================================ -- Set the bindings directory that contains the *.i interface files interface_filepath = wxlua_dir.."bindings/wxluasocket" ! -- ---------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. *************** *** 92,96 **** } ! ------------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. --- 98,102 ---- } ! -- ---------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. *************** *** 98,102 **** override_fileTable = { "override.hpp" } ! --============================================================================= -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper --- 104,108 ---- override_fileTable = { "override.hpp" } ! -- ============================================================================ -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper *************** *** 108,112 **** datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxcore_datatypes.lua" } ! ------------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this --- 114,118 ---- datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxcore_datatypes.lua" } ! -- ---------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this *************** *** 115,119 **** datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" ! --============================================================================= -- Declare functions or member variables for the derived wxLuaBinding class -- that will be generated for this binding. The string will be copied verbatim --- 121,125 ---- datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" ! -- ============================================================================ -- Declare functions or member variables for the derived wxLuaBinding class -- that will be generated for this binding. The string will be copied verbatim *************** *** 124,128 **** --wxLuaBinding_class_declaration = nothing to do here ! ------------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the --- 130,134 ---- --wxLuaBinding_class_declaration = nothing to do here ! -- ---------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the *************** *** 132,144 **** --wxLuaBinding_class_implementation = nothing to do here ! --============================================================================= -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! ------------------------------------------------------------------------------- -- Add additional data types here -- example: AllocDataType("wxArrayInt", "class",false) ! --============================================================================= -- Generate comments into binding C++ code comment_cpp_binding_code = true --- 138,150 ---- --wxLuaBinding_class_implementation = nothing to do here ! -- ============================================================================ -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! -- ---------------------------------------------------------------------------- -- Add additional data types here -- example: AllocDataType("wxArrayInt", "class",false) ! -- ============================================================================ -- Generate comments into binding C++ code comment_cpp_binding_code = true |
|
From: John L. <jr...@us...> - 2008-01-29 00:49:44
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/wxLua/bindings Modified Files: genidocs_rules.lua genwxbind.lua Log Message: FIX mistake in making wxLuaState::LuaPCall() clear the stack. Cleanup to the *.i files, add output_single_cpp_binding_file to have only one cpp file generated. Add wxFileSystem and it's handlers. Index: genidocs_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs_rules.lua,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** genidocs_rules.lua 18 Dec 2007 01:03:32 -0000 1.6 --- genidocs_rules.lua 29 Jan 2008 00:49:10 -0000 1.7 *************** *** 1,16 **** ! ------------------------------------------------------------------------------- -- Rules to build the wxWidgets reference for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genidocs.lua ! ------------------------------------------------------------------------------- ! ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! --============================================================================= -- Set the output filename for the generated html output_filename = wxlua_dir.."/docs/wxluaref.html" ! --============================================================================= -- A list of interface files to use to make the bindings. These files will be -- converted into a html file and placed in the output_filepath directory. --- 1,16 ---- ! -- ---------------------------------------------------------------------------- -- Rules to build the wxWidgets reference for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genidocs.lua ! -- ---------------------------------------------------------------------------- ! -- ---------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" ! -- ============================================================================ -- Set the output filename for the generated html output_filename = wxlua_dir.."/docs/wxluaref.html" ! -- ============================================================================ -- A list of interface files to use to make the bindings. These files will be -- converted into a html file and placed in the output_filepath directory. *************** *** 160,164 **** } ! --============================================================================= -- A list of files that contain class names only that should be a complete -- list of all classes that could be wrapped. --- 160,164 ---- } ! -- ============================================================================ -- A list of files that contain class names only that should be a complete -- list of all classes that could be wrapped. *************** *** 176,184 **** ["wxAppTraits"] = "Most functions are available elsewhere", ["wxArray"] = "Not a real class, see implementations (wxArrayInt)", ! ["wxArrayInt"] = "Interchangeable with a numeric indexed lua table", ! ["wxArrayString"] = "Interchangeable with a numeric indexed lua table", ["wxBitmapHandler"] = "Base class for bitmap loaders, not needed", ["wxCondition"] = "For threading in C", ! ["wxCmdLineParser"] = "Easier to implement in lua", ["wxCSConv"] = "Lua uses ANSI 8-bit strings", --- 176,184 ---- ["wxAppTraits"] = "Most functions are available elsewhere", ["wxArray"] = "Not a real class, see implementations (wxArrayInt)", ! ["wxArrayInt"] = "Interchangeable with a numeric indexed Lua table", ! ["wxArrayString"] = "Interchangeable with a numeric indexed Lua table", ["wxBitmapHandler"] = "Base class for bitmap loaders, not needed", ["wxCondition"] = "For threading in C", ! ["wxCmdLineParser"] = "Easier to implement in Lua", ["wxCSConv"] = "Lua uses ANSI 8-bit strings", *************** *** 212,230 **** ["wxMutexLocker"] = "For threading in C", ["wxRealPoint"] = "Not used anywhere in wxWidgets", ! ["wxRecursionGuard"] = "Easier to implement in lua", ! ["wxRecursionGuardFlag"]= "Easier to implement in lua", ! ["wxScopedArray"] = "Useable in C++ only (unnecessary in lua)", ! ["wxScopedPtr"] = "Useable in C++ only (unnecessary in lua)", ! ["wxScopedTiedPtr"] = "Useable in C++ only (unnecessary in lua)", ["wxSemaphore"] = "For threading in C", ! ["wxSortedArrayString"] = "Interchangeable with a numeric indexed lua table", ! ["wxString"] = "Interchangeable with a lua string", ! ["wxStringBuffer"] = "Useable in C++ only (unnecessary in lua)", ! ["wxStringBufferLength"]= "Useable in C++ only (unnecessary in lua)", ! ["wxVariant"] = "Unnecessary in lua", ! ["wxVariantData"] = "Unnecessary in lua", } ! --============================================================================= -- The HTML header for the generated file. htmlHeader = [[ --- 212,230 ---- ["wxMutexLocker"] = "For threading in C", ["wxRealPoint"] = "Not used anywhere in wxWidgets", ! ["wxRecursionGuard"] = "Easier to implement in Lua", ! ["wxRecursionGuardFlag"]= "Easier to implement in Lua", ! ["wxScopedArray"] = "Useable in C++ only (unnecessary in Lua)", ! ["wxScopedPtr"] = "Useable in C++ only (unnecessary in Lua)", ! ["wxScopedTiedPtr"] = "Useable in C++ only (unnecessary in Lua)", ["wxSemaphore"] = "For threading in C", ! ["wxSortedArrayString"] = "Interchangeable with a numeric indexed Lua table", ! ["wxString"] = "Interchangeable with a Lua string", ! ["wxStringBuffer"] = "Useable in C++ only (unnecessary in Lua)", ! ["wxStringBufferLength"]= "Useable in C++ only (unnecessary in Lua)", ! ["wxVariant"] = "Unnecessary in Lua", ! ["wxVariantData"] = "Unnecessary in Lua", } ! -- ============================================================================ -- The HTML header for the generated file. htmlHeader = [[ *************** *** 238,242 **** <body> ! <h1>wxLua 2.8.4.0 Reference Manual for wxWidgets 2.8.7</h1> ]] --- 238,242 ---- <body> ! <h1>wxLua 2.8.7.0 Reference Manual for wxWidgets 2.8.7</h1> ]] Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.162 retrieving revision 1.163 diff -C2 -d -r1.162 -r1.163 *** genwxbind.lua 25 Jan 2008 23:50:46 -0000 1.162 --- genwxbind.lua 29 Jan 2008 00:49:10 -0000 1.163 *************** *** 93,97 **** -- Replacement for pairs(table) that sorts them alphabetically, returns iterator -- Code from "Programming in Lua" by Roberto Ierusalimschy ! -- the input is a lua table and optional comp function (see table.sort) -- --------------------------------------------------------------------------- function pairs_sort(atable, comp_func) --- 93,97 ---- -- Replacement for pairs(table) that sorts them alphabetically, returns iterator -- Code from "Programming in Lua" by Roberto Ierusalimschy ! -- the input is a Lua table and optional comp function (see table.sort) -- --------------------------------------------------------------------------- function pairs_sort(atable, comp_func) *************** *** 195,199 **** -- determines how to handle the data type BaseClass = nil, -- the BaseClass of this, if this is a class ! IsNumber = is_number, -- can this data type be stored as a double (lua's number type) Abstract = abstract, Condition = nil, -- conditions for this data type, eg. wxLUA_USE_xxx --- 195,199 ---- -- determines how to handle the data type BaseClass = nil, -- the BaseClass of this, if this is a class ! IsNumber = is_number, -- can this data type be stored as a double (Lua's number type) Abstract = abstract, Condition = nil, -- conditions for this data type, eg. wxLUA_USE_xxx *************** *** 253,257 **** --AllocDataType("wxStructStat", "number", true) ! -- lua data types AllocDataType("lua_State", "number", false) --- 253,257 ---- --AllocDataType("wxStructStat", "number", true) ! -- Lua data types AllocDataType("lua_State", "number", false) *************** *** 279,284 **** dataTypeAttribTable["const"] = true ! dataTypeAttribTable["%gc"] = true -- this object will be gc by lua ! dataTypeAttribTable["%ungc"] = true -- this object won't be gc by lua -- attributes that can precede a function (must set equal to true) --- 279,284 ---- dataTypeAttribTable["const"] = true ! dataTypeAttribTable["%gc"] = true -- this object will be gc by Lua ! dataTypeAttribTable["%ungc"] = true -- this object won't be gc by Lua -- attributes that can precede a function (must set equal to true) *************** *** 610,614 **** -- --------------------------------------------------------------------------- ! -- Build condition string using condition stack (number indexed lua table) -- --------------------------------------------------------------------------- function BuildCondition(conditionStack) --- 610,614 ---- -- --------------------------------------------------------------------------- ! -- Build condition string using condition stack (number indexed Lua table) -- --------------------------------------------------------------------------- function BuildCondition(conditionStack) *************** *** 1460,1463 **** --- 1460,1464 ---- local time1 = os.time() + local monolithicFileData = {} local updated_files = 0 *************** *** 1471,1478 **** -- create c/c++ file ! local fileData = GenerateBindingFileTable(interface) ! local written = WriteTableToFile(interface.CPPFileName, fileData, false) ! if written then ! updated_files = updated_files + 1 end end --- 1472,1489 ---- -- create c/c++ file ! local fileData = {} ! if output_single_cpp_binding_file then ! fileData = monolithicFileData ! end ! ! fileData = GenerateBindingFileTable(interface, fileData) ! ! if output_single_cpp_binding_file then ! monolithicFileData[#monolithicFileData+1] = "\n\n" ! else ! local written = WriteTableToFile(interface.CPPFileName, fileData, false) ! if written then ! updated_files = updated_files + 1 ! end end end *************** *** 1485,1489 **** local fileData = {} -- reset to empty table ! fileData = GenerateHookCppFileHeader(fileData) table.insert(fileData, (hook_cpp_binding_source_includes or "").."\n") fileData = GenerateHookEventFileTable(fileData) --- 1496,1504 ---- local fileData = {} -- reset to empty table ! if output_single_cpp_binding_file then ! fileData = monolithicFileData ! end ! ! fileData = GenerateHookCppFileHeader(fileData, GetCPPFileName(hook_cpp_binding_filename)) table.insert(fileData, (hook_cpp_binding_source_includes or "").."\n") fileData = GenerateHookEventFileTable(fileData) *************** *** 3177,3181 **** end ! -- our special notation to get wxString/IntArray from a lua table of strings -- BUT! it has to be const wxArrayString& arr or wxArrayString arr -- and NOT wxArrayString& arr or wxArrayString* arr --- 3192,3196 ---- end ! -- our special notation to get wxString/IntArray from a Lua table of strings -- BUT! it has to be const wxArrayString& arr or wxArrayString arr -- and NOT wxArrayString& arr or wxArrayString* arr *************** *** 4015,4022 **** table.insert(fileData, "// ---------------------------------------------------------------------------\n") ! table.insert(fileData, "// "..hook_cpp_namespace..".h - headers and tags for wxLua binding\n") table.insert(fileData, "//\n") table.insert(fileData, "// This file was generated by genwxbind.lua \n") ! table.insert(fileData, "// Any changes made to this file may be lost when file is regenerated\n") table.insert(fileData, "// ---------------------------------------------------------------------------\n") table.insert(fileData, "\n") --- 4030,4037 ---- table.insert(fileData, "// ---------------------------------------------------------------------------\n") ! table.insert(fileData, "// "..hook_cpp_namespace..".h - headers and wxLua types for wxLua binding\n") table.insert(fileData, "//\n") table.insert(fileData, "// This file was generated by genwxbind.lua \n") ! table.insert(fileData, "// Any changes made to this file will be lost when the file is regenerated\n") table.insert(fileData, "// ---------------------------------------------------------------------------\n") table.insert(fileData, "\n") *************** *** 4178,4186 **** -- --------------------------------------------------------------------------- ! function GenerateHookCppFileHeader(fileData) table.insert(fileData, "// ---------------------------------------------------------------------------\n") ! table.insert(fileData, "// This file was generated by genwxbind.lua \n") table.insert(fileData, "//\n") ! table.insert(fileData, "// Any changes made to this file may be lost when file is regenerated.\n") table.insert(fileData, "// ---------------------------------------------------------------------------\n") table.insert(fileData, "\n") --- 4193,4201 ---- -- --------------------------------------------------------------------------- ! function GenerateHookCppFileHeader(fileData, fileName) table.insert(fileData, "// ---------------------------------------------------------------------------\n") ! table.insert(fileData, "// "..fileName.." was generated by genwxbind.lua \n") table.insert(fileData, "//\n") ! table.insert(fileData, "// Any changes made to this file will be lost when the file is regenerated.\n") table.insert(fileData, "// ---------------------------------------------------------------------------\n") table.insert(fileData, "\n") *************** *** 4600,4607 **** -- Write Hook file for an interface file -- --------------------------------------------------------------------------- ! function GenerateBindingFileTable(interface) ! local fileData = {} ! fileData = GenerateHookCppFileHeader(fileData) for k, v in pairs_sort(interface.includeFiles) do --- 4615,4621 ---- -- Write Hook file for an interface file -- --------------------------------------------------------------------------- ! function GenerateBindingFileTable(interface, fileData) ! fileData = GenerateHookCppFileHeader(fileData, interface.CPPFileName) for k, v in pairs_sort(interface.includeFiles) do *************** *** 4743,4749 **** table.insert(fileData, "-- ---------------------------------------------------------------------------\n") ! table.insert(fileData, "-- This file was generated by genwxbind.lua \n") table.insert(fileData, "-- \n") ! table.insert(fileData, "-- Any changes made to this file may be lost when file is regenerated \n") table.insert(fileData, "-- ---------------------------------------------------------------------------\n") table.insert(fileData, "\n\n") --- 4757,4763 ---- table.insert(fileData, "-- ---------------------------------------------------------------------------\n") ! table.insert(fileData, "-- "..filename.." was generated by genwxbind.lua \n") table.insert(fileData, "-- \n") ! table.insert(fileData, "-- Any changes made to this file will be lost when the file is regenerated \n") table.insert(fileData, "-- ---------------------------------------------------------------------------\n") table.insert(fileData, "\n\n") *************** *** 4859,4862 **** --- 4873,4877 ---- CheckRules() else + dofile(rulesFilename) -- get the error message print("ERROR: Unable to load rules file: '"..tostring(rulesFilename).."'") do return end |
|
From: John L. <jr...@us...> - 2008-01-29 00:49:43
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan_bind.cpp wxluacan_bind.h wxluacan_rules.lua Log Message: FIX mistake in making wxLuaState::LuaPCall() clear the stack. Cleanup to the *.i files, add output_single_cpp_binding_file to have only one cpp file generated. Add wxFileSystem and it's handlers. Index: wxluacan_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxluacan_bind.h 25 Jan 2008 23:50:46 -0000 1.1 --- wxluacan_bind.h 29 Jan 2008 00:49:10 -0000 1.2 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxluacan.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxluacan.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** wxluacan.cpp 25 Jan 2008 23:50:45 -0000 1.40 --- wxluacan.cpp 29 Jan 2008 00:49:10 -0000 1.41 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ./wxluacan.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxluacan_bind.cpp 25 Jan 2008 23:50:46 -0000 1.31 --- wxluacan_bind.cpp 29 Jan 2008 00:49:10 -0000 1.32 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ./wxluacan_bind.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxluacan_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_rules.lua,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxluacan_rules.lua 25 Jan 2008 23:50:46 -0000 1.16 --- wxluacan_rules.lua 29 Jan 2008 00:49:10 -0000 1.17 *************** *** 1,22 **** ! ------------------------------------------------------------------------------- -- Rules to build the wxLuaCan app's bindings for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! ------------------------------------------------------------------------------- ! --============================================================================= ! -- Set the lua namespace (lua table) that the bindings will be placed into. ! -- eg. wx.wxWindow(...) hook_lua_namespace = "wxluacan" ! -- Set the C++ "namespace" that the bindings will be placed. ! -- i.e. cpp function names contain this to prevent duplicate function names hook_cpp_namespace = "wxluacan" ! --============================================================================= -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = "." output_cpp_filepath = "." ! --============================================================================= -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros --- 1,23 ---- ! -- ---------------------------------------------------------------------------- -- Rules to build the wxLuaCan app's bindings for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ! -- ---------------------------------------------------------------------------- ! -- ============================================================================ ! -- Set the Lua namespace (Lua table) that the bindings will be placed into. ! -- See wxLuaBinding::GetLuaNamespace(); eg. wx.wxWindow(...) hook_lua_namespace = "wxluacan" ! -- Set the unique C++ "namespace" for the bindings, not a real namespace, but ! -- a string used in declared C++ objects to prevent duplicate names. ! -- See wxLuaBinding::GetBindingName(). hook_cpp_namespace = "wxluacan" ! -- ============================================================================ -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = "." output_cpp_filepath = "." ! -- ============================================================================ -- Set the DLLIMPEXP macros for compiling these bindings into a DLL -- Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros *************** *** 25,29 **** output_cpp_impexpdatasymbol = "WXLUA_NO_DLLIMPEXP_DATA" ! ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in --- 26,30 ---- output_cpp_impexpdatasymbol = "WXLUA_NO_DLLIMPEXP_DATA" ! -- ---------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in *************** *** 31,35 **** hook_cpp_header_filename = hook_cpp_namespace.."_bind.h" ! ------------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be --- 32,36 ---- hook_cpp_header_filename = hook_cpp_namespace.."_bind.h" ! -- ---------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be *************** *** 37,45 **** hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ! ------------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ! ------------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. --- 38,52 ---- hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ! -- ---------------------------------------------------------------------------- ! -- Generate only a single output C++ binding source file with the name of ! -- hook_cpp_binding_filename, as opposed to generating a single cpp file ! -- for each *.i file plus the hook_cpp_binding_filename file. ! output_single_cpp_binding_file = false ! ! -- ---------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ! -- ---------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. *************** *** 51,79 **** hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none hook_cpp_binding_post_includes = "" ! ------------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file. -- This code will be place directly after any #includes at the top of the file hook_cpp_binding_header_includes = "#include \"wxbind/include/wxcore_bind.h\"\n" ! ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = "" ! --============================================================================= -- Set the bindings directory that contains the *.i interface files interface_filepath = "." ! ------------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. --- 58,86 ---- hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "" ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim below the -- #includes of every generated cpp file or "" for none hook_cpp_binding_post_includes = "" ! -- ---------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file. -- This code will be place directly after any #includes at the top of the file hook_cpp_binding_header_includes = "#include \"wxbind/include/wxcore_bind.h\"\n" ! -- ---------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = "" ! -- ============================================================================ -- Set the bindings directory that contains the *.i interface files interface_filepath = "." ! -- ---------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. *************** *** 84,88 **** } ! ------------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. --- 91,95 ---- } ! -- ---------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden or empty -- table {} for none. *************** *** 90,94 **** override_fileTable = {} ! --============================================================================= -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper --- 97,101 ---- override_fileTable = {} ! -- ============================================================================ -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper *************** *** 100,104 **** datatype_cache_input_fileTable = { "../../../bindings/wxwidgets/wx_datatypes.lua" } ! ------------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this --- 107,111 ---- datatype_cache_input_fileTable = { "../../../bindings/wxwidgets/wx_datatypes.lua" } ! -- ---------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this *************** *** 107,111 **** datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" ! --============================================================================= -- Declare functions or member variables for the derived wxLuaBinding class -- that will be generated for this binding. The string will be copied verbatim --- 114,118 ---- datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" ! -- ============================================================================ -- Declare functions or member variables for the derived wxLuaBinding class -- that will be generated for this binding. The string will be copied verbatim *************** *** 116,120 **** --wxLuaBinding_class_declaration = nothing to do here ! ------------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the --- 123,127 ---- --wxLuaBinding_class_declaration = nothing to do here ! -- ---------------------------------------------------------------------------- -- Implement the functions or member variables for the derived wxLuaBinding -- class that you have declared. The string will be copied into the *************** *** 124,136 **** --wxLuaBinding_class_implementation = nothing to do here ! --============================================================================= -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! ------------------------------------------------------------------------------- -- Add additional data types here -- example: AllocDataType("wxArrayInt", "class",false) ! --============================================================================= -- Generate comments into binding C++ code comment_cpp_binding_code = true --- 131,143 ---- --wxLuaBinding_class_implementation = nothing to do here ! -- ============================================================================ -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! -- ---------------------------------------------------------------------------- -- Add additional data types here -- example: AllocDataType("wxArrayInt", "class",false) ! -- ============================================================================ -- Generate comments into binding C++ code comment_cpp_binding_code = true |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/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 wxgl_bind.cpp wxgl_gl.cpp wxhtml_bind.cpp wxhtml_html.cpp wxmedia_bind.cpp wxmedia_media.cpp wxnet_bind.cpp wxnet_net.cpp wxrichtext_bind.cpp wxrichtext_richtext.cpp wxstc_bind.cpp wxstc_stc.cpp wxxml_bind.cpp wxxml_xml.cpp wxxrc_bind.cpp wxxrc_xrc.cpp Log Message: FIX mistake in making wxLuaState::LuaPCall() clear the stack. Cleanup to the *.i files, add output_single_cpp_binding_file to have only one cpp file generated. Add wxFileSystem and it's handlers. Index: wxxrc_xrc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_xrc.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxxrc_xrc.cpp 23 Jan 2008 06:43:38 -0000 1.11 --- wxxrc_xrc.cpp 29 Jan 2008 00:49:15 -0000 1.12 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxxrc_xrc.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxstc_stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_stc.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxstc_stc.cpp 23 Jan 2008 06:43:38 -0000 1.12 --- wxstc_stc.cpp 29 Jan 2008 00:49:15 -0000 1.13 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxstc_stc.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxnet_net.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_net.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxnet_net.cpp 23 Jan 2008 06:43:38 -0000 1.10 --- wxnet_net.cpp 29 Jan 2008 00:49:15 -0000 1.11 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxnet_net.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxhtml_html.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxhtml_html.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxhtml_html.cpp 23 Jan 2008 06:43:38 -0000 1.11 --- wxhtml_html.cpp 29 Jan 2008 00:49:15 -0000 1.12 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxhtml_html.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxcore_clipdrag.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_clipdrag.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxcore_clipdrag.cpp 23 Jan 2008 06:43:36 -0000 1.11 --- wxcore_clipdrag.cpp 29 Jan 2008 00:49:12 -0000 1.12 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxcore_clipdrag.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxcore_help.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_help.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxcore_help.cpp 23 Jan 2008 06:43:38 -0000 1.11 --- wxcore_help.cpp 29 Jan 2008 00:49:13 -0000 1.12 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxcore_help.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxadv_adv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_adv.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxadv_adv.cpp 23 Jan 2008 06:43:35 -0000 1.13 --- wxadv_adv.cpp 29 Jan 2008 00:49:11 -0000 1.14 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxadv_adv.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxaui_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxaui_bind.cpp 25 Jan 2008 23:50:52 -0000 1.9 --- wxaui_bind.cpp 29 Jan 2008 00:49:12 -0000 1.10 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxaui_bind.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxcore_gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_gdi.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxcore_gdi.cpp 23 Jan 2008 06:43:36 -0000 1.15 --- wxcore_gdi.cpp 29 Jan 2008 00:49:13 -0000 1.16 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxcore_gdi.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxbase_data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_data.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxbase_data.cpp 23 Jan 2008 06:43:36 -0000 1.14 --- wxbase_data.cpp 29 Jan 2008 00:49:12 -0000 1.15 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxbase_data.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxgl_gl.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxgl_gl.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxgl_gl.cpp 23 Jan 2008 06:43:38 -0000 1.9 --- wxgl_gl.cpp 29 Jan 2008 00:49:15 -0000 1.10 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxgl_gl.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxaui_aui.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_aui.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxaui_aui.cpp 23 Jan 2008 06:43:35 -0000 1.16 --- wxaui_aui.cpp 29 Jan 2008 00:49:12 -0000 1.17 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxaui_aui.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxbase_config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_config.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxbase_config.cpp 23 Jan 2008 06:43:35 -0000 1.11 --- wxbase_config.cpp 29 Jan 2008 00:49:12 -0000 1.12 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxbase_config.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxxrc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_bind.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxxrc_bind.cpp 25 Jan 2008 23:50:52 -0000 1.7 --- wxxrc_bind.cpp 29 Jan 2008 00:49:15 -0000 1.8 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxxrc_bind.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxcore_mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_mdi.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxcore_mdi.cpp 23 Jan 2008 06:43:38 -0000 1.11 --- wxcore_mdi.cpp 29 Jan 2008 00:49:14 -0000 1.12 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxcore_mdi.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxmedia_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxmedia_bind.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxmedia_bind.cpp 25 Jan 2008 23:50:52 -0000 1.7 --- wxmedia_bind.cpp 29 Jan 2008 00:49:15 -0000 1.8 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxmedia_bind.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxcore_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_bind.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxcore_bind.cpp 25 Jan 2008 23:50:52 -0000 1.15 --- wxcore_bind.cpp 29 Jan 2008 00:49:12 -0000 1.16 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxcore_bind.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- *************** *** 4617,4620 **** --- 4617,4624 ---- #endif // wxLUA_USE_wxDC + #if wxUSE_STREAMS && wxUSE_FILESYSTEM + { "wxMemoryFSHandler", wxMemoryFSHandler_methods, wxMemoryFSHandler_methodCount, NULL, &wxluatype_wxMemoryFSHandler, "wxFileSystemHandler", NULL ,g_wxluanumberArray_None, 0, }, + #endif // wxUSE_STREAMS && wxUSE_FILESYSTEM + #if wxLUA_USE_wxMenu && wxUSE_MENUS { "wxMenu", wxMenu_methods, wxMenu_methodCount, CLASSINFO(wxMenu), &wxluatype_wxMenu, "wxEvtHandler", NULL ,g_wxluanumberArray_None, 0, }, Index: wxrichtext_richtext.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxrichtext_richtext.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxrichtext_richtext.cpp 16 Jul 2007 19:35:23 -0000 1.1 --- wxrichtext_richtext.cpp 29 Jan 2008 00:49:15 -0000 1.2 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxrichtext_richtext.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxcore_controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_controls.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxcore_controls.cpp 23 Jan 2008 06:43:36 -0000 1.12 --- wxcore_controls.cpp 29 Jan 2008 00:49:12 -0000 1.13 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxcore_controls.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxxml_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxml_bind.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxxml_bind.cpp 25 Jan 2008 23:50:52 -0000 1.7 --- wxxml_bind.cpp 29 Jan 2008 00:49:15 -0000 1.8 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxxml_bind.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxcore_menutool.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_menutool.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxcore_menutool.cpp 23 Jan 2008 06:43:38 -0000 1.11 --- wxcore_menutool.cpp 29 Jan 2008 00:49:14 -0000 1.12 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxcore_menutool.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxcore_picker.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_picker.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxcore_picker.cpp 23 Jan 2008 06:43:38 -0000 1.10 --- wxcore_picker.cpp 29 Jan 2008 00:49:14 -0000 1.11 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxcore_picker.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxmedia_media.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxmedia_media.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxmedia_media.cpp 23 Jan 2008 06:43:38 -0000 1.10 --- wxmedia_media.cpp 29 Jan 2008 00:49:15 -0000 1.11 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxmedia_media.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxcore_dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_dialogs.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxcore_dialogs.cpp 23 Jan 2008 06:43:36 -0000 1.10 --- wxcore_dialogs.cpp 29 Jan 2008 00:49:13 -0000 1.11 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxcore_dialogs.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxbase_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_bind.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxbase_bind.cpp 25 Jan 2008 23:50:52 -0000 1.13 --- wxbase_bind.cpp 29 Jan 2008 00:49:12 -0000 1.14 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxbase_bind.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- *************** *** 339,342 **** --- 339,347 ---- #endif // wxUSE_INTL + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + { "wxFS_READ", wxFS_READ }, + { "wxFS_SEEKABLE", wxFS_SEEKABLE }, + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + #if wxLUA_USE_wxFile && wxUSE_FILE { "wxFromCurrent", wxFromCurrent }, *************** *** 971,975 **** wxDos2UnixFilename((wxChar*)str.GetData()); // push the result string ! lua_pushstring(L, wx2lua(str)); return 1; --- 976,980 ---- wxDos2UnixFilename((wxChar*)str.GetData()); // push the result string ! wxlua_pushwxString(L, str); return 1; *************** *** 1960,1964 **** wxUnix2DosFilename((wxChar*)str.GetData()); // push the result string ! lua_pushstring(L, wx2lua(str)); return 1; --- 1965,1969 ---- wxUnix2DosFilename((wxChar*)str.GetData()); // push the result string ! wxlua_pushwxString(L, str); return 1; *************** *** 2168,2171 **** --- 2173,2180 ---- static wxLuaBindClass classList[] = { + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + { "wxArchiveFSHandler", wxArchiveFSHandler_methods, wxArchiveFSHandler_methodCount, CLASSINFO(wxArchiveFSHandler), &wxluatype_wxArchiveFSHandler, "wxFileSystemHandler", NULL ,g_wxluanumberArray_None, 0, }, + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + #if wxLUA_USE_wxArrayInt { "wxArrayInt", wxArrayInt_methods, wxArrayInt_methodCount, NULL, &wxluatype_wxArrayInt, NULL, NULL ,g_wxluanumberArray_None, 0, }, *************** *** 2224,2227 **** --- 2233,2240 ---- { "wxDynamicLibraryDetailsArray", wxDynamicLibraryDetailsArray_methods, wxDynamicLibraryDetailsArray_methodCount, NULL, &wxluatype_wxDynamicLibraryDetailsArray, NULL, NULL ,g_wxluanumberArray_None, 0, }, + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + { "wxFSFile", wxFSFile_methods, wxFSFile_methodCount, CLASSINFO(wxFSFile), &wxluatype_wxFSFile, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + #if wxLUA_USE_wxFile && wxUSE_FILE { "wxFile", wxFile_methods, wxFile_methodCount, NULL, &wxluatype_wxFile, NULL, NULL ,wxFile_enums, wxFile_enumCount, }, *************** *** 2244,2250 **** --- 2257,2273 ---- #endif // wxUSE_STREAMS + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + { "wxFileSystem", wxFileSystem_methods, wxFileSystem_methodCount, NULL, &wxluatype_wxFileSystem, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, + { "wxFileSystemHandler", wxFileSystemHandler_methods, wxFileSystemHandler_methodCount, CLASSINFO(wxFileSystemHandler), &wxluatype_wxFileSystemHandler, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + { "wxFileType", wxFileType_methods, wxFileType_methodCount, NULL, &wxluatype_wxFileType, NULL, NULL ,g_wxluanumberArray_None, 0, }, { "wxFileTypeInfo", wxFileTypeInfo_methods, wxFileTypeInfo_methodCount, NULL, &wxluatype_wxFileTypeInfo, NULL, NULL ,g_wxluanumberArray_None, 0, }, { "wxFileType_MessageParameters", wxFileType_MessageParameters_methods, wxFileType_MessageParameters_methodCount, NULL, &wxluatype_wxFileType_MessageParameters, NULL, NULL ,g_wxluanumberArray_None, 0, }, + + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + { "wxFilterFSHandler", wxFilterFSHandler_methods, wxFilterFSHandler_methodCount, CLASSINFO(wxFilterFSHandler), &wxluatype_wxFilterFSHandler, "wxFileSystemHandler", NULL ,g_wxluanumberArray_None, 0, }, + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + { "wxIconLocation", wxIconLocation_methods, wxIconLocation_methodCount, NULL, &wxluatype_wxIconLocation, NULL, NULL ,g_wxluanumberArray_None, 0, }, *************** *** 2253,2256 **** --- 2276,2283 ---- #endif // wxUSE_STREAMS + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) + { "wxInternetFSHandler", wxInternetFSHandler_methods, wxInternetFSHandler_methodCount, CLASSINFO(wxInternetFSHandler), &wxluatype_wxInternetFSHandler, "wxFileSystemHandler", NULL ,g_wxluanumberArray_None, 0, }, + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) + #if wxUSE_INTL { "wxLanguageInfo", wxLanguageInfo_methods, wxLanguageInfo_methodCount, NULL, &wxluatype_wxLanguageInfo, NULL, NULL ,g_wxluanumberArray_None, 0, }, *************** *** 2261,2264 **** --- 2288,2295 ---- #endif // wxLUA_USE_wxList && !wxUSE_STL + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + { "wxLocalFSHandler", wxLocalFSHandler_methods, wxLocalFSHandler_methodCount, CLASSINFO(wxLocalFSHandler), &wxluatype_wxLocalFSHandler, "wxFileSystemHandler", NULL ,g_wxluanumberArray_None, 0, }, + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + #if wxUSE_INTL { "wxLocale", wxLocale_methods, wxLocale_methodCount, NULL, &wxluatype_wxLocale, NULL, NULL ,g_wxluanumberArray_None, 0, }, *************** *** 2524,2528 **** --- 2555,2561 ---- wxLUA_IMPLEMENT_ENCAPSULATION(wxFileInputStream, wxFileInputStream) wxLUA_IMPLEMENT_ENCAPSULATION(wxFileOutputStream, wxFileOutputStream) + wxLUA_IMPLEMENT_ENCAPSULATION(wxInputStream, wxInputStream) wxLUA_IMPLEMENT_ENCAPSULATION(wxMemoryInputStream, wxMemoryInputStream) + wxLUA_IMPLEMENT_ENCAPSULATION(wxOutputStream, wxOutputStream) #endif // wxUSE_STREAMS Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_bind.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxstc_bind.cpp 25 Jan 2008 23:50:52 -0000 1.7 --- wxstc_bind.cpp 29 Jan 2008 00:49:15 -0000 1.8 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxstc_bind.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxxml_xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxml_xml.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxxml_xml.cpp 23 Jan 2008 06:43:38 -0000 1.12 --- wxxml_xml.cpp 29 Jan 2008 00:49:15 -0000 1.13 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxxml_xml.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxcore_defsutils.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_defsutils.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxcore_defsutils.cpp 23 Jan 2008 06:43:36 -0000 1.10 --- wxcore_defsutils.cpp 29 Jan 2008 00:49:13 -0000 1.11 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxcore_defsutils.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxbase_datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_datetime.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxbase_datetime.cpp 23 Jan 2008 06:43:36 -0000 1.11 --- wxbase_datetime.cpp 29 Jan 2008 00:49:12 -0000 1.12 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxbase_datetime.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxbase_file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_file.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxbase_file.cpp 23 Jan 2008 06:43:36 -0000 1.11 --- wxbase_file.cpp 29 Jan 2008 00:49:12 -0000 1.12 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxbind/src/wxbase_file.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- *************** *** 4225,4229 **** // push the result flag lua_pushboolean(L, returns); ! lua_pushstring(L, wx2lua(desc)); return 2; --- 4225,4229 ---- // push the result flag lua_pushboolean(L, returns); ! wxlua_pushwxString(L, desc); return 2; *************** *** 4328,4332 **** // push the result flag lua_pushboolean(L, returns); ! lua_pushstring(L, wx2lua(printCmd)); return 2; --- 4328,4332 ---- // push the result flag lua_pushboolean(L, returns); ! wxlua_pushwxString(L, printCmd); return 2; *************** *** 4945,4949 **** lua_pushlstring(L, (const char *)buffer, size); free(buffer); ! return 2; } return 0; --- 4945,4949 ---- lua_pushlstring(L, (const char *)buffer, size); free(buffer); ! return 1; } return 0; *************** *** 5840,5841 **** --- 5840,6617 ---- #endif // wxUSE_STREAMS + + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + // --------------------------------------------------------------------------- + // Bind class wxFSFile + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxFSFile' + int wxluatype_wxFSFile = WXLUA_TUNKNOWN; + + #if (wxUSE_STREAMS) && ((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) + static wxLuaArgType s_wxluatypeArray_wxLua_wxFSFile_DetachStream[] = { &wxluatype_wxFSFile, NULL }; + static int LUACALL wxLua_wxFSFile_DetachStream(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFSFile_DetachStream[1] = {{ wxLua_wxFSFile_DetachStream, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxFSFile_DetachStream }}; + // %gc wxInputStream *DetachStream() + static int LUACALL wxLua_wxFSFile_DetachStream(lua_State *L) + { + // get this + wxFSFile * self = (wxFSFile *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFSFile); + // call DetachStream + wxInputStream* returns = (wxInputStream*)self->DetachStream(); + if (!wxluaO_isgcobject(L, returns)) wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxInputStream(returns)); + // push the result datatype + wxluaT_pushuserdatatype(L, returns, wxluatype_wxInputStream); + + return 1; + } + + #endif // (wxUSE_STREAMS) && ((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) + + static wxLuaArgType s_wxluatypeArray_wxLua_wxFSFile_GetAnchor[] = { &wxluatype_wxFSFile, NULL }; + static int LUACALL wxLua_wxFSFile_GetAnchor(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFSFile_GetAnchor[1] = {{ wxLua_wxFSFile_GetAnchor, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxFSFile_GetAnchor }}; + // wxString GetAnchor() const + static int LUACALL wxLua_wxFSFile_GetAnchor(lua_State *L) + { + // get this + wxFSFile * self = (wxFSFile *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFSFile); + // call GetAnchor + wxString returns = (self->GetAnchor()); + // push the result string + wxlua_pushwxString(L, returns); + + return 1; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxFSFile_GetLocation[] = { &wxluatype_wxFSFile, NULL }; + static int LUACALL wxLua_wxFSFile_GetLocation(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFSFile_GetLocation[1] = {{ wxLua_wxFSFile_GetLocation, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxFSFile_GetLocation }}; + // wxString GetLocation() const + static int LUACALL wxLua_wxFSFile_GetLocation(lua_State *L) + { + // get this + wxFSFile * self = (wxFSFile *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFSFile); + // call GetLocation + wxString returns = (self->GetLocation()); + // push the result string + wxlua_pushwxString(L, returns); + + return 1; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxFSFile_GetMimeType[] = { &wxluatype_wxFSFile, NULL }; + static int LUACALL wxLua_wxFSFile_GetMimeType(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFSFile_GetMimeType[1] = {{ wxLua_wxFSFile_GetMimeType, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxFSFile_GetMimeType }}; + // wxString GetMimeType() const + static int LUACALL wxLua_wxFSFile_GetMimeType(lua_State *L) + { + // get this + wxFSFile * self = (wxFSFile *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFSFile); + // call GetMimeType + wxString returns = (self->GetMimeType()); + // push the result string + wxlua_pushwxString(L, returns); + + return 1; + } + + + #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && ((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) + static wxLuaArgType s_wxluatypeArray_wxLua_wxFSFile_GetModificationTime[] = { &wxluatype_wxFSFile, NULL }; + static int LUACALL wxLua_wxFSFile_GetModificationTime(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFSFile_GetModificationTime[1] = {{ wxLua_wxFSFile_GetModificationTime, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxFSFile_GetModificationTime }}; + // wxDateTime GetModificationTime() const + static int LUACALL wxLua_wxFSFile_GetModificationTime(lua_State *L) + { + // get this + wxFSFile * self = (wxFSFile *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFSFile); + // call GetModificationTime + // allocate a new object using the copy constructor + wxDateTime* returns = new wxDateTime(self->GetModificationTime()); + // add the new object to the tracked memory list + wxluaO_addgcobject(L, (void*)returns, new wxLua_wxObject_wxDateTime((wxDateTime*)returns)); + // push the result datatype + wxluaT_pushuserdatatype(L, returns, wxluatype_wxDateTime); + + return 1; + } + + #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && ((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) + + #if (wxUSE_STREAMS) && ((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) + static wxLuaArgType s_wxluatypeArray_wxLua_wxFSFile_GetStream[] = { &wxluatype_wxFSFile, NULL }; + static int LUACALL wxLua_wxFSFile_GetStream(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFSFile_GetStream[1] = {{ wxLua_wxFSFile_GetStream, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxFSFile_GetStream }}; + // wxInputStream *GetStream() const + static int LUACALL wxLua_wxFSFile_GetStream(lua_State *L) + { + // get this + wxFSFile * self = (wxFSFile *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFSFile); + // call GetStream + wxInputStream* returns = (wxInputStream*)self->GetStream(); + // push the result datatype + wxluaT_pushuserdatatype(L, returns, wxluatype_wxInputStream); + + return 1; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxFSFile_SetStream[] = { &wxluatype_wxFSFile, &wxluatype_wxInputStream, NULL }; + static int LUACALL wxLua_wxFSFile_SetStream(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFSFile_SetStream[1] = {{ wxLua_wxFSFile_SetStream, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxFSFile_SetStream }}; + // void SetStream(%ungc wxInputStream *stream) + static int LUACALL wxLua_wxFSFile_SetStream(lua_State *L) + { + // wxInputStream stream + wxInputStream * stream = (wxInputStream *)wxluaT_getuserdatatype(L, 2, wxluatype_wxInputStream); + if (wxluaO_isgcobject(L, stream)) wxluaO_undeletegcobject(L, stream); + // get this + wxFSFile * self = (wxFSFile *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFSFile); + // call SetStream + self->SetStream(stream); + + return 0; + } + + #endif // (wxUSE_STREAMS) && ((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) + + static wxLuaArgType s_wxluatypeArray_wxLua_wxFSFile_delete[] = { &wxluatype_wxFSFile, NULL }; + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFSFile_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxFSFile_delete }}; + + + #if (((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) && (wxUSE_STREAMS)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) + static wxLuaArgType s_wxluatypeArray_wxLua_wxFSFile_constructor[] = { &wxluatype_wxInputStream, &wxluatype_TSTRING, &wxluatype_TSTRING, &wxluatype_TSTRING, &wxluatype_wxDateTime, NULL }; + static int LUACALL wxLua_wxFSFile_constructor(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFSFile_constructor[1] = {{ wxLua_wxFSFile_constructor, WXLUAMETHOD_CONSTRUCTOR, 5, 5, s_wxluatypeArray_wxLua_wxFSFile_constructor }}; + // wxFSFile(%ungc wxInputStream *stream, const wxString& loc, const wxString& mimetype, const wxString& anchor, wxDateTime modif) + static int LUACALL wxLua_wxFSFile_constructor(lua_State *L) + { + // wxDateTime modif + wxDateTime modif = *(wxDateTime*)wxluaT_getuserdatatype(L, 5, wxluatype_wxDateTime); + // const wxString anchor + const wxString anchor = wxlua_getwxStringtype(L, 4); + // const wxString mimetype + const wxString mimetype = wxlua_getwxStringtype(L, 3); + // const wxString loc + const wxString loc = wxlua_getwxStringtype(L, 2); + // wxInputStream stream + wxInputStream * stream = (wxInputStream *)wxluaT_getuserdatatype(L, 1, wxluatype_wxInputStream); + if (wxluaO_isgcobject(L, stream)) wxluaO_undeletegcobject(L, stream); + // call constructor + wxFSFile* returns = new wxFSFile(stream, loc, mimetype, anchor, modif); + // add to tracked memory list + wxluaO_addgcobject(L, returns); + // push the constructed class pointer + wxluaT_pushuserdatatype(L, returns, wxluatype_wxFSFile); + + return 1; + } + + #endif // (((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) && (wxUSE_STREAMS)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) + + + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxFSFile_methods[] = { + #if (wxUSE_STREAMS) && ((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) + { "DetachStream", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFSFile_DetachStream, 1, NULL }, + #endif // (wxUSE_STREAMS) && ((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) + + { "GetAnchor", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFSFile_GetAnchor, 1, NULL }, + { "GetLocation", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFSFile_GetLocation, 1, NULL }, + { "GetMimeType", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFSFile_GetMimeType, 1, NULL }, + + #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && ((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) + { "GetModificationTime", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFSFile_GetModificationTime, 1, NULL }, + #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && ((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) + + #if (wxUSE_STREAMS) && ((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) + { "GetStream", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFSFile_GetStream, 1, NULL }, + { "SetStream", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFSFile_SetStream, 1, NULL }, + #endif // (wxUSE_STREAMS) && ((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) + + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxFSFile_delete, 1, NULL }, + + #if (((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) && (wxUSE_STREAMS)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) + { "wxFSFile", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxFSFile_constructor, 1, NULL }, + #endif // (((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) && (wxUSE_STREAMS)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) + + { 0, 0, 0, 0 }, + }; + + int wxFSFile_methodCount = sizeof(wxFSFile_methods)/sizeof(wxLuaBindMethod) - 1; + + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + + + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + // --------------------------------------------------------------------------- + // Bind class wxFileSystemHandler + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxFileSystemHandler' + int wxluatype_wxFileSystemHandler = WXLUA_TUNKNOWN; + + static wxLuaArgType s_wxluatypeArray_wxLua_wxFileSystemHandler_CanOpen[] = { &wxluatype_wxFileSystemHandler, &wxluatype_TSTRING, NULL }; + static int LUACALL wxLua_wxFileSystemHandler_CanOpen(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileSystemHandler_CanOpen[1] = {{ wxLua_wxFileSystemHandler_CanOpen, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxFileSystemHandler_CanOpen }}; + // virtual bool CanOpen(const wxString& location) //= 0; + static int LUACALL wxLua_wxFileSystemHandler_CanOpen(lua_State *L) + { + // const wxString location + const wxString location = wxlua_getwxStringtype(L, 2); + // get this + wxFileSystemHandler * self = (wxFileSystemHandler *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileSystemHandler); + // call CanOpen + bool returns = (self->CanOpen(location)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxFileSystemHandler_FindFirst[] = { &wxluatype_wxFileSystemHandler, &wxluatype_TSTRING, &wxluatype_TNUMBER, NULL }; + static int LUACALL wxLua_wxFileSystemHandler_FindFirst(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileSystemHandler_FindFirst[1] = {{ wxLua_wxFileSystemHandler_FindFirst, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxFileSystemHandler_FindFirst }}; + // virtual wxString FindFirst(const wxString& spec, int flags = 0); + static int LUACALL wxLua_wxFileSystemHandler_FindFirst(lua_State *L) + { + // get number of arguments + int argCount = lua_gettop(L); + // int flags = 0 + int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : 0); + // const wxString spec + const wxString spec = wxlua_getwxStringtype(L, 2); + // get this + wxFileSystemHandler * self = (wxFileSystemHandler *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileSystemHandler); + // call FindFirst + wxString returns = (self->FindFirst(spec, flags)); + // push the result string + wxlua_pushwxString(L, returns); + + return 1; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxFileSystemHandler_FindNext[] = { &wxluatype_wxFileSystemHandler, NULL }; + static int LUACALL wxLua_wxFileSystemHandler_FindNext(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileSystemHandler_FindNext[1] = {{ wxLua_wxFileSystemHandler_FindNext, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxFileSystemHandler_FindNext }}; + // virtual wxString FindNext(); + static int LUACALL wxLua_wxFileSystemHandler_FindNext(lua_State *L) + { + // get this + wxFileSystemHandler * self = (wxFileSystemHandler *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileSystemHandler); + // call FindNext + wxString returns = (self->FindNext()); + // push the result string + wxlua_pushwxString(L, returns); + + return 1; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxFileSystemHandler_OpenFile[] = { &wxluatype_wxFileSystemHandler, &wxluatype_wxFileSystem, &wxluatype_TSTRING, NULL }; + static int LUACALL wxLua_wxFileSystemHandler_OpenFile(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileSystemHandler_OpenFile[1] = {{ wxLua_wxFileSystemHandler_OpenFile, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxFileSystemHandler_OpenFile }}; + // virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) //= 0; + static int LUACALL wxLua_wxFileSystemHandler_OpenFile(lua_State *L) + { + // const wxString location + const wxString location = wxlua_getwxStringtype(L, 3); + // wxFileSystem fs + wxFileSystem * fs = (wxFileSystem *)wxluaT_getuserdatatype(L, 2, wxluatype_wxFileSystem); + // get this + wxFileSystemHandler * self = (wxFileSystemHandler *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileSystemHandler); + // call OpenFile + wxFSFile* returns = (wxFSFile*)self->OpenFile(*fs, location); + // push the result datatype + wxluaT_pushuserdatatype(L, returns, wxluatype_wxFSFile); + + return 1; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxFileSystemHandler_delete[] = { &wxluatype_wxFileSystemHandler, NULL }; + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileSystemHandler_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxFileSystemHandler_delete }}; + + + + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxFileSystemHandler_methods[] = { + { "CanOpen", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileSystemHandler_CanOpen, 1, NULL }, + { "FindFirst", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileSystemHandler_FindFirst, 1, NULL }, + { "FindNext", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileSystemHandler_FindNext, 1, NULL }, + { "OpenFile", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileSystemHandler_OpenFile, 1, NULL }, + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxFileSystemHandler_delete, 1, NULL }, + + { 0, 0, 0, 0 }, + }; + + int wxFileSystemHandler_methodCount = sizeof(wxFileSystemHandler_methods)/sizeof(wxLuaBindMethod) - 1; + + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + + + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + // --------------------------------------------------------------------------- + // Bind class wxLocalFSHandler + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxLocalFSHandler' + int wxluatype_wxLocalFSHandler = WXLUA_TUNKNOWN; + + static wxLuaArgType s_wxluatypeArray_wxLua_wxLocalFSHandler_Chroot[] = { &wxluatype_TSTRING, NULL }; + static int LUACALL wxLua_wxLocalFSHandler_Chroot(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxLocalFSHandler_Chroot[1] = {{ wxLua_wxLocalFSHandler_Chroot, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatypeArray_wxLua_wxLocalFSHandler_Chroot }}; + // static void Chroot(const wxString& root) + static int LUACALL wxLua_wxLocalFSHandler_Chroot(lua_State *L) + { + // const wxString root + const wxString root = wxlua_getwxStringtype(L, 1); + // call Chroot + wxLocalFSHandler::Chroot(root); + + return 0; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxLocalFSHandler_delete[] = { &wxluatype_wxLocalFSHandler, NULL }; + static wxLuaBindCFunc s_wxluafunc_wxLua_wxLocalFSHandler_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxLocalFSHandler_delete }}; + + static int LUACALL wxLua_wxLocalFSHandler_constructor(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxLocalFSHandler_constructor[1] = {{ wxLua_wxLocalFSHandler_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }}; + // wxLocalFSHandler() + static int LUACALL wxLua_wxLocalFSHandler_constructor(lua_State *L) + { + // call constructor + wxLocalFSHandler* returns = new wxLocalFSHandler(); + // add to tracked memory list + wxluaO_addgcobject(L, returns); + // push the constructed class pointer + wxluaT_pushuserdatatype(L, returns, wxluatype_wxLocalFSHandler); + + return 1; + } + + + + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxLocalFSHandler_methods[] = { + { "Chroot", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLocalFSHandler_Chroot, 1, NULL }, + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLocalFSHandler_delete, 1, NULL }, + { "wxLocalFSHandler", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxLocalFSHandler_constructor, 1, NULL }, + + { 0, 0, 0, 0 }, + }; + + int wxLocalFSHandler_methodCount = sizeof(wxLocalFSHandler_methods)/sizeof(wxLuaBindMethod) - 1; + + #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + + + #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) + // --------------------------------------------------------------------------- + // Bind class wxFileSystem + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxFileSystem' + int wxluatype_wxFileSystem = WXLUA_TUNKNOWN; + + static wxLuaArgType s_wxluatypeArray_wxLua_wxFileSystem_AddHandler[] = { &wxluatype_wxFileSystemHandler, NULL }; + static int LUACALL wxLua_wxFileSystem_AddHandler(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileSystem_AddHandler[1] = {{ wxLua_wxFileSystem_AddHandler, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatypeArray_wxLua_wxFileSystem_AddHandler }}; + // static void AddHandler(wxFileSystemHandler *handler); + static int LUACALL wxLua_wxFileSystem_AddHandler(lua_State *L) + { + // wxFileSystemHandler handler + wxFileSystemHandler * handler = (wxFileSystemHandler *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileSystemHandler); + // call AddHandler + wxFileSystem::AddHandler(handler); + + return 0; + } + + static wxLuaArgType s_wxluatypeArray_wxLua_wxFileSystem_ChangePathTo[] = { &wxluatype_wxFileSystem, &wxluatype_TSTRING, &wxluatype_TBOOLEAN, NULL }; + static int LUACALL wxLua_wxFileSystem_ChangePathTo(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileSystem_ChangePathTo[1] = {{ wxLua_wxFileSystem_ChangePathTo, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxFileSystem_ChangePathTo }}; + // void ChangePathTo(const wxString& location, bool is_dir = false); + static int LUACALL wxLua_wxFileSystem_ChangePathTo(lua_State *L) + { + // get number of arguments + int argCount = lua_gettop(L); + // bool is_dir = false + bool is_dir = (argCount >= 3 ? wxlua_getbooleantype(L, 3) : false); + // const wxString location + const wxString location = wxlua_getwxStringtype(L, 2); + // get this + wxFileSystem * self = (wxFileSystem *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileSystem); + // call ChangePathTo + self->ChangePathTo(location, is_dir); + + return 0; + } + + static int LUACALL wxLua_wxFileSystem_CleanUpHandlers(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileSystem_CleanUpHandlers[1] = {{ wxLua_wxFileSystem_CleanUpHandlers, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, g_wxluaargtypeArray_None }}; + // static void CleanUpHandlers(); + static int LUACALL wxLua_wxFileSystem_CleanUpHandlers(lua_State *L) + { + // call CleanUpHandlers + wxFileSystem::CleanUpHandlers(); + + return 0; + } + + + #if (wxLUA_USE_wxFileName) && ((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) + static wxLuaArgType s_wxluatypeArray_wxLua_wxFileSystem_FileNameToURL[] = { &wxluatype_wxFileName, NULL }; + static int LUACALL wxLua_wxFileSystem_FileNameToURL(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileSystem_FileNameToURL[1] = {{ wxLua_wxFileSystem_FileNameToURL, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatypeArray_wxLua_wxFileSystem_FileNameToURL }}; + // static wxString FileNameToURL(const wxFileName& filename); + static int LUACALL wxLua_wxFileSystem_FileNameToURL(lua_State *L) + { + // const wxFileName filename + const wxFileName * filename = (const wxFileName *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileName); + // call FileNameToURL + wxString returns = (wxFileSystem::FileNameToURL(*filename)); + // push the result string + wxlua_pushwxString(L, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxFileName) && ((wxUSE_STREAMS) && (wxUSE_FILESYSTEM)) + + static wxLuaArgType s_wxluatypeArray_wxLua_wxFileSystem_FindFileInPath[] = { &wxluatype_wxFileSystem, &wxluatype_TSTRING, &wxluatype_TSTRING, NULL }; + static int LUACALL wxLua_wxFileSystem_FindFileInPath(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileSystem_FindFileInPath[1] = {{ wxLua_wxFileSystem_FindFileInPath, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxFileSystem_FindFileInPath }}; + // %override wxLua_wxFileSystem_FindFileInPath + // bool FindFileInPath(wxString *pSt... [truncated message content] |
|
From: John L. <jr...@us...> - 2008-01-29 00:49:20
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.cpp wxluasocket_bind.cpp Log Message: FIX mistake in making wxLuaState::LuaPCall() clear the stack. Cleanup to the *.i files, add output_single_cpp_binding_file to have only one cpp file generated. Add wxFileSystem and it's handlers. Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wxluasocket_bind.cpp 25 Jan 2008 23:50:54 -0000 1.28 --- wxluasocket_bind.cpp 29 Jan 2008 00:49:16 -0000 1.29 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxluasocket/src/wxluasocket_bind.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** wxluasocket.cpp 23 Jan 2008 06:43:40 -0000 1.38 --- wxluasocket.cpp 29 Jan 2008 00:49:16 -0000 1.39 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxluasocket/src/wxluasocket.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2008-01-29 00:49:20
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/wxLua/modules/wxluasocket/include Modified Files: wxluasocket_bind.h Log Message: FIX mistake in making wxLuaState::LuaPCall() clear the stack. Cleanup to the *.i files, add output_single_cpp_binding_file to have only one cpp file generated. Add wxFileSystem and it's handlers. Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wxluasocket_bind.h 25 Jan 2008 23:50:54 -0000 1.34 --- wxluasocket_bind.h 29 Jan 2008 00:49:16 -0000 1.35 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxluasocket.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxluasocket.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- *************** *** 12,16 **** #include "wxluasocket/include/wxluasocketdefs.h" #include "wxbind/include/wxcore_bind.h" - #include "wxluasocket/include/wxluasocket_bind.h" #include "wxlua/include/wxlstate.h" --- 12,15 ---- |
|
From: John L. <jr...@us...> - 2008-01-29 00:49:20
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/wxLua/modules/wxlua/src Modified Files: wxlstate.cpp wxlua.cpp wxlua_bind.cpp Log Message: FIX mistake in making wxLuaState::LuaPCall() clear the stack. Cleanup to the *.i files, add output_single_cpp_binding_file to have only one cpp file generated. Add wxFileSystem and it's handlers. Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxlua.cpp 23 Jan 2008 06:43:40 -0000 1.11 --- wxlua.cpp 29 Jan 2008 00:49:16 -0000 1.12 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxlua/src/wxlua.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.168 retrieving revision 1.169 diff -C2 -d -r1.168 -r1.169 *** wxlstate.cpp 26 Jan 2008 23:27:25 -0000 1.168 --- wxlstate.cpp 29 Jan 2008 00:49:15 -0000 1.169 *************** *** 2620,2625 **** SendLuaErrorEvent(status, top - (narg + 1)); - lua_SetTop(top); // restore original top (removes err msg) - return status; } --- 2620,2623 ---- Index: wxlua_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxlua_bind.cpp 26 Jan 2008 23:27:25 -0000 1.24 --- wxlua_bind.cpp 29 Jan 2008 00:49:16 -0000 1.25 *************** *** 1,6 **** // --------------------------------------------------------------------------- ! // This file was generated by genwxbind.lua // ! // Any changes made to this file may be lost when file is regenerated. // --------------------------------------------------------------------------- --- 1,6 ---- // --------------------------------------------------------------------------- ! // ../modules/wxlua/src/wxlua_bind.cpp was generated by genwxbind.lua // ! // Any changes made to this file will be lost when the file is regenerated. // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2008-01-29 00:49:20
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/wxLua/modules/wxlua/include Modified Files: wxlstate.h wxlua_bind.h Log Message: FIX mistake in making wxLuaState::LuaPCall() clear the stack. Cleanup to the *.i files, add output_single_cpp_binding_file to have only one cpp file generated. Add wxFileSystem and it's handlers. Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.119 retrieving revision 1.120 diff -C2 -d -r1.119 -r1.120 *** wxlstate.h 25 Jan 2008 23:50:52 -0000 1.119 --- wxlstate.h 29 Jan 2008 00:49:15 -0000 1.120 *************** *** 774,781 **** --- 774,783 ---- // Run a Lua file from disk using lua_loadfile() then LuaPCall(). + // Leaves nothing on the stack. // Returns 0 on success or Lua's error code. // Sends a wxEVT_LUA_ERROR wxLuaEvent on error. int RunFile(const wxString &fileName); // Run a string that contains Lua code using luaL_loadbuffer() then LuaPCall(). + // Leaves nothing on the stack. // Returns 0 on success or Lua's error code. // Sends a wxEVT_LUA_ERROR wxLuaEvent on error. *************** *** 783,786 **** --- 785,789 ---- // Run a char array #included from bin2c compilation or something else // using luaL_loadbuffer() then LuaPCall(). + // Leaves nothing on the stack. // Returns 0 on success or Lua's error code. // Sends a wxEVT_LUA_ERROR wxLuaEvent on error. Index: wxlua_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua_bind.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxlua_bind.h 25 Jan 2008 23:50:53 -0000 1.13 --- wxlua_bind.h 29 Jan 2008 00:49:15 -0000 1.14 *************** *** 1,7 **** // --------------------------------------------------------------------------- ! // wxlua.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated // --------------------------------------------------------------------------- --- 1,7 ---- // --------------------------------------------------------------------------- ! // wxlua.h - headers and wxLua types for wxLua binding // // This file was generated by genwxbind.lua ! // Any changes made to this file will be lost when the file is regenerated // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2008-01-26 23:27:29
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10601/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlstate.cpp wxlua_bind.cpp Log Message: Cleanup the change to using positive wxLua types and the mapping between the Lua and wxLua types. Fix wxLuaEdit to not stop at -1 line numbers since that's what Lua gives when running require("wx"). Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.167 retrieving revision 1.168 diff -C2 -d -r1.167 -r1.168 *** wxlstate.cpp 25 Jan 2008 23:50:53 -0000 1.167 --- wxlstate.cpp 26 Jan 2008 23:27:25 -0000 1.168 *************** *** 992,996 **** // Check for real type or this is a predefined WXLUA_TXXX type ! if ((L == NULL) || (wxl_type <= 0)) { switch (wxl_type) --- 992,996 ---- // Check for real type or this is a predefined WXLUA_TXXX type ! if ((L == NULL) || (WXLUAT_IS_LUAT(wxl_type))) { switch (wxl_type) *************** *** 1014,1020 **** else { - if (wxl_type == wxluatype_NULL) // FIXME NEEDED since there isn't a wxLuaBindClass - return wxT("NULL"); - const wxLuaBindClass* wxlClass = wxluaT_getclass(L, wxl_type); if (wxlClass) --- 1014,1017 ---- *************** *** 1022,1026 **** } ! return wxEmptyString; } --- 1019,1023 ---- } ! return wxT("Unknown wxLua Type?"); } *************** *** 1301,1305 **** { //int wxltype = LUAT_TO_WXLUAT(luatype); ! //if ((wxltype > WXLUA_T_MAX) || (wxltype < WXLUA_T_MIN)) // return WXLUA_TUNKNOWN; //return wxltype; --- 1298,1302 ---- { //int wxltype = LUAT_TO_WXLUAT(luatype); ! //if (!WXLUAT_IS_LUAT(wxltype)) // return WXLUA_TUNKNOWN; //return wxltype; Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.119 retrieving revision 1.120 diff -C2 -d -r1.119 -r1.120 *** wxlbind.cpp 25 Jan 2008 23:50:53 -0000 1.119 --- wxlbind.cpp 26 Jan 2008 23:27:25 -0000 1.120 *************** *** 45,49 **** int wxluatype_TCFUNCTION = WXLUA_TCFUNCTION; ! int wxluatype_NULL = WXLUA_TNULL; wxLuaBindClass wxLuaBindClass_NULL = --- 45,49 ---- int wxluatype_TCFUNCTION = WXLUA_TCFUNCTION; ! int wxluatype_NULL = WXLUATYPE_NULL; wxLuaBindClass wxLuaBindClass_NULL = *************** *** 952,956 **** wxLuaBindingList wxLuaBinding::sm_bindingList; bool wxLuaBinding::sm_bindingList_initialized = false; ! int wxLuaBinding::sm_wxluatype_max = WXLUA_TNULL; // highest wxLua type initially wxLuaBinding::wxLuaBinding() --- 952,956 ---- wxLuaBindingList wxLuaBinding::sm_bindingList; bool wxLuaBinding::sm_bindingList_initialized = false; ! int wxLuaBinding::sm_wxluatype_max = WXLUA_T_MAX+1; // highest wxLua type initially wxLuaBinding::wxLuaBinding() Index: wxlua_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxlua_bind.cpp 25 Jan 2008 23:50:54 -0000 1.23 --- wxlua_bind.cpp 26 Jan 2008 23:27:25 -0000 1.24 *************** *** 74,78 **** { "WXLUA_TNIL", WXLUA_TNIL }, { "WXLUA_TNONE", WXLUA_TNONE }, - { "WXLUA_TNULL", WXLUA_TNULL }, { "WXLUA_TNUMBER", WXLUA_TNUMBER }, { "WXLUA_TSTRING", WXLUA_TSTRING }, --- 74,77 ---- |
|
From: John L. <jr...@us...> - 2008-01-26 23:27:29
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10601/wxLua/apps/wxluaedit/src Modified Files: wxledit.cpp Log Message: Cleanup the change to using positive wxLua types and the mapping between the Lua and wxLua types. Fix wxLuaEdit to not stop at -1 line numbers since that's what Lua gives when running require("wx"). Index: wxledit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wxledit.cpp 15 Dec 2007 16:56:40 -0000 1.34 --- wxledit.cpp 26 Jan 2008 23:27:24 -0000 1.35 *************** *** 541,545 **** wxluaMenu->Append(s.MenuItem(wxluaMenu, ID_WXLUAIDE_SHOW_STACK, wxT("Stack &tree"), wxT("Show the lua stack tree") , wxITEM_NORMAL, wxBitmap(LUA_xpm))); wxluaMenu->AppendSeparator(); ! wxluaMenu->Append(ID_WXLUAIDE_TOGGLE_BREAKPOINT, wxT("Toggle &breakpoint")); return wxluaMenu; } --- 541,545 ---- wxluaMenu->Append(s.MenuItem(wxluaMenu, ID_WXLUAIDE_SHOW_STACK, wxT("Stack &tree"), wxT("Show the lua stack tree") , wxITEM_NORMAL, wxBitmap(LUA_xpm))); wxluaMenu->AppendSeparator(); ! wxluaMenu->Append(ID_WXLUAIDE_TOGGLE_BREAKPOINT, wxT("Toggle &breakpoint\tF9")); return wxluaMenu; } *************** *** 813,817 **** { int line = event.GetLineNum(); ! if (editor->HasBreakpoint(line-1)) m_wxlState.DebugHookBreak(wxString::Format(wxT("Stopped at breakpoint, line: %d"), line)); } --- 813,818 ---- { int line = event.GetLineNum(); ! // The line is -1 within the require("wx") function ! if ((line >= 0) && editor->HasBreakpoint(line-1)) m_wxlState.DebugHookBreak(wxString::Format(wxT("Stopped at breakpoint, line: %d"), line)); } |
|
From: John L. <jr...@us...> - 2008-01-26 23:27:29
|
Update of /cvsroot/wxlua/wxLua/bindings/wxlua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10601/wxLua/bindings/wxlua Modified Files: wxlua.i Log Message: Cleanup the change to using positive wxLua types and the mapping between the Lua and wxLua types. Fix wxLuaEdit to not stop at -1 line numbers since that's what Lua gives when running require("wx"). Index: wxlua.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/wxlua.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxlua.i 24 Jan 2008 00:18:15 -0000 1.16 --- wxlua.i 26 Jan 2008 23:27:25 -0000 1.17 *************** *** 87,91 **** %define WXLUA_TINTEGER %define WXLUA_TCFUNCTION - %define WXLUA_TNULL %define WXLUA_T_MAX --- 87,90 ---- |
|
From: John L. <jr...@us...> - 2008-01-26 23:27:29
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10601/wxLua/modules/wxlua/include Modified Files: wxlbind.h Log Message: Cleanup the change to using positive wxLua types and the mapping between the Lua and wxLua types. Fix wxLuaEdit to not stop at -1 line numbers since that's what Lua gives when running require("wx"). Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** wxlbind.h 25 Jan 2008 23:50:52 -0000 1.82 --- wxlbind.h 26 Jan 2008 23:27:25 -0000 1.83 *************** *** 55,59 **** #define WXLUA_T_MIN 0 // Min of the Lua WXLUA_TXXX values ! #define WXLUA_TNULL 13 // C++ NULL, has metatable // Blindly convert the lua_type to the wxlua_type. Note: WXLUA_TXXX = LUA_TXXX + 2 --- 55,62 ---- #define WXLUA_T_MIN 0 // Min of the Lua WXLUA_TXXX values ! #define WXLUATYPE_NULL 13 // C++ NULL, is full wxLua type with metatable ! ! // Is this wxLua type one of the basic Lua types ! #define WXLUAT_IS_LUAT(wxl_type) (((wxl_type) >= WXLUA_T_MIN) && ((wxl_type) <= WXLUA_T_MAX)) // Blindly convert the lua_type to the wxlua_type. Note: WXLUA_TXXX = LUA_TXXX + 2 *************** *** 64,68 **** // generic WXLUA_TXXX type. This means that there might be a metatable for // this type in the wxlua_lreg_types_key of the LUA_REGISTRYINDEX table. ! #define wxlua_iswxuserdatatype(wxl_type) ((wxl_type) >= WXLUA_TNULL) // Variables used in the wxLuaArgType member of the wxLuaBindCFunc for --- 67,71 ---- // generic WXLUA_TXXX type. This means that there might be a metatable for // this type in the wxlua_lreg_types_key of the LUA_REGISTRYINDEX table. ! #define wxlua_iswxuserdatatype(wxl_type) ((wxl_type) > WXLUA_T_MAX) // Variables used in the wxLuaArgType member of the wxLuaBindCFunc for *************** *** 82,85 **** --- 85,91 ---- extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_TCFUNCTION; + // The NULL wxLua type is not part of the bindings, but is installed + // by the wxLuaState since it may be used by various bindings and does not + // rely on wxWidgets. extern WXDLLIMPEXP_DATA_WXLUA(int) wxluatype_NULL; // wxLua type for NULL pointer extern WXDLLIMPEXP_DATA_WXLUA(wxLuaBindClass) wxLuaBindClass_NULL; // for NULL pointer *************** *** 345,349 **** public: \ wxLua_wxObject_##objName(className *p_##objName) : m_p##objName(p_##objName) {} \ ! ~wxLua_wxObject_##objName(); \ className *m_p##objName; \ DECLARE_ABSTRACT_CLASS(wxLua_wxObject_##objName) \ --- 351,355 ---- public: \ wxLua_wxObject_##objName(className *p_##objName) : m_p##objName(p_##objName) {} \ ! virtual ~wxLua_wxObject_##objName(); \ className *m_p##objName; \ DECLARE_ABSTRACT_CLASS(wxLua_wxObject_##objName) \ |
|
From: Klaas H. <ti...@us...> - 2008-01-26 22:28:05
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18316 Modified Files: canlua.cpp Log Message: binding file changed, now called wxluacan_bind.h Index: canlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/canlua.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** canlua.cpp 23 Jan 2008 06:43:34 -0000 1.15 --- canlua.cpp 26 Jan 2008 22:28:01 -0000 1.16 *************** *** 21,25 **** #include "canlua.h" #include "cancom.h" ! #include "wxluacan.h" #include "wx/listimpl.cpp" --- 21,25 ---- #include "canlua.h" #include "cancom.h" ! #include "wxluacan_bind.h" #include "wx/listimpl.cpp" |
|
From: John L. <jr...@us...> - 2008-01-25 23:51:37
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1159/wxLua/bindings/wxwidgets Modified Files: wxadv_rules.lua wxaui_rules.lua wxbase_rules.lua wxcore_rules.lua wxdatatypes_rules.lua wxgl_rules.lua wxhtml_rules.lua wxmedia_rules.lua wxnet_rules.lua wxrichtext_rules.lua wxstc_rules.lua wxxml_rules.lua wxxrc_rules.lua Log Message: - Removed the wxLuaBinding::PreRegister() and PostRegister() functions and made RegisterBinding() virtual Note: wxLuaBinding::RegisterBinding() now leaves the Lua table that the binding objects were installed into on the stack. You must pop it. * The rules.lua for genwxbind.lua now uses wxLuaBinding_class_declaration and wxLuaBinding_class_implementation to replace wxLuaBinding_preregister and wxLuaBinding_postregister. You may now add whatever you like to the class declaration and implementation source code. Updated to Lua 5.1.3 official Index: wxrichtext_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxrichtext_rules.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxrichtext_rules.lua 17 Jul 2007 03:30:20 -0000 1.2 --- wxrichtext_rules.lua 25 Jan 2008 23:50:49 -0000 1.3 *************** *** 33,37 **** -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/wxrichtext_bind.h" ------------------------------------------------------------------------------- --- 33,37 ---- -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ------------------------------------------------------------------------------- *************** *** 116,129 **** --============================================================================= ! -- virtual void wxLuaBinding::PreRegister function body for the ! -- hook_cpp_binding_classname. You can initialize data here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PreRegister = nothing to do here ! --============================================================================= ! -- virtual void wxLuaBinding::PostRegister function body for the ! -- hook_cpp_binding_classname. You can load any other custom bindings here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PostRegister = nothing to do here --============================================================================= --- 116,134 ---- --============================================================================= ! -- Declare functions or member variables for the derived wxLuaBinding class ! -- that will be generated for this binding. The string will be copied verbatim ! -- into the body of the hook_cpp_binding_classname class declaration in the ! -- hook_cpp_header_filename header file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! --wxLuaBinding_class_declaration = nothing to do here ! ! ------------------------------------------------------------------------------- ! -- Implement the functions or member variables for the derived wxLuaBinding ! -- class that you have declared. The string will be copied into the ! -- hook_cpp_binding_filename source file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! ! --wxLuaBinding_class_implementation = nothing to do here --============================================================================= Index: wxadv_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_rules.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxadv_rules.lua 17 Jul 2007 03:30:20 -0000 1.2 --- wxadv_rules.lua 25 Jan 2008 23:50:47 -0000 1.3 *************** *** 33,37 **** -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/wxadv_bind.h" ------------------------------------------------------------------------------- --- 33,37 ---- -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ------------------------------------------------------------------------------- *************** *** 117,130 **** --============================================================================= ! -- virtual void wxLuaBinding::PreRegister function body for the ! -- hook_cpp_binding_classname. You can initialize data here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PreRegister = nothing to do here ! --============================================================================= ! -- virtual void wxLuaBinding::PostRegister function body for the ! -- hook_cpp_binding_classname. You can load any other custom bindings here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PostRegister = nothing to do here --============================================================================= --- 117,135 ---- --============================================================================= ! -- Declare functions or member variables for the derived wxLuaBinding class ! -- that will be generated for this binding. The string will be copied verbatim ! -- into the body of the hook_cpp_binding_classname class declaration in the ! -- hook_cpp_header_filename header file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! --wxLuaBinding_class_declaration = nothing to do here ! ! ------------------------------------------------------------------------------- ! -- Implement the functions or member variables for the derived wxLuaBinding ! -- class that you have declared. The string will be copied into the ! -- hook_cpp_binding_filename source file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! ! --wxLuaBinding_class_implementation = nothing to do here --============================================================================= Index: wxbase_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_rules.lua,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxbase_rules.lua 23 Jan 2008 06:43:34 -0000 1.7 --- wxbase_rules.lua 25 Jan 2008 23:50:48 -0000 1.8 *************** *** 33,37 **** -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/wxbase_bind.h" ------------------------------------------------------------------------------- --- 33,37 ---- -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ------------------------------------------------------------------------------- *************** *** 123,143 **** --============================================================================= ! -- virtual void wxLuaBinding::PreRegister function body for the ! -- hook_cpp_binding_classname. You can initialize data here. ! -- Typically this is not necessary and you can rem this out. ! --wxLuaBinding_PreRegister = ! --============================================================================= ! -- virtual void wxLuaBinding::PostRegister function body for the ! -- hook_cpp_binding_classname. You can load any other custom bindings here. ! -- Typically this is not necessary and you can rem this out. ! wxLuaBinding_PostRegister = [[ ! wxCHECK_RET(wxlState.Ok(), wxT("Invalid wxLuaState")); lua_State* L = wxlState.GetLuaState(); lua_pushlstring(L, "NULL", 4); wxluaT_pushuserdatatype(L, NULL, wxluatype_NULL, true, true); ! lua_rawset(L, luaTable); // set t["NULL"] = userdata(NULL) w/ NULL tag p_wxluatype_wxString = &wxluatype_wxString; --- 123,155 ---- --============================================================================= ! -- Declare functions or member variables for the derived wxLuaBinding class ! -- that will be generated for this binding. The string will be copied verbatim ! -- into the body of the hook_cpp_binding_classname class declaration in the ! -- hook_cpp_header_filename header file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! wxLuaBinding_class_declaration = [[ ! virtual bool RegisterBinding(const wxLuaState& wxlState); ! ]] ! ! ------------------------------------------------------------------------------- ! -- Implement the functions or member variables for the derived wxLuaBinding ! -- class that you have declared. The string will be copied into the ! -- hook_cpp_binding_filename source file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! ! wxLuaBinding_class_implementation = ! "bool "..hook_cpp_binding_classname.."::RegisterBinding(const wxLuaState& wxlState)\n".. ! [[ ! { ! bool ret = wxLuaBinding::RegisterBinding(wxlState); ! ! wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState")); lua_State* L = wxlState.GetLuaState(); lua_pushlstring(L, "NULL", 4); wxluaT_pushuserdatatype(L, NULL, wxluatype_NULL, true, true); ! lua_rawset(L, -3); // set t["NULL"] = userdata(NULL) w/ NULL tag p_wxluatype_wxString = &wxluatype_wxString; *************** *** 145,148 **** --- 157,163 ---- p_wxluatype_wxSortedArrayString = &wxluatype_wxSortedArrayString; p_wxluatype_wxArrayInt = &wxluatype_wxArrayInt; + + return ret; + } ]] Index: wxdatatypes_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxdatatypes_rules.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxdatatypes_rules.lua 6 Aug 2007 01:46:32 -0000 1.1 --- wxdatatypes_rules.lua 25 Jan 2008 23:50:48 -0000 1.2 *************** *** 124,137 **** --============================================================================= ! -- virtual void wxLuaBinding::PreRegister function body for the ! -- hook_cpp_binding_classname. You can initialize data here. ! -- Typically this is not necessary and you can rem this out. ! wxLuaBinding_PreRegister = "" ! --============================================================================= ! -- virtual void wxLuaBinding::PostRegister function body for the ! -- hook_cpp_binding_classname. You can load any other custom bindings here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PostRegister = nothing to do here --============================================================================= --- 124,142 ---- --============================================================================= ! -- Declare functions or member variables for the derived wxLuaBinding class ! -- that will be generated for this binding. The string will be copied verbatim ! -- into the body of the hook_cpp_binding_classname class declaration in the ! -- hook_cpp_header_filename header file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! --wxLuaBinding_class_declaration = nothing to do here ! ! ------------------------------------------------------------------------------- ! -- Implement the functions or member variables for the derived wxLuaBinding ! -- class that you have declared. The string will be copied into the ! -- hook_cpp_binding_filename source file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! ! --wxLuaBinding_class_implementation = nothing to do here --============================================================================= Index: wxgl_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxgl_rules.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxgl_rules.lua 17 Jul 2007 03:30:20 -0000 1.2 --- wxgl_rules.lua 25 Jan 2008 23:50:48 -0000 1.3 *************** *** 33,37 **** -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/wxgl_bind.h" ------------------------------------------------------------------------------- --- 33,37 ---- -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ------------------------------------------------------------------------------- *************** *** 116,129 **** --============================================================================= ! -- virtual void wxLuaBinding::PreRegister function body for the ! -- hook_cpp_binding_classname. You can initialize data here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PreRegister = nothing to do here ! --============================================================================= ! -- virtual void wxLuaBinding::PostRegister function body for the ! -- hook_cpp_binding_classname. You can load any other custom bindings here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PostRegister = nothing to do here --============================================================================= --- 116,134 ---- --============================================================================= ! -- Declare functions or member variables for the derived wxLuaBinding class ! -- that will be generated for this binding. The string will be copied verbatim ! -- into the body of the hook_cpp_binding_classname class declaration in the ! -- hook_cpp_header_filename header file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! --wxLuaBinding_class_declaration = nothing to do here ! ! ------------------------------------------------------------------------------- ! -- Implement the functions or member variables for the derived wxLuaBinding ! -- class that you have declared. The string will be copied into the ! -- hook_cpp_binding_filename source file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! ! --wxLuaBinding_class_implementation = nothing to do here --============================================================================= Index: wxstc_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxstc_rules.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxstc_rules.lua 17 Jul 2007 03:30:20 -0000 1.2 --- wxstc_rules.lua 25 Jan 2008 23:50:49 -0000 1.3 *************** *** 33,37 **** -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/wxstc_bind.h" ------------------------------------------------------------------------------- --- 33,37 ---- -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ------------------------------------------------------------------------------- *************** *** 116,129 **** --============================================================================= ! -- virtual void wxLuaBinding::PreRegister function body for the ! -- hook_cpp_binding_classname. You can initialize data here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PreRegister = nothing to do here ! --============================================================================= ! -- virtual void wxLuaBinding::PostRegister function body for the ! -- hook_cpp_binding_classname. You can load any other custom bindings here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PostRegister = nothing to do here --============================================================================= --- 116,134 ---- --============================================================================= ! -- Declare functions or member variables for the derived wxLuaBinding class ! -- that will be generated for this binding. The string will be copied verbatim ! -- into the body of the hook_cpp_binding_classname class declaration in the ! -- hook_cpp_header_filename header file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! --wxLuaBinding_class_declaration = nothing to do here ! ! ------------------------------------------------------------------------------- ! -- Implement the functions or member variables for the derived wxLuaBinding ! -- class that you have declared. The string will be copied into the ! -- hook_cpp_binding_filename source file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! ! --wxLuaBinding_class_implementation = nothing to do here --============================================================================= Index: wxaui_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxaui_rules.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxaui_rules.lua 17 Jul 2007 03:30:20 -0000 1.2 --- wxaui_rules.lua 25 Jan 2008 23:50:47 -0000 1.3 *************** *** 33,37 **** -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/wxaui_bind.h" ------------------------------------------------------------------------------- --- 33,37 ---- -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ------------------------------------------------------------------------------- *************** *** 116,129 **** --============================================================================= ! -- virtual void wxLuaBinding::PreRegister function body for the ! -- hook_cpp_binding_classname. You can initialize data here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PreRegister = nothing to do here ! --============================================================================= ! -- virtual void wxLuaBinding::PostRegister function body for the ! -- hook_cpp_binding_classname. You can load any other custom bindings here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PostRegister = nothing to do here --============================================================================= --- 116,134 ---- --============================================================================= ! -- Declare functions or member variables for the derived wxLuaBinding class ! -- that will be generated for this binding. The string will be copied verbatim ! -- into the body of the hook_cpp_binding_classname class declaration in the ! -- hook_cpp_header_filename header file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! --wxLuaBinding_class_declaration = nothing to do here ! ! ------------------------------------------------------------------------------- ! -- Implement the functions or member variables for the derived wxLuaBinding ! -- class that you have declared. The string will be copied into the ! -- hook_cpp_binding_filename source file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! ! --wxLuaBinding_class_implementation = nothing to do here --============================================================================= Index: wxnet_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxnet_rules.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxnet_rules.lua 17 Jul 2007 03:30:20 -0000 1.2 --- wxnet_rules.lua 25 Jan 2008 23:50:49 -0000 1.3 *************** *** 33,37 **** -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/wxnet_bind.h" ------------------------------------------------------------------------------- --- 33,37 ---- -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ------------------------------------------------------------------------------- *************** *** 116,129 **** --============================================================================= ! -- virtual void wxLuaBinding::PreRegister function body for the ! -- hook_cpp_binding_classname. You can initialize data here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PreRegister = nothing to do here ! --============================================================================= ! -- virtual void wxLuaBinding::PostRegister function body for the ! -- hook_cpp_binding_classname. You can load any other custom bindings here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PostRegister = nothing to do here --============================================================================= --- 116,134 ---- --============================================================================= ! -- Declare functions or member variables for the derived wxLuaBinding class ! -- that will be generated for this binding. The string will be copied verbatim ! -- into the body of the hook_cpp_binding_classname class declaration in the ! -- hook_cpp_header_filename header file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! --wxLuaBinding_class_declaration = nothing to do here ! ! ------------------------------------------------------------------------------- ! -- Implement the functions or member variables for the derived wxLuaBinding ! -- class that you have declared. The string will be copied into the ! -- hook_cpp_binding_filename source file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! ! --wxLuaBinding_class_implementation = nothing to do here --============================================================================= Index: wxmedia_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxmedia_rules.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxmedia_rules.lua 17 Jul 2007 03:30:20 -0000 1.2 --- wxmedia_rules.lua 25 Jan 2008 23:50:48 -0000 1.3 *************** *** 33,37 **** -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/wxmedia_bind.h" ------------------------------------------------------------------------------- --- 33,37 ---- -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ------------------------------------------------------------------------------- *************** *** 120,133 **** --============================================================================= ! -- virtual void wxLuaBinding::PreRegister function body for the ! -- hook_cpp_binding_classname. You can initialize data here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PreRegister = nothing to do here ! --============================================================================= ! -- virtual void wxLuaBinding::PostRegister function body for the ! -- hook_cpp_binding_classname. You can load any other custom bindings here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PostRegister = nothing to do here --============================================================================= --- 120,138 ---- --============================================================================= ! -- Declare functions or member variables for the derived wxLuaBinding class ! -- that will be generated for this binding. The string will be copied verbatim ! -- into the body of the hook_cpp_binding_classname class declaration in the ! -- hook_cpp_header_filename header file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! --wxLuaBinding_class_declaration = nothing to do here ! ! ------------------------------------------------------------------------------- ! -- Implement the functions or member variables for the derived wxLuaBinding ! -- class that you have declared. The string will be copied into the ! -- hook_cpp_binding_filename source file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! ! --wxLuaBinding_class_implementation = nothing to do here --============================================================================= Index: wxcore_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_rules.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxcore_rules.lua 23 Jan 2008 06:43:34 -0000 1.4 --- wxcore_rules.lua 25 Jan 2008 23:50:48 -0000 1.5 *************** *** 33,37 **** -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/wxcore_bind.h" ------------------------------------------------------------------------------- --- 33,37 ---- -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ------------------------------------------------------------------------------- *************** *** 206,214 **** --============================================================================= ! -- virtual void wxLuaBinding::PreRegister function body for the ! -- hook_cpp_binding_classname. You can initialize data here. ! -- Typically this is not necessary and you can rem this out. ! wxLuaBinding_PreRegister = [[ #if defined(__MINGW32__) || defined(__GNUWIN32__) #undef wxDefaultPosition --- 206,230 ---- --============================================================================= ! -- Declare functions or member variables for the derived wxLuaBinding class ! -- that will be generated for this binding. The string will be copied verbatim ! -- into the body of the hook_cpp_binding_classname class declaration in the ! -- hook_cpp_header_filename header file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! ! wxLuaBinding_class_declaration = ! [[ ! virtual bool RegisterBinding(const wxLuaState& wxlState); ! ]] ! ! ------------------------------------------------------------------------------- ! -- Implement the functions or member variables for the derived wxLuaBinding ! -- class that you have declared. The string will be copied into the ! -- hook_cpp_binding_filename source file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! ! wxLuaBinding_class_implementation = ! "bool "..hook_cpp_binding_classname.."::RegisterBinding(const wxLuaState& wxlState)\n".. [[ + { #if defined(__MINGW32__) || defined(__GNUWIN32__) #undef wxDefaultPosition *************** *** 264,277 **** wxLua_wxCROSS_CURSOR = (wxCursor*)wxCROSS_CURSOR; } - ]] ! --============================================================================= ! -- virtual void wxLuaBinding::PostRegister function body for the ! -- hook_cpp_binding_classname. You can load any other custom bindings here. ! -- Typically this is not necessary and you can rem this out. ! wxLuaBinding_PostRegister = ! [[ p_wxluatype_wxEvent = &wxluatype_wxEvent; p_wxluatype_wxWindow = &wxluatype_wxWindow; ]] --- 280,291 ---- wxLua_wxCROSS_CURSOR = (wxCursor*)wxCROSS_CURSOR; } ! int ret = wxLuaBinding::RegisterBinding(wxlState); ! p_wxluatype_wxEvent = &wxluatype_wxEvent; p_wxluatype_wxWindow = &wxluatype_wxWindow; + + return ret; + } ]] Index: wxhtml_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxhtml_rules.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxhtml_rules.lua 17 Jul 2007 03:30:20 -0000 1.2 --- wxhtml_rules.lua 25 Jan 2008 23:50:48 -0000 1.3 *************** *** 33,37 **** -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/wxhtml_bind.h" ------------------------------------------------------------------------------- --- 33,37 ---- -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ------------------------------------------------------------------------------- *************** *** 116,129 **** --============================================================================= ! -- virtual void wxLuaBinding::PreRegister function body for the ! -- hook_cpp_binding_classname. You can initialize data here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PreRegister = nothing to do here ! --============================================================================= ! -- virtual void wxLuaBinding::PostRegister function body for the ! -- hook_cpp_binding_classname. You can load any other custom bindings here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PostRegister = nothing to do here --============================================================================= --- 116,134 ---- --============================================================================= ! -- Declare functions or member variables for the derived wxLuaBinding class ! -- that will be generated for this binding. The string will be copied verbatim ! -- into the body of the hook_cpp_binding_classname class declaration in the ! -- hook_cpp_header_filename header file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! --wxLuaBinding_class_declaration = nothing to do here ! ! ------------------------------------------------------------------------------- ! -- Implement the functions or member variables for the derived wxLuaBinding ! -- class that you have declared. The string will be copied into the ! -- hook_cpp_binding_filename source file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! ! --wxLuaBinding_class_implementation = nothing to do here --============================================================================= Index: wxxml_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxxml_rules.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxxml_rules.lua 17 Jul 2007 03:30:21 -0000 1.2 --- wxxml_rules.lua 25 Jan 2008 23:50:49 -0000 1.3 *************** *** 33,37 **** -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/wxxml_bind.h" ------------------------------------------------------------------------------- --- 33,37 ---- -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ------------------------------------------------------------------------------- *************** *** 116,129 **** --============================================================================= ! -- virtual void wxLuaBinding::PreRegister function body for the ! -- hook_cpp_binding_classname. You can initialize data here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PreRegister = nothing to do here ! --============================================================================= ! -- virtual void wxLuaBinding::PostRegister function body for the ! -- hook_cpp_binding_classname. You can load any other custom bindings here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PostRegister = nothing to do here --============================================================================= --- 116,134 ---- --============================================================================= ! -- Declare functions or member variables for the derived wxLuaBinding class ! -- that will be generated for this binding. The string will be copied verbatim ! -- into the body of the hook_cpp_binding_classname class declaration in the ! -- hook_cpp_header_filename header file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! --wxLuaBinding_class_declaration = nothing to do here ! ! ------------------------------------------------------------------------------- ! -- Implement the functions or member variables for the derived wxLuaBinding ! -- class that you have declared. The string will be copied into the ! -- hook_cpp_binding_filename source file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! ! --wxLuaBinding_class_implementation = nothing to do here --============================================================================= Index: wxxrc_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxxrc_rules.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxxrc_rules.lua 17 Jul 2007 03:30:21 -0000 1.2 --- wxxrc_rules.lua 25 Jan 2008 23:50:49 -0000 1.3 *************** *** 33,37 **** -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/wxxrc_bind.h" ------------------------------------------------------------------------------- --- 33,37 ---- -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. ! hook_cpp_header_filename = "wxbind/include/"..hook_cpp_namespace.."_bind.h" ------------------------------------------------------------------------------- *************** *** 116,129 **** --============================================================================= ! -- virtual void wxLuaBinding::PreRegister function body for the ! -- hook_cpp_binding_classname. You can initialize data here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PreRegister = nothing to do here ! --============================================================================= ! -- virtual void wxLuaBinding::PostRegister function body for the ! -- hook_cpp_binding_classname. You can load any other custom bindings here. ! -- Typically this is not necessary and you can rem this out. ! -- wxLuaBinding_PostRegister = nothing to do here --============================================================================= --- 116,134 ---- --============================================================================= ! -- Declare functions or member variables for the derived wxLuaBinding class ! -- that will be generated for this binding. The string will be copied verbatim ! -- into the body of the hook_cpp_binding_classname class declaration in the ! -- hook_cpp_header_filename header file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! --wxLuaBinding_class_declaration = nothing to do here ! ! ------------------------------------------------------------------------------- ! -- Implement the functions or member variables for the derived wxLuaBinding ! -- class that you have declared. The string will be copied into the ! -- hook_cpp_binding_filename source file. May be remmed out to ignore it. ! -- See usage in the wxWidgets wxbase_rules.lua file. ! ! --wxLuaBinding_class_implementation = nothing to do here --============================================================================= |
|
From: John L. <jr...@us...> - 2008-01-25 23:51:32
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1159/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 the wxLuaBinding::PreRegister() and PostRegister() functions and made RegisterBinding() virtual Note: wxLuaBinding::RegisterBinding() now leaves the Lua table that the binding objects were installed into on the stack. You must pop it. * The rules.lua for genwxbind.lua now uses wxLuaBinding_class_declaration and wxLuaBinding_class_implementation to replace wxLuaBinding_preregister and wxLuaBinding_postregister. You may now add whatever you like to the class declaration and implementation source code. Updated to Lua 5.1.3 official Index: wxadv_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxadv_bind.h 24 Jan 2008 00:18:15 -0000 1.11 --- wxadv_bind.h 25 Jan 2008 23:50:51 -0000 1.12 *************** *** 31,40 **** public: wxLuaBinding_wxadv(); - virtual wxLuaBinding* Clone() const { return new wxLuaBinding_wxadv; } - protected: - virtual void PreRegister(const wxLuaState& wxlState, int luaTable); - virtual void PostRegister(const wxLuaState& wxlState, int luaTable); DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxadv) }; --- 31,37 ---- public: wxLuaBinding_wxadv(); + private: DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxadv) }; Index: wxcore_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxcore_bind.h 24 Jan 2008 00:18:15 -0000 1.12 --- wxcore_bind.h 25 Jan 2008 23:50:51 -0000 1.13 *************** *** 48,57 **** public: wxLuaBinding_wxcore(); - virtual wxLuaBinding* Clone() const { return new wxLuaBinding_wxcore; } ! protected: ! virtual void PreRegister(const wxLuaState& wxlState, int luaTable); ! virtual void PostRegister(const wxLuaState& wxlState, int luaTable); DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxcore) }; --- 48,55 ---- public: wxLuaBinding_wxcore(); ! virtual bool RegisterBinding(const wxLuaState& wxlState); + private: DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxcore) }; Index: wxrichtext_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxrichtext_bind.h 24 Jan 2008 00:18:16 -0000 1.11 --- wxrichtext_bind.h 25 Jan 2008 23:50:51 -0000 1.12 *************** *** 31,40 **** public: wxLuaBinding_wxrichtext(); - virtual wxLuaBinding* Clone() const { return new wxLuaBinding_wxrichtext; } - protected: - virtual void PreRegister(const wxLuaState& wxlState, int luaTable); - virtual void PostRegister(const wxLuaState& wxlState, int luaTable); DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxrichtext) }; --- 31,37 ---- public: wxLuaBinding_wxrichtext(); + private: DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxrichtext) }; Index: wxxrc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxxrc_bind.h 24 Jan 2008 00:18:16 -0000 1.11 --- wxxrc_bind.h 25 Jan 2008 23:50:51 -0000 1.12 *************** *** 31,40 **** public: wxLuaBinding_wxxrc(); - virtual wxLuaBinding* Clone() const { return new wxLuaBinding_wxxrc; } - protected: - virtual void PreRegister(const wxLuaState& wxlState, int luaTable); - virtual void PostRegister(const wxLuaState& wxlState, int luaTable); DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxxrc) }; --- 31,37 ---- public: wxLuaBinding_wxxrc(); + private: DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxxrc) }; Index: wxnet_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxnet_bind.h 24 Jan 2008 00:18:16 -0000 1.11 --- wxnet_bind.h 25 Jan 2008 23:50:51 -0000 1.12 *************** *** 31,40 **** public: wxLuaBinding_wxnet(); - virtual wxLuaBinding* Clone() const { return new wxLuaBinding_wxnet; } - protected: - virtual void PreRegister(const wxLuaState& wxlState, int luaTable); - virtual void PostRegister(const wxLuaState& wxlState, int luaTable); DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxnet) }; --- 31,37 ---- public: wxLuaBinding_wxnet(); + private: DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxnet) }; Index: wxbase_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxbase_bind.h 24 Jan 2008 00:18:15 -0000 1.12 --- wxbase_bind.h 25 Jan 2008 23:50:51 -0000 1.13 *************** *** 30,39 **** public: wxLuaBinding_wxbase(); - virtual wxLuaBinding* Clone() const { return new wxLuaBinding_wxbase; } ! protected: ! virtual void PreRegister(const wxLuaState& wxlState, int luaTable); ! virtual void PostRegister(const wxLuaState& wxlState, int luaTable); DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxbase) }; --- 30,37 ---- public: wxLuaBinding_wxbase(); ! virtual bool RegisterBinding(const wxLuaState& wxlState); + private: DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxbase) }; Index: wxmedia_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxmedia_bind.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxmedia_bind.h 24 Jan 2008 00:18:16 -0000 1.11 --- wxmedia_bind.h 25 Jan 2008 23:50:51 -0000 1.12 *************** *** 32,41 **** public: wxLuaBinding_wxmedia(); - virtual wxLuaBinding* Clone() const { return new wxLuaBinding_wxmedia; } - protected: - virtual void PreRegister(const wxLuaState& wxlState, int luaTable); - virtual void PostRegister(const wxLuaState& wxlState, int luaTable); DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxmedia) }; --- 32,38 ---- public: wxLuaBinding_wxmedia(); + private: DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxmedia) }; Index: wxgl_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxgl_bind.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxgl_bind.h 24 Jan 2008 00:18:15 -0000 1.11 --- wxgl_bind.h 25 Jan 2008 23:50:51 -0000 1.12 *************** *** 31,40 **** public: wxLuaBinding_wxgl(); - virtual wxLuaBinding* Clone() const { return new wxLuaBinding_wxgl; } - protected: - virtual void PreRegister(const wxLuaState& wxlState, int luaTable); - virtual void PostRegister(const wxLuaState& wxlState, int luaTable); DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxgl) }; --- 31,37 ---- public: wxLuaBinding_wxgl(); + private: DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxgl) }; Index: wxstc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxstc_bind.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxstc_bind.h 24 Jan 2008 00:18:16 -0000 1.11 --- wxstc_bind.h 25 Jan 2008 23:50:51 -0000 1.12 *************** *** 31,40 **** public: wxLuaBinding_wxstc(); - virtual wxLuaBinding* Clone() const { return new wxLuaBinding_wxstc; } - protected: - virtual void PreRegister(const wxLuaState& wxlState, int luaTable); - virtual void PostRegister(const wxLuaState& wxlState, int luaTable); DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxstc) }; --- 31,37 ---- public: wxLuaBinding_wxstc(); + private: DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxstc) }; Index: wxaui_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxaui_bind.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxaui_bind.h 24 Jan 2008 00:18:15 -0000 1.12 --- wxaui_bind.h 25 Jan 2008 23:50:51 -0000 1.13 *************** *** 31,40 **** public: wxLuaBinding_wxaui(); - virtual wxLuaBinding* Clone() const { return new wxLuaBinding_wxaui; } - protected: - virtual void PreRegister(const wxLuaState& wxlState, int luaTable); - virtual void PostRegister(const wxLuaState& wxlState, int luaTable); DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxaui) }; --- 31,37 ---- public: wxLuaBinding_wxaui(); + private: DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxaui) }; Index: wxhtml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxhtml_bind.h 24 Jan 2008 00:18:16 -0000 1.12 --- wxhtml_bind.h 25 Jan 2008 23:50:51 -0000 1.13 *************** *** 31,40 **** public: wxLuaBinding_wxhtml(); - virtual wxLuaBinding* Clone() const { return new wxLuaBinding_wxhtml; } - protected: - virtual void PreRegister(const wxLuaState& wxlState, int luaTable); - virtual void PostRegister(const wxLuaState& wxlState, int luaTable); DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxhtml) }; --- 31,37 ---- public: wxLuaBinding_wxhtml(); + private: DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxhtml) }; Index: wxxml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxml_bind.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxxml_bind.h 24 Jan 2008 00:18:16 -0000 1.11 --- wxxml_bind.h 25 Jan 2008 23:50:51 -0000 1.12 *************** *** 31,40 **** public: wxLuaBinding_wxxml(); - virtual wxLuaBinding* Clone() const { return new wxLuaBinding_wxxml; } - protected: - virtual void PreRegister(const wxLuaState& wxlState, int luaTable); - virtual void PostRegister(const wxLuaState& wxlState, int luaTable); DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxxml) }; --- 31,37 ---- public: wxLuaBinding_wxxml(); + private: DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxxml) }; |
|
From: John L. <jr...@us...> - 2008-01-25 23:51:32
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1159/wxLua/modules/wxbind/src Modified Files: wxadv_bind.cpp wxaui_bind.cpp wxbase_bind.cpp wxcore_bind.cpp wxgl_bind.cpp wxhtml_bind.cpp wxmedia_bind.cpp wxnet_bind.cpp wxrichtext_bind.cpp wxstc_bind.cpp wxxml_bind.cpp wxxrc_bind.cpp Log Message: - Removed the wxLuaBinding::PreRegister() and PostRegister() functions and made RegisterBinding() virtual Note: wxLuaBinding::RegisterBinding() now leaves the Lua table that the binding objects were installed into on the stack. You must pop it. * The rules.lua for genwxbind.lua now uses wxLuaBinding_class_declaration and wxLuaBinding_class_implementation to replace wxLuaBinding_preregister and wxLuaBinding_postregister. You may now add whatever you like to the class declaration and implementation source code. Updated to Lua 5.1.3 official Index: wxbase_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_bind.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxbase_bind.cpp 24 Jan 2008 00:18:16 -0000 1.12 --- wxbase_bind.cpp 25 Jan 2008 23:50:52 -0000 1.13 *************** *** 2373,2387 **** } ! void wxLuaBinding_wxbase::PreRegister(const wxLuaState& , int ) ! { ! } ! void wxLuaBinding_wxbase::PostRegister(const wxLuaState& wxlState, int luaTable) { ! wxCHECK_RET(wxlState.Ok(), wxT("Invalid wxLuaState")); lua_State* L = wxlState.GetLuaState(); lua_pushlstring(L, "NULL", 4); wxluaT_pushuserdatatype(L, NULL, wxluatype_NULL, true, true); ! lua_rawset(L, luaTable); // set t["NULL"] = userdata(NULL) w/ NULL tag p_wxluatype_wxString = &wxluatype_wxString; --- 2373,2386 ---- } ! bool wxLuaBinding_wxbase::RegisterBinding(const wxLuaState& wxlState) { ! bool ret = wxLuaBinding::RegisterBinding(wxlState); ! ! wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState")); lua_State* L = wxlState.GetLuaState(); lua_pushlstring(L, "NULL", 4); wxluaT_pushuserdatatype(L, NULL, wxluatype_NULL, true, true); ! lua_rawset(L, -3); // set t["NULL"] = userdata(NULL) w/ NULL tag p_wxluatype_wxString = &wxluatype_wxString; *************** *** 2389,2394 **** --- 2388,2396 ---- p_wxluatype_wxSortedArrayString = &wxluatype_wxSortedArrayString; p_wxluatype_wxArrayInt = &wxluatype_wxArrayInt; + + return ret; } + // --------------------------------------------------------------------------- Index: wxnet_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_bind.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxnet_bind.cpp 24 Jan 2008 00:18:17 -0000 1.6 --- wxnet_bind.cpp 25 Jan 2008 23:50:52 -0000 1.7 *************** *** 236,245 **** } ! void wxLuaBinding_wxnet::PreRegister(const wxLuaState& , int ) ! { ! } ! void wxLuaBinding_wxnet::PostRegister(const wxLuaState&, int ) ! { ! } // --------------------------------------------------------------------------- --- 236,240 ---- } ! // --------------------------------------------------------------------------- Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_bind.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxstc_bind.cpp 24 Jan 2008 00:18:17 -0000 1.6 --- wxstc_bind.cpp 25 Jan 2008 23:50:52 -0000 1.7 *************** *** 1525,1534 **** } ! void wxLuaBinding_wxstc::PreRegister(const wxLuaState& , int ) ! { ! } ! void wxLuaBinding_wxstc::PostRegister(const wxLuaState&, int ) ! { ! } // --------------------------------------------------------------------------- --- 1525,1529 ---- } ! // --------------------------------------------------------------------------- Index: wxgl_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxgl_bind.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxgl_bind.cpp 24 Jan 2008 00:18:16 -0000 1.6 --- wxgl_bind.cpp 25 Jan 2008 23:50:52 -0000 1.7 *************** *** 160,169 **** } ! void wxLuaBinding_wxgl::PreRegister(const wxLuaState& , int ) ! { ! } ! void wxLuaBinding_wxgl::PostRegister(const wxLuaState&, int ) ! { ! } // --------------------------------------------------------------------------- --- 160,164 ---- } ! // --------------------------------------------------------------------------- Index: wxxrc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_bind.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxxrc_bind.cpp 24 Jan 2008 00:18:17 -0000 1.6 --- wxxrc_bind.cpp 25 Jan 2008 23:50:52 -0000 1.7 *************** *** 146,155 **** } ! void wxLuaBinding_wxxrc::PreRegister(const wxLuaState& , int ) ! { ! } ! void wxLuaBinding_wxxrc::PostRegister(const wxLuaState&, int ) ! { ! } // --------------------------------------------------------------------------- --- 146,150 ---- } ! // --------------------------------------------------------------------------- Index: wxmedia_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxmedia_bind.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxmedia_bind.cpp 24 Jan 2008 00:18:17 -0000 1.6 --- wxmedia_bind.cpp 25 Jan 2008 23:50:52 -0000 1.7 *************** *** 190,199 **** } ! void wxLuaBinding_wxmedia::PreRegister(const wxLuaState& , int ) ! { ! } ! void wxLuaBinding_wxmedia::PostRegister(const wxLuaState&, int ) ! { ! } // --------------------------------------------------------------------------- --- 190,194 ---- } ! // --------------------------------------------------------------------------- Index: wxcore_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_bind.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxcore_bind.cpp 24 Jan 2008 00:18:16 -0000 1.14 --- wxcore_bind.cpp 25 Jan 2008 23:50:52 -0000 1.15 *************** *** 5066,5070 **** } ! void wxLuaBinding_wxcore::PreRegister(const wxLuaState& wxlState, int luaTable) { #if defined(__MINGW32__) || defined(__GNUWIN32__) --- 5066,5070 ---- } ! bool wxLuaBinding_wxcore::RegisterBinding(const wxLuaState& wxlState) { #if defined(__MINGW32__) || defined(__GNUWIN32__) *************** *** 5121,5131 **** wxLua_wxCROSS_CURSOR = (wxCursor*)wxCROSS_CURSOR; } ! } ! void wxLuaBinding_wxcore::PostRegister(const wxLuaState& wxlState, int luaTable) ! { p_wxluatype_wxEvent = &wxluatype_wxEvent; p_wxluatype_wxWindow = &wxluatype_wxWindow; } // --------------------------------------------------------------------------- --- 5121,5134 ---- wxLua_wxCROSS_CURSOR = (wxCursor*)wxCROSS_CURSOR; } ! ! int ret = wxLuaBinding::RegisterBinding(wxlState); ! p_wxluatype_wxEvent = &wxluatype_wxEvent; p_wxluatype_wxWindow = &wxluatype_wxWindow; + + return ret; } + // --------------------------------------------------------------------------- Index: wxadv_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_bind.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxadv_bind.cpp 24 Jan 2008 00:18:16 -0000 1.7 --- wxadv_bind.cpp 25 Jan 2008 23:50:52 -0000 1.8 *************** *** 453,462 **** } ! void wxLuaBinding_wxadv::PreRegister(const wxLuaState& , int ) ! { ! } ! void wxLuaBinding_wxadv::PostRegister(const wxLuaState&, int ) ! { ! } // --------------------------------------------------------------------------- --- 453,457 ---- } ! // --------------------------------------------------------------------------- Index: wxrichtext_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxrichtext_bind.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxrichtext_bind.cpp 24 Jan 2008 00:18:17 -0000 1.5 --- wxrichtext_bind.cpp 25 Jan 2008 23:50:52 -0000 1.6 *************** *** 145,154 **** } ! void wxLuaBinding_wxrichtext::PreRegister(const wxLuaState& , int ) ! { ! } ! void wxLuaBinding_wxrichtext::PostRegister(const wxLuaState&, int ) ! { ! } // --------------------------------------------------------------------------- --- 145,149 ---- } ! // --------------------------------------------------------------------------- Index: wxhtml_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxhtml_bind.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxhtml_bind.cpp 24 Jan 2008 00:18:16 -0000 1.6 --- wxhtml_bind.cpp 25 Jan 2008 23:50:52 -0000 1.7 *************** *** 231,240 **** } ! void wxLuaBinding_wxhtml::PreRegister(const wxLuaState& , int ) ! { ! } ! void wxLuaBinding_wxhtml::PostRegister(const wxLuaState&, int ) ! { ! } // --------------------------------------------------------------------------- --- 231,235 ---- } ! // --------------------------------------------------------------------------- Index: wxaui_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxaui_bind.cpp 24 Jan 2008 00:18:16 -0000 1.8 --- wxaui_bind.cpp 25 Jan 2008 23:50:52 -0000 1.9 *************** *** 287,296 **** } ! void wxLuaBinding_wxaui::PreRegister(const wxLuaState& , int ) ! { ! } ! void wxLuaBinding_wxaui::PostRegister(const wxLuaState&, int ) ! { ! } // --------------------------------------------------------------------------- --- 287,291 ---- } ! // --------------------------------------------------------------------------- Index: wxxml_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxml_bind.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxxml_bind.cpp 24 Jan 2008 00:18:17 -0000 1.6 --- wxxml_bind.cpp 25 Jan 2008 23:50:52 -0000 1.7 *************** *** 158,167 **** } ! void wxLuaBinding_wxxml::PreRegister(const wxLuaState& , int ) ! { ! } ! void wxLuaBinding_wxxml::PostRegister(const wxLuaState&, int ) ! { ! } // --------------------------------------------------------------------------- --- 158,162 ---- } ! // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2008-01-25 23:51:32
|
Update of /cvsroot/wxlua/wxLua/modules/lua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1159/wxLua/modules/lua/src Modified Files: Makefile lauxlib.c lbaselib.c ldblib.c ldo.c liolib.c loslib.c lundump.c Log Message: - Removed the wxLuaBinding::PreRegister() and PostRegister() functions and made RegisterBinding() virtual Note: wxLuaBinding::RegisterBinding() now leaves the Lua table that the binding objects were installed into on the stack. You must pop it. * The rules.lua for genwxbind.lua now uses wxLuaBinding_class_declaration and wxLuaBinding_class_implementation to replace wxLuaBinding_preregister and wxLuaBinding_postregister. You may now add whatever you like to the class declaration and implementation source code. Updated to Lua 5.1.3 official Index: liolib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/liolib.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** liolib.c 18 Jan 2008 03:43:00 -0000 1.3 --- liolib.c 25 Jan 2008 23:50:51 -0000 1.4 *************** *** 52,56 **** ! #define topfile(L) ((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE)) --- 52,56 ---- ! #define tofilep(L) ((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE)) *************** *** 71,75 **** static FILE *tofile (lua_State *L) { ! FILE **f = topfile(L); if (*f == NULL) luaL_error(L, "attempt to use a closed file"); --- 71,75 ---- static FILE *tofile (lua_State *L) { ! FILE **f = tofilep(L); if (*f == NULL) luaL_error(L, "attempt to use a closed file"); *************** *** 94,102 **** /* ! ** this function has a separated environment, which defines the ! ** correct __close for 'popen' files */ static int io_pclose (lua_State *L) { ! FILE **p = topfile(L); int ok = lua_pclose(L, *p); *p = NULL; --- 94,111 ---- /* ! ** function to (not) close the standard files stdin, stdout, and stderr ! */ ! static int io_noclose (lua_State *L) { ! lua_pushnil(L); ! lua_pushliteral(L, "cannot close standard file"); ! return 2; ! } ! ! ! /* ! ** function to close 'popen' files */ static int io_pclose (lua_State *L) { ! FILE **p = tofilep(L); int ok = lua_pclose(L, *p); *p = NULL; *************** *** 105,115 **** static int io_fclose (lua_State *L) { ! FILE **p = topfile(L); ! int ok = 0; ! if (*p != stdin && *p != stdout && *p != stderr) { ! ok = (fclose(*p) == 0); ! *p = NULL; ! } return pushresult(L, ok, NULL); } --- 114,124 ---- + /* + ** function to close regular files + */ static int io_fclose (lua_State *L) { ! FILE **p = tofilep(L); ! int ok = (fclose(*p) == 0); ! *p = NULL; return pushresult(L, ok, NULL); } *************** *** 132,137 **** static int io_gc (lua_State *L) { ! FILE *f = *topfile(L); ! if (f != NULL) /* ignore closed files */ aux_close(L); return 0; --- 141,147 ---- static int io_gc (lua_State *L) { ! FILE *f = *tofilep(L); ! /* ignore closed files */ ! if (f != NULL) aux_close(L); return 0; *************** *** 140,146 **** static int io_tostring (lua_State *L) { ! FILE *f = *topfile(L); if (f == NULL) ! lua_pushstring(L, "file (closed)"); else lua_pushfstring(L, "file (%p)", f); --- 150,156 ---- static int io_tostring (lua_State *L) { ! FILE *f = *tofilep(L); if (f == NULL) ! lua_pushliteral(L, "file (closed)"); else lua_pushfstring(L, "file (%p)", f); *************** *** 158,161 **** --- 168,175 ---- + /* + ** this function has a separated environment, which defines the + ** correct __close for 'popen' files + */ static int io_popen (lua_State *L) { const char *filename = luaL_checkstring(L, 1); *************** *** 283,287 **** if (fgets(p, LUAL_BUFFERSIZE, f) == NULL) { /* eof? */ luaL_pushresult(&b); /* close buffer */ ! return (lua_strlen(L, -1) > 0); /* check whether read something */ } l = strlen(p); --- 297,301 ---- if (fgets(p, LUAL_BUFFERSIZE, f) == NULL) { /* eof? */ luaL_pushresult(&b); /* close buffer */ ! return (lua_objlen(L, -1) > 0); /* check whether read something */ } l = strlen(p); *************** *** 311,315 **** } while (n > 0 && nr == rlen); /* until end of count or eof */ luaL_pushresult(&b); /* close buffer */ ! return (n == 0 || lua_strlen(L, -1) > 0); } --- 325,329 ---- } while (n > 0 && nr == rlen); /* until end of count or eof */ luaL_pushresult(&b); /* close buffer */ ! return (n == 0 || lua_objlen(L, -1) > 0); } *************** *** 505,509 **** lua_rawseti(L, LUA_ENVIRONINDEX, k); } ! lua_setfield(L, -2, fname); } --- 519,532 ---- lua_rawseti(L, LUA_ENVIRONINDEX, k); } ! lua_pushvalue(L, -2); /* copy environment */ ! lua_setfenv(L, -2); /* set it */ ! lua_setfield(L, -3, fname); ! } ! ! ! static void newfenv (lua_State *L, lua_CFunction cls) { ! lua_createtable(L, 0, 1); ! lua_pushcfunction(L, cls); ! lua_setfield(L, -2, "__close"); } *************** *** 512,533 **** createmeta(L); /* create (private) environment (with fields IO_INPUT, IO_OUTPUT, __close) */ ! lua_createtable(L, 2, 1); lua_replace(L, LUA_ENVIRONINDEX); /* open library */ luaL_register(L, LUA_IOLIBNAME, iolib); /* create (and set) default files */ createstdfile(L, stdin, IO_INPUT, "stdin"); createstdfile(L, stdout, IO_OUTPUT, "stdout"); createstdfile(L, stderr, 0, "stderr"); ! /* create environment for 'popen' */ lua_getfield(L, -1, "popen"); ! lua_createtable(L, 0, 1); ! lua_pushcfunction(L, io_pclose); ! lua_setfield(L, -2, "__close"); ! lua_setfenv(L, -2); lua_pop(L, 1); /* pop 'popen' */ - /* set default close function */ - lua_pushcfunction(L, io_fclose); - lua_setfield(L, LUA_ENVIRONINDEX, "__close"); return 1; } --- 535,552 ---- createmeta(L); /* create (private) environment (with fields IO_INPUT, IO_OUTPUT, __close) */ ! newfenv(L, io_fclose); lua_replace(L, LUA_ENVIRONINDEX); /* open library */ luaL_register(L, LUA_IOLIBNAME, iolib); /* create (and set) default files */ + newfenv(L, io_noclose); /* close function for default files */ createstdfile(L, stdin, IO_INPUT, "stdin"); createstdfile(L, stdout, IO_OUTPUT, "stdout"); createstdfile(L, stderr, 0, "stderr"); ! lua_pop(L, 1); /* pop environment for default files */ lua_getfield(L, -1, "popen"); ! newfenv(L, io_pclose); /* create environment for 'popen' */ ! lua_setfenv(L, -2); /* set fenv for 'popen' */ lua_pop(L, 1); /* pop 'popen' */ return 1; } Index: lundump.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lundump.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lundump.c 29 Mar 2006 05:48:11 -0000 1.2 --- lundump.c 25 Jan 2008 23:50:51 -0000 1.3 *************** *** 30,33 **** --- 30,34 ---- #ifdef LUAC_TRUST_BINARIES #define IF(c,s) + #define error(S,s) #else #define IF(c,s) if (c) error(S,s) *************** *** 48,51 **** --- 49,53 ---- { size_t r=luaZ_read(S->Z,b,size); + UNUSED(r); IF (r!=0, "unexpected end"); } *************** *** 123,127 **** break; default: ! IF (1, "bad constant"); break; } --- 125,129 ---- break; default: ! error(S,"bad constant"); break; } Index: loslib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/loslib.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** loslib.c 25 Apr 2007 02:52:20 -0000 1.3 --- loslib.c 25 Jan 2008 23:50:51 -0000 1.4 *************** *** 216,220 **** static int os_exit (lua_State *L) { exit(luaL_optint(L, 1, EXIT_SUCCESS)); - return 0; /* to avoid warnings */ } --- 216,219 ---- Index: lauxlib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lauxlib.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lauxlib.c 18 Jan 2008 03:43:00 -0000 1.3 --- lauxlib.c 25 Jan 2008 23:50:51 -0000 1.4 *************** *** 536,540 **** } if (feof(lf->f)) return NULL; ! *size = fread(lf->buff, 1, LUAL_BUFFERSIZE, lf->f); return (*size > 0) ? lf->buff : NULL; } --- 536,540 ---- } if (feof(lf->f)) return NULL; ! *size = fread(lf->buff, 1, sizeof(lf->buff), lf->f); return (*size > 0) ? lf->buff : NULL; } *************** *** 571,577 **** if (c == '\n') c = getc(lf.f); } ! if (c == LUA_SIGNATURE[0] && lf.f != stdin) { /* binary file? */ ! fclose(lf.f); ! lf.f = fopen(filename, "rb"); /* reopen in binary mode */ if (lf.f == NULL) return errfile(L, "reopen", fnameindex); /* skip eventual `#!...' */ --- 571,576 ---- if (c == '\n') c = getc(lf.f); } ! if (c == LUA_SIGNATURE[0] && filename) { /* binary file? */ ! lf.f = freopen(filename, "rb", lf.f); /* reopen in binary mode */ if (lf.f == NULL) return errfile(L, "reopen", fnameindex); /* skip eventual `#!...' */ *************** *** 582,586 **** status = lua_load(L, getF, &lf, lua_tostring(L, -1)); readstatus = ferror(lf.f); ! if (lf.f != stdin) fclose(lf.f); /* close file (even in case of errors) */ if (readstatus) { lua_settop(L, fnameindex); /* ignore results from `lua_load' */ --- 581,585 ---- status = lua_load(L, getF, &lf, lua_tostring(L, -1)); readstatus = ferror(lf.f); ! if (filename) fclose(lf.f); /* close file (even in case of errors) */ if (readstatus) { lua_settop(L, fnameindex); /* ignore results from `lua_load' */ Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile 18 Jan 2008 03:43:00 -0000 1.8 --- Makefile 25 Jan 2008 23:50:51 -0000 1.9 *************** *** 100,106 **** macosx: ! $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX ! # use this on Mac OS X 10.4 ! # $(MAKE) all MYCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE" MYLIBS="-lreadline" mingw: --- 100,106 ---- macosx: ! $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline" ! # use this on Mac OS X 10.3- ! # $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX mingw: Index: ldo.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/ldo.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ldo.c 18 Jan 2008 03:43:00 -0000 1.4 --- ldo.c 25 Jan 2008 23:50:51 -0000 1.5 *************** *** 333,337 **** luaD_callhook(L, LUA_HOOKRET, -1); if (f_isLua(L->ci)) { /* Lua function? */ ! while (L->ci->tailcalls--) /* call hook for eventual tail calls */ luaD_callhook(L, LUA_HOOKTAILRET, -1); } --- 333,337 ---- luaD_callhook(L, LUA_HOOKRET, -1); if (f_isLua(L->ci)) { /* Lua function? */ ! while ((L->hookmask & LUA_MASKRET) && L->ci->tailcalls--) /* tail calls */ luaD_callhook(L, LUA_HOOKTAILRET, -1); } Index: ldblib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/ldblib.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ldblib.c 29 Mar 2006 06:00:00 -0000 1.1 --- ldblib.c 25 Jan 2008 23:50:51 -0000 1.2 *************** *** 139,143 **** return 1; /* return table */ } ! static int db_getlocal (lua_State *L) { --- 139,143 ---- return 1; /* return table */ } ! static int db_getlocal (lua_State *L) { *************** *** 256,277 **** static int db_sethook (lua_State *L) { ! int arg; lua_State *L1 = getthread(L, &arg); if (lua_isnoneornil(L, arg+1)) { lua_settop(L, arg+1); ! lua_sethook(L1, NULL, 0, 0); /* turn off hooks */ } else { const char *smask = luaL_checkstring(L, arg+2); - int count = luaL_optint(L, arg+3, 0); luaL_checktype(L, arg+1, LUA_TFUNCTION); ! lua_sethook(L1, hookf, makemask(smask, count), count); } ! gethooktable(L1); ! lua_pushlightuserdata(L1, L1); lua_pushvalue(L, arg+1); ! lua_xmove(L, L1, 1); ! lua_rawset(L1, -3); /* set new hook */ ! lua_pop(L1, 1); /* remove hook table */ return 0; } --- 256,278 ---- static int db_sethook (lua_State *L) { ! int arg, mask, count; ! lua_Hook func; lua_State *L1 = getthread(L, &arg); if (lua_isnoneornil(L, arg+1)) { lua_settop(L, arg+1); ! func = NULL; mask = 0; count = 0; /* turn off hooks */ } else { const char *smask = luaL_checkstring(L, arg+2); luaL_checktype(L, arg+1, LUA_TFUNCTION); ! count = luaL_optint(L, arg+3, 0); ! func = hookf; mask = makemask(smask, count); } ! gethooktable(L); ! lua_pushlightuserdata(L, L1); lua_pushvalue(L, arg+1); ! lua_rawset(L, -3); /* set new hook */ ! lua_pop(L, 1); /* remove hook table */ ! lua_sethook(L1, func, mask, count); /* set hooks */ return 0; } *************** *** 287,295 **** lua_pushliteral(L, "external hook"); else { ! gethooktable(L1); ! lua_pushlightuserdata(L1, L1); ! lua_rawget(L1, -2); /* get hook */ ! lua_remove(L1, -2); /* remove hook table */ ! lua_xmove(L1, L, 1); } lua_pushstring(L, unmakemask(mask, buff)); --- 288,295 ---- lua_pushliteral(L, "external hook"); else { ! gethooktable(L); ! lua_pushlightuserdata(L, L1); ! lua_rawget(L, -2); /* get hook */ ! lua_remove(L, -2); /* remove hook table */ } lua_pushstring(L, unmakemask(mask, buff)); Index: lbaselib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lbaselib.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lbaselib.c 18 Jan 2008 03:43:00 -0000 1.4 --- lbaselib.c 25 Jan 2008 23:50:51 -0000 1.5 *************** *** 595,601 **** static int luaB_corunning (lua_State *L) { if (lua_pushthread(L)) ! return 0; /* main thread is not a coroutine */ ! else ! return 1; } --- 595,600 ---- static int luaB_corunning (lua_State *L) { if (lua_pushthread(L)) ! lua_pushnil(L); /* main thread is not a coroutine */ ! return 1; } |
|
From: John L. <jr...@us...> - 2008-01-25 23:51:32
|
Update of /cvsroot/wxlua/wxLua/modules/lua/etc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1159/wxLua/modules/lua/etc Modified Files: lua.pc luavs.bat min.c strict.lua Log Message: - Removed the wxLuaBinding::PreRegister() and PostRegister() functions and made RegisterBinding() virtual Note: wxLuaBinding::RegisterBinding() now leaves the Lua table that the binding objects were installed into on the stack. You must pop it. * The rules.lua for genwxbind.lua now uses wxLuaBinding_class_declaration and wxLuaBinding_class_implementation to replace wxLuaBinding_preregister and wxLuaBinding_postregister. You may now add whatever you like to the class declaration and implementation source code. Updated to Lua 5.1.3 official Index: min.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/etc/min.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** min.c 29 Mar 2006 05:48:10 -0000 1.2 --- min.c 25 Jan 2008 23:50:50 -0000 1.3 *************** *** 19,23 **** if (lua_isstring(L,i)) printf("%s",lua_tostring(L,i)); ! else if (lua_isnil(L,i)==2) printf("%s","nil"); else if (lua_isboolean(L,i)) --- 19,23 ---- if (lua_isstring(L,i)) printf("%s",lua_tostring(L,i)); ! else if (lua_isnil(L,i)) printf("%s","nil"); else if (lua_isboolean(L,i)) Index: luavs.bat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/etc/luavs.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** luavs.bat 25 Apr 2007 02:52:20 -0000 1.2 --- luavs.bat 25 Jan 2008 23:50:50 -0000 1.3 *************** *** 1,15 **** ! rem script to build Lua under "Visual Studio .NET Command Prompt". ! rem do not run it from this directory, run it from the toplevel: etc\luavs.bat ! rem it creates lua51.dll, lua51.lib, lua.exe, and luac.exe in src. cd src ! cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DLUA_BUILD_AS_DLL l*.c del lua.obj luac.obj ! link /DLL /out:lua51.dll l*.obj ! cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DLUA_BUILD_AS_DLL lua.c ! link /out:lua.exe lua.obj lua51.lib ! cl /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE l*.c print.c ! del lua.obj linit.obj lbaselib.obj ldblib.obj liolib.obj lmathlib.obj loslib.obj ltablib.obj lstrlib.obj loadlib.obj ! link /out:luac.exe *.obj ! del *.obj cd .. --- 1,28 ---- ! @rem Script to build Lua under "Visual Studio .NET Command Prompt". ! @rem Do not run from this directory; run it from the toplevel: etc\luavs.bat . ! @rem It creates lua51.dll, lua51.lib, lua.exe, and luac.exe in src. ! @rem (contributed by David Manura and Mike Pall) ! ! @setlocal ! @set MYCOMPILE=cl /nologo /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE ! @set MYLINK=link /nologo ! @set MYMT=mt /nologo cd src ! %MYCOMPILE% /DLUA_BUILD_AS_DLL l*.c del lua.obj luac.obj ! %MYLINK% /DLL /out:lua51.dll l*.obj ! if exist lua51.dll.manifest^ ! %MYMT% -manifest lua51.dll.manifest -outputresource:lua51.dll;2 ! %MYCOMPILE% /DLUA_BUILD_AS_DLL lua.c ! %MYLINK% /out:lua.exe lua.obj lua51.lib ! if exist lua.exe.manifest^ ! %MYMT% -manifest lua.exe.manifest -outputresource:lua.exe ! %MYCOMPILE% l*.c print.c ! del lua.obj linit.obj lbaselib.obj ldblib.obj liolib.obj lmathlib.obj^ ! loslib.obj ltablib.obj lstrlib.obj loadlib.obj ! %MYLINK% /out:luac.exe *.obj ! if exist luac.exe.manifest^ ! %MYMT% -manifest luac.exe.manifest -outputresource:luac.exe ! del *.obj *.manifest cd .. Index: lua.pc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/etc/lua.pc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lua.pc 25 Apr 2007 02:52:20 -0000 1.3 --- lua.pc 25 Jan 2008 23:50:50 -0000 1.4 *************** *** 6,10 **** V= 5.1 # grep '^R=' ../Makefile ! R= 5.1.2 # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' --- 6,10 ---- V= 5.1 # grep '^R=' ../Makefile ! R= 5.1.3 # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' Index: strict.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/etc/strict.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** strict.lua 25 Apr 2007 02:52:20 -0000 1.2 --- strict.lua 25 Jan 2008 23:50:50 -0000 1.3 *************** *** 7,10 **** --- 7,12 ---- -- + local getinfo, error, rawset, rawget = debug.getinfo, error, rawset, rawget + local mt = getmetatable(_G) if mt == nil then *************** *** 16,20 **** local function what () ! local d = debug.getinfo(3, "S") return d and d.what or "C" end --- 18,22 ---- local function what () ! local d = getinfo(3, "S") return d and d.what or "C" end |
|
From: John L. <jr...@us...> - 2008-01-25 23:51:32
|
Update of /cvsroot/wxlua/wxLua/modules/lua/doc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1159/wxLua/modules/lua/doc Modified Files: contents.html lua.html luac.html manual.css manual.html readme.html Log Message: - Removed the wxLuaBinding::PreRegister() and PostRegister() functions and made RegisterBinding() virtual Note: wxLuaBinding::RegisterBinding() now leaves the Lua table that the binding objects were installed into on the stack. You must pop it. * The rules.lua for genwxbind.lua now uses wxLuaBinding_class_declaration and wxLuaBinding_class_implementation to replace wxLuaBinding_preregister and wxLuaBinding_postregister. You may now add whatever you like to the class declaration and implementation source code. Updated to Lua 5.1.3 official Index: manual.css =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/doc/manual.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** manual.css 25 Apr 2007 02:52:20 -0000 1.1 --- manual.css 25 Jan 2008 23:50:50 -0000 1.2 *************** *** 6,7 **** --- 6,13 ---- font-size: 105% ; } + + span.apii { + float: right ; + font-family: inherit ; + } + Index: manual.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/doc/manual.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** manual.html 25 Apr 2007 02:52:20 -0000 1.4 --- manual.html 25 Jan 2008 23:50:50 -0000 1.5 *************** *** 1,3 **** ! <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <html> --- 1,3 ---- ! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> *************** *** 6,9 **** --- 6,10 ---- [...3029 lines suppressed...] Last update: ! Mon Mar 26 12:59:26 BRT 2007 </SMALL> <!-- ! Last change: ready for Lua 5.1.2 --> --- 8751,8762 ---- + <HR> <SMALL> Last update: ! Fri Jan 18 22:32:24 BRST 2008 </SMALL> <!-- ! Last change: revised for Lua 5.1.3 --> Index: contents.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/doc/contents.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** contents.html 25 Apr 2007 02:52:20 -0000 1.4 --- contents.html 25 Jan 2008 23:50:50 -0000 1.5 *************** *** 1,6 **** <HTML> <HEAD> ! <TITLE>Lua 5.1 reference manual - contents</TITLE> <LINK REL="stylesheet" TYPE="text/css" HREF="lua.css"> <STYLE TYPE="text/css"> ul { --- 1,8 ---- + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <HTML> <HEAD> ! <TITLE>Lua 5.1 Reference Manual - contents</TITLE> <LINK REL="stylesheet" TYPE="text/css" HREF="lua.css"> + <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1"> <STYLE TYPE="text/css"> ul { *************** *** 34,42 **** <P> ! Buy a paper copy and <A HREF="http://www.lua.org/donations.html">help to support</A> the Lua project. <P> <A HREF="manual.html">start</A> · --- 36,49 ---- <P> ! Buy a copy of this book and <A HREF="http://www.lua.org/donations.html">help to support</A> the Lua project. <P> + The reference manual is the official definition of the Lua language. + For a complete introduction to Lua programming, see the book + <A HREF="http://www.lua.org/docs.html#books">Programming in Lua</A>. + <P> + <A HREF="manual.html">start</A> · *************** *** 45,52 **** <A HREF="#index">index</A> · ! <A HREF="http://www.lua.org/manual/5.1/errata.html">errata</A> <HR> <SMALL> ! Copyright © 2006-2007 Lua.org, PUC-Rio. Freely available under the terms of the <a href="http://www.lua.org/license.html#5">Lua license</a>. --- 52,61 ---- <A HREF="#index">index</A> · ! <A HREF="http://www.lua.org/manual/5.1/pt/">português</A> ! · ! <A HREF="http://www.lua.org/manual/5.1/es/">español</A> <HR> <SMALL> ! Copyright © 2006-2008 Lua.org, PUC-Rio. Freely available under the terms of the <a href="http://www.lua.org/license.html#5">Lua license</a>. *************** *** 56,60 **** <H2><A NAME="contents">Contents</A></H2> <UL style="padding: 0"> ! <LI><A HREF="manual.html#1">1 - Introduction</A> <LI><A HREF="manual.html#2">2 - The Language</A> <UL> --- 65,70 ---- <H2><A NAME="contents">Contents</A></H2> <UL style="padding: 0"> ! <LI><A HREF="manual.html">1 - Introduction</A> ! <P> <LI><A HREF="manual.html#2">2 - The Language</A> <UL> *************** *** 98,101 **** --- 108,112 ---- <LI><A HREF="manual.html#2.11">2.11 - Coroutines</A> </UL> + <P> <LI><A HREF="manual.html#3">3 - The Application Program Interface</A> <UL> *************** *** 109,116 **** --- 120,129 ---- <LI><A HREF="manual.html#3.8">3.8 - The Debug Interface</A> </UL> + <P> <LI><A HREF="manual.html#4">4 - The Auxiliary Library</A> <UL> <LI><A HREF="manual.html#4.1">4.1 - Functions and Types</A> </UL> + <P> <LI><A HREF="manual.html#5">5 - Standard Libraries</A> <UL> *************** *** 128,132 **** --- 141,147 ---- <LI><A HREF="manual.html#5.9">5.9 - The Debug Library</A> </UL> + <P> <LI><A HREF="manual.html#6">6 - Lua Stand-alone</A> + <P> <LI><A HREF="manual.html#7">7 - Incompatibilities with the Previous Version</A> <UL> *************** *** 135,138 **** --- 150,154 ---- <LI><A HREF="manual.html#7.3">7.3 - Changes in the API</A> </UL> + <P> <LI><A HREF="manual.html#8">8 - The Complete Syntax of Lua</A> </UL> *************** *** 172,179 **** <A HREF="manual.html#pdf-unpack">unpack</A><BR> <A HREF="manual.html#pdf-xpcall">xpcall</A><BR> - </TD> - <TD> - <H3> </H3> <A HREF="manual.html#pdf-coroutine.create">coroutine.create</A><BR> <A HREF="manual.html#pdf-coroutine.resume">coroutine.resume</A><BR> --- 188,193 ---- <A HREF="manual.html#pdf-unpack">unpack</A><BR> <A HREF="manual.html#pdf-xpcall">xpcall</A><BR> + <P> <A HREF="manual.html#pdf-coroutine.create">coroutine.create</A><BR> <A HREF="manual.html#pdf-coroutine.resume">coroutine.resume</A><BR> *************** *** 182,185 **** --- 196,201 ---- <A HREF="manual.html#pdf-coroutine.wrap">coroutine.wrap</A><BR> <A HREF="manual.html#pdf-coroutine.yield">coroutine.yield</A><BR> + <P> + <A HREF="manual.html#pdf-debug.debug">debug.debug</A><BR> <A HREF="manual.html#pdf-debug.getfenv">debug.getfenv</A><BR> *************** *** 196,199 **** --- 212,219 ---- <A HREF="manual.html#pdf-debug.setupvalue">debug.setupvalue</A><BR> <A HREF="manual.html#pdf-debug.traceback">debug.traceback</A><BR> + + </TD> + <TD> + <H3> </H3> <A HREF="manual.html#pdf-file:close">file:close</A><BR> <A HREF="manual.html#pdf-file:flush">file:flush</A><BR> *************** *** 203,206 **** --- 223,228 ---- <A HREF="manual.html#pdf-file:setvbuf">file:setvbuf</A><BR> <A HREF="manual.html#pdf-file:write">file:write</A><BR> + <P> + <A HREF="manual.html#pdf-io.close">io.close</A><BR> <A HREF="manual.html#pdf-io.flush">io.flush</A><BR> *************** *** 211,225 **** <A HREF="manual.html#pdf-io.popen">io.popen</A><BR> <A HREF="manual.html#pdf-io.read">io.read</A><BR> <A HREF="manual.html#pdf-io.tmpfile">io.tmpfile</A><BR> <A HREF="manual.html#pdf-io.type">io.type</A><BR> <A HREF="manual.html#pdf-io.write">io.write</A><BR> <A HREF="manual.html#pdf-math.abs">math.abs</A><BR> <A HREF="manual.html#pdf-math.acos">math.acos</A><BR> <A HREF="manual.html#pdf-math.asin">math.asin</A><BR> - <A HREF="manual.html#pdf-math.atan2">math.atan2</A><BR> <A HREF="manual.html#pdf-math.atan">math.atan</A><BR> <A HREF="manual.html#pdf-math.ceil">math.ceil</A><BR> - <A HREF="manual.html#pdf-math.cosh">math.cosh</A><BR> <A HREF="manual.html#pdf-math.cos">math.cos</A><BR> <A HREF="manual.html#pdf-math.deg">math.deg</A><BR> <A HREF="manual.html#pdf-math.exp">math.exp</A><BR> --- 233,252 ---- <A HREF="manual.html#pdf-io.popen">io.popen</A><BR> <A HREF="manual.html#pdf-io.read">io.read</A><BR> + <A HREF="manual.html#pdf-io.stderr">io.stderr</A><BR> + <A HREF="manual.html#pdf-io.stdin">io.stdin</A><BR> + <A HREF="manual.html#pdf-io.stdout">io.stdout</A><BR> <A HREF="manual.html#pdf-io.tmpfile">io.tmpfile</A><BR> <A HREF="manual.html#pdf-io.type">io.type</A><BR> <A HREF="manual.html#pdf-io.write">io.write</A><BR> + <P> + <A HREF="manual.html#pdf-math.abs">math.abs</A><BR> <A HREF="manual.html#pdf-math.acos">math.acos</A><BR> <A HREF="manual.html#pdf-math.asin">math.asin</A><BR> <A HREF="manual.html#pdf-math.atan">math.atan</A><BR> + <A HREF="manual.html#pdf-math.atan2">math.atan2</A><BR> <A HREF="manual.html#pdf-math.ceil">math.ceil</A><BR> <A HREF="manual.html#pdf-math.cos">math.cos</A><BR> + <A HREF="manual.html#pdf-math.cosh">math.cosh</A><BR> <A HREF="manual.html#pdf-math.deg">math.deg</A><BR> <A HREF="manual.html#pdf-math.exp">math.exp</A><BR> *************** *** 229,234 **** <A HREF="manual.html#pdf-math.huge">math.huge</A><BR> <A HREF="manual.html#pdf-math.ldexp">math.ldexp</A><BR> - <A HREF="manual.html#pdf-math.log10">math.log10</A><BR> <A HREF="manual.html#pdf-math.log">math.log</A><BR> <A HREF="manual.html#pdf-math.max">math.max</A><BR> <A HREF="manual.html#pdf-math.min">math.min</A><BR> --- 256,261 ---- <A HREF="manual.html#pdf-math.huge">math.huge</A><BR> <A HREF="manual.html#pdf-math.ldexp">math.ldexp</A><BR> <A HREF="manual.html#pdf-math.log">math.log</A><BR> + <A HREF="manual.html#pdf-math.log10">math.log10</A><BR> <A HREF="manual.html#pdf-math.max">math.max</A><BR> <A HREF="manual.html#pdf-math.min">math.min</A><BR> *************** *** 239,247 **** <A HREF="manual.html#pdf-math.random">math.random</A><BR> <A HREF="manual.html#pdf-math.randomseed">math.randomseed</A><BR> - <A HREF="manual.html#pdf-math.sinh">math.sinh</A><BR> <A HREF="manual.html#pdf-math.sin">math.sin</A><BR> <A HREF="manual.html#pdf-math.sqrt">math.sqrt</A><BR> - <A HREF="manual.html#pdf-math.tanh">math.tanh</A><BR> <A HREF="manual.html#pdf-math.tan">math.tan</A><BR> <A HREF="manual.html#pdf-os.clock">os.clock</A><BR> <A HREF="manual.html#pdf-os.date">os.date</A><BR> --- 266,276 ---- <A HREF="manual.html#pdf-math.random">math.random</A><BR> <A HREF="manual.html#pdf-math.randomseed">math.randomseed</A><BR> <A HREF="manual.html#pdf-math.sin">math.sin</A><BR> + <A HREF="manual.html#pdf-math.sinh">math.sinh</A><BR> <A HREF="manual.html#pdf-math.sqrt">math.sqrt</A><BR> <A HREF="manual.html#pdf-math.tan">math.tan</A><BR> + <A HREF="manual.html#pdf-math.tanh">math.tanh</A><BR> + <P> + <A HREF="manual.html#pdf-os.clock">os.clock</A><BR> <A HREF="manual.html#pdf-os.date">os.date</A><BR> *************** *** 255,264 **** --- 284,298 ---- <A HREF="manual.html#pdf-os.time">os.time</A><BR> <A HREF="manual.html#pdf-os.tmpname">os.tmpname</A><BR> + <P> + <A HREF="manual.html#pdf-package.cpath">package.cpath</A><BR> <A HREF="manual.html#pdf-package.loaded">package.loaded</A><BR> + <A HREF="manual.html#pdf-package.loaders">package.loaders</A><BR> <A HREF="manual.html#pdf-package.loadlib">package.loadlib</A><BR> <A HREF="manual.html#pdf-package.path">package.path</A><BR> <A HREF="manual.html#pdf-package.preload">package.preload</A><BR> <A HREF="manual.html#pdf-package.seeall">package.seeall</A><BR> + <P> + <A HREF="manual.html#pdf-string.byte">string.byte</A><BR> <A HREF="manual.html#pdf-string.char">string.char</A><BR> *************** *** 275,278 **** --- 309,314 ---- <A HREF="manual.html#pdf-string.sub">string.sub</A><BR> <A HREF="manual.html#pdf-string.upper">string.upper</A><BR> + <P> + <A HREF="manual.html#pdf-table.concat">table.concat</A><BR> <A HREF="manual.html#pdf-table.insert">table.insert</A><BR> *************** *** 293,296 **** --- 329,334 ---- <A HREF="manual.html#lua_State">lua_State</A><BR> <A HREF="manual.html#lua_Writer">lua_Writer</A><BR> + <P> + <A HREF="manual.html#lua_atpanic">lua_atpanic</A><BR> <A HREF="manual.html#lua_call">lua_call</A><BR> *************** *** 324,327 **** --- 362,367 ---- <A HREF="manual.html#lua_islightuserdata">lua_islightuserdata</A><BR> <A HREF="manual.html#lua_isnil">lua_isnil</A><BR> + <A HREF="manual.html#lua_isnone">lua_isnone</A><BR> + <A HREF="manual.html#lua_isnoneornil">lua_isnoneornil</A><BR> <A HREF="manual.html#lua_isnumber">lua_isnumber</A><BR> <A HREF="manual.html#lua_isstring">lua_isstring</A><BR> *************** *** 345,348 **** --- 385,389 ---- <A HREF="manual.html#lua_pushinteger">lua_pushinteger</A><BR> <A HREF="manual.html#lua_pushlightuserdata">lua_pushlightuserdata</A><BR> + <A HREF="manual.html#lua_pushliteral">lua_pushliteral</A><BR> <A HREF="manual.html#lua_pushlstring">lua_pushlstring</A><BR> <A HREF="manual.html#lua_pushnil">lua_pushnil</A><BR> *************** *** 392,395 **** --- 433,438 ---- <A HREF="manual.html#luaL_Buffer">luaL_Buffer</A><BR> <A HREF="manual.html#luaL_Reg">luaL_Reg</A><BR> + <P> + <A HREF="manual.html#luaL_addchar">luaL_addchar</A><BR> <A HREF="manual.html#luaL_addlstring">luaL_addlstring</A><BR> *************** *** 447,454 **** <SMALL> Last update: ! Fri Mar 23 08:33:19 BRT 2007 </SMALL> <!-- ! Last change: minor edit --> --- 490,497 ---- <SMALL> Last update: ! Sat Jan 19 13:24:29 BRST 2008 </SMALL> <!-- ! Last change: revised for Lua 5.1.3 --> Index: readme.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/doc/readme.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** readme.html 25 Apr 2007 02:52:20 -0000 1.3 --- readme.html 25 Jan 2008 23:50:50 -0000 1.4 *************** *** 13,17 **** </H1> ! This is the documentation included in the source distribution of Lua 5.1.2. <UL> --- 13,17 ---- </H1> ! This is the documentation included in the source distribution of Lua 5.1.3. <UL> *************** *** 34,38 **** <SMALL> Last update: ! Fri Mar 23 14:19:36 BRT 2007 </SMALL> --- 34,38 ---- <SMALL> Last update: ! Wed Dec 19 13:59:14 BRST 2007 </SMALL> |
|
From: John L. <jr...@us...> - 2008-01-25 23:51:31
|
Update of /cvsroot/wxlua/wxLua/modules/lua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1159/wxLua/modules/lua Modified Files: COPYRIGHT Makefile Removed Files: MANIFEST Log Message: - Removed the wxLuaBinding::PreRegister() and PostRegister() functions and made RegisterBinding() virtual Note: wxLuaBinding::RegisterBinding() now leaves the Lua table that the binding objects were installed into on the stack. You must pop it. * The rules.lua for genwxbind.lua now uses wxLuaBinding_class_declaration and wxLuaBinding_class_implementation to replace wxLuaBinding_preregister and wxLuaBinding_postregister. You may now add whatever you like to the class declaration and implementation source code. Updated to Lua 5.1.3 official Index: COPYRIGHT =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/COPYRIGHT,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** COPYRIGHT 25 Apr 2007 02:52:20 -0000 1.3 --- COPYRIGHT 25 Jan 2008 23:50:49 -0000 1.4 *************** *** 10,14 **** =============================================================================== ! Copyright (C) 1994-2007 Lua.org, PUC-Rio. Permission is hereby granted, free of charge, to any person obtaining a copy --- 10,14 ---- =============================================================================== ! Copyright (C) 1994-2008 Lua.org, PUC-Rio. Permission is hereby granted, free of charge, to any person obtaining a copy Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 25 Apr 2007 02:52:20 -0000 1.5 --- Makefile 25 Jan 2008 23:50:49 -0000 1.6 *************** *** 21,38 **** INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V ! # How to install. You may prefer "install" instead of "cp" if you have it. ! # To remove debug information from binaries, use "install -s" in INSTALL_EXEC. ! # ! INSTALL_EXEC= $(CP) ! INSTALL_DATA= $(CP) ! #INSTALL_EXEC= $(INSTALL) -m 0755 ! #INSTALL_DATA= $(INSTALL) -m 0644 # Utilities. - CP= cp - FIND= find INSTALL= install MKDIR= mkdir - RANLIB= ranlib # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= --- 21,33 ---- INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V ! # How to install. If you don't have "install" (unlikely) then get install-sh at ! # http://dev.w3.org/cvsweb/libwww/config/install-sh ! # or use cp instead. ! INSTALL_EXEC= $(INSTALL) -p -m 0755 ! INSTALL_DATA= $(INSTALL) -p -m 0644 # Utilities. INSTALL= install MKDIR= mkdir # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= *************** *** 49,53 **** # Lua version and release. V= 5.1 ! R= 5.1.2 all: $(PLAT) --- 44,48 ---- # Lua version and release. V= 5.1 ! R= 5.1.3 all: $(PLAT) *************** *** 65,72 **** cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) - # $(RANLIB) $(INSTALL_LIB)/$(TO_LIB) local: ! $(MAKE) install INSTALL_TOP=.. INSTALL_EXEC="cp -p" INSTALL_DATA="cp -p" none: --- 60,66 ---- cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) local: ! $(MAKE) install INSTALL_TOP=.. none: --- MANIFEST DELETED --- |
|
From: John L. <jr...@us...> - 2008-01-25 23:51:27
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1159/wxLua/apps/build/msvc6 Modified Files: apps_app_wxluacan.dsp Log Message: - Removed the wxLuaBinding::PreRegister() and PostRegister() functions and made RegisterBinding() virtual Note: wxLuaBinding::RegisterBinding() now leaves the Lua table that the binding objects were installed into on the stack. You must pop it. * The rules.lua for genwxbind.lua now uses wxLuaBinding_class_declaration and wxLuaBinding_class_implementation to replace wxLuaBinding_preregister and wxLuaBinding_postregister. You may now add whatever you like to the class declaration and implementation source code. Updated to Lua 5.1.3 official Index: apps_app_wxluacan.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_wxluacan.dsp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** apps_app_wxluacan.dsp 20 Jan 2008 22:40:04 -0000 1.13 --- apps_app_wxluacan.dsp 25 Jan 2008 23:50:44 -0000 1.14 *************** *** 509,513 **** # Begin Source File ! SOURCE=..\..\wxluacan\src\wxluacan.h # End Source File # End Group --- 509,513 ---- # Begin Source File ! SOURCE=..\..\wxluacan\src\wxluacan_bind.h # End Source File # End Group |
