Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9956/wxLua/modules/wxlua/include
Modified Files:
internal.h wxlbind.h wxlstate.h
Log Message:
Fix Makefiles to use wx-config --exec-prefix for lib dir
remove wxLiaCheckRunError, make CheckRunError static in wxLuaState
Capitalize all functions in genwxbind.lua, provide means to dump data types
wxGetFreeMemory depends on wxLongLong in 2.6, rem out until solution found
comment wx.rules and give better names to variables
move garbageCollect, setTableFunc, getTableFunc to wxlbind.cpp from internal.cpp rename to wxLua_lua_XXX
move callFunction from internal.cpp to wxlstate.cpp prepend with wxLua_lua_XXX
Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxlbind.h 30 Nov 2005 04:46:17 -0000 1.6
--- wxlbind.h 12 Dec 2005 05:16:31 -0000 1.7
***************
*** 25,28 ****
--- 25,39 ----
// ----------------------------------------------------------------------------
+ // C functions for lua installed by the wxLuaBinding
+ // ----------------------------------------------------------------------------
+
+ // memory deallocation function, lua's __gc
+ int LUACALL wxLua_lua_garbageCollect(lua_State *L);
+ // lua 'set table' tag method handler, lua's __newindex
+ int LUACALL wxLua_lua_setTableFunc(lua_State *L);
+ // lua 'get table' tag method handler, lua's __index
+ int LUACALL wxLua_lua_getTableFunc(lua_State *L);
+
+ // ----------------------------------------------------------------------------
// wxLua binding enums and structs
// ----------------------------------------------------------------------------
Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** wxlstate.h 8 Dec 2005 16:07:07 -0000 1.10
--- wxlstate.h 12 Dec 2005 05:16:31 -0000 1.11
***************
*** 52,56 ****
#define wxLUA_UNUSED_NOTUNICODE(x) x
#else /* !Unicode */
! #define wxLUA_UNUSED_NOTUNICODE(x)
#endif // wxUSE_UNICODE
--- 52,56 ----
#define wxLUA_UNUSED_NOTUNICODE(x) x
#else /* !Unicode */
! #define wxLUA_UNUSED_NOTUNICODE(x)
#endif // wxUSE_UNICODE
***************
*** 94,97 ****
--- 94,107 ----
//----------------------------------------------------------------------------
+ // C functions for lua used in the wxLuaState
+ //----------------------------------------------------------------------------
+
+ // free memory associated with the lua call class, lua's __gc
+ int LUACALL wxLua_lua_functionGarbageCollect(lua_State *L);
+
+ // call a Lua function, lua's __call
+ int LUACALL wxLua_lua_callFunction(lua_State *L);
+
+ //----------------------------------------------------------------------------
// wxLuaStateRefData - the internal data for the wxLuaState.
// please use the wxLuaState accessor functions
***************
*** 242,246 ****
// -----------------------------------------------------------------------
! // wxLua Lua Registry Table Functions
// create a reference to the object at index iParam in the Lua index
--- 252,256 ----
// -----------------------------------------------------------------------
! // wxLua lua Registry Table Functions
// create a reference to the object at index iParam in the Lua index
***************
*** 331,335 ****
// Check the return value of LuaDoFile, LuaDoBuffer, lua_dostring, lua_dofile
// returns true for no error, if error fills msg with a useful message if !NULL
! bool CheckRunError(int ret_val, wxString *msg);
// -----------------------------------------------------------------------
--- 341,345 ----
// Check the return value of LuaDoFile, LuaDoBuffer, lua_dostring, lua_dofile
// returns true for no error, if error fills msg with a useful message if !NULL
! static bool CheckRunError(int ret_val, wxString *msg);
// -----------------------------------------------------------------------
Index: internal.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** internal.h 1 Dec 2005 06:43:53 -0000 1.14
--- internal.h 12 Dec 2005 05:16:31 -0000 1.15
***************
*** 234,249 ****
int LUACALL toarrayint(lua_State *L, int iParam, wxArrayInt &intArray);
- // free memory associated with the lua call class, lua's __gc
- int LUACALL functionGarbageCollect(lua_State *L);
-
- // memory deallocation function, lua's __gc
- int LUACALL garbageCollect(lua_State *L);
- // lua 'set table' tag method handler, lua's __newindex
- int LUACALL setTableFunc(lua_State *L);
- // lua 'get table' tag method handler, lua's __index
- int LUACALL getTableFunc(lua_State *L);
- // call a Lua function, lua's __call
- int LUACALL callFunction(lua_State *L);
-
// Given a lua tag, return the corresponding tag name
wxDEPRECATED( const char * LUACALL GetLuaTagName(lua_State *L, int nTag) );
--- 234,237 ----
***************
*** 265,272 ****
int LUACALL LuaDoBuffer(lua_State *L, const char *buffer, size_t len, const char *name);
- // Check the return value of LuaDoFile, LuaDoBuffer, lua_dostring, lua_dofile
- // returns true for no error, if error fills msg with a useful message if !NULL
- bool wxLuaCheckRunError(int ret_val, wxString *msg);
-
// create a reference to the object at index iParam in the Lua index
wxDEPRECATED( int LUACALL tinsert(lua_State *luaState, int iParam) );
--- 253,256 ----
|
