[Wxlua-commit] wxLua/modules/wxlua/include internal.h,1.28,1.29 wxlbind.h,1.18,1.19

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26442/modules/wxlua/include

Modified Files:
	internal.h wxlbind.h 
Log Message:
fixing WXDLLIMPEXP symbols

Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxlbind.h	18 May 2006 05:47:40 -0000	1.18
--- wxlbind.h	20 May 2006 14:00:48 -0000	1.19
***************
*** 15,18 ****
--- 15,19 ----

  #include "wxlua/include/wxldefs.h"
+ #include "wxbind/include/wxbinddefs.h"

  extern "C"
***************
*** 63,74 ****

  // wxlua arg tags for common lua types
! extern int s_wxluaarg_String;
! extern int s_wxluaarg_Boolean;
! extern int s_wxluaarg_Enumeration;
! extern int s_wxluaarg_Number;
! extern int s_wxluaarg_LightUserData;
! extern int s_wxluaarg_UserData;
! extern int s_wxluaarg_LuaTable;
! extern int s_wxluaarg_LuaFunction;

  struct WXLUACLASS               // defines a LUA class interface
--- 64,75 ----

  // wxlua arg tags for common lua types
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_String;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Boolean;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Enumeration;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Number;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LightUserData;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_UserData;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaTable;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaFunction;

  struct WXLUACLASS               // defines a LUA class interface
***************
*** 156,160 ****
  #define wxLUA_DECLARE_ENCAPSULATION(theObject) \
  class theObject; \
