Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxlua/include wxlbind.h, 1.69, 1.70 wxlstate.h, 1.103, 1.104 wxlua_bind.h, 1.7, 1.8
|
From: John L. <jr...@us...> - 2007-12-10 05:39:21
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23281/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxlstate.h wxlua_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: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** wxlbind.h 7 Dec 2007 02:13:14 -0000 1.69 --- wxlbind.h 10 Dec 2007 05:39:09 -0000 1.70 *************** *** 87,90 **** --- 87,93 ---- extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxWindow; // The Lua tag for wxWindows extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxString; // The Lua tag for wxStrings + extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxArrayString; // The Lua tag for wxArrayString + extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxSortedArrayString; // The Lua tag for wxSortedArrayString + extern WXDLLIMPEXP_DATA_WXLUA(int) g_wxluatag_wxArrayInt; // The Lua tag for wxArrayInt // ---------------------------------------------------------------------------- Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** wxlstate.h 8 Dec 2007 00:25:22 -0000 1.103 --- wxlstate.h 10 Dec 2007 05:39:09 -0000 1.104 *************** *** 132,135 **** --- 132,140 ---- // lightuserdata value for the wxLuaState. extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_wxluadebughookdata_key; + // The key in the LUA_REGISTRYINDEX table that is a weak keyed table of + // LUA_REGISTRYINDEX[wxlua_lreg_XXX_key table] = {&wxlua_lreg_XXX_key} + // This is used by the wxLuaDebugData to know if the table is one of the wxLua + // Reg tables for better wxLuaStackDialog performance. + extern WXDLLIMPEXP_DATA_WXLUA(const char*) wxlua_lreg_regtable_key; // Light user data used as keys in the metatables created for the class userdata objects. *************** *** 143,146 **** --- 148,156 ---- // ---------------------------------------------------------------------------- + // Create one of the wxlua_lreg_XXX_key tables in the LUA_REGISTRYINDEX and + // properly set the wxlua_lreg_regtablekey_key key too. + WXDLLIMPEXP_WXLUA void wxlua_lreg_createtable(lua_State* L, void* lightuserdata_reg_key); + + // ---------------------------------------------------------------------------- // Lua C helper functions - These functions are also part of the wxLuaState // and you are recommended to use those if the wxLuaState is required. However *************** *** 263,266 **** --- 273,278 ---- // LUA_REGISTRYINDEX. WXDLLIMPEXP_WXLUA bool LUACALL wxluaO_istrackedobject(lua_State *L, void *obj_ptr); + // Get a wxArrayString of the info in the wxlua_lreg_delobjects_key LUA_REGISTRYINDEX table. + WXDLLIMPEXP_WXLUA wxArrayString LUACALL wxluaO_gettrackedobjectstrings(lua_State *L); // If an object was pushed into Lua using wxluaT_pushusertag with track=true *************** *** 284,287 **** --- 296,301 ---- // wxlua_lreg_topwindows_key table of the LUA_REGISTRYINDEX table WXDLLIMPEXP_WXLUA bool LUACALL wxluaW_istrackedwindow(lua_State *L, wxWindow* win, bool check_parents); + // Get a wxArrayString of the info in the wxlua_lreg_topwindows_key LUA_REGISTRYINDEX table. + WXDLLIMPEXP_WXLUA wxArrayString LUACALL wxluaW_gettrackedwindowstrings(lua_State *L); // ---------------------------------------------------------------------------- *************** *** 620,626 **** wxWindowID GetId() const; ! // Sends a wxLuaEvent, after checking that this is valid, to the set ! // wxEventHandler with the set id (see SetEventHandler) which may be NULL. ! void SendEvent( wxLuaEvent &event ) const; // ----------------------------------------------------------------------- --- 634,641 ---- wxWindowID GetId() const; ! // Sends the input wxLuaEvent, after checking that this is valid, to the ! // set wxEventHandler (may be NULL), see constructor or SetEventHandler(). ! // returns wxEvtHandler::ProcessEvent(event) ! bool SendEvent( wxLuaEvent &event ) const; // ----------------------------------------------------------------------- Index: wxlua_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua_bind.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxlua_bind.h 7 Dec 2007 02:13:14 -0000 1.7 --- wxlua_bind.h 10 Dec 2007 05:39:10 -0000 1.8 *************** *** 50,53 **** --- 50,64 ---- // --------------------------------------------------------------------------- + // Functions to access wxLuaBindXXX structs + // --------------------------------------------------------------------------- + + extern wxLuaBindClass *wxLuaGetClassList_wxlua(size_t &count); + extern wxLuaBindDefine *wxLuaGetDefineList_wxlua(size_t &count); + extern wxLuaBindString *wxLuaGetStringList_wxlua(size_t &count); + extern wxLuaBindEvent *wxLuaGetEventList_wxlua(size_t &count); + extern wxLuaBindObject *wxLuaGetObjectList_wxlua(size_t &count); + extern wxLuaBindMethod *wxLuaGetFunctionList_wxlua(size_t &count); + + // --------------------------------------------------------------------------- // Lua Tag Method Values and Tables for each Class // --------------------------------------------------------------------------- *************** *** 61,65 **** - // --------------------------------------------------------------------------- // Encapsulation Declarations - need to be public for other bindings. --- 72,75 ---- |
