[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp, 1.43, 1.44 wxlstack.cpp, 1.14, 1.15

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

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

Modified Files:
	wxldebug.cpp wxlstack.cpp 
Log Message:
Use lowercase "table" in stack dialog/debug data
remove < wx2.6 pre wxComboBox::Insert code


Index: wxlstack.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxlstack.cpp	7 Aug 2007 20:23:26 -0000	1.14
--- wxlstack.cpp	8 Aug 2007 22:49:32 -0000	1.15
***************
*** 381,385 ****
  
      // Add the locals, fake a debug item to get it setup right
!     wxLuaDebugItem* localItem  = new wxLuaDebugItem(_("Locals"), wxT("Table"),
                      wxString::Format(wxT("Count %d"), (int)debugData.GetCount()),
                      wxT(""), LUA_NOREF, 0, WXLUA_DEBUGITEM_EXPANDED);
--- 381,385 ----
  
      // Add the locals, fake a debug item to get it setup right
!     wxLuaDebugItem* localItem  = new wxLuaDebugItem(_("Locals"), wxT("table"),
                      wxString::Format(wxT("Count %d"), (int)debugData.GetCount()),
                      wxT(""), LUA_NOREF, 0, WXLUA_DEBUGITEM_EXPANDED);
***************
*** 637,664 ****
          combo->Delete(pos);
  
- #if wxCHECK_VERSION(2,5,0)
      combo->Insert(str, 0);
- #else
-     // note: can use SetString in MSW, but not in GTK
-     int n, count = combo->GetCount();
-     wxArrayString strings;
-     strings.Alloc(count);
-     for (n = 0; n < count; n++)
-         strings.Add(combo->GetString(n));
- 
-     combo->Clear();
-     combo->Append(str); // put new string first
- 
-     for (n = 0; n < count; n++)
-         combo->Append(strings[n]);
- #endif
- 
      combo->SetSelection(0);
  
!     if (max_strings > 0)
!     {
!         while ((int)combo->GetCount() > max_strings)
!             combo->Delete(combo->GetCount()-1);
!     }
  }
  
--- 637,645 ----
          combo->Delete(pos);
  
      combo->Insert(str, 0);
      combo->SetSelection(0);
  
!     while ((max_strings > 0) && ((int)combo->GetCount() > max_strings))
!         combo->Delete(combo->GetCount()-1);
  }
  

Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** wxldebug.cpp	7 Aug 2007 20:23:26 -0000	1.43
--- wxldebug.cpp	8 Aug 2007 22:49:32 -0000	1.44
***************
*** 265,269 ****
          GetTypeValue(wxlState, -1, type, value, &flag_type);
          int nRef = wxlua_tinsert(L, -1);
!         Add(new wxLuaDebugItem(wxT("Globals"), wxT("Table"), value, wxT(""), nRef, 0, WXLUA_DEBUGITEM_TTABLE|WXLUA_DEBUGITEM_LUAREFED));
          references.Add(nRef);
      }
--- 265,269 ----
          GetTypeValue(wxlState, -1, type, value, &flag_type);
          int nRef = wxlua_tinsert(L, -1);
!         Add(new wxLuaDebugItem(wxT("Globals"), wxT("table"), value, wxT(""), nRef, 0, WXLUA_DEBUGITEM_TTABLE|WXLUA_DEBUGITEM_LUAREFED));
          references.Add(nRef);
      }
***************
*** 273,277 ****
          GetTypeValue(wxlState, -1, type, value, &flag_type);
          int nRef = wxlua_tinsert(L, -1);
!         Add(new wxLuaDebugItem(wxT("Lua Registry"), wxT("Table"), value, wxT(""), nRef, 0, WXLUA_DEBUGITEM_TTABLE|WXLUA_DEBUGITEM_LUAREFED));
          references.Add(nRef);
      }
--- 273,277 ----
          GetTypeValue(wxlState, -1, type, value, &flag_type);
          int nRef = wxlua_tinsert(L, -1);
!         Add(new wxLuaDebugItem(wxT("Lua Registry"), wxT("table"), value, wxT(""), nRef, 0, WXLUA_DEBUGITEM_TTABLE|WXLUA_DEBUGITEM_LUAREFED));
          references.Add(nRef);
      }
***************
*** 576,580 ****
          if (tableArray.Index(value) == wxNOT_FOUND)
          {
!             if (valueType == wxT("Table"))
              {
                  wxString tname = wxString::Format(wxT("%s.%s"), tablename.c_str(), indexValue.c_str());
--- 576,580 ----
          if (tableArray.Index(value) == wxNOT_FOUND)
          {
!             if (valueType == wxT("table"))
              {
                  wxString tname = wxString::Format(wxT("%s.%s"), tablename.c_str(), indexValue.c_str());