Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/include wxadv_bind.h, 1.6, 1.7 wxaui_bind.h, 1.7, 1.8 wxbase_bind.h, 1.6, 1.7 wxcore_bind.h, 1.6, 1.7 wxcore_wxlprint.h, 1.2, 1.3 wxgl_bind.h, 1.6, 1.7 wxhtml_bind.h, 1.6, 1.7 wxmedia_bind.h, 1.6, 1.7 wxnet_bind.h, 1.6, 1.7 wxrichtext_bind.h, 1.6, 1.7 wxstc_bind.h, 1.6, 1.7 wxxml_bind.h, 1.6, 1.7 wxxrc_bind.h, 1.6, 1.7
|
From: John L. <jr...@us...> - 2007-12-10 05:39:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23281/wxLua/modules/wxbind/include Modified Files: wxadv_bind.h wxaui_bind.h wxbase_bind.h wxcore_bind.h wxcore_wxlprint.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: genwxbind.lua - don't create "returns" variable before use to save a line of code. Applied Lua patches for 5.1.2 8-11 Added wxlua_lreg_createtable(..) to create the LUA_REGISTRYINDEX tables for wxLua Added wxlua_lreg_regtable_key in LUA_REGISTRYINDEX to help the wxLuaDebugData find wxLua's tables faster to give more information Index: wxadv_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxadv_bind.h 7 Dec 2007 02:13:10 -0000 1.6 --- wxadv_bind.h 10 Dec 2007 05:39:06 -0000 1.7 *************** *** 109,112 **** --- 109,123 ---- // --------------------------------------------------------------------------- + // Functions to access wxLuaBindXXX structs + // --------------------------------------------------------------------------- + + extern wxLuaBindClass *wxLuaGetClassList_wxadv(size_t &count); + extern wxLuaBindDefine *wxLuaGetDefineList_wxadv(size_t &count); + extern wxLuaBindString *wxLuaGetStringList_wxadv(size_t &count); + extern wxLuaBindEvent *wxLuaGetEventList_wxadv(size_t &count); + extern wxLuaBindObject *wxLuaGetObjectList_wxadv(size_t &count); + extern wxLuaBindMethod *wxLuaGetFunctionList_wxadv(size_t &count); + + // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- *************** *** 324,328 **** - // --------------------------------------------------------------------------- // Encapsulation Declarations - need to be public for other bindings. --- 335,338 ---- Index: wxcore_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxcore_bind.h 7 Dec 2007 02:13:10 -0000 1.6 --- wxcore_bind.h 10 Dec 2007 05:39:06 -0000 1.7 *************** *** 522,525 **** --- 522,536 ---- // --------------------------------------------------------------------------- + // Functions to access wxLuaBindXXX structs + // --------------------------------------------------------------------------- + + extern wxLuaBindClass *wxLuaGetClassList_wxcore(size_t &count); + extern wxLuaBindDefine *wxLuaGetDefineList_wxcore(size_t &count); + extern wxLuaBindString *wxLuaGetStringList_wxcore(size_t &count); + extern wxLuaBindEvent *wxLuaGetEventList_wxcore(size_t &count); + extern wxLuaBindObject *wxLuaGetObjectList_wxcore(size_t &count); + extern wxLuaBindMethod *wxLuaGetFunctionList_wxcore(size_t &count); + + // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- *************** *** 1097,1100 **** --- 1108,1114 ---- extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxArtProvider_methods[]; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxArtProvider_methodCount; + extern WXDLLIMPEXP_DATA_BINDWXCORE(int) s_wxluatag_wxLuaArtProvider; + extern WXDLLIMPEXP_BINDWXCORE wxLuaBindMethod wxLuaArtProvider_methods[]; + extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxLuaArtProvider_methodCount; #endif // wxLUA_USE_wxArtProvider *************** *** 1806,1810 **** - // --------------------------------------------------------------------------- // Encapsulation Declarations - need to be public for other bindings. --- 1820,1823 ---- Index: wxrichtext_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxrichtext_bind.h 7 Dec 2007 02:13:10 -0000 1.6 --- wxrichtext_bind.h 10 Dec 2007 05:39:06 -0000 1.7 *************** *** 52,58 **** // --------------------------------------------------------------------------- ! // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- --- 52,68 ---- // --------------------------------------------------------------------------- ! // Functions to access wxLuaBindXXX structs // --------------------------------------------------------------------------- + extern wxLuaBindClass *wxLuaGetClassList_wxrichtext(size_t &count); + extern wxLuaBindDefine *wxLuaGetDefineList_wxrichtext(size_t &count); + extern wxLuaBindString *wxLuaGetStringList_wxrichtext(size_t &count); + extern wxLuaBindEvent *wxLuaGetEventList_wxrichtext(size_t &count); + extern wxLuaBindObject *wxLuaGetObjectList_wxrichtext(size_t &count); + extern wxLuaBindMethod *wxLuaGetFunctionList_wxrichtext(size_t &count); + + // --------------------------------------------------------------------------- + // Lua Tag Method Values and Tables for each Class + // --------------------------------------------------------------------------- Index: wxxrc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxxrc_bind.h 7 Dec 2007 02:13:11 -0000 1.6 --- wxxrc_bind.h 10 Dec 2007 05:39:06 -0000 1.7 *************** *** 56,59 **** --- 56,70 ---- // --------------------------------------------------------------------------- + // Functions to access wxLuaBindXXX structs + // --------------------------------------------------------------------------- + + extern wxLuaBindClass *wxLuaGetClassList_wxxrc(size_t &count); + extern wxLuaBindDefine *wxLuaGetDefineList_wxxrc(size_t &count); + extern wxLuaBindString *wxLuaGetStringList_wxxrc(size_t &count); + extern wxLuaBindEvent *wxLuaGetEventList_wxxrc(size_t &count); + extern wxLuaBindObject *wxLuaGetObjectList_wxxrc(size_t &count); + extern wxLuaBindMethod *wxLuaGetFunctionList_wxxrc(size_t &count); + + // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- *************** *** 66,70 **** - // --------------------------------------------------------------------------- // Encapsulation Declarations - need to be public for other bindings. --- 77,80 ---- Index: wxnet_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxnet_bind.h 7 Dec 2007 02:13:10 -0000 1.6 --- wxnet_bind.h 10 Dec 2007 05:39:06 -0000 1.7 *************** *** 73,76 **** --- 73,87 ---- // --------------------------------------------------------------------------- + // Functions to access wxLuaBindXXX structs + // --------------------------------------------------------------------------- + + extern wxLuaBindClass *wxLuaGetClassList_wxnet(size_t &count); + extern wxLuaBindDefine *wxLuaGetDefineList_wxnet(size_t &count); + extern wxLuaBindString *wxLuaGetStringList_wxnet(size_t &count); + extern wxLuaBindEvent *wxLuaGetEventList_wxnet(size_t &count); + extern wxLuaBindObject *wxLuaGetObjectList_wxnet(size_t &count); + extern wxLuaBindMethod *wxLuaGetFunctionList_wxnet(size_t &count); + + // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- *************** *** 130,134 **** - // --------------------------------------------------------------------------- // Encapsulation Declarations - need to be public for other bindings. --- 141,144 ---- Index: wxbase_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxbase_bind.h 7 Dec 2007 02:13:10 -0000 1.6 --- wxbase_bind.h 10 Dec 2007 05:39:06 -0000 1.7 *************** *** 155,158 **** --- 155,169 ---- // --------------------------------------------------------------------------- + // Functions to access wxLuaBindXXX structs + // --------------------------------------------------------------------------- + + extern wxLuaBindClass *wxLuaGetClassList_wxbase(size_t &count); + extern wxLuaBindDefine *wxLuaGetDefineList_wxbase(size_t &count); + extern wxLuaBindString *wxLuaGetStringList_wxbase(size_t &count); + extern wxLuaBindEvent *wxLuaGetEventList_wxbase(size_t &count); + extern wxLuaBindObject *wxLuaGetObjectList_wxbase(size_t &count); + extern wxLuaBindMethod *wxLuaGetFunctionList_wxbase(size_t &count); + + // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- *************** *** 423,427 **** - // --------------------------------------------------------------------------- // Encapsulation Declarations - need to be public for other bindings. --- 434,437 ---- Index: wxmedia_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxmedia_bind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxmedia_bind.h 7 Dec 2007 02:13:10 -0000 1.6 --- wxmedia_bind.h 10 Dec 2007 05:39:06 -0000 1.7 *************** *** 57,60 **** --- 57,71 ---- // --------------------------------------------------------------------------- + // Functions to access wxLuaBindXXX structs + // --------------------------------------------------------------------------- + + extern wxLuaBindClass *wxLuaGetClassList_wxmedia(size_t &count); + extern wxLuaBindDefine *wxLuaGetDefineList_wxmedia(size_t &count); + extern wxLuaBindString *wxLuaGetStringList_wxmedia(size_t &count); + extern wxLuaBindEvent *wxLuaGetEventList_wxmedia(size_t &count); + extern wxLuaBindObject *wxLuaGetObjectList_wxmedia(size_t &count); + extern wxLuaBindMethod *wxLuaGetFunctionList_wxmedia(size_t &count); + + // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- *************** *** 70,74 **** - // --------------------------------------------------------------------------- // Encapsulation Declarations - need to be public for other bindings. --- 81,84 ---- Index: wxcore_wxlprint.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_wxlprint.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxcore_wxlprint.h 17 Jul 2007 23:09:17 -0000 1.2 --- wxcore_wxlprint.h 10 Dec 2007 05:39:06 -0000 1.3 *************** *** 60,62 **** --- 60,88 ---- #endif //wxLUA_USE_wxLuaPrintout + + #if wxLUA_USE_wxArtProvider + + #include "wx/artprov.h" + + class WXDLLIMPEXP_BINDWXCORE wxLuaArtProvider : public wxArtProvider + { + public: + wxLuaArtProvider(const wxLuaState& wxlState); + + // Get the default size of an icon for a specific client + virtual wxSize DoGetSizeHint(const wxArtClient& client); + + // Derived classes must override this method to create requested + // art resource. This method is called only once per instance's + // lifetime for each requested wxArtID. + virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size); + + private: + wxLuaState m_wxlState; + + DECLARE_ABSTRACT_CLASS(wxLuaArtProvider) + }; + + #endif // wxLUA_USE_wxArtProvider + #endif //WX_LUA_PRINTING_H Index: wxgl_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxgl_bind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxgl_bind.h 7 Dec 2007 02:13:10 -0000 1.6 --- wxgl_bind.h 10 Dec 2007 05:39:06 -0000 1.7 *************** *** 56,59 **** --- 56,70 ---- // --------------------------------------------------------------------------- + // Functions to access wxLuaBindXXX structs + // --------------------------------------------------------------------------- + + extern wxLuaBindClass *wxLuaGetClassList_wxgl(size_t &count); + extern wxLuaBindDefine *wxLuaGetDefineList_wxgl(size_t &count); + extern wxLuaBindString *wxLuaGetStringList_wxgl(size_t &count); + extern wxLuaBindEvent *wxLuaGetEventList_wxgl(size_t &count); + extern wxLuaBindObject *wxLuaGetObjectList_wxgl(size_t &count); + extern wxLuaBindMethod *wxLuaGetFunctionList_wxgl(size_t &count); + + // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- *************** *** 69,73 **** - // --------------------------------------------------------------------------- // Encapsulation Declarations - need to be public for other bindings. --- 80,83 ---- Index: wxstc_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxstc_bind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxstc_bind.h 7 Dec 2007 02:13:10 -0000 1.6 --- wxstc_bind.h 10 Dec 2007 05:39:06 -0000 1.7 *************** *** 54,57 **** --- 54,68 ---- // --------------------------------------------------------------------------- + // Functions to access wxLuaBindXXX structs + // --------------------------------------------------------------------------- + + extern wxLuaBindClass *wxLuaGetClassList_wxstc(size_t &count); + extern wxLuaBindDefine *wxLuaGetDefineList_wxstc(size_t &count); + extern wxLuaBindString *wxLuaGetStringList_wxstc(size_t &count); + extern wxLuaBindEvent *wxLuaGetEventList_wxstc(size_t &count); + extern wxLuaBindObject *wxLuaGetObjectList_wxstc(size_t &count); + extern wxLuaBindMethod *wxLuaGetFunctionList_wxstc(size_t &count); + + // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- *************** *** 65,69 **** - // --------------------------------------------------------------------------- // Encapsulation Declarations - need to be public for other bindings. --- 76,79 ---- Index: wxaui_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxaui_bind.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxaui_bind.h 7 Dec 2007 02:13:10 -0000 1.7 --- wxaui_bind.h 10 Dec 2007 05:39:06 -0000 1.8 *************** *** 56,59 **** --- 56,70 ---- // --------------------------------------------------------------------------- + // Functions to access wxLuaBindXXX structs + // --------------------------------------------------------------------------- + + extern wxLuaBindClass *wxLuaGetClassList_wxaui(size_t &count); + extern wxLuaBindDefine *wxLuaGetDefineList_wxaui(size_t &count); + extern wxLuaBindString *wxLuaGetStringList_wxaui(size_t &count); + extern wxLuaBindEvent *wxLuaGetEventList_wxaui(size_t &count); + extern wxLuaBindObject *wxLuaGetObjectList_wxaui(size_t &count); + extern wxLuaBindMethod *wxLuaGetFunctionList_wxaui(size_t &count); + + // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- *************** *** 133,137 **** - // --------------------------------------------------------------------------- // Encapsulation Declarations - need to be public for other bindings. --- 144,147 ---- Index: wxhtml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxhtml_bind.h 7 Dec 2007 02:13:10 -0000 1.6 --- wxhtml_bind.h 10 Dec 2007 05:39:06 -0000 1.7 *************** *** 74,77 **** --- 74,88 ---- // --------------------------------------------------------------------------- + // Functions to access wxLuaBindXXX structs + // --------------------------------------------------------------------------- + + extern wxLuaBindClass *wxLuaGetClassList_wxhtml(size_t &count); + extern wxLuaBindDefine *wxLuaGetDefineList_wxhtml(size_t &count); + extern wxLuaBindString *wxLuaGetStringList_wxhtml(size_t &count); + extern wxLuaBindEvent *wxLuaGetEventList_wxhtml(size_t &count); + extern wxLuaBindObject *wxLuaGetObjectList_wxhtml(size_t &count); + extern wxLuaBindMethod *wxLuaGetFunctionList_wxhtml(size_t &count); + + // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- *************** *** 152,156 **** - // --------------------------------------------------------------------------- // Encapsulation Declarations - need to be public for other bindings. --- 163,166 ---- Index: wxxml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxml_bind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxxml_bind.h 7 Dec 2007 02:13:10 -0000 1.6 --- wxxml_bind.h 10 Dec 2007 05:39:06 -0000 1.7 *************** *** 56,59 **** --- 56,70 ---- // --------------------------------------------------------------------------- + // Functions to access wxLuaBindXXX structs + // --------------------------------------------------------------------------- + + extern wxLuaBindClass *wxLuaGetClassList_wxxml(size_t &count); + extern wxLuaBindDefine *wxLuaGetDefineList_wxxml(size_t &count); + extern wxLuaBindString *wxLuaGetStringList_wxxml(size_t &count); + extern wxLuaBindEvent *wxLuaGetEventList_wxxml(size_t &count); + extern wxLuaBindObject *wxLuaGetObjectList_wxxml(size_t &count); + extern wxLuaBindMethod *wxLuaGetFunctionList_wxxml(size_t &count); + + // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- *************** *** 72,76 **** - // --------------------------------------------------------------------------- // Encapsulation Declarations - need to be public for other bindings. --- 83,86 ---- |
