Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets wx_datatypes.lua, 1.88, 1.89 wxadv_adv.i, 1.1, 1.2 wxadv_override.hpp, 1.2, 1.3 wxbase_file.i, 1.1, 1.2 wxbase_override.hpp, 1.8, 1.9 wxcore_appframe.i, 1.1, 1.2 wxcore_image.i, 1.1, 1.2 wxcore_menutool.i, 1.1, 1.2 wxcore_override.hpp, 1.8, 1.9 wxcore_print.i, 1.1, 1.2 wxhtml_override.hpp, 1.4, 1.5 wxstc_override.hpp, 1.2, 1.3 wxxml_override.hpp, 1.4, 1.5
|
From: John L. <jr...@us...> - 2007-12-10 05:39:40
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23281/wxLua/bindings/wxwidgets Modified Files: wx_datatypes.lua wxadv_adv.i wxadv_override.hpp wxbase_file.i wxbase_override.hpp wxcore_appframe.i wxcore_image.i wxcore_menutool.i wxcore_override.hpp wxcore_print.i wxhtml_override.hpp wxstc_override.hpp wxxml_override.hpp Log Message: genwxbind.lua - don't create "returns" variable before use to save a line of code. Applied Lua patches for 5.1.2 8-11 Added wxlua_lreg_createtable(..) to create the LUA_REGISTRYINDEX tables for wxLua Added wxlua_lreg_regtable_key in LUA_REGISTRYINDEX to help the wxLuaDebugData find wxLua's tables faster to give more information Index: wxbase_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxbase_override.hpp 7 Dec 2007 06:44:41 -0000 1.8 --- wxbase_override.hpp 10 Dec 2007 05:39:05 -0000 1.9 *************** *** 14,18 **** static int LUACALL wxLua_function_wxGetOsVersion(lua_State *L) { - int returns; // int *minor = NULL int minor= 0; --- 14,17 ---- *************** *** 20,24 **** int major = 0; // call wxGetOsVersion ! returns = wxGetOsVersion(&major, &minor); // push the result numbers lua_pushnumber(L, returns); --- 19,23 ---- int major = 0; // call wxGetOsVersion ! int returns = wxGetOsVersion(&major, &minor); // push the result numbers lua_pushnumber(L, returns); *************** *** 34,42 **** static int LUACALL wxLua_function_wxGetEnv(lua_State *L) { - bool returns; wxString var = wxlua_getwxStringtype(L, 1); wxString value; // call wxGetEnv ! returns = wxGetEnv(var, &value); // push the result number lua_pushboolean(L, returns); --- 33,40 ---- static int LUACALL wxLua_function_wxGetEnv(lua_State *L) { wxString var = wxlua_getwxStringtype(L, 1); wxString value; // call wxGetEnv ! bool returns = wxGetEnv(var, &value); // push the result number lua_pushboolean(L, returns); *************** *** 51,57 **** static int LUACALL wxLua_wxStandardPaths_Get(lua_State *L) { - wxStandardPathsBase *returns; // call Get ! returns = &wxStandardPaths::Get(); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxStandardPaths, returns); --- 49,54 ---- static int LUACALL wxLua_wxStandardPaths_Get(lua_State *L) { // call Get ! wxStandardPathsBase *returns = &wxStandardPaths::Get(); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxStandardPaths, returns); *************** *** 65,69 **** static int LUACALL wxLua_wxRegEx_GetMatchIndexes(lua_State *L) { - bool returns; // get number of arguments int argCount = lua_gettop(L); --- 62,65 ---- *************** *** 77,81 **** wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call GetMatch ! returns = self->GetMatch(&start, &len, index); // push the result number lua_pushboolean(L, returns); --- 73,77 ---- wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call GetMatch ! bool returns = self->GetMatch(&start, &len, index); // push the result number lua_pushboolean(L, returns); *************** *** 92,96 **** static int LUACALL wxLua_wxRegEx_Replace(lua_State *L) { - int returns; // get number of arguments int argCount = lua_gettop(L); --- 88,91 ---- *************** *** 104,108 **** wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call Replace ! returns = self->Replace(&text, replacement, maxMatches); // push the result number lua_pushnumber(L, returns); --- 99,103 ---- wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call Replace ! int returns = self->Replace(&text, replacement, maxMatches); // push the result number lua_pushnumber(L, returns); *************** *** 118,122 **** static int LUACALL wxLua_wxRegEx_ReplaceAll(lua_State *L) { - int returns; // const wxString& replacement wxString replacement = wxlua_getwxStringtype(L, 3); --- 113,116 ---- *************** *** 126,130 **** wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call ReplaceAll ! returns = self->ReplaceAll(&text, replacement); // push the result number lua_pushnumber(L, returns); --- 120,124 ---- wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call ReplaceAll ! int returns = self->ReplaceAll(&text, replacement); // push the result number lua_pushnumber(L, returns); *************** *** 140,144 **** static int LUACALL wxLua_wxRegEx_ReplaceFirst(lua_State *L) { - int returns; // const wxString& replacement wxString replacement = wxlua_getwxStringtype(L, 3); --- 134,137 ---- *************** *** 148,152 **** wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call ReplaceFirst ! returns = self->ReplaceFirst(&text, replacement); // push the result number lua_pushnumber(L, returns); --- 141,145 ---- wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx); // call ReplaceFirst ! int returns = self->ReplaceFirst(&text, replacement); // push the result number lua_pushnumber(L, returns); *************** *** 257,261 **** static int LUACALL wxLua_wxConfigBase_GetFirstGroup(lua_State *L) { - bool returns; // get number of arguments int argCount = lua_gettop(L); --- 250,253 ---- *************** *** 266,270 **** wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetFirstGroup ! returns = self->GetFirstGroup(str, index); // push the result number lua_pushboolean(L, returns); --- 258,262 ---- wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetFirstGroup ! bool returns = self->GetFirstGroup(str, index); // push the result number lua_pushboolean(L, returns); *************** *** 282,286 **** static int LUACALL wxLua_wxConfigBase_GetFirstEntry(lua_State *L) { - bool returns; // get number of arguments int argCount = lua_gettop(L); --- 274,277 ---- *************** *** 291,295 **** wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetFirstEntry ! returns = self->GetFirstEntry(str, index); // push the result number lua_pushboolean(L, returns); --- 282,286 ---- wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetFirstEntry ! bool returns = self->GetFirstEntry(str, index); // push the result number lua_pushboolean(L, returns); *************** *** 307,311 **** static int LUACALL wxLua_wxConfigBase_GetNextGroup(lua_State *L) { - bool returns; // only the number is needed long index = (long)wxlua_getintegertype(L, 2); --- 298,301 ---- *************** *** 314,318 **** wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetNextGroup ! returns = self->GetNextGroup(str, index); // push the result number lua_pushboolean(L, returns); --- 304,308 ---- wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetNextGroup ! bool returns = self->GetNextGroup(str, index); // push the result number lua_pushboolean(L, returns); *************** *** 330,334 **** static int LUACALL wxLua_wxConfigBase_GetNextEntry(lua_State *L) { - bool returns; // only the number is needed long index = (long)wxlua_getintegertype(L, 2); --- 320,323 ---- *************** *** 337,341 **** wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetNextEntry ! returns = self->GetNextEntry(str, index); // push the result number lua_pushboolean(L, returns); --- 326,330 ---- wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase); // call GetNextEntry ! bool returns = self->GetNextEntry(str, index); // push the result number lua_pushboolean(L, returns); *************** *** 359,363 **** wxluabind_removetableforcall(L); - wxString* returns; // get number of arguments int argCount = lua_gettop(L); --- 348,351 ---- *************** *** 365,369 **** const wxString str = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxEmptyString)); // call constructor ! returns = new wxString(str); // add to tracked memory list wxluaO_addtrackedobject(L, (void*)returns, new wxLua_wxObject_wxString(returns)); --- 353,357 ---- const wxString str = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxEmptyString)); // call constructor ! wxString* returns = new wxString(str); // add to tracked memory list wxluaO_addtrackedobject(L, (void*)returns, new wxLua_wxObject_wxString(returns)); *************** *** 381,389 **** wxluabind_removetableforcall(L); - wxClassInfo *returns; // const wxString &name wxString name = wxlua_getwxStringtype(L, 1); // call constructor ! returns = wxClassInfo::FindClass((wxChar *)name.c_str()); // push the constructed class pointer wxluaT_pushuserdatatype(L, s_wxluatag_wxClassInfo, returns); --- 369,376 ---- wxluabind_removetableforcall(L); // const wxString &name wxString name = wxlua_getwxStringtype(L, 1); // call constructor ! wxClassInfo *returns = wxClassInfo::FindClass((wxChar *)name.c_str()); // push the constructed class pointer wxluaT_pushuserdatatype(L, s_wxluatag_wxClassInfo, returns); *************** *** 432,436 **** %override wxLua_wxArrayInt_ToLuaTable ! // int ToLuaTable const static int LUACALL wxLua_wxArrayInt_ToLuaTable(lua_State *L) { --- 419,423 ---- %override wxLua_wxArrayInt_ToLuaTable ! // int ToLuaTable() const static int LUACALL wxLua_wxArrayInt_ToLuaTable(lua_State *L) { *************** *** 442,446 **** %override wxLua_wxArrayString_ToLuaTable ! // int ToLuaTable const static int LUACALL wxLua_wxArrayString_ToLuaTable(lua_State *L) { --- 429,433 ---- %override wxLua_wxArrayString_ToLuaTable ! // int ToLuaTable() const static int LUACALL wxLua_wxArrayString_ToLuaTable(lua_State *L) { *************** *** 457,463 **** wxluabind_removetableforcall(L); - wxStringList *returns; // call constructor ! returns = new wxStringList(); int argCount = lua_gettop(L); --- 444,449 ---- wxluabind_removetableforcall(L); // call constructor ! wxStringList *returns = new wxStringList(); int argCount = lua_gettop(L); *************** *** 530,538 **** static int LUACALL wxLua_function_wxGetTempFileName(lua_State *L) { - wxString returns; // const wxString& prefix wxString prefix = lua2wx(wxlua_getstringtype(L, 1)); // call wxGetTempFileName ! returns = wxGetTempFileName(prefix, NULL); // push the result number lua_pushstring(L, wx2lua(returns)); --- 516,523 ---- static int LUACALL wxLua_function_wxGetTempFileName(lua_State *L) { // const wxString& prefix wxString prefix = lua2wx(wxlua_getstringtype(L, 1)); // call wxGetTempFileName ! wxString returns = wxGetTempFileName(prefix, NULL); // push the result number lua_pushstring(L, wx2lua(returns)); *************** *** 564,572 **** static int LUACALL wxLua_wxFileName_GetDirs(lua_State *L) { - wxArrayString returns; // get this wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileName); // call GetDirs ! returns = self->GetDirs(); // push the result datatype wxlua_pushwxArrayStringtable(L, returns); --- 549,556 ---- static int LUACALL wxLua_wxFileName_GetDirs(lua_State *L) { // get this wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileName); // call GetDirs ! wxArrayString returns = self->GetDirs(); // push the result datatype wxlua_pushwxArrayStringtable(L, returns); *************** *** 580,584 **** static int LUACALL wxLua_wxFileName_GetTimes(lua_State *L) { - bool returns; wxDateTime *dtCreate = new wxDateTime(); wxDateTime *dtMod = new wxDateTime(); --- 564,567 ---- *************** *** 587,591 **** wxFileName *self = (wxFileName *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileName); // call GetTimes ! returns = self->GetTimes(dtAccess, dtMod, dtCreate); // add to tracked memory list wxluaO_addtrackedobject(L, (void*)dtAccess, new wxLua_wxObject_wxDateTime(dtAccess)); --- 570,574 ---- wxFileName *self = (wxFileName *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileName); // call GetTimes ! bool returns = self->GetTimes(dtAccess, dtMod, dtCreate); // add to tracked memory list wxluaO_addtrackedobject(L, (void*)dtAccess, new wxLua_wxObject_wxDateTime(dtAccess)); *************** *** 678,682 **** static int LUACALL wxLua_wxDir_GetFirst(lua_State *L) { - bool returns; // get number of arguments int argCount = lua_gettop(L); --- 661,664 ---- *************** *** 690,694 **** wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDir); // call GetFirst ! returns = self->GetFirst(&filename, filespec, flags); lua_pushboolean(L, returns); // push the result number --- 672,676 ---- wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDir); // call GetFirst ! bool returns = self->GetFirst(&filename, filespec, flags); lua_pushboolean(L, returns); // push the result number *************** *** 703,707 **** static int LUACALL wxLua_wxDir_GetNext(lua_State *L) { - bool returns; // wxString * filename wxString filename; --- 685,688 ---- *************** *** 709,713 **** wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDir); // call GetNext ! returns = self->GetNext(&filename); lua_pushboolean(L, returns); // push the result number --- 690,694 ---- wxDir *self = (wxDir *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDir); // call GetNext ! bool returns = self->GetNext(&filename); lua_pushboolean(L, returns); // push the result number *************** *** 722,726 **** static int LUACALL wxLua_wxDir_GetAllFiles(lua_State *L) { - unsigned int returns; // get number of arguments int argCount = lua_gettop(L); --- 703,706 ---- *************** *** 734,738 **** wxString dirname = wxlua_getwxStringtype(L, 1); // call GetAllFiles ! returns = wxDir::GetAllFiles(dirname, &files, filespec, flags); // push the result number lua_pushnumber(L, returns); --- 714,718 ---- wxString dirname = wxlua_getwxStringtype(L, 1); // call GetAllFiles ! unsigned int returns = wxDir::GetAllFiles(dirname, &files, filespec, flags); // push the result number lua_pushnumber(L, returns); *************** *** 747,751 **** static int LUACALL wxLua_wxFile_Read(lua_State *L) { - unsigned int returns; // unsigned int count unsigned int count = (unsigned int)wxlua_getintegertype(L, 2); --- 727,730 ---- *************** *** 757,761 **** wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFile); // call Read ! returns = self->Read(buffer, count); // push the result number lua_pushnumber(L, returns); --- 736,740 ---- wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFile); // call Read ! unsigned int returns = self->Read(buffer, count); // push the result number lua_pushnumber(L, returns); *************** *** 773,777 **** static int LUACALL wxLua_wxFile_Write(lua_State *L) { - unsigned int returns; // get number of arguments int argCount = lua_gettop(L); --- 752,755 ---- *************** *** 783,787 **** wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFile); // call Write ! returns = self->Write(buffer, nbytes); // push the result number lua_pushnumber(L, returns); --- 761,765 ---- wxFile *self = (wxFile *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFile); // call Write ! unsigned int returns = self->Write(buffer, nbytes); // push the result number lua_pushnumber(L, returns); *************** *** 795,799 **** static int LUACALL wxLua_wxFileType_GetDescription(lua_State *L) { - bool returns; // wxString desc wxString desc; // = wxlua_getwxStringtype(L, 2); --- 773,776 ---- *************** *** 801,805 **** wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileType); // call GetDescription ! returns = (self->GetDescription(&desc)); // push the result flag lua_pushboolean(L, returns); --- 778,782 ---- wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileType); // call GetDescription ! bool returns = (self->GetDescription(&desc)); // push the result flag lua_pushboolean(L, returns); *************** *** 814,818 **** static int LUACALL wxLua_wxFileType_GetPrintCommand(lua_State *L) { - bool returns; // const wxFileType::MessageParameters params const wxFileType::MessageParameters * params = (const wxFileType::MessageParameters *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxFileType_MessageParameters); --- 791,794 ---- *************** *** 822,826 **** wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileType); // call GetPrintCommand ! returns = (self->GetPrintCommand(&printCmd, *params)); // push the result flag lua_pushboolean(L, returns); --- 798,802 ---- wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileType); // call GetPrintCommand ! bool returns = (self->GetPrintCommand(&printCmd, *params)); // push the result flag lua_pushboolean(L, returns); *************** *** 835,839 **** static int LUACALL wxLua_wxInputStream_Read(lua_State *L) { - wxInputStream *returns; // size_t size size_t size = (size_t)wxlua_getintegertype(L, 2); --- 811,814 ---- *************** *** 845,849 **** { // call Read ! returns = &self->Read(buffer, size); // only return the data that was read, they already have self //wxluaT_pushuserdatatype(L, s_wxluatag_wxInputStream, returns); --- 820,825 ---- { // call Read ! // wxInputStream *returns = & // we don't return wxInputStream ! self->Read(buffer, size); // only return the data that was read, they already have self //wxluaT_pushuserdatatype(L, s_wxluatag_wxInputStream, returns); *************** *** 860,864 **** static int LUACALL wxLua_wxInputStream_UngetchString(lua_State *L) { - size_t returns; // size_t size size_t size = (size_t)wxlua_getintegertype(L, 3); --- 836,839 ---- *************** *** 868,872 **** wxInputStream *self = (wxInputStream *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxInputStream); // call Ungetch ! returns = self->Ungetch(buffer, size); // push the result number lua_pushnumber(L, returns); --- 843,847 ---- wxInputStream *self = (wxInputStream *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxInputStream); // call Ungetch ! size_t returns = self->Ungetch(buffer, size); // push the result number lua_pushnumber(L, returns); *************** *** 880,884 **** static int LUACALL wxLua_wxOutputStream_Write(lua_State *L) { - wxOutputStream *returns; // size_t size size_t size = (size_t)wxlua_getintegertype(L, 3); --- 855,858 ---- *************** *** 888,892 **** wxOutputStream *self = (wxOutputStream *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxOutputStream); // call Write ! returns = &self->Write(buffer, size); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxOutputStream, returns); --- 862,866 ---- wxOutputStream *self = (wxOutputStream *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxOutputStream); // call Write ! wxOutputStream *returns = &self->Write(buffer, size); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxOutputStream, returns); Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** wx_datatypes.lua 25 Nov 2007 21:34:04 -0000 1.88 --- wx_datatypes.lua 10 Dec 2007 05:39:05 -0000 1.89 *************** *** 2549,2552 **** --- 2549,2559 ---- ValueType = "class", }, + wxLuaArtProvider = { + BaseClass = "wxArtProvider", + Condition = "wxLUA_USE_wxArtProvider", + IsNumber = false, + Name = "wxLuaArtProvider", + ValueType = "class", + }, wxLuaHtmlWinTagEvent = { BaseClass = "wxEvent", Index: wxbase_file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_file.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxbase_file.i 16 Jul 2007 19:34:24 -0000 1.1 --- wxbase_file.i 10 Dec 2007 05:39:05 -0000 1.2 *************** *** 15,21 **** --- 15,24 ---- %function bool wxDirExists(const wxString& dirname) %function bool wxFileExists(const wxString& filename) + // %override [new lua string] wxDos2UnixFilename(lua string) + // C++ Func: void wxDos2UnixFilename(wxChar *s) %function wxString wxDos2UnixFilename(const wxString& s) // %override wxDateTime wxFileModificationTime(const wxString& filename) (not overridden, just return wxDateTime) + // C++ Func: time_t wxFileModificationTime(const wxString& filename) %function wxDateTime wxFileModificationTime(const wxString& filename) //%function wxString wxFileNameFromPath(const wxString& path) // obsolete use wxFileName::SplitPath *************** *** 28,31 **** --- 31,35 ---- %function wxString wxPathOnly(const wxString& path) // %override [new lua string] wxUnix2DosFilename(lua string) + // C++ Func: void wxUnix2DosFilename(wxChar *s) %function wxString wxUnix2DosFilename(const wxString& s) %function bool wxConcatFiles(const wxString& file1, const wxString& file2,const wxString& file3) Index: wxcore_print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_print.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_print.i 16 Jul 2007 19:34:25 -0000 1.1 --- wxcore_print.i 10 Dec 2007 05:39:05 -0000 1.2 *************** *** 62,65 **** --- 62,66 ---- %class %delete wxLuaPrintout, wxPrintout + // %override - the C++ function takes the wxLuaState as the first param wxLuaPrintout(const wxString& title = "Printout", wxLuaObject *pObject = NULL) Index: wxadv_adv.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_adv.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxadv_adv.i 16 Jul 2007 19:34:23 -0000 1.1 --- wxadv_adv.i 10 Dec 2007 05:39:05 -0000 1.2 *************** *** 42,46 **** wxIcon GetIcon() const ! void SetWebSite(const wxString& url, const wxString& desc = wxEmptyString) bool HasWebSite() const --- 42,46 ---- wxIcon GetIcon() const ! void SetWebSite(const wxString& url, const wxString& desc = "") bool HasWebSite() const *************** *** 70,75 **** // implementation only // ------------------- ! //bool IsSimple() const ! //wxString GetDescriptionAndCredits() const %endclass --- 70,75 ---- // implementation only // ------------------- ! bool IsSimple() const ! wxString GetDescriptionAndCredits() const %endclass *************** *** 94,98 **** %endenum ! %class %delete wxAnimation, wxGDIObject wxAnimation() wxAnimation(const wxAnimation& anim) --- 94,98 ---- %endenum ! %class %delete wxAnimation, wxGDIObject // ignore platform independent wxAnimationBase wxAnimation() wxAnimation(const wxAnimation& anim) *************** *** 113,117 **** %define wxAC_NO_AUTORESIZE ! %define wxAC_DEFAULT_STYLE %class wxAnimationCtrl, wxControl --- 113,117 ---- %define wxAC_NO_AUTORESIZE ! %define wxAC_DEFAULT_STYLE // = wxNO_BORDER %class wxAnimationCtrl, wxControl Index: wxadv_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_override.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxadv_override.hpp 7 Dec 2007 02:13:09 -0000 1.2 --- wxadv_override.hpp 10 Dec 2007 05:39:05 -0000 1.3 *************** *** 14,18 **** static int LUACALL wxLua_wxCalendarCtrl_HitTest(lua_State *L) { - wxCalendarHitTestResult returns; // const wxPoint pos const wxPoint * pos = (const wxPoint *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxPoint); --- 14,17 ---- *************** *** 23,27 **** wxDateTime::WeekDay wd = wxDateTime::Inv_WeekDay; ! returns = self->HitTest(*pos, date, &wd); // push the result number lua_pushnumber(L, returns); --- 22,26 ---- wxDateTime::WeekDay wd = wxDateTime::Inv_WeekDay; ! wxCalendarHitTestResult returns = self->HitTest(*pos, date, &wd); // push the result number lua_pushnumber(L, returns); Index: wxstc_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxstc_override.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxstc_override.hpp 7 Dec 2007 02:13:10 -0000 1.2 --- wxstc_override.hpp 10 Dec 2007 05:39:05 -0000 1.3 *************** *** 14,23 **** static int LUACALL wxLua_wxStyledTextCtrl_GetCurLine(lua_State *L) { - wxString returns; int linePos; // get this wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); // call GetCurLine ! returns = self->GetCurLine(&linePos); // push the result string lua_pushstring(L, wx2lua(returns)); --- 14,22 ---- static int LUACALL wxLua_wxStyledTextCtrl_GetCurLine(lua_State *L) { int linePos; // get this wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); // call GetCurLine ! wxString returns = self->GetCurLine(&linePos); // push the result string lua_pushstring(L, wx2lua(returns)); Index: wxhtml_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxhtml_override.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxhtml_override.hpp 7 Dec 2007 06:44:41 -0000 1.4 --- wxhtml_override.hpp 10 Dec 2007 05:39:05 -0000 1.5 *************** *** 16,20 **** static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L) { - bool returns; // int * pagebreak int pagebreak = (int)wxlua_getintegertype(L, 2); --- 16,19 ---- *************** *** 22,26 **** wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlCell); // call AdjustPagebreak ! returns = self->AdjustPagebreak(&pagebreak); // push the result number lua_pushboolean(L, returns); --- 21,25 ---- wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlCell); // call AdjustPagebreak ! bool returns = self->AdjustPagebreak(&pagebreak); // push the result number lua_pushboolean(L, returns); *************** *** 34,38 **** static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L) { - bool returns; // int * pagebreak int pagebreak = (int)wxlua_getintegertype(L, 3); --- 33,36 ---- *************** *** 42,46 **** wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlCell); // call AdjustPagebreak ! returns = self->AdjustPagebreak(&pagebreak, *known_pagebreaks); // push the result number lua_pushboolean(L, returns); --- 40,44 ---- wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlCell); // call AdjustPagebreak ! bool returns = self->AdjustPagebreak(&pagebreak, *known_pagebreaks); // push the result number lua_pushboolean(L, returns); *************** *** 99,103 **** static int LUACALL wxLua_wxHtmlTag_GetParamAsColour(lua_State *L) { - bool returns; wxColour *retColour = new wxColour; // const wxString& par --- 97,100 ---- *************** *** 106,110 **** wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlTag); // call GetParamAsColour ! returns = self->GetParamAsColour(par, retColour); // // push the result number --- 103,107 ---- wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlTag); // call GetParamAsColour ! bool returns = self->GetParamAsColour(par, retColour); // // push the result number *************** *** 120,124 **** static int LUACALL wxLua_wxHtmlTag_GetParamAsInt(lua_State *L) { - bool returns; int value; // const wxString& par --- 117,120 ---- *************** *** 127,131 **** wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlTag); // call GetParamAsInt ! returns = self->GetParamAsInt(par, &value); // push the result number lua_pushboolean(L, returns); --- 123,127 ---- wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlTag); // call GetParamAsInt ! bool returns = self->GetParamAsInt(par, &value); // push the result number lua_pushboolean(L, returns); *************** *** 254,258 **** wxluabind_removetableforcall(L); wxLuaState wxlState(L); - wxLuaHtmlWindow *returns; // get number of arguments int argCount = lua_gettop(L); --- 250,253 ---- *************** *** 270,274 **** wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor ! returns = new wxLuaHtmlWindow(wxlState, parent, id, *pos, *size, style, name); // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) --- 265,269 ---- wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor ! wxLuaHtmlWindow *returns = new wxLuaHtmlWindow(wxlState, parent, id, *pos, *size, style, name); // add to tracked window list if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) Index: wxcore_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxcore_override.hpp 7 Dec 2007 06:44:41 -0000 1.8 --- wxcore_override.hpp 10 Dec 2007 05:39:05 -0000 1.9 *************** *** 14,20 **** static int LUACALL wxLua_function_wxGetApp(lua_State *L) { - wxApp *returns; // call wxGetApp(), actually not since you have to have IMPLEMENT_APP ! returns = wxTheApp; // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxApp, returns); --- 14,19 ---- static int LUACALL wxLua_function_wxGetApp(lua_State *L) { [...1149 lines suppressed...] int argCount = lua_gettop(L); --- 2718,2722 ---- wxluabind_removetableforcall(L); wxLuaState wxlState(L); ! // get number of arguments int argCount = lua_gettop(L); *************** *** 2767,2771 **** const wxString title = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxT("Printout"))); // call constructor ! returns = new wxLuaPrintout(wxlState, title, pObject); // add to tracked memory list wxluaO_addtrackedobject(L, (wxLuaPrintout *)returns); --- 2726,2730 ---- const wxString title = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxT("Printout"))); // call constructor ! wxLuaPrintout *returns = new wxLuaPrintout(wxlState, title, pObject); // add to tracked memory list wxluaO_addtrackedobject(L, (wxLuaPrintout *)returns); Index: wxcore_image.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_image.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_image.i 16 Jul 2007 19:34:25 -0000 1.1 --- wxcore_image.i 10 Dec 2007 05:39:05 -0000 1.2 *************** *** 517,521 **** %define_string wxART_INFORMATION %define_string wxART_MISSING_IMAGE - %define_string wxART_COPY %define_string wxART_CUT --- 517,520 ---- *************** *** 532,547 **** %define_string wxART_FIND_AND_REPLACE - // All the public functions are static so we rename them and use builtin - // also just use wxString instead of wxArtID and wxArtClient - %class wxArtProvider, wxObject // wxArtProvider() - abstract class %if %wxchkver_2_8 ! static void Push(wxArtProvider *provider) ! static void Insert(wxArtProvider *provider) static bool Pop() ! static bool Remove(wxArtProvider *provider) ! static bool Delete(wxArtProvider *provider) %endif // %wxchkver_2_8 --- 531,543 ---- %define_string wxART_FIND_AND_REPLACE %class wxArtProvider, wxObject // wxArtProvider() - abstract class %if %wxchkver_2_8 ! static void Push(%ungc wxArtProvider *provider) ! static void Insert(%ungc wxArtProvider *provider) static bool Pop() ! static bool Remove(%gc wxArtProvider *provider) // FIXME - mem leak if not found ! static bool Delete(%ungc wxArtProvider *provider) %endif // %wxchkver_2_8 *************** *** 557,559 **** --- 553,571 ---- %endclass + %class %delete wxLuaArtProvider, wxArtProvider + // %override - the C++ function takes the wxLuaState as the first param + wxLuaArtProvider() + + // virtual function that you can override in Lua. + virtual wxSize DoGetSizeHint(const wxString& client) // { return GetSizeHint(client, true); } + + // virtual function that you can override in Lua. + + // Derived classes must override this method to create requested + // art resource. This method is called only once per instance's + // lifetime for each requested wxArtID. + virtual wxBitmap CreateBitmap(const wxString& id, const wxString& client, const wxSize& size); + + %endclass + %endif //wxLUA_USE_wxArtProvider Index: wxcore_appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_appframe.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_appframe.i 16 Jul 2007 19:34:24 -0000 1.1 --- wxcore_appframe.i 10 Dec 2007 05:39:05 -0000 1.2 *************** *** 16,19 **** --- 16,21 ---- %include "wx/app.h" + // %override wxApp* wxGetApp() + // C++ func: wxApp* wxGetApp() - use wxTheApp* since this requires IMPLEMENT_APP() %function wxApp* wxGetApp() Index: wxcore_menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_menutool.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_menutool.i 16 Jul 2007 19:34:25 -0000 1.1 --- wxcore_menutool.i 10 Dec 2007 05:39:05 -0000 1.2 *************** *** 358,361 **** --- 358,362 ---- bool Ok() const + //%wxchkver_2_8 bool IsOk() const // believe it or not, there aren't functions to add or remove wxAcceleratorEntries for MSW *************** *** 369,372 **** --- 370,375 ---- %wxcompat_2_6 %function wxAcceleratorEntry* wxGetAccelFromString(const wxString& label) // deprecated in 2.8 use wxAcceleratorEntry::Create() or FromString() + %include "wx/accel.h" + %enum wxACCEL_NORMAL *************** *** 378,382 **** %class %delete %noclassinfo %encapsulate wxAcceleratorEntry ! wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0) wxAcceleratorEntry(const wxAcceleratorEntry& entry) --- 381,385 ---- %class %delete %noclassinfo %encapsulate wxAcceleratorEntry ! wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0, wxMenuItem *item = NULL) wxAcceleratorEntry(const wxAcceleratorEntry& entry) *************** *** 384,388 **** int GetFlags() const int GetKeyCode() const ! void Set(int flags, int keyCode, int Cmd) %if %wxchkver_2_8 --- 387,391 ---- int GetFlags() const int GetKeyCode() const ! void Set(int flags, int keyCode, int Cmd, wxMenuItem *item = NULL) %if %wxchkver_2_8 *************** *** 391,394 **** --- 394,398 ---- wxString ToString() const bool FromString(const wxString& str) + wxMenuItem *GetMenuItem() const %endif // %wxchkver_2_8 Index: wxxml_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxxml_override.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxxml_override.hpp 7 Dec 2007 06:44:41 -0000 1.4 --- wxxml_override.hpp 10 Dec 2007 05:39:05 -0000 1.5 *************** *** 16,20 **** wxluabind_removetableforcall(L); - wxXmlNode *returns; // wxXmlNode next wxXmlNode * next = (wxXmlNode *)wxluaT_getuserdatatype(L, 6, s_wxluatag_wxXmlNode); --- 16,19 ---- *************** *** 30,34 **** wxXmlNode * parent = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode); // call constructor ! returns = new wxXmlNode(parent, type, name, content, props, next); // add to tracked memory list if (parent == NULL) --- 29,33 ---- wxXmlNode * parent = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode); // call constructor ! wxXmlNode *returns = new wxXmlNode(parent, type, name, content, props, next); // add to tracked memory list if (parent == NULL) *************** *** 45,49 **** static int LUACALL wxLua_wxXmlNode_RemoveChild(lua_State *L) { - bool returns; // wxXmlNode child wxXmlNode * child = (wxXmlNode *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxXmlNode); --- 44,47 ---- *************** *** 51,55 **** wxXmlNode * self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode); // call RemoveChild ! returns = (self->RemoveChild(child)); if (returns && !wxluaO_istrackedobject(L, child)) --- 49,53 ---- wxXmlNode * self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode); // call RemoveChild ! bool returns = (self->RemoveChild(child)); if (returns && !wxluaO_istrackedobject(L, child)) *************** *** 67,71 **** static int LUACALL wxLua_wxXmlNode_GetPropValPtr(lua_State *L) { - bool returns; // wxString *value wxString value; --- 65,68 ---- *************** *** 75,79 **** wxXmlNode *self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode); // call GetPropVal ! returns = self->GetPropVal(propName, &value); // push the result number lua_pushboolean(L, returns); --- 72,76 ---- wxXmlNode *self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode); // call GetPropVal ! bool returns = self->GetPropVal(propName, &value); // push the result number lua_pushboolean(L, returns); |
