Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/include wxadv_bind.h, 1.12, 1.13 wxaui_bind.h, 1.13, 1.14 wxbase_bind.h, 1.13, 1.14 wxcore_bind.h, 1.13, 1.14 wxcore_wxlcore.h, 1.1, 1.2 wxgl_bind.h, 1.12, 1.13 wxhtml_bind.h, 1.13, 1.14 wxmedia_bind.h, 1.12, 1.13 wxnet_bind.h, 1.12, 1.13 wxrichtext_bind.h, 1.12, 1.13 wxstc_bind.h, 1.12, 1.13 wxxml_bind.h, 1.12, 1.13 wxxrc_bind.h, 1.12, 1.13
|
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 + |
