[Wxlua-commit] wxLua/apps/luamodule/src wrapmodule.wx.lua,NONE,1.1 Makefile,1.1,1.2 luamodule.cpp,1.1,1.2 luamodule.wx.lua,1.2,1.3

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

Update of /cvsroot/wxlua/wxLua/apps/luamodule/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20100/wxLua/apps/luamodule/src

Modified Files:
	Makefile luamodule.cpp luamodule.wx.lua 
Added Files:
	wrapmodule.wx.lua 
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: luamodule.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/luamodule/src/luamodule.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** luamodule.cpp	13 May 2006 21:05:35 -0000	1.1
--- luamodule.cpp	14 May 2006 01:49:10 -0000	1.2
***************
*** 52,56 ****
  
  BEGIN_EVENT_TABLE(wxLuaModuleApp, wxApp)
!     EVT_LUA_CONSOLE     (wxID_ANY, wxLuaModuleApp::OnLua)
      EVT_LUA_ERROR       (wxID_ANY, wxLuaModuleApp::OnLua)
      //EVT_LUA_DEBUG_HOOK  (wxID_ANY, wxLuaModuleApp::OnLua)
--- 52,56 ----
  
  BEGIN_EVENT_TABLE(wxLuaModuleApp, wxApp)
!     EVT_LUA_PRINT       (wxID_ANY, wxLuaModuleApp::OnLua)
      EVT_LUA_ERROR       (wxID_ANY, wxLuaModuleApp::OnLua)
      //EVT_LUA_DEBUG_HOOK  (wxID_ANY, wxLuaModuleApp::OnLua)

--- NEW FILE: wrapmodule.wx.lua ---
-----------------------------------------------------------------------------
-- Name:        wrapmodule.wx.lua
-- Purpose:     Allow running wxLua programs using require by "appending" wx.wxGetApp():MainLoop()
-- Author:      John Labenski
-- Modified by:
-- Created:     05/13/2006
-- RCS-ID:
-- Copyright:   (c) 2001 John Labenski. All rights reserved.
-- Licence:     wxWidgets licence
-----------------------------------------------------------------------------

-- Usage: $lua wrapmodule.wx.lua wxluaprogram.wx.lua

require("wx")

assert(arg and arg[1] and (type(arg[1]) == "string"), "Usage: $lua wrapmodule.wx.lua wxluaprogram.wx.lua")

dofile(arg[1])

-- ALWAYS call wx.wxGetApp():MainLoop() last to keep the program active
-- otherwise the lua program will exit immediately
wx.wxGetApp():MainLoop()


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/luamodule/src/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	13 May 2006 21:05:35 -0000	1.1
--- Makefile	14 May 2006 01:49:10 -0000	1.2
***************
*** 53,57 ****
  # This will build a shared wxLua app, dynamicly linked to .so libs
  #  -l$(WXFL_LIB)
! APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTC_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUASTC_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS)
  
  #OBJECTS=luamodule.o
--- 53,57 ----
  # This will build a shared wxLua app, dynamicly linked to .so libs
  #  -l$(WXFL_LIB)
! APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTC_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUASTC_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) 
  
  #OBJECTS=luamodule.o

Index: luamodule.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/luamodule/src/luamodule.wx.lua,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** luamodule.wx.lua	13 May 2006 21:48:22 -0000	1.2
--- luamodule.wx.lua	14 May 2006 01:49:10 -0000	1.3
***************
*** 10,14 ****
  -----------------------------------------------------------------------------
  
! require"wx"
  
  -- simple test of Non GUI elements
--- 10,14 ----
  -----------------------------------------------------------------------------
  
! require("wx")
  
  -- simple test of Non GUI elements