[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp, 1.52, 1.53

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

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

Modified Files:
	wxldebug.cpp 
Log Message:
Code cleanup in wxlstate.cpp
Sort numeric debug items by number so you don't get 1,10,2,3,4...


Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** wxldebug.cpp	2 Dec 2007 20:57:34 -0000	1.52
--- wxldebug.cpp	3 Dec 2007 23:47:24 -0000	1.53
***************
*** 125,133 ****
  int wxLuaDebugData::SortFunction(wxLuaDebugItem *elem1, wxLuaDebugItem *elem2 )
  {
!     int ret = elem1->m_itemKey.Cmp(elem2->m_itemKey); // not GetKey() for speed
  
      if (ret == 0) // can be true for unnamed "(*temporary)" vars
      {
!         ret = elem1->GetKeyType() - elem2->GetKeyType(); // shouldn't happen
  
          if (ret == 0)
--- 125,143 ----
  int wxLuaDebugData::SortFunction(wxLuaDebugItem *elem1, wxLuaDebugItem *elem2 )
  {
!     int ret = 0;
! 
!     long l1 = 0, l2 = 0;
! 
!     if ((elem1->m_itemKeyType == WXLUAARG_Number) &&
!         (elem2->m_itemKeyType == WXLUAARG_Number) &&
!         elem1->m_itemKey.BeforeFirst(wxT(' ')).ToLong(&l1) &&
!         elem2->m_itemKey.BeforeFirst(wxT(' ')).ToLong(&l2))
!         ret = l1 - l2;
!     else
!         ret = elem1->m_itemKey.Cmp(elem2->m_itemKey);
  
      if (ret == 0) // can be true for unnamed "(*temporary)" vars
      {
!         ret = elem1->GetKeyType() - elem2->GetKeyType(); 
  
          if (ret == 0)