[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp, 1.73, 1.74

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

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8979/src

Modified Files:
	wxldebug.cpp 
Log Message:
Unable to use wxstr.Printf("blah %s", wxstr.c_str()) in >= wx 2.8 anymore, 
  use wxstr = wxString::Format("blah %s", wxstr.c_str()) instead.


Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** wxldebug.cpp	23 Nov 2009 05:29:00 -0000	1.73
--- wxldebug.cpp	1 Dec 2010 00:25:00 -0000	1.74
***************
*** 416,429 ****
                          wxWindow* win = (wxWindow*)lua_touserdata(L, -2);
                          name += wxT(" ") + wxString(win->GetClassInfo()->GetClassName());
!                     }                    
                      else if (lightuserdata_reg_key == &wxlua_lreg_gcobjects_key)
                      {
                          int wxl_type_ = (int)lua_tonumber(L, -1);
!                         name.Printf(wxT("%s(%s)"), wxluaT_typename(L, wxl_type_).c_str(), name.c_str());
                      }
                      else if (lightuserdata_reg_key == &wxlua_lreg_weakobjects_key)
                      {
                          wxString names_weak;
!                     
                          // iterate the table of userdata
                          lua_pushnil(L);
--- 416,429 ----
                          wxWindow* win = (wxWindow*)lua_touserdata(L, -2);
                          name += wxT(" ") + wxString(win->GetClassInfo()->GetClassName());
!                     }
                      else if (lightuserdata_reg_key == &wxlua_lreg_gcobjects_key)
                      {
                          int wxl_type_ = (int)lua_tonumber(L, -1);
!                         name = wxString::Format(wxT("%s(%s)"), wxluaT_typename(L, wxl_type_).c_str(), name.c_str());
                      }
                      else if (lightuserdata_reg_key == &wxlua_lreg_weakobjects_key)
                      {
                          wxString names_weak;
! 
                          // iterate the table of userdata
                          lua_pushnil(L);
***************
*** 436,441 ****
                              lua_pop(L, 1); // pop value, lua_next will pop key at end
                          }
!                     
!                         name.Printf(wxT("%s (%s)"), names_weak.c_str(), name.c_str());
                      }
                  }
--- 436,441 ----
                              lua_pop(L, 1); // pop value, lua_next will pop key at end
                          }
! 
!                         name = wxString::Format(wxT("%s (%s)"), names_weak.c_str(), name.c_str());
                      }
                  }