From: John L. <jr...@us...> - 2006-05-14 01:49:13
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20100/wxLua/apps/wxluaedit/src Modified Files: wxledit.cpp Log Message: change EVT_LUA_CONSOLE to EVT_LUA_PRINT add simple wrapper for running sample using require don't link to lua libs in luamodule Index: wxledit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxledit.cpp 20 Apr 2006 01:10:57 -0000 1.23 --- wxledit.cpp 14 May 2006 01:49:10 -0000 1.24 *************** *** 51,55 **** BEGIN_EVENT_TABLE(wxLuaShell, wxSTEditorShell) EVT_STESHELL_ENTER ( wxID_ANY, wxLuaShell::OnSTEEvent ) ! EVT_LUA_CONSOLE ( wxID_ANY, wxLuaShell::OnLua ) EVT_LUA_ERROR ( wxID_ANY, wxLuaShell::OnLua ) END_EVENT_TABLE() --- 51,55 ---- BEGIN_EVENT_TABLE(wxLuaShell, wxSTEditorShell) EVT_STESHELL_ENTER ( wxID_ANY, wxLuaShell::OnSTEEvent ) ! EVT_LUA_PRINT ( wxID_ANY, wxLuaShell::OnLua ) EVT_LUA_ERROR ( wxID_ANY, wxLuaShell::OnLua ) END_EVENT_TABLE() *************** *** 177,181 **** void wxLuaShell::OnLua(wxLuaEvent &event) { ! if (event.GetEventType() == wxEVT_LUA_CONSOLE) { AppendText(event.GetString() + wxT("\n")); --- 177,181 ---- void wxLuaShell::OnLua(wxLuaEvent &event) { ! if (event.GetEventType() == wxEVT_LUA_PRINT) { AppendText(event.GetString() + wxT("\n")); *************** *** 329,333 **** EVT_SIZE (wxLuaConsole::OnSize) ! EVT_LUA_CONSOLE (wxID_ANY, wxLuaConsole::OnLua) EVT_LUA_ERROR (wxID_ANY, wxLuaConsole::OnLua) EVT_LUA_DEBUG_HOOK (wxID_ANY, wxLuaConsole::OnLua) --- 329,333 ---- EVT_SIZE (wxLuaConsole::OnSize) ! EVT_LUA_PRINT (wxID_ANY, wxLuaConsole::OnLua) EVT_LUA_ERROR (wxID_ANY, wxLuaConsole::OnLua) EVT_LUA_DEBUG_HOOK (wxID_ANY, wxLuaConsole::OnLua) *************** *** 793,797 **** } } ! else if (event.GetEventType() == wxEVT_LUA_CONSOLE) { outEditor->AppendText(event.GetString() + wxT("\n")); --- 793,797 ---- } } ! else if (event.GetEventType() == wxEVT_LUA_PRINT) { outEditor->AppendText(event.GetString() + wxT("\n")); |