[Wxlua-commit] wxLua/modules/wxluadebug/include wxldebug.h, 1.44, 1.45 wxlstack.h, 1.10, 1.11

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22316/wxLua/modules/wxluadebug/include

Modified Files:
	wxldebug.h wxlstack.h 
Log Message:
 - wxLuaStackDialog has better search for all columns, collapse and expand
   tables, and show metatables. It also now uses a virtual wxListCtrl so
   it's much faster.
 - Separated the "tags" for C++ classes from "refs" for objects we want a
   handle on in the Lua registry by putting them in separate tables.
 - Removed wxlua_pushkey_XXX #defines since we now have a few tables in the
   registry that we use and those methods were not useful anymore.
   The lightuserdata keys are now const char* strings with a descriptive name,
   however only the mem address is used as the table key.
 - wxluaT_newtag() now leaves the created table on the stack.
 - Removed wxluaT_newweaktag() and wxluaT_settagmethod() since they were
   not needed anymore.


Index: wxldebug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** wxldebug.h	30 Nov 2007 06:23:39 -0000	1.44
--- wxldebug.h	30 Nov 2007 23:00:08 -0000	1.45
***************
*** 147,151 ****
      // Get a wxString description about user data at the stack_idx in the Lua stack
      //  if full then try to look up the name of the user data from the bindings
!     static wxString GetUserDataInfo(const wxLuaState& wxlState, int stack_idx, bool full = true);
  
      //-------------------------------------------------------------------------
--- 147,151 ----
      // Get a wxString description about user data at the stack_idx in the Lua stack
      //  if full then try to look up the name of the user data from the bindings
!     static wxString GetUserDataInfo(const wxLuaState& wxlState, int stack_idx, bool full_userdata);
  
      //-------------------------------------------------------------------------

Index: wxlstack.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxlstack.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** wxlstack.h	30 Nov 2007 06:23:39 -0000	1.10
--- wxlstack.h	30 Nov 2007 23:00:08 -0000	1.11
***************
*** 66,73 ****
  {
  public:
!     wxLuaStackListData(int item_idx,
                         const wxLuaDebugData& parentDebugData,
                         const wxLuaDebugData& childrenDebugData = wxNullLuaDebugData) :
!                        m_item_idx(item_idx),
                         m_parentDebugData(parentDebugData),
                         m_childrenDebugData(childrenDebugData) {}
--- 66,73 ----
  {
  public:
!     wxLuaStackListData(int item_idx, int level,
                         const wxLuaDebugData& parentDebugData,
                         const wxLuaDebugData& childrenDebugData = wxNullLuaDebugData) :
!                        m_item_idx(item_idx), m_level(level),
                         m_parentDebugData(parentDebugData),
                         m_childrenDebugData(childrenDebugData) {}
***************
*** 76,79 ****
--- 76,80 ----
  
      int             m_item_idx;
+     int             m_level;
      wxLuaDebugData  m_parentDebugData;
      wxLuaDebugData  m_childrenDebugData;
***************
*** 144,148 ****
      virtual wxBitmap CreateBmpString(const wxBitmap& bmp, const wxString& s);
      // Set the image and color to use
!     virtual int SetupListItem(const wxLuaDebugItem *dbgItem, wxListItem& lItem);
  
      // Override these functions if you need to provide an alternate way to get
--- 145,149 ----
      virtual wxBitmap CreateBmpString(const wxBitmap& bmp, const wxString& s);
      // Set the image and color to use
!     virtual int GetItemImage(const wxLuaDebugItem *dbgItem);
  
      // Override these functions if you need to provide an alternate way to get
***************
*** 174,179 ****
      long FindListItem(wxLuaStackListData* stkListData, bool get_parent = false) const;
  
-     void DoExpandCollapse(const wxTreeItemId& treeId, bool expand, wxProgressDialog* dlg, long& counter);
- 
      void OnExpandButton(wxCommandEvent& event);
      void OnMenu(wxCommandEvent& event);
--- 175,178 ----
***************
*** 197,204 ****
      void SetShowDuplicateExpandMessage(bool show) { m_show_dup_expand_msg = show; }
  
!     void OnListItemDeleted(wxListEvent &event);
!     void OnListAllItemsDeleted(wxListEvent &event);
! 
! protected:
      void DeleteAllListItemData();
      void RemoveAllLuaReferences();
--- 196,200 ----
      void SetShowDuplicateExpandMessage(bool show) { m_show_dup_expand_msg = show; }
  
! //protected:
      void DeleteAllListItemData();
      void RemoveAllLuaReferences();
***************
*** 224,231 ****
      bool m_show_dup_expand_msg;
      int  m_batch_count;
-     bool m_skip_tree_event;
  
      wxLongToLongHashMap m_expandedItems;
  
      static wxSize m_defaultSize;  // remember last dialog size
  
--- 220,228 ----
      bool m_show_dup_expand_msg;
      int  m_batch_count;
  
      wxLongToLongHashMap m_expandedItems;
  
+     wxArrayPtrVoid m_listData;
+ 
      static wxSize m_defaultSize;  // remember last dialog size