[Wxlua-commit] wxLua/modules/wxluasocket/src wxldtarg.cpp, 1.49, 1.50

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

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

Modified Files:
	wxldtarg.cpp 
Log Message:
Don't duplicate breakpoint entries.
Remove the prepended '@' Lua puts on the filename retrieved from the LuaDebug struct.


Index: wxldtarg.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** wxldtarg.cpp	15 Nov 2009 17:56:04 -0000	1.49
--- wxldtarg.cpp	27 Aug 2010 20:23:30 -0000	1.50
***************
*** 353,358 ****
  bool wxLuaDebugTarget::AddBreakPoint(const wxString &fileName, int lineNumber)
  {
      wxCriticalSectionLocker locker(m_breakPointListCriticalSection);
!     m_breakPointList.Add(CreateBreakPoint(fileName, lineNumber));
      return true;
  }
--- 353,360 ----
  bool wxLuaDebugTarget::AddBreakPoint(const wxString &fileName, int lineNumber)
  {
+     wxString breakPoint = CreateBreakPoint(fileName, lineNumber);
      wxCriticalSectionLocker locker(m_breakPointListCriticalSection);
!     if (m_breakPointList.Index(breakPoint) == wxNOT_FOUND)
!         m_breakPointList.Add(breakPoint);
      return true;
  }
***************
*** 669,672 ****
--- 671,676 ----
          lineNumber = luaDebug.currentline - 1;
          fileName = lua2wx(luaDebug.source);
+         if (!fileName.IsEmpty() && (fileName[0] == wxT('@')))
+             fileName = fileName.Mid(1);
      }