[Wxlua-commit] wxLua/apps/wxlua/src editor.h,1.3,1.4 wxlua.cpp,1.9,1.10

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-cvs1.sourceforge.net:/tmp/cvs-serv28335/wxLua/apps/wxlua/src

Modified Files:
	editor.h wxlua.cpp 
Log Message:
try to make the stack tree not segfault in wxLua app (still doesn't work)
no major changes


Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wxlua.cpp	1 Dec 2005 04:17:28 -0000	1.9
--- wxlua.cpp	5 Dec 2005 06:11:14 -0000	1.10
***************
*** 56,60 ****
      virtual void AddPendingEvent(wxEvent& event) { m_app->AddPendingEvent(event); }
      virtual bool ProcessEvent(wxEvent& event) { return m_app->ProcessEvent(event); }
!     //virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) { m_app->SetStackFrame(pStackFrame); }
      virtual void DisplayError(const wxString &strError) const { m_app->DisplayError(strError); }
  
--- 56,60 ----
      virtual void AddPendingEvent(wxEvent& event) { m_app->AddPendingEvent(event); }
      virtual bool ProcessEvent(wxEvent& event) { return m_app->ProcessEvent(event); }
!     virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) { m_app->SetStackFrame(pStackFrame); }
      virtual void DisplayError(const wxString &strError) const { m_app->DisplayError(strError); }
  

Index: editor.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** editor.h	1 Dec 2005 04:17:28 -0000	1.3
--- editor.h	5 Dec 2005 06:11:14 -0000	1.4
***************
*** 9,14 ****
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 81924;
! const unsigned char wxLuaEditor[81924] = {
   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 = 82318;
! const unsigned char wxLuaEditor[82318] = {
   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,
***************
*** 277,282 ****
   10,
  102,117,110, 99,116,105,111,110, 32,103,101,116, 77,111,100, 84,105,109,101, 40,102,105,108,101, 80, 97,116,104, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32,119,120, 46,119,120, 70,105,108,101, 78, 97,109,101, 40,102,105,108,101, 80, 97,116,104, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32,114,101,116,117,114,110, 32,102,105,108,101, 78, 97,109,101, 58, 71,101,116, 77,111,100,105,102,105, 99, 97,116,105,111,110, 84,105,109,101, 40, 41, 59, 10,
  101,110,100, 10,
   10,
--- 277,282 ----
   10,
  102,117,110, 99,116,105,111,110, 32,103,101,116, 77,111,100, 84,105,109,101, 40,102,105,108,101, 80, 97,116,104, 41, 10,
!  32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32,119,120, 46,119,120, 70,105,108,101, 78, 97,109,101, 40,102,105,108,101, 80, 97,116,104, 41, 10,
!  32, 32, 32, 32,114,101,116,117,114,110, 32,102,105,108,101, 78, 97,109,101, 58, 71,101,116, 77,111,100,105,102,105, 99, 97,116,105,111,110, 84,105,109,101, 40, 41, 59, 10,
  101,110,100, 10,
   10,
***************
*** 1879,1884 ****
--- 1879,1888 ----
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 66, 82, 69, 65, 75, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
+  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 32, 61, 32,101,118,101,110,116, 58, 68,121,110, 97,109,105, 99, 67, 97,115,116, 40, 34,119,120, 76,117, 97, 68,101, 98,117,103, 69,118,101,110,116, 34, 41, 10,
+  10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,114,111,119, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 76,105,110,101, 78,117,109, 98,101,114, 40, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 70,105,108,101, 78, 97,109,101, 40, 41, 10,
+  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 49, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 70,105,108,101, 78, 97,109,101, 40, 41, 10,
+  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 50, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 70,105,108,101, 78, 97,109,101, 40, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,115,116,114,105,110,103, 46,115,117, 98, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 44, 32, 49, 44, 32, 49, 41, 32, 61, 61, 32, 39, 64, 39, 32,116,104,101,110, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 32, 61, 32,115,116,114,105,110,103, 46,115,117, 98, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 44, 32, 50, 44, 32, 45, 49, 41, 10,
***************
*** 1887,1893 ****
--- 1891,1899 ----
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10,
+  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 49, 32, 61, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,119,120, 46,119,120, 80,108, 97,116,102,111,114,109, 87,105,110,100,111,119,115, 32,116,104,101,110, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 32, 61, 32,119,120, 46,119,120, 85,110,105,120, 50, 68,111,115, 70,105,108,101,110, 97,109,101, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10,
+  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 77,101,115,115, 97,103,101, 66,111,120, 40, 34, 39, 34, 46, 46,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 46, 46, 34, 39, 34, 46, 46,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 49, 46, 46, 34, 39, 34, 46, 46,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 50, 46, 46, 34, 39, 34, 44, 32,101,118,101,110,116, 58, 71,101,116, 70,105,108,101, 78, 97,109,101, 40, 41, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 70,111,117,110,100, 32, 61, 32,102, 97,108,115,101, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,105,115,112,108, 97,121, 79,117,116,112,117,116, 40, 34, 65,116, 32, 66,114,101, 97,107,112,111,105,110,116, 32,108,105,110,101, 58, 32, 34, 46, 46,116,111,115,116,114,105,110,103, 40,114,111,119, 41, 46, 46, 34, 32,102,105,108,101, 58, 32, 34, 46, 46,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 46, 46, 34, 92,110, 34, 41, 10,