[Wxlua-commit] wxLua/apps/wxluaedit/src wxledit.cpp,1.33,1.34

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

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

Modified Files:
	wxledit.cpp 
Log Message:
 * Changed signature of the function wxLuaState::SetLuaDebugHook() so that
   the inputs to lua_sethook() are together and in the same order.
 - Renamed wxLuaCallback to wxLuaEventCallback to make it more clear that
   it is a callback for the wxEvents using wxEvtHandlers.

Cleaned up the comments in the headers.


Index: wxledit.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** wxledit.cpp	31 Jul 2007 20:54:02 -0000	1.33
--- wxledit.cpp	15 Dec 2007 16:56:40 -0000	1.34
***************
*** 120,124 ****
      {
          wxLuaState wxlState = wxLuaState(wxlStateEvtHandler, win_id);
!         wxlState.SetLuaDebugHook( 1000, 50, false, LUA_MASKCOUNT );
          SetwxLuaState(wxlState, false);
      }
--- 120,124 ----
      {
          wxLuaState wxlState = wxLuaState(wxlStateEvtHandler, win_id);
!         wxlState.SetLuaDebugHook( LUA_MASKCOUNT, 1000, 50, false );
          SetwxLuaState(wxlState, false);
      }
***************
*** 586,590 ****
      {
          wxLuaState wxlState = wxLuaState(wxlStateEvtHandler, win_id);
!         wxlState.SetLuaDebugHook( 1000, 50, false, LUA_MASKCOUNT );
          SetwxLuaState(wxlState, false);
      }
--- 586,590 ----
      {
          wxLuaState wxlState = wxLuaState(wxlStateEvtHandler, win_id);
!         wxlState.SetLuaDebugHook( LUA_MASKCOUNT, 1000, 50, false );
          SetwxLuaState(wxlState, false);
      }
***************
*** 700,706 ****
  
              if (editor->HasBreakpoint(-1))
!                 m_wxlState.SetLuaDebugHook(1, 50, true, LUA_MASKCALL|LUA_MASKRET|LUA_MASKLINE|LUA_MASKCOUNT);
              else
!                 m_wxlState.SetLuaDebugHook(1000, 100, false, LUA_MASKCALL|LUA_MASKRET|LUA_MASKLINE|LUA_MASKCOUNT);
  
              m_luaOutput->SetReadOnly(true);
--- 700,706 ----
  
              if (editor->HasBreakpoint(-1))
!                 m_wxlState.SetLuaDebugHook(LUA_MASKCALL|LUA_MASKRET|LUA_MASKLINE|LUA_MASKCOUNT, 1, 50, true);
              else
!                 m_wxlState.SetLuaDebugHook(LUA_MASKCALL|LUA_MASKRET|LUA_MASKLINE|LUA_MASKCOUNT, 1000, 100, false);
  
              m_luaOutput->SetReadOnly(true);
***************
*** 761,767 ****
                  int  hook_mask  = wxlState.GetLuaDebugHook();
  
!                 wxlState.SetLuaDebugHook(1, -1, true);
                  wxlState.RunString(wxT("print(\"Showing stack\")"));
!                 wxlState.SetLuaDebugHook(hook_count, hook_yield, hook_send, hook_mask);
                  luaShell->CheckPrompt(true);
                  err = false;
--- 761,767 ----
                  int  hook_mask  = wxlState.GetLuaDebugHook();
  
!                 wxlState.SetLuaDebugHook(LUA_MASKCALL|LUA_MASKRET|LUA_MASKLINE|LUA_MASKCOUNT, 1, -1, true);
                  wxlState.RunString(wxT("print(\"Showing stack\")"));
!                 wxlState.SetLuaDebugHook(hook_mask, hook_count, hook_yield, hook_send);
                  luaShell->CheckPrompt(true);
                  err = false;