From: John L. <jr...@us...> - 2007-12-22 06:07:23
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16833/wxLua/modules/wxluadebug/include Modified Files: wxldebug.h wxlstack.h Log Message: * Updated the naming conventions of the wxLua C/C++ functions to get rid of the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but rather metatables to attach functions to userdata in Lua. The new term for the C++ objects that wxLua wraps in Lua userdata and assigns a metatable to are wxLua types. wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types. wxLua types > 0 are types from the bindings and denote a class or struct. - Most notably for people who have written their own overrides for their bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType(). Those two functions existed before, but basically did the same thing. The calling arguments of PushUserTag() were taken however and were the reverse of what PushUserDataType() had. - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and wxluaT_type() where the latter works just like lua_type(), but returns one of the wxLua types. - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the %ungc tag to release wxLua from deleting the input wxImageList. Index: wxldebug.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** wxldebug.h 20 Dec 2007 02:26:58 -0000 1.49 --- wxldebug.h 22 Dec 2007 06:07:16 -0000 1.50 *************** *** 31,35 **** WXLUA_DEBUGITEM_EXPANDED = 0x0200, // for wxLuaStackDialog ! WXLUA_DEBUGITEM_IS_REFED = 0x1000, // This item was created with a new // wxluaR_ref() rather than using an existing one. WXLUA_DEBUGITEM_KEY_REF = 0x2000, // The ref is for the key --- 31,35 ---- WXLUA_DEBUGITEM_EXPANDED = 0x0200, // for wxLuaStackDialog ! WXLUA_DEBUGITEM_IS_REFED = 0x1000, // This item was created with a new // wxluaR_ref() rather than using an existing one. WXLUA_DEBUGITEM_KEY_REF = 0x2000, // The ref is for the key *************** *** 49,58 **** wxString GetKey() const { return m_itemKey; } int GetKeyType() const { return m_itemKeyType; } ! wxString GetKeyTypeString() const { return wxlua_getwxluatypename(m_itemKeyType); } // The value has the typical meaning of the value for the key in a Lua table wxString GetValue() const { return m_itemValue; } int GetValueType() const { return m_itemValueType; } ! wxString GetValueTypeString() const { return wxlua_getwxluatypename(m_itemValueType); } // The lua_Debug.source value when enumerating the stack or a stack item --- 49,58 ---- wxString GetKey() const { return m_itemKey; } int GetKeyType() const { return m_itemKeyType; } ! wxString GetKeyTypeString() const { return wxluaT_typename(NULL, m_itemKeyType); } // The value has the typical meaning of the value for the key in a Lua table wxString GetValue() const { return m_itemValue; } int GetValueType() const { return m_itemValueType; } ! wxString GetValueTypeString() const { return wxluaT_typename(NULL, m_itemValueType); } // The lua_Debug.source value when enumerating the stack or a stack item *************** *** 116,120 **** virtual ~wxLuaDebugData() {} // make gcc happy even though it's not used ! // Has this been created with it's ref data? bool Ok() const { return (m_refData != NULL); } --- 116,120 ---- virtual ~wxLuaDebugData() {} // make gcc happy even though it's not used ! // Has this been created with its ref data? bool Ok() const { return (m_refData != NULL); } *************** *** 203,210 **** // Returns a string of all of the global variables and subtables with additional msg. wxString DumpGlobals(const wxString& msg = wxEmptyString); ! // Dump the table and it's subtables from the globals index with additional msg. // The name may be of the form "table1.subtable2.subtable3..." wxString DumpTable(const wxString& tableName, const wxString& msg = wxEmptyString); ! // Dump the table and it's subtables at the stack_idx with additional msg. wxString DumpTable(int stack_idx, const wxString& msg = wxEmptyString); --- 203,210 ---- // Returns a string of all of the global variables and subtables with additional msg. wxString DumpGlobals(const wxString& msg = wxEmptyString); ! // Dump the table and its subtables from the globals index with additional msg. // The name may be of the form "table1.subtable2.subtable3..." wxString DumpTable(const wxString& tableName, const wxString& msg = wxEmptyString); ! // Dump the table and its subtables at the stack_idx with additional msg. wxString DumpTable(int stack_idx, const wxString& msg = wxEmptyString); Index: wxlstack.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxlstack.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxlstack.h 20 Dec 2007 02:26:58 -0000 1.17 --- wxlstack.h 22 Dec 2007 06:07:16 -0000 1.18 *************** *** 203,209 **** // Expand a single list item bool ExpandItem(long lc_item); ! // Expand a list item and all it's children bool ExpandItemChildren(long lc_item); ! // Collapse an item and it's children bool CollapseItem(long lc_item); --- 203,209 ---- // Expand a single list item bool ExpandItem(long lc_item); ! // Expand a list item and all its children bool ExpandItemChildren(long lc_item); ! // Collapse an item and its children bool CollapseItem(long lc_item); |