[Wxlua-commit] wxLua/modules/wxluadebug/src staktree.cpp, 1.34, 1.35

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

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

Modified Files:
	staktree.cpp 
Log Message:
speed up genwxbind.lua
add wxLuaBinding::GetBindingName as a unique name to know if it's added
Rename *AddToTrackedMemory -> AddTrackedObject since it only tracks wxObjects
Rename wxLuaState::AddTrackedEventHandler to AddTrackedCallback and only accept wxLuaCallbacks
Rename wxLuaState::AddTrackedDestroyEventHandler to AddTrackedWinDestroyCallback and only accept wxLuaWinDestroyCallbacks
Make type evaluation for the bindings more strict


Index: staktree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** staktree.cpp	13 Dec 2006 06:57:50 -0000	1.34
--- staktree.cpp	14 Dec 2006 01:01:27 -0000	1.35
***************
*** 259,272 ****
  
      int derivedCount    = wxlState.GetLuaStateData()->m_pDerivedList.size();
!     int trackedCount    = wxlState.GetLuaStateData()->m_pTrackedList.size();
!     int evtHandlerCount = wxlState.GetTrackedEventHandlerList()->GetCount();
      int windowCount     = wxlState.GetLuaStateData()->m_windowList.GetCount();
!     int destroyCount    = wxlState.GetLuaStateData()->m_destroyHandlerList.GetCount();
  
      wxLuaDebugDataItem* derivedItem    = new wxLuaDebugDataItem(_("Derived List"),  wxT("wxLuaData"), wxString::Format(wxT("%d"), derivedCount), wxT(""), LUA_NOREF, 0);
      wxLuaDebugDataItem* trackedItem    = new wxLuaDebugDataItem(_("Tracked List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), trackedCount), wxT(""), LUA_NOREF, 0);
!     wxLuaDebugDataItem* evtHandlerItem = new wxLuaDebugDataItem(_("Event Handler List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), evtHandlerCount), wxT(""), LUA_NOREF, 0);
      wxLuaDebugDataItem* windowItem     = new wxLuaDebugDataItem(_("wxWindow List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), windowCount), wxT(""), LUA_NOREF, 0);
!     wxLuaDebugDataItem* destroyItem    = new wxLuaDebugDataItem(_("wxWindow Destroy List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), destroyCount), wxT(""), LUA_NOREF, 0);
  
      wxTreeItemId treeNode;
--- 259,272 ----
  
      int derivedCount    = wxlState.GetLuaStateData()->m_pDerivedList.size();
!     int trackedCount    = wxlState.GetTrackedObjects()->size();
!     int callbackCount   = wxlState.GetTrackedCallbackList()->GetCount();
      int windowCount     = wxlState.GetLuaStateData()->m_windowList.GetCount();
!     int destroyCount    = wxlState.GetTrackedWinDestroyCallbackList()->GetCount();
  
      wxLuaDebugDataItem* derivedItem    = new wxLuaDebugDataItem(_("Derived List"),  wxT("wxLuaData"), wxString::Format(wxT("%d"), derivedCount), wxT(""), LUA_NOREF, 0);
      wxLuaDebugDataItem* trackedItem    = new wxLuaDebugDataItem(_("Tracked List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), trackedCount), wxT(""), LUA_NOREF, 0);
!     wxLuaDebugDataItem* callbackItem   = new wxLuaDebugDataItem(_("Event Callback List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), callbackCount), wxT(""), LUA_NOREF, 0);
      wxLuaDebugDataItem* windowItem     = new wxLuaDebugDataItem(_("wxWindow List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), windowCount), wxT(""), LUA_NOREF, 0);
!     wxLuaDebugDataItem* destroyItem    = new wxLuaDebugDataItem(_("wxWindow Destroy Callback List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), destroyCount), wxT(""), LUA_NOREF, 0);
  
      wxTreeItemId treeNode;
***************
*** 276,281 ****
      treeNode = treeControl->AppendItem(rootItem, wxT("Tracked List"), 1, 1, trackedItem);
      if (trackedCount > 0) m_treeControl->SetItemHasChildren(treeNode);
!     treeNode = treeControl->AppendItem(rootItem, wxT("Event Handler List"), 1, 1, evtHandlerItem);
!     if (evtHandlerCount > 0) m_treeControl->SetItemHasChildren(treeNode);
      treeNode = treeControl->AppendItem(rootItem, wxT("wxWindow List"), 1, 1, windowItem);
      if (windowCount > 0) m_treeControl->SetItemHasChildren(treeNode);
--- 276,281 ----
      treeNode = treeControl->AppendItem(rootItem, wxT("Tracked List"), 1, 1, trackedItem);
      if (trackedCount > 0) m_treeControl->SetItemHasChildren(treeNode);
!     treeNode = treeControl->AppendItem(rootItem, wxT("Event Callback List"), 1, 1, callbackItem);
!     if (callbackCount > 0) m_treeControl->SetItemHasChildren(treeNode);
      treeNode = treeControl->AppendItem(rootItem, wxT("wxWindow List"), 1, 1, windowItem);
      if (windowCount > 0) m_treeControl->SetItemHasChildren(treeNode);
***************
*** 320,324 ****
              else if (m_wxlState.Ok() &&
                      ((pDebugDataItem->GetName() == _("Tracked List")) ||
!                      (pDebugDataItem->GetName() == _("Event Handler List")) ||
                       (pDebugDataItem->GetName() == _("wxWindow List"))))
              {
--- 320,324 ----
              else if (m_wxlState.Ok() &&
                      ((pDebugDataItem->GetName() == _("Tracked List")) ||
!                      (pDebugDataItem->GetName() == _("Event Callback List")) ||
                       (pDebugDataItem->GetName() == _("wxWindow List"))))
              {
***************
*** 331,335 ****
                  {
                      wxLongToLongHashMap::iterator it;
!                     wxLongToLongHashMap* hashMap = &wxlState.GetLuaStateRefData()->m_wxlStateData->m_pTrackedList;
  
                      for (it = hashMap->begin(); it != hashMap->end(); ++it)
--- 331,335 ----
                  {
                      wxLongToLongHashMap::iterator it;
!                     wxLongToLongHashMap* hashMap = wxlState.GetTrackedObjects();
  
                      for (it = hashMap->begin(); it != hashMap->end(); ++it)
***************
*** 353,359 ****
                      }
                  }
!                 else if (pDebugDataItem->GetName() == _("Event Handler List"))
                  {
!                     wxNode* node = wxlState.GetTrackedEventHandlerList()->GetFirst();
                      while (node)
                      {
--- 353,359 ----
                      }
                  }
!                 else if (pDebugDataItem->GetName() == _("Event Callback List"))
                  {
!                     wxNode* node = wxlState.GetTrackedCallbackList()->GetFirst();
                      while (node)
                      {