[Wxlua-commit] wxLua/apps/wxluaedit/src wxledit.cpp, 1.31, 1.32 wxluaedit.cpp, 1.30, 1.31

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

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

Modified Files:
	wxledit.cpp wxluaedit.cpp 
Log Message:
Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp
Rebaked with the changes


Index: wxluaedit.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** wxluaedit.cpp	27 Feb 2007 20:52:37 -0000	1.30
--- wxluaedit.cpp	24 May 2007 00:59:44 -0000	1.31
***************
*** 33,37 ****
  #include "wxluasocket/include/wxldserv.h"
  #include "wxluasocket/include/wxldtarg.h"
! #include "wxluadebug/include/staktree.h"
  
  class wxLuaConsole;
--- 33,37 ----
  #include "wxluasocket/include/wxldserv.h"
  #include "wxluasocket/include/wxldtarg.h"
! #include "wxluadebug/include/wxlstack.h"
  
  class wxLuaConsole;
***************
*** 465,469 ****
      shell->AppendText(wxT("  Enter lua code and press <enter> to run it.\n"));
      shell->AppendText(wxT("  Multiline code can be typed by pressing <shift>-<enter>.\n"));
!     shell->AppendText(wxT("  The wxLua intrepreter can be restarted with the command 'reset'.\n"));    
      shell->MarkerDeleteAll(wxSTEditorShell::markerPrompt);
      shell->CheckPrompt(true);
--- 465,469 ----
      shell->AppendText(wxT("  Enter lua code and press <enter> to run it.\n"));
      shell->AppendText(wxT("  Multiline code can be typed by pressing <shift>-<enter>.\n"));
!     shell->AppendText(wxT("  The wxLua intrepreter can be restarted with the command 'reset'.\n"));
      shell->MarkerDeleteAll(wxSTEditorShell::markerPrompt);
      shell->CheckPrompt(true);

Index: wxledit.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** wxledit.cpp	8 May 2007 00:55:12 -0000	1.31
--- wxledit.cpp	24 May 2007 00:59:43 -0000	1.32
***************
*** 26,30 ****
  
  #include "wxledit.h"
! #include "wxluadebug/include/staktree.h"
  #include "wxluadebug/include/wxldebug.h"
  
--- 26,30 ----
  
  #include "wxledit.h"
! #include "wxluadebug/include/wxlstack.h"
  #include "wxluadebug/include/wxldebug.h"
  
***************
*** 101,111 ****
      // ask if anyone else wants to create a new wxLuaState for us
      wxLuaEvent event(wxEVT_LUASHELL_wxLUA_CREATION, GetId(), m_wxlState);
!     event.SetEventObject(this); 
      event.SetInt(0);
      event.SetExtraLong(win_id);
  
      // return if handled, but not skipped.
!     if (GetEventHandler()->ProcessEvent(event)) 
!         return false; 
  
      // Did they set a valid interpreter for the event and is it new?
--- 101,111 ----
      // ask if anyone else wants to create a new wxLuaState for us
      wxLuaEvent event(wxEVT_LUASHELL_wxLUA_CREATION, GetId(), m_wxlState);
!     event.SetEventObject(this);
      event.SetInt(0);
      event.SetExtraLong(win_id);
  
      // return if handled, but not skipped.
!     if (GetEventHandler()->ProcessEvent(event))
!         return false;
  
      // Did they set a valid interpreter for the event and is it new?
***************
*** 439,443 ****
      m_luaOutput->SetFileName(wxT("Output"));
  
!     
      m_msgNotebook->InsertEditorSplitter(-1, steSplitter, false);
  
--- 439,443 ----
      m_luaOutput->SetFileName(wxT("Output"));
  
! 
      m_msgNotebook->InsertEditorSplitter(-1, steSplitter, false);
  
***************
*** 572,577 ****
  
      // return if handled, but not skipped.
!     if (GetEventHandler()->ProcessEvent(event)) 
!         return false; 
  
      // Did they set a valid interpreter for the event and is it new?
--- 572,577 ----
  
      // return if handled, but not skipped.
!     if (GetEventHandler()->ProcessEvent(event))
!         return false;
  
      // Did they set a valid interpreter for the event and is it new?