From: John L. <jr...@us...> - 2007-07-18 02:41:37
|
Update of /cvsroot/wxlua/wxLua/modules/luamodule/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8338/wxLua/modules/luamodule/src Modified Files: luamodule.cpp Log Message: Fix controls sample for separated wxWidgets bindings Check for MainLoop already running in luamodule Index: luamodule.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/luamodule/src/luamodule.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** luamodule.cpp 4 May 2007 16:12:24 -0000 1.5 --- luamodule.cpp 18 Jul 2007 02:41:33 -0000 1.6 *************** *** 21,26 **** // Declare the binding initialization functions as extern so we don't have to // #include the binding header for simplicity. ! extern bool wxLuaBinding_wx_init(); ! extern bool wxLuaBinding_wxstc_init(); // ---------------------------------------------------------------------------- --- 21,26 ---- // Declare the binding initialization functions as extern so we don't have to // #include the binding header for simplicity. ! #include "wxbind/include/wxbinddefs.h" ! WXLUA_DECLARE_BIND_ALL // ---------------------------------------------------------------------------- *************** *** 77,81 **** int retval = 0; bool initialized = (wxTopLevelWindows.GetCount() != 0); ! if (initialized) retval = wxApp::MainLoop(); return retval; --- 77,81 ---- int retval = 0; bool initialized = (wxTopLevelWindows.GetCount() != 0); ! if (initialized && !IsMainLoopRunning()) retval = wxApp::MainLoop(); return retval; *************** *** 124,128 **** wxInitAllImageHandlers(); ! wxLuaBinding_wx_init(); s_wxlState.Create(L, WXLUASTATE_SETSTATE); s_wxlState.SetEventHandler((wxEvtHandler*)wxTheApp); --- 124,128 ---- wxInitAllImageHandlers(); ! WXLUA_IMPLEMENT_BIND_ALL s_wxlState.Create(L, WXLUASTATE_SETSTATE); s_wxlState.SetEventHandler((wxEvtHandler*)wxTheApp); |