[Wxlua-commit] wxLua/apps/wxlua/src editor.h, 1.28, 1.29 wxlua.cpp, 1.41, 1.42

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wxlua/wxLua/apps/wxlua/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8247/wxLua/apps/wxlua/src

Modified Files:
	editor.h wxlua.cpp 
Log Message:
subclass the wxProcess in the debugger so we don't have to send an event
fixes crashes when an error occurs in the debugger's lua program
test compile lua programs before running or debugging to catch syntax errors


Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** wxlua.cpp	7 Dec 2006 22:05:52 -0000	1.41
--- wxlua.cpp	8 Dec 2006 06:16:17 -0000	1.42
***************
*** 82,88 ****
  
  // Find the index into the argv that matches name starting at arg start_n
! // This is necessary since the wxCmdLineParser drops -- and all -X 
  //  params so we use this to make sure that the lua program is at 0.
! int FindFirstCmdParam(int start_n, const wxString& name, 
                        int argc, wxChar** argv)
  {
--- 82,88 ----
  
  // Find the index into the argv that matches name starting at arg start_n
! // This is necessary since the wxCmdLineParser drops -- and all -X
  //  params so we use this to make sure that the lua program is at 0.
! int FindFirstCmdParam(int start_n, const wxString& name,
                        int argc, wxChar** argv)
  {
***************
*** 108,112 ****
  
  bool wxLuaStandaloneApp::OnInit()
! {    
      m_programName  = argv[0];  // The name of this program
      m_luaConsole   = NULL;
--- 108,112 ----
  
  bool wxLuaStandaloneApp::OnInit()
! {
      m_programName  = argv[0];  // The name of this program
      m_luaConsole   = NULL;
***************
*** 179,183 ****
                  arg_count++; // remove -c arg
                  m_want_console = true;
!                 // Note: The m_luaConsole will be nulled when it closes in 
                  //       wxLuaConsole::OnCloseWindow.
                  m_luaConsole = new wxLuaConsole(NULL, ID_WXLUA_CONSOLE);
--- 179,183 ----
                  arg_count++; // remove -c arg
                  m_want_console = true;
!                 // Note: The m_luaConsole will be nulled when it closes in
                  //       wxLuaConsole::OnCloseWindow.
                  m_luaConsole = new wxLuaConsole(NULL, ID_WXLUA_CONSOLE);
***************
*** 204,208 ****
              if (parser.Found(wxT("d"), &debugString))
              {
!                 // Note: wxLuaDebuggerServer::StartClient() runs 
                  //       wxExecute(m_programName -d[host]:[port], ...)
  
--- 204,208 ----
              if (parser.Found(wxT("d"), &debugString))
              {
!                 // Note: wxLuaDebuggerServer::StartClient() runs
                  //       wxExecute(m_programName -d[host]:[port], ...)
  
***************
*** 220,224 ****
                          m_pDebugTarget = new wxLuaDebugTarget(m_wxlState, serverName, (int)portNumber);
                          if (m_pDebugTarget != NULL)
!                             return m_pDebugTarget->Run();
                          else
                              DisplayMessage(_("The wxLua debug target cannot start.\n"), true);
--- 220,228 ----
                          m_pDebugTarget = new wxLuaDebugTarget(m_wxlState, serverName, (int)portNumber);
                          if (m_pDebugTarget != NULL)
!                         {
!                             bool ok = m_pDebugTarget->Run();
!                             //wxSafeShowMessage(wxT("Target"), wxString::Format(wxT("PID %ld TIME %s ok %d"), (long)wxGetProcessId(), wxT(__TIME__), int(ok)));
!                             return ok;
!                         }
                          else
                              DisplayMessage(_("The wxLua debug target cannot start.\n"), true);
***************
*** 239,243 ****
  
              if (open_file || (parser.GetParamCount() == 0))
!             {                
                  if (openFileName.IsEmpty() && (parser.GetParamCount() > 0u))
                      openFileName = parser.GetParam(0);
--- 243,247 ----
  
              if (open_file || (parser.GetParamCount() == 0))
!             {
                  if (openFileName.IsEmpty() && (parser.GetParamCount() > 0u))
                      openFileName = parser.GetParam(0);

Index: editor.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** editor.h	7 Dec 2006 06:34:24 -0000	1.28
--- editor.h	8 Dec 2006 06:16:17 -0000	1.29
***************
*** 9,14 ****
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 74827;
! const unsigned char wxLuaEditor[74828] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
--- 9,14 ----
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 75835;
[...976 lines suppressed...]
!  32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 32, 61, 32,110,105,108, 10,
   32, 32, 32, 32,101,110,100, 10,
!  32, 32, 32, 32,100,101, 98,117,103,103,101,101, 95,114,117,110,110,105,110,103, 32, 61, 32,102, 97,108,115,101, 10,
   32, 32, 32, 32, 83, 97,118,101, 79,110, 69,120,105,116, 40, 41, 10,
   32, 32, 32, 32, 67,111,110,102,105,103, 83, 97,118,101, 70,114, 97,109,101, 80,111,115,105,116,105,111,110, 40,102,114, 97,109,101, 44, 32, 34, 77, 97,105,110, 70,114, 97,109,101, 34, 41, 10,
***************
*** 2011,2015 ****
   32, 32, 32, 32,102,111,114, 32,105,110,100,101,120, 32, 61, 32, 49, 44, 32, 35, 97,114,103, 32,100,111, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32, 97,114,103, 91,105,110,100,101,120, 93, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 76,111, 97,100, 70,105,108,101, 40,102,105,108,101, 78, 97,109,101, 44, 32,102,105,108,101, 78, 97,109,101, 41, 10,
   32, 32, 32, 32,101,110,100, 10,
   10,
--- 2032,2038 ----
   32, 32, 32, 32,102,111,114, 32,105,110,100,101,120, 32, 61, 32, 49, 44, 32, 35, 97,114,103, 32,100,111, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32, 97,114,103, 91,105,110,100,101,120, 93, 10,
!  32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,102,105,108,101, 78, 97,109,101, 32,126, 61, 32, 34, 45, 45, 34, 32,116,104,101,110, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 76,111, 97,100, 70,105,108,101, 40,102,105,108,101, 78, 97,109,101, 44, 32,119,120, 46,119,120, 70,105,108,101, 78, 97,109,101, 40,102,105,108,101, 78, 97,109,101, 41, 58, 71,101,116, 70,117,108,108, 78, 97,109,101, 40, 41, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10,
   32, 32, 32, 32,101,110,100, 10,
   10,