[Wxlua-commit] wxLua/samples editor.wx.lua,1.47,1.48

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

Update of /cvsroot/wxlua/wxLua/samples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1533/wxLua/samples

Modified Files:
	editor.wx.lua 
Log Message:
Fix server to work in MSW for the wxLua IDE


Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** editor.wx.lua	19 May 2007 02:05:47 -0000	1.47
--- editor.wx.lua	19 May 2007 17:14:14 -0000	1.48
***************
*** 1975,1979 ****
      debuggerServer:Connect(wx.wxEVT_WXLUA_DEBUGGER_EXIT,
          function (event)
-             DisplayOutput("\nDebugger Client finished.\n\n")
              ClearAllCurrentLineMarkers()
  
--- 1975,1978 ----
***************
*** 1981,1987 ****
                  DestroyDebuggerServer()
              end
-             DisplayOutput("\nDebugger Client finished1.\n\n")
              SetAllEditorsReadOnly(false)
-             DisplayOutput("\nDebugger Client finished2.\n\n")
              ignoredFilesList = {}
          end)
--- 1980,1984 ----
***************
*** 2013,2023 ****
                  debugger_destroy = debugger_destroy + 1
              end
!             if (debugger_destroy > 4) then
                  debugger_destroy = 0;
                  local ds = debuggerServer_
                  debuggerServer_ = nil
!                 ds:StopServer()
!                 ds:Delete()
                  debuggee_running = false
  
                  if (debuggee_pid > 0) then
--- 2010,2024 ----
                  debugger_destroy = debugger_destroy + 1
              end
!             if (debugger_destroy > 5) then
!                 debuggee_running = false
!                 debuggerServer_:StopServer()
!             end
!             if (debugger_destroy > 10) then
                  debugger_destroy = 0;
                  local ds = debuggerServer_
                  debuggerServer_ = nil
! 
                  debuggee_running = false
+                 ds:Delete()
  
                  if (debuggee_pid > 0) then
***************
*** 2025,2029 ****
                          local ret = wx.wxProcess_Kill(debuggee_pid, wx.wxSIGKILL, wx.wxKILL_CHILDREN)
                          if (ret ~= wx.wxKILL_OK) then
!                             DisplayOutput("Unable to kill debuggee process "..debuggee_pid..".\n")
                          end
                      end
--- 2026,2030 ----
                          local ret = wx.wxProcess_Kill(debuggee_pid, wx.wxSIGKILL, wx.wxKILL_CHILDREN)
                          if (ret ~= wx.wxKILL_OK) then
!                             DisplayOutput("Unable to kill debuggee process "..debuggee_pid..", code "..tostring(ret)..".\n")
                          end
                      end
***************
*** 2034,2038 ****
          end)
  
- 
  frame:Connect(ID_START_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED,
          function (event)
--- 2035,2038 ----
***************
*** 2051,2055 ****
              if debuggerServer and (debuggee_pid > 0) then
                  SetAllEditorsReadOnly(true)
!                 DisplayOutput("Waiting for client connection.\n")
              else
                  DisplayOutput("Unable to start debuggee process.\n")
--- 2051,2055 ----
              if debuggerServer and (debuggee_pid > 0) then
                  SetAllEditorsReadOnly(true)
!                 DisplayOutput("Waiting for client connection, process "..tostring(debuggee_pid)..".\n")
              else
                  DisplayOutput("Unable to start debuggee process.\n")
***************
*** 2072,2076 ****
  
              if debuggerServer then
!                 DestroyDebuggerServer()
              end
              SetAllEditorsReadOnly(false)
--- 2072,2077 ----
  
              if debuggerServer then
!                 debuggerServer:Reset();
!                 --DestroyDebuggerServer()
              end
              SetAllEditorsReadOnly(false)