Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxlua/include wxlbind.h, 1.51, 1.52 wxldefs.h, 1.26, 1.27 wxlstate.h, 1.79, 1.80 wxlua_bind.h, 1.1, 1.2
|
From: John L. <jr...@us...> - 2007-06-16 06:21:50
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19284/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxldefs.h wxlstate.h wxlua_bind.h Log Message: Add back the wxTreeCtrl into the stack dialog, on left of listctrl so you get both for easier navigation. Added functions to the wxlua.XXX table to get info about the status of wxLua Use qsort and bsearch to find the class methods ~ %25 faster Make wxLuaDebugData not always create it's ref data so it can !Ok() Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxldefs.h 14 Jun 2007 05:02:48 -0000 1.26 --- wxldefs.h 16 Jun 2007 06:21:46 -0000 1.27 *************** *** 67,71 **** //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 13 // ---------------------------------------------------------------------------- --- 67,71 ---- //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 14 // ---------------------------------------------------------------------------- Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** wxlbind.h 14 Jun 2007 23:59:48 -0000 1.51 --- wxlbind.h 16 Jun 2007 06:21:45 -0000 1.52 *************** *** 52,59 **** #define WXLUAARG_Number -5 #define WXLUAARG_String -6 ! #define WXLUAARG_LuaTable -7 ! #define WXLUAARG_LuaFunction -8 #define WXLUAARG_UserData -9 ! #define WXLUAARG_LuaThread -10 #define WXLUAARG_Integer -11 --- 52,59 ---- #define WXLUAARG_Number -5 #define WXLUAARG_String -6 ! #define WXLUAARG_Table -7 ! #define WXLUAARG_Function -8 #define WXLUAARG_UserData -9 ! #define WXLUAARG_Thread -10 #define WXLUAARG_Integer -11 *************** *** 64,71 **** extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Number; extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_String; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaTable; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaFunction; extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_UserData; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaThread; extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Integer; --- 64,71 ---- extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Number; extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_String; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Table; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Function; extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_UserData; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Thread; extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Integer; *************** *** 261,265 **** union { ! bool m_bool; int m_int; wxString* m_string; --- 261,265 ---- union { ! bool m_bool; int m_int; wxString* m_string; Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** wxlstate.h 14 Jun 2007 23:59:48 -0000 1.79 --- wxlstate.h 16 Jun 2007 06:21:46 -0000 1.80 *************** *** 89,93 **** // ---------------------------------------------------------------------------- // Push a special number into lua, defines to make sure it's always done the same. ! // // Note we do not push a human readable string for these because lua always makes // a copy of the string and the copying takes a considerable amount of time --- 89,93 ---- // ---------------------------------------------------------------------------- // Push a special number into lua, defines to make sure it's always done the same. ! // // Note we do not push a human readable string for these because lua always makes // a copy of the string and the copying takes a considerable amount of time *************** *** 102,107 **** #define WXLUA_METATABLE_CLASS 1 ! // Push a key that is index in the LUA_REGISTRYINDEX table that is a table indexed ! // on the "tags" and each item is a metatable for classes // or a reference to an object we want to keep a handle to. #define wxlua_pushkey_wxLuaReferences(L) lua_pushnumber(L, WXLUA_LREG_REFERENCES) --- 102,107 ---- #define WXLUA_METATABLE_CLASS 1 ! // Push a key that is index in the LUA_REGISTRYINDEX table that is a table indexed ! // on the "tags" and each item is a metatable for classes // or a reference to an object we want to keep a handle to. #define wxlua_pushkey_wxLuaReferences(L) lua_pushnumber(L, WXLUA_LREG_REFERENCES) *************** *** 175,178 **** --- 175,181 ---- WXDLLIMPEXP_WXLUA bool LUACALL wxlua_tsettagmethod(lua_State* L, int tag, const char* method, lua_CFunction func, void* pClass = NULL); + // Is the item at the stack_idx in the wxLuaReferences table already? + // returns the tag or LUA_NOREF if it's not. + WXDLLIMPEXP_WXLUA int LUACALL wxlua_tisrefed(lua_State* L, int stack_idx); // ---------------------------------------------------------------------------- *************** *** 593,596 **** --- 596,601 ---- bool RemoveTrackedObject(void *pObject, bool fDelete = true); wxLongToLongHashMap* GetTrackedObjects(); + // Get an array of strings "wxObject_classname count#" + wxArrayString GetTrackedObjectStrings(); // Add a wxWindow to track and delete when we're closed, only track *************** *** 604,607 **** --- 609,614 ---- // Is this window tracked, if check_parents see if a parent of it is. bool IsWindowTracked(wxWindow *win, bool check_parents = true) const; + // Get an array of strings "wxWindow_classname count#" + wxArrayString GetTrackedWindowStrings(); // delete all stray wxWindow derived classes that have been destroyed *************** *** 614,617 **** --- 621,626 ---- bool RemoveTrackedCallback(wxLuaCallback* callback); wxList* GetTrackedCallbackList(); + // Get an array of strings "wxEVT_XXX (wxEventType #) count#" + wxArrayString GetTrackedCallbackStrings(); // Add or remove a tracked wxLuaWinDestroyCallback connected to wxEVT_DESTROY. *************** *** 619,622 **** --- 628,633 ---- bool RemoveTrackedWinDestroyCallback(wxLuaWinDestroyCallback* callback); wxList* GetTrackedWinDestroyCallbackList(); + // Get an array of strings "wxWindow_classname count#" + wxArrayString GetTrackedWinDestroyCallbackStrings(); // ----------------------------------------------------------------------- Index: wxlua_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua_bind.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxlua_bind.h 14 Jun 2007 01:23:19 -0000 1.1 --- wxlua_bind.h 16 Jun 2007 06:21:46 -0000 1.2 *************** *** 17,23 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 13 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 13 // --------------------------------------------------------------------------- --- 17,23 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 14 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 14 // --------------------------------------------------------------------------- |
