Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10601/wxLua/apps/wxluaedit/src
Modified Files:
wxledit.cpp
Log Message:
Cleanup the change to using positive wxLua types and the mapping between
the Lua and wxLua types.
Fix wxLuaEdit to not stop at -1 line numbers since that's what Lua gives
when running require("wx").
Index: wxledit.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** wxledit.cpp 15 Dec 2007 16:56:40 -0000 1.34
--- wxledit.cpp 26 Jan 2008 23:27:24 -0000 1.35
***************
*** 541,545 ****
wxluaMenu->Append(s.MenuItem(wxluaMenu, ID_WXLUAIDE_SHOW_STACK, wxT("Stack &tree"), wxT("Show the lua stack tree") , wxITEM_NORMAL, wxBitmap(LUA_xpm)));
wxluaMenu->AppendSeparator();
! wxluaMenu->Append(ID_WXLUAIDE_TOGGLE_BREAKPOINT, wxT("Toggle &breakpoint"));
return wxluaMenu;
}
--- 541,545 ----
wxluaMenu->Append(s.MenuItem(wxluaMenu, ID_WXLUAIDE_SHOW_STACK, wxT("Stack &tree"), wxT("Show the lua stack tree") , wxITEM_NORMAL, wxBitmap(LUA_xpm)));
wxluaMenu->AppendSeparator();
! wxluaMenu->Append(ID_WXLUAIDE_TOGGLE_BREAKPOINT, wxT("Toggle &breakpoint\tF9"));
return wxluaMenu;
}
***************
*** 813,817 ****
{
int line = event.GetLineNum();
! if (editor->HasBreakpoint(line-1))
m_wxlState.DebugHookBreak(wxString::Format(wxT("Stopped at breakpoint, line: %d"), line));
}
--- 813,818 ----
{
int line = event.GetLineNum();
! // The line is -1 within the require("wx") function
! if ((line >= 0) && editor->HasBreakpoint(line-1))
m_wxlState.DebugHookBreak(wxString::Format(wxT("Stopped at breakpoint, line: %d"), line));
}
|