From: John L. <jr...@us...> - 2007-03-07 23:56:48
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14147/wxLua/modules/wxbind/src Modified Files: data.cpp wx_bind.cpp Log Message: Add stub for wxSortedArrayString Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** data.cpp 26 Feb 2007 01:57:02 -0000 1.34 --- data.cpp 7 Mar 2007 23:56:42 -0000 1.35 *************** *** 2339,2340 **** --- 2339,2460 ---- #endif // wxLUA_USE_wxArrayString + + #if wxLUA_USE_wxArrayString + // --------------------------------------------------------------------------- + // Bind class wxSortedArrayString + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxSortedArrayString' + int s_wxluatag_wxSortedArrayString = -1; + + // %overload wxSortedArrayString() + static int LUACALL wxLua_wxSortedArrayString_constructor1(lua_State *L) + { + wxLuaState wxlState(L); + wxSortedArrayString *returns; + // call constructor + returns = new wxSortedArrayString(); + // add to tracked memory list + wxLua_AddTrackedObject(wxlState, (wxSortedArrayString *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxSortedArrayString, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxSortedArrayStringCopy_constructor[] = { &s_wxluatag_wxSortedArrayString, 0 }; + // %overload %constructor wxSortedArrayStringCopy(const wxSortedArrayString& src) + static int LUACALL wxLua_wxSortedArrayStringCopy_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxSortedArrayString *returns; + // const wxSortedArrayString src + const wxSortedArrayString * src = (const wxSortedArrayString *)wxlState.GetUserDataType(1, s_wxluatag_wxSortedArrayString); + // call constructor + returns = new wxSortedArrayString(*src); + // add to tracked memory list + wxLua_AddTrackedObject(wxlState, (wxSortedArrayString *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxSortedArrayString, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxSortedArrayStringFromTable_constructor[] = { &s_wxluaarg_LuaTable, 0 }; + // %overload %constructor wxSortedArrayStringFromTable(const wxArrayString_FromLuaTable& array) + static int LUACALL wxLua_wxSortedArrayStringFromTable_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxSortedArrayString *returns; + // const wxArrayString_FromLuaTable array + wxArrayString array = wxArrayString(); wxlState.GetwxArrayString(1, array); + // call constructor + returns = new wxSortedArrayString(array); + // add to tracked memory list + wxLua_AddTrackedObject(wxlState, (wxSortedArrayString *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxSortedArrayString, returns); + + return 1; + } + + static int LUACALL wxLua_wxSortedArrayString_destructor(lua_State *L) + { + wxLuaState wxlState(L); + wxSortedArrayString * self = (wxSortedArrayString *)wxlState.GetUserDataType(1, s_wxluatag_wxSortedArrayString); + + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedObject(self); + return 0; + } + + static int LUACALL wxLua_wxSortedArrayString_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxSortedArrayString * self = (wxSortedArrayString *)wxlState.GetUserDataType(1, s_wxluatag_wxSortedArrayString); + // remove from tracked memory list + if (self != 0) + if (wxlState.RemoveTrackedObject(self)) + { // if removed, reset the tag so that gc() is not called on this object. + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + + + + // Overloaded function bindings + + #if (wxLUA_USE_wxArrayString) + // Overloaded functions for wxLua_wxSortedArrayString_constructor + static int LUACALL wxLua_wxSortedArrayString_constructor(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaConstructor, "wxSortedArrayString", wxLua_wxSortedArrayString_constructor1, 0, 0, s_wxluaargArray_None }, + { LuaConstructor, "wxSortedArrayStringCopy", wxLua_wxSortedArrayStringCopy_constructor, 1, 1, s_wxluatagArray_wxLua_wxSortedArrayStringCopy_constructor }, + { LuaConstructor, "wxSortedArrayStringFromTable", wxLua_wxSortedArrayStringFromTable_constructor, 1, 1, s_wxluatagArray_wxLua_wxSortedArrayStringFromTable_constructor }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif // (wxLUA_USE_wxArrayString) + + + + // Map Lua Class Methods to C Binding Functions + WXLUAMETHOD wxSortedArrayString_methods[] = { + { LuaConstructor, "wxSortedArrayString", wxLua_wxSortedArrayString_constructor, 0, 0, s_wxluaargArray_None }, + { LuaConstructor, "wxSortedArrayStringCopy", wxLua_wxSortedArrayStringCopy_constructor, 1, 1, s_wxluatagArray_wxLua_wxSortedArrayStringCopy_constructor }, + { LuaConstructor, "wxSortedArrayStringFromTable", wxLua_wxSortedArrayStringFromTable_constructor, 1, 1, s_wxluatagArray_wxLua_wxSortedArrayStringFromTable_constructor }, + { LuaDelete, "wxSortedArrayString", wxLua_wxSortedArrayString_destructor, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "Delete", wxLua_wxSortedArrayString_Delete, 0, 0, s_wxluaargArray_None }, + }; + + int wxSortedArrayString_methodCount = sizeof(wxSortedArrayString_methods)/sizeof(wxSortedArrayString_methods[0]); + #endif // wxLUA_USE_wxArrayString + Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** wx_bind.cpp 2 Mar 2007 05:44:28 -0000 1.80 --- wx_bind.cpp 7 Mar 2007 23:56:43 -0000 1.81 *************** *** 5937,5940 **** --- 5937,5941 ---- #if wxLUA_USE_wxArrayString { "wxArrayString", wxArrayString_methods, wxArrayString_methodCount, NULL, &s_wxluatag_wxArrayString, NULL, NULL }, + { "wxSortedArrayString", wxSortedArrayString_methods, wxSortedArrayString_methodCount, NULL, &s_wxluatag_wxSortedArrayString, "wxArrayString", NULL }, #endif // wxLUA_USE_wxArrayString *************** *** 6807,6810 **** --- 6808,6812 ---- #if wxLUA_USE_wxArrayString wxLUA_IMPLEMENT_ENCAPSULATION(wxArrayString, wxArrayString) + wxLUA_IMPLEMENT_ENCAPSULATION(wxSortedArrayString, wxSortedArrayString) #endif // wxLUA_USE_wxArrayString |