[Wxlua-commit] wxLua/modules/wxluadebug/src wxlstack.cpp, 1.22, 1.23

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

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

Modified Files:
	wxlstack.cpp 
Log Message:
Show linked table message when expanding all for the first table only


Index: wxlstack.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** wxlstack.cpp	4 Dec 2007 05:20:29 -0000	1.22
--- wxlstack.cpp	4 Dec 2007 16:26:11 -0000	1.23
***************
*** 109,113 ****
  
      stkCtrl->m_itemAttr.SetTextColour(m_stkDlg->m_typeColours[img]);
!     //SetBackgroundColour
  
      return &stkCtrl->m_itemAttr;
--- 109,115 ----
  
      stkCtrl->m_itemAttr.SetTextColour(m_stkDlg->m_typeColours[img]);
! 
!     //unsigned char c = 255 - (stkListData->m_level % 5)*22;
!     //stkCtrl->m_itemAttr.SetBackgroundColour(wxColour(c,c,c));
  
      return &stkCtrl->m_itemAttr;
***************
*** 444,447 ****
--- 446,450 ----
      {
          case 0:
+         {
              if (exact_value)
                  return debugItem->GetKey();
***************
*** 456,459 ****
--- 459,463 ----
              else
                  return debugItem->GetKey();
+         }
          case 1:
              return wxString::Format(wxT("%d:%d"), stkListData->m_level+1, stkListData->m_item_idx+1);
***************
*** 715,741 ****
  }
  
- wxTreeItemId wxLuaStackDialog::FindTreeItemId(const wxTreeItemId& id_, wxLuaStackListData* stkListData) const
- {
-     wxTreeItemIdValue cookie;
-     wxTreeItemId id = m_treeCtrl->GetFirstChild(id_, cookie);
- 
-     while (id)
-     {
-         wxTreeItemId i = FindTreeItemId(id, stkListData);
-         if (i) return i;
- 
-         wxLuaStackTreeData* data = (wxLuaStackTreeData*)m_treeCtrl->GetItemData(id);
-         if (data != NULL)
-         {
-             if (data->m_stkListData == stkListData)
-                 return id;
-         }
- 
-         id = m_treeCtrl->GetNextChild(id_, cookie);
-     }
- 
-     return wxTreeItemId();
- }
- 
  long wxLuaStackDialog::FindListItem(wxLuaStackListData* stkListData, bool get_parent) const
  {
--- 719,722 ----
***************
*** 816,830 ****
          if (list_item >= 0)
          {
!             wxListItem li;
!             li.SetId(list_item);
!             li.SetMask(wxLIST_MASK_TEXT);
!             li.SetColumn(id - ID_WXLUA_STACK_LISTMENU_COPY0);
!             m_listCtrl->GetItem(li);
  
              if (wxTheClipboard->Open())
              {
!                 // This data objects are held by the clipboard,
                  // so do not delete them in the app.
!                 wxTheClipboard->SetData( new wxTextDataObject(li.GetText()) );
                  wxTheClipboard->Close();
              }
--- 797,807 ----
          if (list_item >= 0)
          {
!             wxString s(GetItemText(list_item, id - ID_WXLUA_STACK_LISTMENU_COPY0, true));
  
              if (wxTheClipboard->Open())
              {
!                 // These data objects are held by the clipboard,
                  // so do not delete them in the app.
!                 wxTheClipboard->SetData( new wxTextDataObject(s) );
                  wxTheClipboard->Close();
              }
***************
*** 1151,1155 ****
                           wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT);
  
-     m_show_dup_expand_msg = false;
      BeginBatch();
  
--- 1128,1131 ----
***************
*** 1164,1167 ****
--- 1140,1146 ----
      while (n < (int)m_listData.GetCount())
      {
+         // show message for first item only so it doesn't silently fail
+         if (n > lc_item) m_show_dup_expand_msg = false;
+         
          wxLuaStackListData* stkListData_n = (wxLuaStackListData*)m_listData[n];