[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp, 1.66, 1.67

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

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4615/wxLua/modules/wxluadebug/src

Modified Files:
	wxldebug.cpp 
Log Message:
More fixes for mysterious crash using MSVC release and wxString + operator
   wxT("a")+wxString("b")+wxT("c")+wxString("d")...


Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** wxldebug.cpp	14 May 2009 05:06:21 -0000	1.66
--- wxldebug.cpp	24 Jun 2009 19:57:40 -0000	1.67
***************
*** 184,188 ****
          if (lua_getinfo(L, "Sln", &luaDebug))
          {
!             //wxPrintf(wxString(lua_Debug_to_wxString(luaDebug) + wxT("\n")).c_str());
  
              // skip stack frames that do not have line number, always add first
--- 184,188 ----
          if (lua_getinfo(L, "Sln", &luaDebug))
          {
!             //wxPrintf(wxT("%s\n"), lua_Debug_to_wxString(luaDebug).c_str());
  
              // skip stack frames that do not have line number, always add first
***************
*** 228,232 ****
          while (!name.IsEmpty())
          {
!             //wxPrintf(wxString(lua_Debug_to_wxString(luaDebug) + wxT(" lua_getlocal :") + name + wxT("\n")).c_str());
  
              int wxl_valuetype = WXLUA_TNONE;
--- 228,232 ----
          while (!name.IsEmpty())
          {
!             //wxPrintf(wxT("%s lua_getlocal :%s\n"), lua_Debug_to_wxString(luaDebug).c_str(), name.c_str());
  
              int wxl_valuetype = WXLUA_TNONE;
***************
*** 367,371 ****
                      if (lightuserdata_reg_key == &wxlua_lreg_types_key)
                      {
!                         value += wxT(" (") + wxluaT_typename(L, (int)lua_tonumber(L, -2)) + wxT(")");
                      }
                      else if (lightuserdata_reg_key == &wxlua_lreg_classes_key)
--- 367,371 ----
                      if (lightuserdata_reg_key == &wxlua_lreg_types_key)
                      {
!                         value += wxString::Format(wxT(" (%s)"), wxluaT_typename(L, (int)lua_tonumber(L, -2)).c_str());
                      }
                      else if (lightuserdata_reg_key == &wxlua_lreg_classes_key)
***************
*** 377,381 ****
                      {
                          wxLuaBinding* binding = (wxLuaBinding*)lua_touserdata(L, -2);
!                         name = wxT("wxLuaBinding(")+name+wxT(") -> ")+binding->GetBindingName();
                          value += wxT(" = ") + binding->GetLuaNamespace();
                      }
--- 377,381 ----
                      {
                          wxLuaBinding* binding = (wxLuaBinding*)lua_touserdata(L, -2);
!                         name = wxString::Format(wxT("wxLuaBinding(%s) -> %s"), name.c_str(), binding->GetBindingName().c_str());
                          value += wxT(" = ") + binding->GetLuaNamespace();
                      }
***************
*** 407,411 ****
                      {
                          wxObject* obj = (wxObject*)lua_touserdata(L, -1);
!                         name = wxString(obj->GetClassInfo()->GetClassName()) + wxT("(") + name + wxT(")");
                      }
                  }
--- 407,411 ----
                      {
                          wxObject* obj = (wxObject*)lua_touserdata(L, -1);
!                         name = wxString::Format(wxT("%s(%s)"), obj->GetClassInfo()->GetClassName(), name.c_str());
                      }
                  }
***************
*** 418,422 ****
                      if (key == &wxlua_metatable_type_key)
                      {
!                         value += wxT(" (") + wxluaT_typename(L, (int)lua_tonumber(L, -1)) + wxT(")");
                      }
                      else if (key == &wxlua_metatable_wxluabindclass_key)
--- 418,422 ----
                      if (key == &wxlua_metatable_type_key)
                      {
!                         value += wxString::Format(wxT(" (%s)"), wxluaT_typename(L, (int)lua_tonumber(L, -1)).c_str());
                      }
                      else if (key == &wxlua_metatable_wxluabindclass_key)
***************
*** 646,650 ****
          {
              const char* ss = *(const char**)udata;
!             s += wxT(" (") + lua2wx(ss) + wxT(")");
          }
      }
--- 646,650 ----
          {
              const char* ss = *(const char**)udata;
!             s += wxString::Format(wxT(" (%s)"), lua2wx(ss).c_str());
          }
      }