Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxlua/src internal.cpp,1.2,1.3 interp.cpp,1.2,1.3 library.cpp,1.2,1.3
|
From: John L. <jr...@us...> - 2005-06-18 20:46:10
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2914/wxLua/modules/wxlua/src Modified Files: internal.cpp interp.cpp library.cpp Log Message: Updated to wxIDE's wrapper files Index: interp.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/interp.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** interp.cpp 7 Jun 2005 04:17:39 -0000 1.2 --- interp.cpp 18 Jun 2005 20:46:00 -0000 1.3 *************** *** 231,235 **** list->DeleteObject(win); ! wxPrintf(wxT("%d %d\n"), int(1), int(win)); fflush(stdout); node = list->GetFirst(); --- 231,235 ---- list->DeleteObject(win); ! //wxPrintf(wxT("%d %d\n"), int(1), int(win)); fflush(stdout); node = list->GetFirst(); *************** *** 380,384 **** } ! event.m_commandInt = (int)line; luaInterpreter->SendEvent( event ); } --- 380,384 ---- } ! event.SetInt((int)line); luaInterpreter->SendEvent( event ); } *************** *** 422,426 **** wxLuaEvent event(wxEVT_LUA_DEBUG_HOOK, luaInterpreter->GetId(), luaInterpreter); event.m_lua_Debug = LDebug; ! event.m_commandInt = LDebug->currentline; luaInterpreter->SendEvent( event ); if (event.m_stop_interpreter) --- 422,426 ---- wxLuaEvent event(wxEVT_LUA_DEBUG_HOOK, luaInterpreter->GetId(), luaInterpreter); event.m_lua_Debug = LDebug; ! event.SetInt(LDebug->currentline); luaInterpreter->SendEvent( event ); if (event.m_stop_interpreter) *************** *** 439,443 **** { luaInterpreter->SetLastLuaDebugHookTime( cur_time ); ! wxYieldIfNeeded(); } } --- 439,466 ---- { luaInterpreter->SetLastLuaDebugHookTime( cur_time ); ! ! bool painting = false; ! ! #if WXWIN_COMPATIBILITY_24 || !wxCHECK_VERSION(2, 5, 0) ! wxNode* node; ! #else ! wxHashTable::Node* node; ! #endif ! ! // FIXME - wxGTK crashes if wxYield[IfNeeded] is called within a paint handler? I think ! luaInterpreter->GetStateVariables()->m_pTrackedList->BeginFind(); ! node = luaInterpreter->GetStateVariables()->m_pTrackedList->Next(); ! while (node) ! { ! if (wxDynamicCast(node->GetData(), wxPaintDC)) ! { ! painting = true; ! break; ! } ! node = luaInterpreter->GetStateVariables()->m_pTrackedList->Next(); ! } ! ! if (!painting) ! wxYieldIfNeeded(); } } *************** *** 453,456 **** --- 476,481 ---- DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_ERROR) DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUG_HOOK) + DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_INIT) + DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUGGERATTACHED) DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_SHUTDOWN) *************** *** 503,508 **** bool wxLuaInterpreter::Create(lua_State *inL, wxEvtHandler *handler, int id) { ! if (Ok() && !Destroy()) ! return FALSE; m_luaStateVariables = new wxLuaStateVariables; --- 528,533 ---- bool wxLuaInterpreter::Create(lua_State *inL, wxEvtHandler *handler, int id) { ! if (Ok() && !Destroy(true)) ! return false; m_luaStateVariables = new wxLuaStateVariables; *************** *** 548,558 **** } - // Load the wxWidgets libraries - RegisterWxLua(L); - // alert people that we've been created so they can finish setting us up wxLuaEvent event(wxEVT_LUA_CREATION, GetId(), this); SendEvent( event ); return TRUE; } --- 573,583 ---- } // alert people that we've been created so they can finish setting us up wxLuaEvent event(wxEVT_LUA_CREATION, GetId(), this); SendEvent( event ); + // now register bindings + m_luaStateVariables->RegisterBindings(m_lua_State, true); + return TRUE; } *************** *** 563,567 **** { m_evtHandler = NULL; // no events here, the handler may already be gone ! Destroy(TRUE); } --- 588,592 ---- { m_evtHandler = NULL; // no events here, the handler may already be gone ! Destroy(true); } *************** *** 569,572 **** --- 594,606 ---- } + void wxLuaInterpreter::GarbageCollectWindows(bool closeWindows) + { + // remove deleted windows + if (Ok() && + m_luaStateVariables->m_pWindowList && + m_luaStateVariables->m_pWindowList->GetCount()) + wxLuaCleanupWindows(m_luaStateVariables->m_pWindowList, !closeWindows); + } + bool wxLuaInterpreter::Destroy(bool force) { *************** *** 594,598 **** return FALSE; ! wxPrintf(wxT("Deleting windows\n")); // delete windows and their eventhandler since they delete the LuaCallbacks --- 628,632 ---- return FALSE; ! //wxPrintf(wxT("Deleting windows\n")); // delete windows and their eventhandler since they delete the LuaCallbacks *************** *** 624,640 **** m_evtHandler = evtHandler; } - wxEvtHandler *wxLuaInterpreter::GetEventHandler() const - { - return m_evtHandler; - } - - void wxLuaInterpreter::SetId(int id) - { - m_id = id; - } - int wxLuaInterpreter::GetId() const - { - return m_id; - } int wxLuaInterpreter::RunFile(const wxString &filename) --- 658,661 ---- *************** *** 707,715 **** } - bool wxLuaInterpreter::IsRunning() const - { - return m_is_running; - } - void wxLuaInterpreter::Break(const wxString &msg) { --- 728,731 ---- *************** *** 726,738 **** } - bool wxLuaInterpreter::GetBreak() const - { - return m_user_break; - } - wxString wxLuaInterpreter::GetBreakMessage() const - { - return m_break_msg; - } - void wxLuaInterpreter::SetLuaDebugHook(int count, int yield, bool send_debug_evt, int hook) { --- 742,745 ---- *************** *** 755,775 **** } - int wxLuaInterpreter::GetLuaDebugHookCount() const - { - return m_lua_debug_hook_count; - } - int wxLuaInterpreter::GetLuaDebugHookYield() const - { - return m_lua_debug_hook_yield; - } - bool wxLuaInterpreter::GetLuaDebugHookSendEvt() const - { - return m_lua_debug_hook_send_evt; - } - int wxLuaInterpreter::GetLuaDebugHook() const - { - return m_lua_debug_hook; - } - unsigned long wxLuaInterpreter::GetLastLuaDebugHookTime() const { --- 762,765 ---- *************** *** 810,814 **** wxLuaEvent event(wxEVT_LUA_ERROR, GetId(), this); event.SetString(msg); ! event.m_commandInt = -1; // don't know what line the error occured SendEvent( event ); return FALSE; --- 800,804 ---- wxLuaEvent event(wxEVT_LUA_ERROR, GetId(), this); event.SetString(msg); ! event.SetInt(-1); // don't know what line the error occured SendEvent( event ); return FALSE; Index: internal.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** internal.cpp 7 Jun 2005 04:17:39 -0000 1.2 --- internal.cpp 18 Jun 2005 20:46:00 -0000 1.3 *************** *** 37,40 **** --- 37,41 ---- #include "wxlua/include/internal.h" #include "wxlua/include/callback.h" + #include "wxbind/include/wxbind.h" class wxStyledTextCtrlDocument; // for void* wxStyledTextCtrl::GetDocPointer() *************** *** 59,62 **** --- 60,70 ---- //#include "wxlua/include/library.h" [...1207 lines suppressed...] int eventClassTag = s_wxEvent; ! GET_LUASTATEVARS_RET(m_luaState) ! const WXLUAEVENT *pLuaEvent = stateVars->GetLuaEvent(pEvent); ! if (pLuaEvent) eventClassTag = *pLuaEvent->eventClassTag; *************** *** 2144,2148 **** default: if (newtop > top) ! errorMsg += lua2wx(lua_tostring(L, -1)); break; } --- 2385,2389 ---- default: if (newtop > top) ! errorMsg += wxT("\n") + lua2wx(lua_tostring(L, -1)); break; } Index: library.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/library.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** library.cpp 7 Jun 2005 04:17:39 -0000 1.2 --- library.cpp 18 Jun 2005 20:46:00 -0000 1.3 *************** *** 26,30 **** #include "wxlua/include/library.h" #include "wxlua/include/internal.h" - //#include "wxlua/include/dserver.h" // ---------------------------------------------------------------------------- --- 26,29 ---- |
