Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src config.cpp, 1.34, 1.35 controls.cpp, 1.52, 1.53 datetime.cpp, 1.35, 1.36 dialogs.cpp, 1.36, 1.37 file.cpp, 1.41, 1.42 gdi.cpp, 1.58, 1.59 grid.cpp, 1.32, 1.33 help.cpp, 1.30, 1.31 html.cpp, 1.35, 1.36 image.cpp, 1.35, 1.36 mdi.cpp, 1.31, 1.32 menutool.cpp, 1.33, 1.34 print.cpp, 1.34, 1.35 regex.cpp, 1.26, 1.27 socket.cpp, 1.33, 1.34 windows.cpp, 1.47, 1.48 xml.cpp, 1.29, 1.30
|
From: John L. <jr...@us...> - 2007-05-31 21:39:27
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11100/wxLua/modules/wxbind/src Modified Files: config.cpp controls.cpp datetime.cpp dialogs.cpp file.cpp gdi.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp socket.cpp windows.cpp xml.cpp Log Message: More cleanup, remove %rename tag for functions that can be overloaded Format %override text in .i files uniformly Remove wxConfig::Read/WriteInt/Float since lua uses double, just have Read/Write Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** config.cpp 31 May 2007 17:18:49 -0000 1.34 --- config.cpp 31 May 2007 21:38:40 -0000 1.35 *************** *** 51,54 **** --- 51,74 ---- } + static int LUACALL wxLua_wxConfigBase_Delete(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Delete[1] = {{ wxLua_wxConfigBase_Delete, 0, 0, s_wxluaargArray_None }}; + + // %override wxLua_wxConfigBase_Delete + // void Destroy() + static int LUACALL wxLua_wxConfigBase_Delete(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); + + if (wxConfigBase::Get(false) == self) // clear us from the wxConfigBase + wxConfigBase::Set(NULL); + + // call Destroy + delete self; + // return the number of parameters + return 0; + } + static int LUACALL wxLua_wxConfigBase_DeleteAll(lua_State *L); static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_DeleteAll[1] = {{ wxLua_wxConfigBase_DeleteAll, 0, 0, s_wxluaargArray_None }}; *************** *** 115,138 **** } - static int LUACALL wxLua_wxConfigBase_Destroy(lua_State *L); - static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Destroy[1] = {{ wxLua_wxConfigBase_Destroy, 0, 0, s_wxluaargArray_None }}; - - // %override wxLua_wxConfigBase_Destroy - // void Destroy() - static int LUACALL wxLua_wxConfigBase_Destroy(lua_State *L) - { - wxLuaState wxlState(L); - // get this - wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); - - if (wxConfigBase::Get(false) == self) // clear us from the wxConfigBase - wxConfigBase::Set(NULL); - - // call Destroy - delete self; - // return the number of parameters - return 0; - } - static int LUACALL wxLua_wxConfigBase_DontCreateOnDemand(lua_State *L); static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_DontCreateOnDemand[1] = {{ wxLua_wxConfigBase_DontCreateOnDemand, 0, 0, s_wxluaargArray_None }}; --- 135,138 ---- *************** *** 520,554 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_Read[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxConfigBase_Read(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Read[1] = {{ wxLua_wxConfigBase_Read, 1, 2, s_wxluatagArray_wxLua_wxConfigBase_Read }}; ! ! // %override wxLua_wxConfigBase_Read ! // bool Read(const wxString& key, wxString* str, const wxString& defaultVal = wxEmptyString) const ! static int LUACALL wxLua_wxConfigBase_Read(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxString returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // wxString defaultVal ! wxString defaultVal = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); ! // const wxString& key ! wxString key = wxlState.GetwxStringType(2); ! // get this ! wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); ! // call Read ! bool ret = self->Read(key, &returns, defaultVal); ! // push the result bool ! lua_pushboolean(L, ret); ! // push the result string ! wxlState.lua_PushString(returns); ! // return the number of parameters ! return 2; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_ReadFloat[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxConfigBase_ReadFloat(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_ReadFloat[1] = {{ wxLua_wxConfigBase_ReadFloat, 1, 2, s_wxluatagArray_wxLua_wxConfigBase_ReadFloat }}; // %override wxLua_wxConfigBase_ReadFloat --- 520,527 ---- } ! #define wxLua_wxConfigBase_Read1 wxLua_wxConfigBase_ReadFloat ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_Read1[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxConfigBase_Read1(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Read1[1] = {{ wxLua_wxConfigBase_Read1, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Read1 }}; // %override wxLua_wxConfigBase_ReadFloat *************** *** 576,593 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_ReadInt[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxConfigBase_ReadInt(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_ReadInt[1] = {{ wxLua_wxConfigBase_ReadInt, 1, 2, s_wxluatagArray_wxLua_wxConfigBase_ReadInt }}; ! // %override wxLua_wxConfigBase_ReadInt ! // %rename ReadInt bool Read(const wxString& key, long* l, long defaultVal = 0) const ! static int LUACALL wxLua_wxConfigBase_ReadInt(lua_State *L) { wxLuaState wxlState(L); ! long returns = 0; // get number of arguments int argCount = lua_gettop(L); ! // double defaultVal = 0 ! long defaultVal = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& key wxString key = wxlState.GetwxStringType(2); --- 549,566 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_Read[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxConfigBase_Read(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Read[1] = {{ wxLua_wxConfigBase_Read, 1, 2, s_wxluatagArray_wxLua_wxConfigBase_Read }}; ! // %override wxLua_wxConfigBase_Read ! // bool Read(const wxString& key, wxString* str, const wxString& defaultVal = wxEmptyString) const ! static int LUACALL wxLua_wxConfigBase_Read(lua_State *L) { wxLuaState wxlState(L); ! wxString returns; // get number of arguments int argCount = lua_gettop(L); ! // wxString defaultVal ! wxString defaultVal = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); // const wxString& key wxString key = wxlState.GetwxStringType(2); *************** *** 598,603 **** // push the result bool lua_pushboolean(L, ret); ! // push the result number ! lua_pushnumber(L, returns); // return the number of parameters return 2; --- 571,576 ---- // push the result bool lua_pushboolean(L, ret); ! // push the result string ! wxlState.lua_PushString(returns); // return the number of parameters return 2; *************** *** 729,761 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_Write[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxConfigBase_Write(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Write[1] = {{ wxLua_wxConfigBase_Write, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Write }}; ! ! // bool Write(const wxString& key, wxString &value) ! static int LUACALL wxLua_wxConfigBase_Write(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // wxString value ! wxString value = wxlState.GetwxStringType(3); ! // const wxString key ! const wxString key = wxlState.GetwxStringType(2); ! // get this ! wxConfigBase * self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); ! // call Write ! returns = self->Write(key, value); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_WriteFloat[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxConfigBase_WriteFloat(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_WriteFloat[1] = {{ wxLua_wxConfigBase_WriteFloat, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_WriteFloat }}; ! // %rename WriteFloat bool Write(const wxString &key, double value) ! static int LUACALL wxLua_wxConfigBase_WriteFloat(lua_State *L) { wxLuaState wxlState(L); --- 702,711 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_Write1[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxConfigBase_Write1(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Write1[1] = {{ wxLua_wxConfigBase_Write1, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Write1 }}; ! // bool Write(const wxString &key, double value) ! static int LUACALL wxLua_wxConfigBase_Write1(lua_State *L) { wxLuaState wxlState(L); *************** *** 775,789 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_WriteInt[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxConfigBase_WriteInt(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_WriteInt[1] = {{ wxLua_wxConfigBase_WriteInt, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_WriteInt }}; ! // %rename WriteInt bool Write(const wxString &key, long value) ! static int LUACALL wxLua_wxConfigBase_WriteInt(lua_State *L) { wxLuaState wxlState(L); bool returns; ! // long value ! long value = (long)wxlua_getnumbertype(L, 3); // const wxString key const wxString key = wxlState.GetwxStringType(2); --- 725,739 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxConfigBase_Write[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxConfigBase_Write(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Write[1] = {{ wxLua_wxConfigBase_Write, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Write }}; ! // bool Write(const wxString& key, wxString &value) ! static int LUACALL wxLua_wxConfigBase_Write(lua_State *L) { wxLuaState wxlState(L); bool returns; ! // wxString value ! wxString value = wxlState.GetwxStringType(3); // const wxString key const wxString key = wxlState.GetwxStringType(2); *************** *** 801,811 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxConfigBase_methods[] = { { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Create", s_wxluafunc_wxLua_wxConfigBase_Create, 1 }, { WXLUAMETHOD_METHOD, "DeleteAll", s_wxluafunc_wxLua_wxConfigBase_DeleteAll, 1 }, { WXLUAMETHOD_METHOD, "DeleteEntry", s_wxluafunc_wxLua_wxConfigBase_DeleteEntry, 1 }, { WXLUAMETHOD_METHOD, "DeleteGroup", s_wxluafunc_wxLua_wxConfigBase_DeleteGroup, 1 }, - { WXLUAMETHOD_METHOD, "Destroy", s_wxluafunc_wxLua_wxConfigBase_Destroy, 1 }, { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "DontCreateOnDemand", s_wxluafunc_wxLua_wxConfigBase_DontCreateOnDemand, 1 }, { WXLUAMETHOD_METHOD, "Exists", s_wxluafunc_wxLua_wxConfigBase_Exists, 1 }, --- 751,798 ---- + #if (wxLUA_USE_wxConfig && wxUSE_CONFIG) + static int LUACALL wxLua_wxConfigBase_Read_overload(lua_State *L); + // function overload table + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Read_overload[] = + { + { wxLua_wxConfigBase_Read_overload, -1, -1, s_wxluaargArray_None }, + { wxLua_wxConfigBase_Read1, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Read1 }, + { wxLua_wxConfigBase_Read, 1, 2, s_wxluatagArray_wxLua_wxConfigBase_Read }, + }; + static int s_wxluafunc_wxLua_wxConfigBase_Read_overload_count = sizeof(s_wxluafunc_wxLua_wxConfigBase_Read_overload)/sizeof(s_wxluafunc_wxLua_wxConfigBase_Read_overload[0]); + // Overloaded function for wxConfigBase::Read + static int LUACALL wxLua_wxConfigBase_Read_overload(lua_State *L) + { + wxLuaState wxlState(L); + static WXLUAMETHOD overload_method = + { WXLUAMETHOD_METHOD, "Read", s_wxluafunc_wxLua_wxConfigBase_Read_overload, s_wxluafunc_wxLua_wxConfigBase_Read_overload_count }; + return wxlState.CallOverloadedFunction(&overload_method); + } + static int LUACALL wxLua_wxConfigBase_Write_overload(lua_State *L); + // function overload table + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigBase_Write_overload[] = + { + { wxLua_wxConfigBase_Write_overload, -1, -1, s_wxluaargArray_None }, + { wxLua_wxConfigBase_Write1, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Write1 }, + { wxLua_wxConfigBase_Write, 2, 2, s_wxluatagArray_wxLua_wxConfigBase_Write }, + }; + static int s_wxluafunc_wxLua_wxConfigBase_Write_overload_count = sizeof(s_wxluafunc_wxLua_wxConfigBase_Write_overload)/sizeof(s_wxluafunc_wxLua_wxConfigBase_Write_overload[0]); + // Overloaded function for wxConfigBase::Write + static int LUACALL wxLua_wxConfigBase_Write_overload(lua_State *L) + { + wxLuaState wxlState(L); + static WXLUAMETHOD overload_method = + { WXLUAMETHOD_METHOD, "Write", s_wxluafunc_wxLua_wxConfigBase_Write_overload, s_wxluafunc_wxLua_wxConfigBase_Write_overload_count }; + return wxlState.CallOverloadedFunction(&overload_method); + } + #endif // (wxLUA_USE_wxConfig && wxUSE_CONFIG) + // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxConfigBase_methods[] = { { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Create", s_wxluafunc_wxLua_wxConfigBase_Create, 1 }, + { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxConfigBase_Delete, 1 }, { WXLUAMETHOD_METHOD, "DeleteAll", s_wxluafunc_wxLua_wxConfigBase_DeleteAll, 1 }, { WXLUAMETHOD_METHOD, "DeleteEntry", s_wxluafunc_wxLua_wxConfigBase_DeleteEntry, 1 }, { WXLUAMETHOD_METHOD, "DeleteGroup", s_wxluafunc_wxLua_wxConfigBase_DeleteGroup, 1 }, { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "DontCreateOnDemand", s_wxluafunc_wxLua_wxConfigBase_DontCreateOnDemand, 1 }, { WXLUAMETHOD_METHOD, "Exists", s_wxluafunc_wxLua_wxConfigBase_Exists, 1 }, *************** *** 826,832 **** { WXLUAMETHOD_METHOD, "IsExpandingEnvVars", s_wxluafunc_wxLua_wxConfigBase_IsExpandingEnvVars, 1 }, { WXLUAMETHOD_METHOD, "IsRecordingDefaults", s_wxluafunc_wxLua_wxConfigBase_IsRecordingDefaults, 1 }, ! { WXLUAMETHOD_METHOD, "Read", s_wxluafunc_wxLua_wxConfigBase_Read, 1 }, ! { WXLUAMETHOD_METHOD, "ReadFloat", s_wxluafunc_wxLua_wxConfigBase_ReadFloat, 1 }, ! { WXLUAMETHOD_METHOD, "ReadInt", s_wxluafunc_wxLua_wxConfigBase_ReadInt, 1 }, { WXLUAMETHOD_METHOD, "RenameEntry", s_wxluafunc_wxLua_wxConfigBase_RenameEntry, 1 }, { WXLUAMETHOD_METHOD, "RenameGroup", s_wxluafunc_wxLua_wxConfigBase_RenameGroup, 1 }, --- 813,821 ---- { WXLUAMETHOD_METHOD, "IsExpandingEnvVars", s_wxluafunc_wxLua_wxConfigBase_IsExpandingEnvVars, 1 }, { WXLUAMETHOD_METHOD, "IsRecordingDefaults", s_wxluafunc_wxLua_wxConfigBase_IsRecordingDefaults, 1 }, ! ! #if (wxLUA_USE_wxConfig && wxUSE_CONFIG) ! { WXLUAMETHOD_METHOD, "Read", s_wxluafunc_wxLua_wxConfigBase_Read_overload, s_wxluafunc_wxLua_wxConfigBase_Read_overload_count }, ! #endif // (wxLUA_USE_wxConfig && wxUSE_CONFIG) ! { WXLUAMETHOD_METHOD, "RenameEntry", s_wxluafunc_wxLua_wxConfigBase_RenameEntry, 1 }, { WXLUAMETHOD_METHOD, "RenameGroup", s_wxluafunc_wxLua_wxConfigBase_RenameGroup, 1 }, *************** *** 835,841 **** { WXLUAMETHOD_METHOD, "SetPath", s_wxluafunc_wxLua_wxConfigBase_SetPath, 1 }, { WXLUAMETHOD_METHOD, "SetRecordDefaults", s_wxluafunc_wxLua_wxConfigBase_SetRecordDefaults, 1 }, ! { WXLUAMETHOD_METHOD, "Write", s_wxluafunc_wxLua_wxConfigBase_Write, 1 }, ! { WXLUAMETHOD_METHOD, "WriteFloat", s_wxluafunc_wxLua_wxConfigBase_WriteFloat, 1 }, ! { WXLUAMETHOD_METHOD, "WriteInt", s_wxluafunc_wxLua_wxConfigBase_WriteInt, 1 }, { WXLUAMETHOD_METHOD, 0, 0, 0 }, --- 824,831 ---- { WXLUAMETHOD_METHOD, "SetPath", s_wxluafunc_wxLua_wxConfigBase_SetPath, 1 }, { WXLUAMETHOD_METHOD, "SetRecordDefaults", s_wxluafunc_wxLua_wxConfigBase_SetRecordDefaults, 1 }, ! ! #if (wxLUA_USE_wxConfig && wxUSE_CONFIG) ! { WXLUAMETHOD_METHOD, "Write", s_wxluafunc_wxLua_wxConfigBase_Write_overload, s_wxluafunc_wxLua_wxConfigBase_Write_overload_count }, ! #endif // (wxLUA_USE_wxConfig && wxUSE_CONFIG) { WXLUAMETHOD_METHOD, 0, 0, 0 }, *************** *** 1052,1055 **** --- 1042,1061 ---- int s_wxluatag_wxConfigPathChanger = -1; + static int LUACALL wxLua_wxConfigPathChanger_Delete(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigPathChanger_Delete[1] = {{ wxLua_wxConfigPathChanger_Delete, 0, 0, s_wxluaargArray_None }}; + + static int LUACALL wxLua_wxConfigPathChanger_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxConfigPathChanger * self = (wxConfigPathChanger *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigPathChanger); + // if removed from tracked mem list, reset the tag so that gc() is not called on this object. + if ((self != NULL) && wxlState.RemoveTrackedObject(self)) + { + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + static int LUACALL wxLua_wxConfigPathChanger_Name(lua_State *L); static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxConfigPathChanger_Name[1] = {{ wxLua_wxConfigPathChanger_Name, 0, 0, s_wxluaargArray_None }}; *************** *** 1105,1108 **** --- 1111,1116 ---- // call constructor returns = new wxConfigPathChanger(pContainer, strEntry); + // add to tracked memory list + wxlState.AddTrackedObject((long)returns, new wxObject_wxConfigPathChanger((wxConfigPathChanger *)returns)); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxConfigPathChanger, returns); *************** *** 1116,1119 **** --- 1124,1128 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxConfigPathChanger_methods[] = { + { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxConfigPathChanger_Delete }, { WXLUAMETHOD_METHOD, "Name", s_wxluafunc_wxLua_wxConfigPathChanger_Name, 1 }, Index: print.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/print.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** print.cpp 31 May 2007 17:18:51 -0000 1.34 --- print.cpp 31 May 2007 21:38:45 -0000 1.35 *************** *** 56,62 **** #endif // (wxLUA_USE_wxDC) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) - static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_GetPPIPrinter[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxPrintout_GetPPIPrinter(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPPIPrinter[1] = {{ wxLua_wxPrintout_GetPPIPrinter, 2, 2, s_wxluatagArray_wxLua_wxPrintout_GetPPIPrinter }}; // %override wxLua_wxPrintout_GetPPIPrinter --- 56,61 ---- #endif // (wxLUA_USE_wxDC) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) static int LUACALL wxLua_wxPrintout_GetPPIPrinter(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPPIPrinter[1] = {{ wxLua_wxPrintout_GetPPIPrinter, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxPrintout_GetPPIPrinter *************** *** 77,83 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_GetPPIScreen[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxPrintout_GetPPIScreen(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPPIScreen[1] = {{ wxLua_wxPrintout_GetPPIScreen, 2, 2, s_wxluatagArray_wxLua_wxPrintout_GetPPIScreen }}; // %override wxLua_wxPrintout_GetPPIScreen --- 76,81 ---- } static int LUACALL wxLua_wxPrintout_GetPPIScreen(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPPIScreen[1] = {{ wxLua_wxPrintout_GetPPIScreen, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxPrintout_GetPPIScreen *************** *** 98,104 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_GetPageInfo[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxPrintout_GetPageInfo(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPageInfo[1] = {{ wxLua_wxPrintout_GetPageInfo, 4, 4, s_wxluatagArray_wxLua_wxPrintout_GetPageInfo }}; // %override wxLua_wxPrintout_GetPageInfo --- 96,101 ---- } static int LUACALL wxLua_wxPrintout_GetPageInfo(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPageInfo[1] = {{ wxLua_wxPrintout_GetPageInfo, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxPrintout_GetPageInfo *************** *** 123,129 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_GetPageSizeMM[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxPrintout_GetPageSizeMM(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPageSizeMM[1] = {{ wxLua_wxPrintout_GetPageSizeMM, 2, 2, s_wxluatagArray_wxLua_wxPrintout_GetPageSizeMM }}; // %override wxLua_wxPrintout_GetPageSizeMM --- 120,125 ---- } static int LUACALL wxLua_wxPrintout_GetPageSizeMM(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPageSizeMM[1] = {{ wxLua_wxPrintout_GetPageSizeMM, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxPrintout_GetPageSizeMM *************** *** 144,150 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_GetPageSizePixels[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxPrintout_GetPageSizePixels(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPageSizePixels[1] = {{ wxLua_wxPrintout_GetPageSizePixels, 2, 2, s_wxluatagArray_wxLua_wxPrintout_GetPageSizePixels }}; // %override wxLua_wxPrintout_GetPageSizePixels --- 140,145 ---- } static int LUACALL wxLua_wxPrintout_GetPageSizePixels(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPrintout_GetPageSizePixels[1] = {{ wxLua_wxPrintout_GetPageSizePixels, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxPrintout_GetPageSizePixels *************** *** 1997,2005 **** } #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) static wxLuaArgTag s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize[] = { &s_wxluatag_wxSize, 0 }; static int LUACALL wxLua_wxPageSetupDialogData_SetPaperSize(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize[1] = {{ wxLua_wxPageSetupDialogData_SetPaperSize, 1, 1, s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize }}; // void SetPaperSize(const wxSize& sz) --- 1992,2018 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize1[] = { &s_wxluaarg_Enumeration, 0 }; + static int LUACALL wxLua_wxPageSetupDialogData_SetPaperSize1(lua_State *L); + // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize1[1] = {{ wxLua_wxPageSetupDialogData_SetPaperSize1, 1, 1, s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize1 }}; + + // void SetPaperSize(wxPaperSize id) + static int LUACALL wxLua_wxPageSetupDialogData_SetPaperSize1(lua_State *L) + { + wxLuaState wxlState(L); + // wxPaperSize id + wxPaperSize id = (wxPaperSize)wxlua_getenumerationtype(L, 2); + // get this + wxPageSetupDialogData * self = (wxPageSetupDialogData *)wxlState.GetUserDataType(1, s_wxluatag_wxPageSetupDialogData); + // call SetPaperSize + self->SetPaperSize(id); + + return 0; + } + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) static wxLuaArgTag s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize[] = { &s_wxluatag_wxSize, 0 }; static int LUACALL wxLua_wxPageSetupDialogData_SetPaperSize(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize[1] = {{ wxLua_wxPageSetupDialogData_SetPaperSize, 1, 1, s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize }}; // void SetPaperSize(const wxSize& sz) *************** *** 2081,2084 **** --- 2094,2120 ---- + #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)||((wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)) + static int LUACALL wxLua_wxPageSetupDialogData_SetPaperSize_overload(lua_State *L); + // function overload table + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload[] = + { + { wxLua_wxPageSetupDialogData_SetPaperSize_overload, -1, -1, s_wxluaargArray_None }, + { wxLua_wxPageSetupDialogData_SetPaperSize1, 1, 1, s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize1 }, + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) + { wxLua_wxPageSetupDialogData_SetPaperSize, 1, 1, s_wxluatagArray_wxLua_wxPageSetupDialogData_SetPaperSize }, + #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) + }; + static int s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload_count = sizeof(s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload)/sizeof(s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload[0]); + // Overloaded function for wxPageSetupDialogData::SetPaperSize + static int LUACALL wxLua_wxPageSetupDialogData_SetPaperSize_overload(lua_State *L) + { + wxLuaState wxlState(L); + static WXLUAMETHOD overload_method = + { WXLUAMETHOD_METHOD, "SetPaperSize", s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload, s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload_count }; + return wxlState.CallOverloadedFunction(&overload_method); + } + #endif // (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)||((wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)) + #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) static int LUACALL wxLua_wxPageSetupDialogData_constructor_overload(lua_State *L); *************** *** 2147,2153 **** { WXLUAMETHOD_METHOD, "SetPaperId", s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperId, 1 }, ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) ! { WXLUAMETHOD_METHOD, "SetPaperSize", s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize, 1 }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) { WXLUAMETHOD_METHOD, "SetPrintData", s_wxluafunc_wxLua_wxPageSetupDialogData_SetPrintData, 1 }, --- 2183,2189 ---- { WXLUAMETHOD_METHOD, "SetPaperId", s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperId, 1 }, ! #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)||((wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)) ! { WXLUAMETHOD_METHOD, "SetPaperSize", s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload, s_wxluafunc_wxLua_wxPageSetupDialogData_SetPaperSize_overload_count }, ! #endif // (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)||((wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)) { WXLUAMETHOD_METHOD, "SetPrintData", s_wxluafunc_wxLua_wxPageSetupDialogData_SetPrintData, 1 }, Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** controls.cpp 31 May 2007 17:18:50 -0000 1.52 --- controls.cpp 31 May 2007 21:38:41 -0000 1.53 *************** *** 9170,9176 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxTextCtrl_GetSelection[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxTextCtrl_GetSelection(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTextCtrl_GetSelection[1] = {{ wxLua_wxTextCtrl_GetSelection, 2, 2, s_wxluatagArray_wxLua_wxTextCtrl_GetSelection }}; // %override wxLua_wxTextCtrl_GetSelection --- 9170,9175 ---- } static int LUACALL wxLua_wxTextCtrl_GetSelection(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTextCtrl_GetSelection[1] = {{ wxLua_wxTextCtrl_GetSelection, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxTextCtrl_GetSelection *************** *** 10976,10982 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeCtrl_GetFirstChild[] = { &s_wxluatag_wxTreeItemId, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxTreeCtrl_GetFirstChild(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTreeCtrl_GetFirstChild[1] = {{ wxLua_wxTreeCtrl_GetFirstChild, 2, 2, s_wxluatagArray_wxLua_wxTreeCtrl_GetFirstChild }}; // %override wxLua_wxTreeCtrl_GetFirstChild --- 10975,10981 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeCtrl_GetFirstChild[] = { &s_wxluatag_wxTreeItemId, 0 }; static int LUACALL wxLua_wxTreeCtrl_GetFirstChild(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTreeCtrl_GetFirstChild[1] = {{ wxLua_wxTreeCtrl_GetFirstChild, 1, 1, s_wxluatagArray_wxLua_wxTreeCtrl_GetFirstChild }}; // %override wxLua_wxTreeCtrl_GetFirstChild *************** *** 11277,11281 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeCtrl_GetNextChild[] = { &s_wxluatag_wxTreeItemId, &s_wxluaarg_LightUserData, 0 }; static int LUACALL wxLua_wxTreeCtrl_GetNextChild(lua_State *L); static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTreeCtrl_GetNextChild[1] = {{ wxLua_wxTreeCtrl_GetNextChild, 2, 2, s_wxluatagArray_wxLua_wxTreeCtrl_GetNextChild }}; --- 11276,11280 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeCtrl_GetNextChild[] = { &s_wxluatag_wxTreeItemId, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxTreeCtrl_GetNextChild(lua_State *L); static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTreeCtrl_GetNextChild[1] = {{ wxLua_wxTreeCtrl_GetNextChild, 2, 2, s_wxluatagArray_wxLua_wxTreeCtrl_GetNextChild }}; Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** xml.cpp 31 May 2007 17:18:53 -0000 1.29 --- xml.cpp 31 May 2007 21:38:47 -0000 1.30 *************** *** 39,43 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddChild[1] = {{ wxLua_wxXmlNode_AddChild, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_AddChild }}; ! // void AddChild(wxXmlNode *child); static int LUACALL wxLua_wxXmlNode_AddChild(lua_State *L) { --- 39,43 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddChild[1] = {{ wxLua_wxXmlNode_AddChild, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_AddChild }}; ! // void AddChild(wxXmlNode *child) static int LUACALL wxLua_wxXmlNode_AddChild(lua_State *L) { *************** *** 57,61 **** // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddProperty1[1] = {{ wxLua_wxXmlNode_AddProperty1, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_AddProperty1 }}; ! // void AddProperty(wxXmlProperty *prop); static int LUACALL wxLua_wxXmlNode_AddProperty1(lua_State *L) { --- 57,61 ---- // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddProperty1[1] = {{ wxLua_wxXmlNode_AddProperty1, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_AddProperty1 }}; ! // void AddProperty(wxXmlProperty *prop) static int LUACALL wxLua_wxXmlNode_AddProperty1(lua_State *L) { *************** *** 75,79 **** // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddProperty[1] = {{ wxLua_wxXmlNode_AddProperty, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_AddProperty }}; ! // void AddProperty(const wxString& name, const wxString& value); static int LUACALL wxLua_wxXmlNode_AddProperty(lua_State *L) { --- 75,79 ---- // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddProperty[1] = {{ wxLua_wxXmlNode_AddProperty, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_AddProperty }}; ! // void AddProperty(const wxString& name, const wxString& value) static int LUACALL wxLua_wxXmlNode_AddProperty(lua_State *L) { *************** *** 111,115 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_DeleteProperty[1] = {{ wxLua_wxXmlNode_DeleteProperty, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_DeleteProperty }}; ! // bool DeleteProperty(const wxString& name); static int LUACALL wxLua_wxXmlNode_DeleteProperty(lua_State *L) { --- 111,115 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_DeleteProperty[1] = {{ wxLua_wxXmlNode_DeleteProperty, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_DeleteProperty }}; ! // bool DeleteProperty(const wxString& name) static int LUACALL wxLua_wxXmlNode_DeleteProperty(lua_State *L) { *************** *** 131,135 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetChildren[1] = {{ wxLua_wxXmlNode_GetChildren, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNode *GetChildren() const; static int LUACALL wxLua_wxXmlNode_GetChildren(lua_State *L) { --- 131,135 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetChildren[1] = {{ wxLua_wxXmlNode_GetChildren, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNode *GetChildren() const static int LUACALL wxLua_wxXmlNode_GetChildren(lua_State *L) { *************** *** 149,153 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetContent[1] = {{ wxLua_wxXmlNode_GetContent, 0, 0, s_wxluaargArray_None }}; ! // wxString GetContent() const; static int LUACALL wxLua_wxXmlNode_GetContent(lua_State *L) { --- 149,153 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetContent[1] = {{ wxLua_wxXmlNode_GetContent, 0, 0, s_wxluaargArray_None }}; ! // wxString GetContent() const static int LUACALL wxLua_wxXmlNode_GetContent(lua_State *L) { *************** *** 167,171 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetName[1] = {{ wxLua_wxXmlNode_GetName, 0, 0, s_wxluaargArray_None }}; ! // wxString GetName() const; static int LUACALL wxLua_wxXmlNode_GetName(lua_State *L) { --- 167,171 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetName[1] = {{ wxLua_wxXmlNode_GetName, 0, 0, s_wxluaargArray_None }}; ! // wxString GetName() const static int LUACALL wxLua_wxXmlNode_GetName(lua_State *L) { *************** *** 185,189 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetNext[1] = {{ wxLua_wxXmlNode_GetNext, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNode *GetNext() const; static int LUACALL wxLua_wxXmlNode_GetNext(lua_State *L) { --- 185,189 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetNext[1] = {{ wxLua_wxXmlNode_GetNext, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNode *GetNext() const static int LUACALL wxLua_wxXmlNode_GetNext(lua_State *L) { *************** *** 203,207 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetParent[1] = {{ wxLua_wxXmlNode_GetParent, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNode *GetParent() const; static int LUACALL wxLua_wxXmlNode_GetParent(lua_State *L) { --- 203,207 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetParent[1] = {{ wxLua_wxXmlNode_GetParent, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNode *GetParent() const static int LUACALL wxLua_wxXmlNode_GetParent(lua_State *L) { *************** *** 218,227 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetPropVal[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxXmlNode_GetPropVal(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetPropVal[1] = {{ wxLua_wxXmlNode_GetPropVal, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal }}; ! // wxString GetPropVal(const wxString& propName, const wxString& defaultVal) const; ! static int LUACALL wxLua_wxXmlNode_GetPropVal(lua_State *L) { wxLuaState wxlState(L); --- 218,227 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetPropVal1[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxXmlNode_GetPropVal1(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetPropVal1[1] = {{ wxLua_wxXmlNode_GetPropVal1, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal1 }}; ! // wxString GetPropVal(const wxString& propName, const wxString& defaultVal) const ! static int LUACALL wxLua_wxXmlNode_GetPropVal1(lua_State *L) { wxLuaState wxlState(L); *************** *** 241,247 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetPropValPtr[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxXmlNode_GetPropValPtr(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetPropValPtr[1] = {{ wxLua_wxXmlNode_GetPropValPtr, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropValPtr }}; // %override wxLua_wxXmlNode_GetPropValPtr --- 241,248 ---- } ! #define wxLua_wxXmlNode_GetPropVal wxLua_wxXmlNode_GetPropValPtr ! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetPropVal[] = { &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxXmlNode_GetPropVal(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetPropVal[1] = {{ wxLua_wxXmlNode_GetPropVal, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal }}; // %override wxLua_wxXmlNode_GetPropValPtr *************** *** 270,274 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetProperties[1] = {{ wxLua_wxXmlNode_GetProperties, 0, 0, s_wxluaargArray_None }}; ! // wxXmlProperty *GetProperties() const; static int LUACALL wxLua_wxXmlNode_GetProperties(lua_State *L) { --- 271,275 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetProperties[1] = {{ wxLua_wxXmlNode_GetProperties, 0, 0, s_wxluaargArray_None }}; ! // wxXmlProperty *GetProperties() const static int LUACALL wxLua_wxXmlNode_GetProperties(lua_State *L) { *************** *** 288,292 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetType[1] = {{ wxLua_wxXmlNode_GetType, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNodeType GetType() const; static int LUACALL wxLua_wxXmlNode_GetType(lua_State *L) { --- 289,293 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetType[1] = {{ wxLua_wxXmlNode_GetType, 0, 0, s_wxluaargArray_None }}; ! // wxXmlNodeType GetType() const static int LUACALL wxLua_wxXmlNode_GetType(lua_State *L) { *************** *** 307,311 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_HasProp[1] = {{ wxLua_wxXmlNode_HasProp, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_HasProp }}; ! // bool HasProp(const wxString& propName) const; static int LUACALL wxLua_wxXmlNode_HasProp(lua_State *L) { --- 308,312 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_HasProp[1] = {{ wxLua_wxXmlNode_HasProp, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_HasProp }}; ! // bool HasProp(const wxString& propName) const static int LUACALL wxLua_wxXmlNode_HasProp(lua_State *L) { *************** *** 328,332 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_InsertChild[1] = {{ wxLua_wxXmlNode_InsertChild, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_InsertChild }}; ! // void InsertChild(wxXmlNode *child, wxXmlNode *before_node); static int LUACALL wxLua_wxXmlNode_InsertChild(lua_State *L) { --- 329,333 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_InsertChild[1] = {{ wxLua_wxXmlNode_InsertChild, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_InsertChild }}; ! // void InsertChild(wxXmlNode *child, wxXmlNode *before_node) static int LUACALL wxLua_wxXmlNode_InsertChild(lua_State *L) { *************** *** 348,352 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_RemoveChild[1] = {{ wxLua_wxXmlNode_RemoveChild, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_RemoveChild }}; ! // bool RemoveChild(wxXmlNode *child); static int LUACALL wxLua_wxXmlNode_RemoveChild(lua_State *L) { --- 349,353 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_RemoveChild[1] = {{ wxLua_wxXmlNode_RemoveChild, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_RemoveChild }}; ! // bool RemoveChild(wxXmlNode *child) static int LUACALL wxLua_wxXmlNode_RemoveChild(lua_State *L) { *************** *** 369,373 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetChildren[1] = {{ wxLua_wxXmlNode_SetChildren, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetChildren }}; ! // void SetChildren(wxXmlNode *child); static int LUACALL wxLua_wxXmlNode_SetChildren(lua_State *L) { --- 370,374 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetChildren[1] = {{ wxLua_wxXmlNode_SetChildren, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetChildren }}; ! // void SetChildren(wxXmlNode *child) static int LUACALL wxLua_wxXmlNode_SetChildren(lua_State *L) { *************** *** 387,391 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetContent[1] = {{ wxLua_wxXmlNode_SetContent, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetContent }}; ! // void SetContent(const wxString& con); static int LUACALL wxLua_wxXmlNode_SetContent(lua_State *L) { --- 388,392 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetContent[1] = {{ wxLua_wxXmlNode_SetContent, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetContent }}; ! // void SetContent(const wxString& con) static int LUACALL wxLua_wxXmlNode_SetContent(lua_State *L) { *************** *** 405,409 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetName[1] = {{ wxLua_wxXmlNode_SetName, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetName }}; ! // void SetName(const wxString& name); static int LUACALL wxLua_wxXmlNode_SetName(lua_State *L) { --- 406,410 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetName[1] = {{ wxLua_wxXmlNode_SetName, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetName }}; ! // void SetName(const wxString& name) static int LUACALL wxLua_wxXmlNode_SetName(lua_State *L) { *************** *** 423,427 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetNext[1] = {{ wxLua_wxXmlNode_SetNext, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetNext }}; ! // void SetNext(wxXmlNode *next); static int LUACALL wxLua_wxXmlNode_SetNext(lua_State *L) { --- 424,428 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetNext[1] = {{ wxLua_wxXmlNode_SetNext, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetNext }}; ! // void SetNext(wxXmlNode *next) static int LUACALL wxLua_wxXmlNode_SetNext(lua_State *L) { *************** *** 441,445 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetParent[1] = {{ wxLua_wxXmlNode_SetParent, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetParent }}; ! // void SetParent(wxXmlNode *parent); static int LUACALL wxLua_wxXmlNode_SetParent(lua_State *L) { --- 442,446 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetParent[1] = {{ wxLua_wxXmlNode_SetParent, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetParent }}; ! // void SetParent(wxXmlNode *parent) static int LUACALL wxLua_wxXmlNode_SetParent(lua_State *L) { *************** *** 459,463 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetProperties[1] = {{ wxLua_wxXmlNode_SetProperties, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetProperties }}; ! // void SetProperties(wxXmlProperty *prop); static int LUACALL wxLua_wxXmlNode_SetProperties(lua_State *L) { --- 460,464 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetProperties[1] = {{ wxLua_wxXmlNode_SetProperties, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetProperties }}; ! // void SetProperties(wxXmlProperty *prop) static int LUACALL wxLua_wxXmlNode_SetProperties(lua_State *L) { *************** *** 477,481 **** static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetType[1] = {{ wxLua_wxXmlNode_SetType, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetType }}; ! // void SetType(wxXmlNodeType type); static int LUACALL wxLua_wxXmlNode_SetType(lua_State *L) { --- 478,482 ---- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetType[1] = {{ wxLua_wxXmlNode_SetType, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetType }}; ! // void SetType(wxXmlNodeType type) static int LUACALL wxLua_wxXmlNode_SetType(lua_State *L) { *************** *** 495,499 **** // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_constructor2[1] = {{ wxLua_wxXmlNode_constructor2, 6, 6, s_wxluatagArray_wxLua_wxXmlNode_constructor2 }}; ! // wxXmlNode(wxXmlNode *parent, wxXmlNodeType type, const wxString& name, const wxString& content, wxXmlProperty *props, wxXmlNode *next); static int LUACALL wxLua_wxXmlNode_constructor2(lua_State *L) { --- 496,500 ---- // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_constructor2[1] = {{ wxLua_wxXmlNode_constructor2, 6, 6, s_wxluatagArray_wxLua_wxXmlNode_constructor2 }}; ! // wxXmlNode(wxXmlNode *parent, wxXmlNodeType type, const wxString& name, const wxString& content, wxXmlProperty *props, wxXmlNode *next) static int LUACALL wxLua_wxXmlNode_constructor2(lua_State *L) { *************** *** 527,531 **** // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_constructor1[1] = {{ wxLua_wxXmlNode_constructor1, 2, 3, s_wxluatagArray_wxLua_wxXmlNode_constructor1 }}; ! // wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString); static int LUACALL wxLua_wxXmlNode_constructor1(lua_State *L) { --- 528,532 ---- // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_constructor1[1] = {{ wxLua_wxXmlNode_constructor1, 2, 3, s_wxluatagArray_wxLua_wxXmlNode_constructor1 }}; ! // wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString) static int LUACALL wxLua_wxXmlNode_constructor1(lua_State *L) { *************** *** 591,594 **** --- 592,612 ---- return wxlState.CallOverloadedFunction(&overload_method); } + static int LUACALL wxLua_wxXmlNode_GetPropVal_overload(lua_State *L); + // function overload table + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload[] = + { + { wxLua_wxXmlNode_GetPropVal_overload, -1, -1, s_wxluaargArray_None }, + { wxLua_wxXmlNode_GetPropVal1, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal1 }, + { wxLua_wxXmlNode_GetPropVal, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal }, + }; + static int s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload)/sizeof(s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload[0]); + // Overloaded function for wxXmlNode::GetPropVal + static int LUACALL wxLua_wxXmlNode_GetPropVal_overload(lua_State *L) + { + wxLuaState wxlState(L); + static WXLUAMETHOD overload_method = + { WXLUAMETHOD_METHOD, "GetPropVal", s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload, s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload_count }; + return wxlState.CallOverloadedFunction(&overload_method); + } static int LUACALL wxLua_wxXmlNode_constructor_overload(lua_State *L); // function overload table *************** *** 626,631 **** { WXLUAMETHOD_METHOD, "GetNext", s_wxluafunc_wxLua_wxXmlNode_GetNext, 1 }, { WXLUAMETHOD_METHOD, "GetParent", s_wxluafunc_wxLua_wxXmlNode_GetParent, 1 }, ! { WXLUAMETHOD_METHOD, "GetPropVal", s_wxluafunc_wxLua_wxXmlNode_GetPropVal, 1 }, ! { WXLUAMETHOD_METHOD, "GetPropValPtr", s_wxluafunc_wxLua_wxXmlNode_GetPropValPtr, 1 }, { WXLUAMETHOD_METHOD, "GetProperties", s_wxluafunc_wxLua_wxXmlNode_GetProperties, 1 }, { WXLUAMETHOD_METHOD, "GetType", s_wxluafunc_wxLua_wxXmlNode_GetType, 1 }, --- 644,652 ---- { WXLUAMETHOD_METHOD, "GetNext", s_wxluafunc_wxLua_wxXmlNode_GetNext, 1 }, { WXLUAMETHOD_METHOD, "GetParent", s_wxluafunc_wxLua_wxXmlNode_GetParent, 1 }, ! ! #if (wxLUA_USE_wxXMLResource && wxUSE_XML) ! { WXLUAMETHOD_METHOD, "GetPropVal", s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload, s_wxluafunc_wxLua_wxXmlNode_GetPropVal_overload_count }, ! #endif // (wxLUA_USE_wxXMLResource && wxUSE_XML) ! { WXLUAMETHOD_METHOD, "GetProperties", s_wxluafunc_wxLua_wxXmlNode_GetProperties, 1 }, { WXLUAMETHOD_METHOD, "GetType", s_wxluafunc_wxLua_wxXmlNode_GetType, 1 }, Index: regex.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/regex.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** regex.cpp 31 May 2007 17:18:51 -0000 1.26 --- regex.cpp 31 May 2007 21:38:45 -0000 1.27 *************** *** 76,82 **** } static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_GetMatch[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxRegEx_GetMatch(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_GetMatch[1] = {{ wxLua_wxRegEx_GetMatch, 1, 2, s_wxluatagArray_wxLua_wxRegEx_GetMatch }}; // wxString GetMatch(const wxString& text, size_t index = 0) const --- 76,114 ---- } + #define wxLua_wxRegEx_GetMatch1 wxLua_wxRegEx_GetMatchIndexes + static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_GetMatch1[] = { &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxRegEx_GetMatch1(lua_State *L); + // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_GetMatch1[1] = {{ wxLua_wxRegEx_GetMatch1, 0, 1, s_wxluatagArray_wxLua_wxRegEx_GetMatch1 }}; + + // %override wxLua_wxRegEx_GetMatchIndexes + // %rename GetMatchPointer bool GetMatch(size_t* start, size_t* len, size_t index = 0) const + static int LUACALL wxLua_wxRegEx_GetMatchIndexes(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // size_t index = 0 + size_t index = (argCount >= 2 ? (size_t)wxlState.GetNumberType(2) : 0); + // size_t* len + size_t len = 0; + // size_t* start + size_t start = 0; + // get this + wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); + // call GetMatch + returns = self->GetMatch(&start, &len, index); + // push the result number + lua_pushboolean(L, returns); + // push the match start and length indexes + lua_pushnumber(L, start); + lua_pushnumber(L, len); + // return the number of parameters + return 3; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_GetMatch[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxRegEx_GetMatch(lua_State *L); ! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_GetMatch[1] = {{ wxLua_wxRegEx_GetMatch, 1, 2, s_wxluatagArray_wxLua_wxRegEx_GetMatch }}; // wxString GetMatch(const wxString& text, size_t index = 0) const *************** *** 119,153 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxRegEx_GetMatchIndexes[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 }; - static int LUACALL wxLua_wxRegEx_GetMatchIndexes(lua_State *L); - static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_GetMatchIndexes[1] = {{ wxLua_wxRegEx_GetMatchIndexes, 2, 3, s_wxluatagArray_wxLua_wxRegEx_GetMatchIndexes }}; - - // %override wxLua_wxRegEx_GetMatchIndexes - // %rename GetMatchPointer bool GetMatch(size_t* start, size_t* len, size_t index = 0) const - static int LUACALL wxLua_wxRegEx_GetMatchIndexes(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // get number of arguments - int argCount = lua_gettop(L); - // size_t index = 0 - size_t index = (argCount >= 2 ? (size_t)wxlState.GetNumberType(2) : 0); - // size_t* len - size_t len = 0; - // size_t* start - size_t start = 0; - // get this - wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); - // call GetMatch - returns = self->GetMatch(&start, &len, index); - // push the result number - lua_pushboolean(L, returns); - // push the match start and length indexes - lua_pushnumber(L, start); - lua_pushnumber(L, len); - // return the number of parameters - return 3; - } - static int LUACALL wxLua_wxRegEx_IsValid(lua_State *L); static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_IsValid[1] = {{ wxLua_wxRegEx_IsValid, 0, 0, s_wxluaargArray_None }}; --- 151,154 ---- *************** *** 324,327 **** --- 325,345 ---- #if (wxLUA_USE_wxRegEx && wxUSE_REGEX) + static int LUACALL wxLua_wxRegEx_GetMatch_overload(lua_State *L); + // function overload table + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxRegEx_GetMatch_overload[] = + { + { wxLua_wxRegEx_GetMatch_overload, -1, -1, s_wxluaargArray_None }, + { wxLua_wxRegEx_GetMatch1, 0, 1, s_wxluatagArray_wxLua_wxRegEx_GetMatch1 }, + { wxLua_wxRegEx_GetMatch, 1, 2, s_wxluatagArray_wxLua_wxRegEx_GetMatch }, + }; + static int s_wxluafunc_wxLua_wxRegEx_GetMatch_overload_count = sizeof(s_wxluafunc_wxLua_wxRegEx_GetMatch_overload)/sizeof(s_wxluafunc_wxLua_wxRegEx_GetMatch_overload[0]); + // Overloaded function for wxRegEx::GetMatch + static int LUACALL wxLua_wxRegEx_GetMatch_overload(lua_State *L) + { + wxLuaState wxlState(L); + static WXLUAMETHOD overload_method = + { WXLUAMETHOD_METHOD, "GetMatch", s_wxluafunc_wxLua_wxRegEx_GetMatch_overload, s_wxluafunc_wxLua_wxRegEx_GetMatch_overload_count }; + return wxlState.CallOverloadedFunction(&overload_method); + } static int LUACALL wxLua_wxRegEx_constructor_overload(lua_State *L); // function overload table *************** *** 347,353 **** { WXLUAMETHOD_METHOD, "Compile", s_wxluafunc_wxLua_wxRegEx_Compile, 1 }, { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxRegEx_Delete }, ! { WXLUAMETHOD_METHOD, "GetMatch", s_wxluafunc_wxLua_wxRegEx_GetMatch, 1 }, { WXLUAMETHOD_METHOD, "GetMatchCount", s_wxluafunc_wxLua_wxRegEx_GetMatchCount, 1 }, - { WXLUAMETHOD_METHOD, "GetMatchIndexes", s_wxluafunc_wxLua_wxRegEx_GetMatchIndexes, 1 }, { WXLUAMETHOD_METHOD, "IsValid", s_wxluafunc_wxLua_wxRegEx_IsValid, 1 }, { WXLUAMETHOD_METHOD, "Matches", s_wxluafunc_wxLua_wxRegEx_Matches, 1 }, --- 365,374 ---- { WXLUAMETHOD_METHOD, "Compile", s_wxluafunc_wxLua_wxRegEx_Compile, 1 }, { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxRegEx_Delete }, ! ! #if (wxLUA_USE_wxRegEx && wxUSE_REGEX) ! { WXLUAMETHOD_METHOD, "GetMatch", s_wxluafunc_wxLua_wxRegEx_GetMatch_overload, s_wxluafunc_wxLua_wxRegEx_GetMatch_overload_count }, ! #endif // (wxLUA_USE_wxRegEx && wxUSE_REGEX) ! { WXLUAMETHOD_METHOD, "GetMatchCount", s_wxluafunc_wxLua_wxRegEx_GetMatchCount, 1 }, { WXLUAMETHOD_METHOD, "IsValid", s_wxluafunc_wxLua_wxRegEx_IsValid, 1 }, { WXLUAMETHOD_METHOD, "Matches", s_wxluafunc_wxLua_wxRegEx_Matches, 1 }, Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** file.cpp 31 May 2007 17:18:50 -0000 1.41 --- file.cpp 31 May 2007 21:38:43 -0000 1.42 *************** *** 1154,1161 **** #endif // ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileName)) && (wxUSE_LONGLONG) - #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) - static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetTimes[] = { &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTime, 0 }; static int LUACALL wxLua_wxFileName_GetTimes(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetTimes[1] = {{ wxLua_wxFileName_GetTimes, 3, 3, s_wxluatagArray_wxLua_wxFileName_GetTimes }}; // %override wxLua_wxFileName_GetTimes --- 1154,1159 ---- #endif // ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileName)) && (wxUSE_LONGLONG) static int LUACALL wxLua_wxFileName_GetTimes(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetTimes[1] = {{ wxLua_wxFileName_GetTimes, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxFileName_GetTimes *************** *** 1186,1191 **** } - #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) - static int LUACALL wxLua_wxFileName_GetVolume(lua_State *L); static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetVolume[1] = {{ wxLua_wxFileName_GetVolume, 0, 0, s_wxluaargArray_None }}; --- 1184,1187 ---- *************** *** 2398,2405 **** #endif // ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFileName)) && (wxUSE_LONGLONG) - #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) { WXLUAMETHOD_METHOD, "GetTimes", s_wxluafunc_wxLua_wxFileName_GetTimes, 1 }, - #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) - { WXLUAMETHOD_METHOD, "GetVolume", s_wxluafunc_wxLua_wxFileName_GetVolume, 1 }, { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetVolumeSeparator", s_wxluafunc_wxLua_wxFileName_GetVolumeSeparator, 1 }, --- 2394,2398 ---- *************** *** 2733,2739 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxFile_Read[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxFile_Read(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFile_Read[1] = {{ wxLua_wxFile_Read, 2, 2, s_wxluatagArray_wxLua_wxFile_Read }}; // %override wxLua_wxFile_Read --- 2726,2732 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxFile_Read[] = { &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxFile_Read(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFile_Read[1] = {{ wxLua_wxFile_Read, 1, 1, s_wxluatagArray_wxLua_wxFile_Read }}; // %override wxLua_wxFile_Read *************** *** 3379,3386 **** #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDir) ! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxDir) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_GetAllFiles[] = { &s_wxluaarg_String, &s_wxluatag_wxArrayString, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxDir_GetAllFiles(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDir_GetAllFiles[1] = {{ wxLua_wxDir_GetAllFiles, 2, 4, s_wxluatagArray_wxLua_wxDir_GetAllFiles }}; // %override wxLua_wxDir_GetAllFiles --- 3372,3378 ---- #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDir) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_GetAllFiles[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxDir_GetAllFiles(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDir_GetAllFiles[1] = {{ wxLua_wxDir_GetAllFiles, 1, 3, s_wxluatagArray_wxLua_wxDir_GetAllFiles }}; // %override wxLua_wxDir_GetAllFiles *************** *** 3409,3417 **** } ! #endif // (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxDir) ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_GetFirst[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxDir_GetFirst(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDir_GetFirst[1] = {{ wxLua_wxDir_GetFirst, 1, 3, s_wxluatagArray_wxLua_wxDir_GetFirst }}; // %override wxLua_wxDir_GetFirst --- 3401,3407 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_GetFirst[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; static int LUACALL wxLua_wxDir_GetFirst(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDir_GetFirst[1] = {{ wxLua_wxDir_GetFirst, 0, 2, s_wxluatagArray_wxLua_wxDir_GetFirst }}; // %override wxLua_wxDir_GetFirst *************** *** 3458,3464 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxDir_GetNext[] = { &s_wxluaarg_String, 0 }; static int LUACALL wxLua_wxDir_GetNext(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDir_GetNext[1] = {{ wxLua_wxDir_GetNext, 1, 1, s_wxluatagArray_wxLua_wxDir_GetNext }}; // %override wxLua_wxDir_GetNext --- 3448,3453 ---- } static int LUACALL wxLua_wxDir_GetNext(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDir_GetNext[1] = {{ wxLua_wxDir_GetNext, 0, 0, s_wxluaargArray_None }}; // %override wxLua_wxDir_GetNext *************** *** 3665,3672 **** #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDir) - #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxDir) { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetAllFiles", s_wxluafunc_wxLua_wxDir_GetAllFiles, 1 },... [truncated message content] |
