[Wxlua-commit] wxLua/modules/wxbind/src wxcore_appframe.cpp, 1.8, 1.9

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32640/wxLua/modules/wxbind/src

Modified Files:
	wxcore_appframe.cpp 
Log Message:
 - Added static bool wxLuaState::sm_wxAppMainLoop_will_run so that Lua code
   that calls "wx.wxGetApp:MainLoop()" will not do anything. C++ coders
   should call it if they create a wxLuaState and run Lua code from
   their wxApp:OnInit() when wxApp:IsMainLoopRunning() returns false.

Added luamodule_mono to wxLua.dsw


Index: wxcore_appframe.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_appframe.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wxcore_appframe.cpp	22 Dec 2007 06:07:12 -0000	1.8
--- wxcore_appframe.cpp	20 Jan 2008 19:23:01 -0000	1.9
***************
*** 197,202 ****
      // get this
      wxApp * self = (wxApp *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxApp);
!     // call MainLoop
!     int returns = !wxApp::IsMainLoopRunning() ? (self->MainLoop()) : 0;
      // push the result number
      lua_pushnumber(L, returns);
--- 197,205 ----
      // get this
      wxApp * self = (wxApp *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxApp);
!     int returns = 0;
! 
!     if (!wxLuaState::sm_wxAppMainLoop_will_run)
!         returns = self->MainLoop();
! 
      // push the result number
      lua_pushnumber(L, returns);