! void LUACALL wxLua_AddToTrackedMemoryList(wxLuaState& wxlState, theObject *); \
  class wxObject_##theObject : public wxObject \
  { \
--- 157,161 ----
  #define wxLUA_DECLARE_ENCAPSULATION(theObject) \
  class theObject; \
! void WXDLLIMPEXP_WXLUA LUACALL wxLua_AddToTrackedMemoryList(wxLuaState& wxlState, theObject *); \
  class wxObject_##theObject : public wxObject \
  { \
***************
*** 186,190 ****
  // garbage collection purposes. This is a C function for symmetry with
  // the functions defined using wxLUA_DECLARE_ENCAPSULATION.
! void LUACALL wxLua_AddToTrackedMemoryList(wxLuaState& wxlState, wxObject *);

  // ----------------------------------------------------------------------------
--- 187,191 ----
  // garbage collection purposes. This is a C function for symmetry with
  // the functions defined using wxLUA_DECLARE_ENCAPSULATION.
! void WXDLLIMPEXP_WXLUA LUACALL wxLua_AddToTrackedMemoryList(wxLuaState& wxlState, wxObject *);

  // ----------------------------------------------------------------------------

Index: internal.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** internal.h	4 May 2006 02:47:34 -0000	1.28
--- internal.h	20 May 2006 14:00:48 -0000	1.29
***************
*** 123,178 ****

  // helper functions to get numbers, booleans and strings safer
! const char* LUACALL wxLua_lua_getstringtype(lua_State* L, int iParam);
! bool LUACALL wxLua_lua_getbooleantype(lua_State* L, int iParam);
! long LUACALL wxLua_lua_getenumerationtype(lua_State* L, int iParam);
! double LUACALL wxLua_lua_getnumbertype(lua_State* L, int iParam);

  // convert a parameter which is presumably a table into a string array.
  // returns the number of strings in the array in count.
  // the return value may need to be deleted.
! wxString* LUACALL wxLua_lua_getwxstringarray(lua_State* L, int iParam, int& count);
  // convert a parameter which is presumably a table into a character pointer array.
  // returns the number of character strings in the array in count.
  // the return value may need to be deleted.
! const char** LUACALL wxLua_lua_getchararray(lua_State* L, int iParam, int& count);
  // convert a parameter which is presumably a wxArrayString reference a string array.
  // returns the table containing the strings on the Lua stack.
  // returns the number of items in the table
! int LUACALL wxLua_lua_pushwxarraystringtable(lua_State* L, wxArrayString& files);
! int LUACALL wxLua_lua_pushwxarrayinttable(lua_State* L, const wxArrayInt& table);
  // convert a parameter which is presumably a table into a integer array.
  // returns the number of ints in the array in count.
  // the return value may need to be deleted.
! int* LUACALL wxLua_lua_getintarray(lua_State* L, int iParam, int& count);
! int  LUACALL wxLua_lua_getwxarrayint(lua_State* L, int iParam, wxArrayInt& intArray);

  // create a reference to the object at index iParam in the Lua index
! wxDEPRECATED( int LUACALL wxLua_lua_tinsert(lua_State* L, int iParam) );
  // push onto the top of the stack the object referenced by iReference
! bool LUACALL wxLua_lua_tget(lua_State* L, int iReference);
  // remove a Lua reference
! wxDEPRECATED( bool LUACALL wxLua_lua_tremove(lua_State* L, int iReference) );
  // Get the number of items in the reference table
! int  LUACALL wxLua_lua_tgetn(lua_State* L);
  // Display an error message
! void LUACALL wxLua_lua_terror(lua_State* L, const char* errorMsg);
  // push onto the top of the stack an userdata object containing u using tag to set the metatable
! void LUACALL wxLua_lua_tpushusertag(lua_State* L, const void* u, int tag);
  // get the tag of the object at index
! int  LUACALL wxLua_lua_ttag(lua_State* L, int index);
  // return the user data in the userdata object at index, if reset is true clear the user data
! void* LUACALL wxLua_lua_ttouserdata(lua_State* L, int index, bool reset = false);
  // allocate a new metatable return its reference
! wxDEPRECATED( int LUACALL wxLua_lua_tnewtag(lua_State* L) );
! int LUACALL wxLua_lua_tnewweaktag(lua_State* L, bool fWeakKey, bool fWeakData);
  // set the metatable of the object at top of stack from the reference tag
! void LUACALL wxLua_lua_tsettag(lua_State* L, int tag);
  // set a metamethod for the metatable referenced by tag with the supplied name and function.
  // if pClass is non-null set the upvalue of the function to the supplied class
! bool LUACALL wxLua_lua_tsettagmethod(lua_State* L, int tag, const char* method, lua_CFunction func, void* pClass = NULL);
  // push the wxLuaReferences string onto the stack
! void LUACALL wxLua_lua_tpushwxLuaReferences(lua_State* L);
  // push the wxLuaNull string onto the stack
! void LUACALL wxLua_lua_tpushwxLuaNull(lua_State* L);

  // ----------------------------------------------------------------------------
--- 123,178 ----

  // helper functions to get numbers, booleans and strings safer
! WXDLLIMPEXP_WXLUA const char* LUACALL wxLua_lua_getstringtype(lua_State* L, int iParam);
! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_getbooleantype(lua_State* L, int iParam);
! WXDLLIMPEXP_WXLUA long LUACALL wxLua_lua_getenumerationtype(lua_State* L, int iParam);
! WXDLLIMPEXP_WXLUA double LUACALL wxLua_lua_getnumbertype(lua_State* L, int iParam);

  // convert a parameter which is presumably a table into a string array.
  // returns the number of strings in the array in count.
  // the return value may need to be deleted.
! WXDLLIMPEXP_WXLUA wxString* LUACALL wxLua_lua_getwxstringarray(lua_State* L, int iParam, int& count);
  // convert a parameter which is presumably a table into a character pointer array.
  // returns the number of character strings in the array in count.
  // the return value may need to be deleted.
! WXDLLIMPEXP_WXLUA const char** LUACALL wxLua_lua_getchararray(lua_State* L, int iParam, int& count);
  // convert a parameter which is presumably a wxArrayString reference a string array.
  // returns the table containing the strings on the Lua stack.
  // returns the number of items in the table
! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_pushwxarraystringtable(lua_State* L, wxArrayString& files);
! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_pushwxarrayinttable(lua_State* L, const wxArrayInt& table);
  // convert a parameter which is presumably a table into a integer array.
  // returns the number of ints in the array in count.
  // the return value may need to be deleted.
! WXDLLIMPEXP_WXLUA int* LUACALL wxLua_lua_getintarray(lua_State* L, int iParam, int& count);
! WXDLLIMPEXP_WXLUA int  LUACALL wxLua_lua_getwxarrayint(lua_State* L, int iParam, wxArrayInt& intArray);

  // create a reference to the object at index iParam in the Lua index
! WXDLLIMPEXP_WXLUA wxDEPRECATED( int LUACALL wxLua_lua_tinsert(lua_State* L, int iParam) );
  // push onto the top of the stack the object referenced by iReference
! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_tget(lua_State* L, int iReference);
  // remove a Lua reference
! WXDLLIMPEXP_WXLUA wxDEPRECATED( bool LUACALL wxLua_lua_tremove(lua_State* L, int iReference) );
  // Get the number of items in the reference table
! WXDLLIMPEXP_WXLUA int  LUACALL wxLua_lua_tgetn(lua_State* L);
  // Display an error message
! WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_terror(lua_State* L, const char* errorMsg);
  // push onto the top of the stack an userdata object containing u using tag to set the metatable
! WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_tpushusertag(lua_State* L, const void* u, int tag);
  // get the tag of the object at index
! WXDLLIMPEXP_WXLUA int  LUACALL wxLua_lua_ttag(lua_State* L, int index);
  // return the user data in the userdata object at index, if reset is true clear the user data
! WXDLLIMPEXP_WXLUA void* LUACALL wxLua_lua_ttouserdata(lua_State* L, int index, bool reset = false);
  // allocate a new metatable return its reference
! WXDLLIMPEXP_WXLUA wxDEPRECATED( int LUACALL wxLua_lua_tnewtag(lua_State* L) );
! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_tnewweaktag(lua_State* L, bool fWeakKey, bool fWeakData);
  // set the metatable of the object at top of stack from the reference tag
! WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_tsettag(lua_State* L, int tag);
  // set a metamethod for the metatable referenced by tag with the supplied name and function.
  // if pClass is non-null set the upvalue of the function to the supplied class
! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_tsettagmethod(lua_State* L, int tag, const char* method, lua_CFunction func, void* pClass = NULL);
  // push the wxLuaReferences string onto the stack
! WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_tpushwxLuaReferences(lua_State* L);
  // push the wxLuaNull string onto the stack
! WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_tpushwxLuaNull(lua_State* L);

  // ----------------------------------------------------------------------------