Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src wxadv_adv.cpp, 1.5, 1.6 wxadv_bind.cpp, 1.3, 1.4 wxadv_grid.cpp, 1.5, 1.6 wxaui_aui.cpp, 1.8, 1.9 wxaui_bind.cpp, 1.3, 1.4 wxbase_base.cpp, 1.5, 1.6 wxbase_bind.cpp, 1.6, 1.7 wxbase_config.cpp, 1.5, 1.6 wxbase_data.cpp, 1.8, 1.9 wxbase_datetime.cpp, 1.5, 1.6 wxbase_file.cpp, 1.5, 1.6 wxcore_appframe.cpp, 1.3, 1.4 wxcore_bind.cpp, 1.8, 1.9 wxcore_clipdrag.cpp, 1.5, 1.6 wxcore_controls.cpp, 1.6, 1.7 wxcore_core.cpp, 1.5, 1.6 wxcore_defsutils.cpp, 1.5, 1.6 wxcore_dialogs.cpp, 1.5, 1.6 wxcore_event.cpp, 1.6, 1.7 wxcore_gdi.cpp, 1.7, 1.8 wxcore_geometry.cpp, 1.4, 1.5 wxcore_help.cpp, 1.5, 1.6 wxcore_image.cpp, 1.6, 1.7 wxcore_mdi.cpp, 1.5, 1.6 wxcore_menutool.cpp, 1.5, 1.6 wxcore_picker.cpp, 1.5, 1.6 wxcore_print.cpp, 1.5, 1.6 wxcore_sizer.cpp, 1.6, 1.7 wxcore_windows.cpp, 1.6, 1.7 wxcore_wxlprint.cpp, 1.3, 1.4 wxgl_bind.cpp, 1.2, 1.3 wxgl_gl.cpp, 1.3, 1.4 wxhtml_bind.cpp, 1.2, 1.3 wxhtml_html.cpp, 1.6, 1.7 wxmedia_bind.cpp, 1.2, 1.3 wxmedia_media.cpp, 1.5, 1.6 wxnet_bind.cpp, 1.2, 1.3 wxnet_net.cpp, 1.5, 1.6 wxrichtext_bind.cpp, 1.2, 1.3 wxstc_bind.cpp, 1.2, 1.3 wxstc_stc.cpp, 1.6, 1.7 wxxml_bind.cpp, 1.2, 1.3 wxxml_xml.cpp, 1.6, 1.7 wxxrc_bind.cpp, 1.2, 1.3 wxxrc_xrc.cpp, 1.5, 1.6
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23281/wxLua/modules/wxbind/src Modified Files: wxadv_adv.cpp wxadv_bind.cpp wxadv_grid.cpp wxaui_aui.cpp wxaui_bind.cpp wxbase_base.cpp wxbase_bind.cpp wxbase_config.cpp wxbase_data.cpp wxbase_datetime.cpp wxbase_file.cpp wxcore_appframe.cpp wxcore_bind.cpp wxcore_clipdrag.cpp wxcore_controls.cpp wxcore_core.cpp wxcore_defsutils.cpp wxcore_dialogs.cpp wxcore_event.cpp wxcore_gdi.cpp wxcore_geometry.cpp wxcore_help.cpp wxcore_image.cpp wxcore_mdi.cpp wxcore_menutool.cpp wxcore_picker.cpp wxcore_print.cpp wxcore_sizer.cpp wxcore_windows.cpp wxcore_wxlprint.cpp wxgl_bind.cpp wxgl_gl.cpp wxhtml_bind.cpp wxhtml_html.cpp wxmedia_bind.cpp wxmedia_media.cpp wxnet_bind.cpp wxnet_net.cpp wxrichtext_bind.cpp wxstc_bind.cpp wxstc_stc.cpp wxxml_bind.cpp wxxml_xml.cpp wxxrc_bind.cpp wxxrc_xrc.cpp 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: wxxrc_xrc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_xrc.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxxrc_xrc.cpp 7 Dec 2007 06:44:46 -0000 1.5 --- wxxrc_xrc.cpp 10 Dec 2007 05:39:09 -0000 1.6 *************** *** 35,39 **** static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L) { - bool returns; // get number of arguments int argCount = lua_gettop(L); --- 35,38 ---- *************** *** 47,51 **** wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call AttachUnknownControl ! returns = (self->AttachUnknownControl(name, control, parent)); // push the result flag lua_pushboolean(L, returns); --- 46,50 ---- wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call AttachUnknownControl ! bool returns = (self->AttachUnknownControl(name, control, parent)); // push the result flag lua_pushboolean(L, returns); *************** *** 74,78 **** static int LUACALL wxLua_wxXmlResource_CompareVersion(lua_State *L) { - int returns; // int revision int revision = (int)wxlua_getnumbertype(L, 5); --- 73,76 ---- *************** *** 86,90 **** wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call CompareVersion ! returns = (self->CompareVersion(major, minor, release, revision)); // push the result number lua_pushnumber(L, returns); --- 84,88 ---- wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call CompareVersion ! int returns = (self->CompareVersion(major, minor, release, revision)); // push the result number lua_pushnumber(L, returns); *************** *** 98,104 **** static int LUACALL wxLua_wxXmlResource_Get(lua_State *L) { - wxXmlResource *returns; // call Get ! returns = (wxXmlResource *)wxXmlResource::Get(); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxXmlResource, returns); --- 96,101 ---- static int LUACALL wxLua_wxXmlResource_Get(lua_State *L) { // call Get ! wxXmlResource* returns = (wxXmlResource*)wxXmlResource::Get(); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxXmlResource, returns); *************** *** 113,121 **** static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L) { - int returns; // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call GetFlags ! returns = (self->GetFlags()); // push the result number lua_pushnumber(L, returns); --- 110,117 ---- static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L) { // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call GetFlags ! int returns = (self->GetFlags()); // push the result number lua_pushnumber(L, returns); *************** *** 130,138 **** static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L) { - long returns; // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call GetVersion ! returns = (self->GetVersion()); // push the result number lua_pushnumber(L, returns); --- 126,133 ---- static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L) { // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call GetVersion ! long returns = (self->GetVersion()); // push the result number lua_pushnumber(L, returns); *************** *** 147,151 **** static int LUACALL wxLua_wxXmlResource_GetXRCID(lua_State *L) { - int returns; // get number of arguments int argCount = lua_gettop(L); --- 142,145 ---- *************** *** 155,159 **** const wxString stringID = wxlua_getwxStringtype(L, 1); // call GetXRCID ! returns = (wxXmlResource::GetXRCID(stringID, value_if_not_found)); // push the result number lua_pushnumber(L, returns); --- 149,153 ---- const wxString stringID = wxlua_getwxStringtype(L, 1); // call GetXRCID ! int returns = (wxXmlResource::GetXRCID(stringID, value_if_not_found)); // push the result number lua_pushnumber(L, returns); *************** *** 182,186 **** static int LUACALL wxLua_wxXmlResource_Load(lua_State *L) { - bool returns; // const wxString filemask const wxString filemask = wxlua_getwxStringtype(L, 2); --- 176,179 ---- *************** *** 188,192 **** wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call Load ! returns = (self->Load(filemask)); // push the result flag lua_pushboolean(L, returns); --- 181,185 ---- wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call Load ! bool returns = (self->Load(filemask)); // push the result flag lua_pushboolean(L, returns); *************** *** 203,207 **** static int LUACALL wxLua_wxXmlResource_LoadBitmap(lua_State *L) { - wxBitmap *returns; // const wxString name const wxString name = wxlua_getwxStringtype(L, 2); --- 196,199 ---- *************** *** 210,216 **** // call LoadBitmap // allocate a new object using the copy constructor ! returns = new wxBitmap(self->LoadBitmap(name)); // add the new object to the tracked memory list ! wxluaO_addtrackedobject(L, (wxBitmap *)returns); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxBitmap, returns); --- 202,208 ---- // call LoadBitmap // allocate a new object using the copy constructor ! wxBitmap* returns = new wxBitmap(self->LoadBitmap(name)); // add the new object to the tracked memory list ! wxluaO_addtrackedobject(L, (wxBitmap*)returns); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxBitmap, returns); *************** *** 228,232 **** static int LUACALL wxLua_wxXmlResource_LoadDialog1(lua_State *L) { - bool returns; // const wxString name const wxString name = wxlua_getwxStringtype(L, 4); --- 220,223 ---- *************** *** 238,242 **** wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadDialog ! returns = (self->LoadDialog(dlg, parent, name)); // push the result flag lua_pushboolean(L, returns); --- 229,233 ---- wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadDialog ! bool returns = (self->LoadDialog(dlg, parent, name)); // push the result flag lua_pushboolean(L, returns); *************** *** 251,255 **** static int LUACALL wxLua_wxXmlResource_LoadDialog(lua_State *L) { - wxDialog *returns; // const wxString name const wxString name = wxlua_getwxStringtype(L, 3); --- 242,245 ---- *************** *** 259,263 **** wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadDialog ! returns = (wxDialog *)self->LoadDialog(parent, name); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxDialog, returns); --- 249,253 ---- wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadDialog ! wxDialog* returns = (wxDialog*)self->LoadDialog(parent, name); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxDialog, returns); *************** *** 275,279 **** static int LUACALL wxLua_wxXmlResource_LoadFrame(lua_State *L) { - bool returns; // const wxString name const wxString name = wxlua_getwxStringtype(L, 4); --- 265,268 ---- *************** *** 285,289 **** wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadFrame ! returns = (self->LoadFrame(frame, parent, name)); // push the result flag lua_pushboolean(L, returns); --- 274,278 ---- wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadFrame ! bool returns = (self->LoadFrame(frame, parent, name)); // push the result flag lua_pushboolean(L, returns); *************** *** 301,305 **** static int LUACALL wxLua_wxXmlResource_LoadIcon(lua_State *L) { - wxIcon *returns; // const wxString name const wxString name = wxlua_getwxStringtype(L, 2); --- 290,293 ---- *************** *** 308,314 **** // call LoadIcon // allocate a new object using the copy constructor ! returns = new wxIcon(self->LoadIcon(name)); // add the new object to the tracked memory list ! wxluaO_addtrackedobject(L, (wxIcon *)returns); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxIcon, returns); --- 296,302 ---- // call LoadIcon // allocate a new object using the copy constructor ! wxIcon* returns = new wxIcon(self->LoadIcon(name)); // add the new object to the tracked memory list ! wxluaO_addtrackedobject(L, (wxIcon*)returns); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxIcon, returns); *************** *** 326,330 **** static int LUACALL wxLua_wxXmlResource_LoadMenu(lua_State *L) { - wxMenu *returns; // const wxString name const wxString name = wxlua_getwxStringtype(L, 2); --- 314,317 ---- *************** *** 332,336 **** wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadMenu ! returns = (wxMenu *)self->LoadMenu(name); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxMenu, returns); --- 319,323 ---- wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadMenu ! wxMenu* returns = (wxMenu*)self->LoadMenu(name); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxMenu, returns); *************** *** 345,349 **** static int LUACALL wxLua_wxXmlResource_LoadMenuBar1(lua_State *L) { - wxMenuBar *returns; // const wxString name const wxString name = wxlua_getwxStringtype(L, 2); --- 332,335 ---- *************** *** 351,355 **** wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadMenuBar ! returns = (wxMenuBar *)self->LoadMenuBar(name); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxMenuBar, returns); --- 337,341 ---- wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadMenuBar ! wxMenuBar* returns = (wxMenuBar*)self->LoadMenuBar(name); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxMenuBar, returns); *************** *** 364,368 **** static int LUACALL wxLua_wxXmlResource_LoadMenuBar(lua_State *L) { - wxMenuBar *returns; // const wxString name const wxString name = wxlua_getwxStringtype(L, 3); --- 350,353 ---- *************** *** 372,376 **** wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadMenuBar ! returns = (wxMenuBar *)self->LoadMenuBar(parent, name); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxMenuBar, returns); --- 357,361 ---- wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadMenuBar ! wxMenuBar* returns = (wxMenuBar*)self->LoadMenuBar(parent, name); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxMenuBar, returns); *************** *** 387,391 **** static int LUACALL wxLua_wxXmlResource_LoadPanel1(lua_State *L) { - bool returns; // const wxString name const wxString name = wxlua_getwxStringtype(L, 4); --- 372,375 ---- *************** *** 397,401 **** wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadPanel ! returns = (self->LoadPanel(panel, parent, name)); // push the result flag lua_pushboolean(L, returns); --- 381,385 ---- wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadPanel ! bool returns = (self->LoadPanel(panel, parent, name)); // push the result flag lua_pushboolean(L, returns); *************** *** 410,414 **** static int LUACALL wxLua_wxXmlResource_LoadPanel(lua_State *L) { - wxPanel *returns; // const wxString name const wxString name = wxlua_getwxStringtype(L, 3); --- 394,397 ---- *************** *** 418,422 **** wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadPanel ! returns = (wxPanel *)self->LoadPanel(parent, name); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxPanel, returns); --- 401,405 ---- wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadPanel ! wxPanel* returns = (wxPanel*)self->LoadPanel(parent, name); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxPanel, returns); *************** *** 433,437 **** static int LUACALL wxLua_wxXmlResource_LoadToolBar(lua_State *L) { - wxToolBar *returns; // const wxString name const wxString name = wxlua_getwxStringtype(L, 3); --- 416,419 ---- *************** *** 441,445 **** wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadToolBar ! returns = (wxToolBar *)self->LoadToolBar(parent, name); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxToolBar, returns); --- 423,427 ---- wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call LoadToolBar ! wxToolBar* returns = (wxToolBar*)self->LoadToolBar(parent, name); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxToolBar, returns); *************** *** 456,465 **** static int LUACALL wxLua_wxXmlResource_Set(lua_State *L) { - wxXmlResource *returns; // wxXmlResource res wxXmlResource * res = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); if (wxluaO_istrackedobject(L, res)) wxluaO_removetrackedobject(L, res, wxLUA_UNDELETE_OBJECT); // call Set ! returns = (wxXmlResource *)wxXmlResource::Set(res); if (!wxluaO_istrackedobject(L, returns)) wxluaO_addtrackedobject(L, returns); // push the result datatype --- 438,446 ---- static int LUACALL wxLua_wxXmlResource_Set(lua_State *L) { // wxXmlResource res wxXmlResource * res = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); if (wxluaO_istrackedobject(L, res)) wxluaO_removetrackedobject(L, res, wxLUA_UNDELETE_OBJECT); // call Set ! wxXmlResource* returns = (wxXmlResource*)wxXmlResource::Set(res); if (!wxluaO_istrackedobject(L, returns)) wxluaO_addtrackedobject(L, returns); // push the result datatype *************** *** 507,511 **** static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L) { - bool returns; // const wxString filename const wxString filename = wxlua_getwxStringtype(L, 2); --- 488,491 ---- *************** *** 513,517 **** wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call Unload ! returns = (self->Unload(filename)); // push the result flag lua_pushboolean(L, returns); --- 493,497 ---- wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); // call Unload ! bool returns = (self->Unload(filename)); // push the result flag lua_pushboolean(L, returns); *************** *** 542,546 **** { wxluabind_removetableforcall(L); - wxXmlResource *returns; // get number of arguments int argCount = lua_gettop(L); --- 522,525 ---- *************** *** 552,556 **** const wxString filemask = wxlua_getwxStringtype(L, 1); // call constructor ! returns = new wxXmlResource(filemask, flags, domain); // add to tracked memory list wxluaO_addtrackedobject(L, returns); --- 531,535 ---- const wxString filemask = wxlua_getwxStringtype(L, 1); // call constructor ! wxXmlResource* returns = new wxXmlResource(filemask, flags, domain); // add to tracked memory list wxluaO_addtrackedobject(L, returns); *************** *** 568,572 **** { wxluabind_removetableforcall(L); - wxXmlResource *returns; // get number of arguments int argCount = lua_gettop(L); --- 547,550 ---- *************** *** 576,580 **** int flags = (argCount >= 1 ? (int)wxlua_getnumbertype(L, 1) : wxXRC_USE_LOCALE); // call constructor ! returns = new wxXmlResource(flags, domain); // add to tracked memory list wxluaO_addtrackedobject(L, returns); --- 554,558 ---- int flags = (argCount >= 1 ? (int)wxlua_getnumbertype(L, 1) : wxXRC_USE_LOCALE); // call constructor ! wxXmlResource* returns = new wxXmlResource(flags, domain); // add to tracked memory list wxluaO_addtrackedobject(L, returns); Index: wxstc_stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_stc.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxstc_stc.cpp 7 Dec 2007 06:44:46 -0000 1.6 --- wxstc_stc.cpp 10 Dec 2007 05:39:08 -0000 1.7 *************** *** 113,121 **** static int LUACALL wxLua_wxStyledTextCtrl_AutoCompActive(lua_State *L) { - bool returns; // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); // call AutoCompActive ! returns = (self->AutoCompActive()); // push the result flag lua_pushboolean(L, returns); --- 113,120 ---- [...3601 lines suppressed...] *** 8861,8865 **** { wxluabind_removetableforcall(L); - wxStyledTextEvent *returns; // get number of arguments int argCount = lua_gettop(L); --- 8685,8688 ---- *************** *** 8869,8873 **** wxEventType commandType = (argCount >= 1 ? (wxEventType)wxlua_getnumbertype(L, 1) : 0); // call constructor ! returns = new wxStyledTextEvent(commandType, id); // add to tracked memory list wxluaO_addtrackedobject(L, returns); --- 8692,8696 ---- wxEventType commandType = (argCount >= 1 ? (wxEventType)wxlua_getnumbertype(L, 1) : 0); // call constructor ! wxStyledTextEvent* returns = new wxStyledTextEvent(commandType, id); // add to tracked memory list wxluaO_addtrackedobject(L, returns); Index: wxnet_net.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_net.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxnet_net.cpp 7 Dec 2007 06:44:46 -0000 1.5 --- wxnet_net.cpp 10 Dec 2007 05:39:08 -0000 1.6 *************** *** 49,57 **** static int LUACALL wxLua_wxSocketBase_Destroy(lua_State *L) { - bool returns; // get this wxSocketBase * self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase); // call Destroy ! returns = (self->Destroy()); // push the result flag lua_pushboolean(L, returns); --- 49,56 ---- [...1948 lines suppressed...] *************** *** 2927,2935 **** { wxluabind_removetableforcall(L); - wxURL *returns; // const wxString sUrl const wxString sUrl = wxlua_getwxStringtype(L, 1); // call constructor ! returns = new wxURL(sUrl); // add to tracked memory list wxluaO_addtrackedobject(L, returns); --- 2830,2837 ---- { wxluabind_removetableforcall(L); // const wxString sUrl const wxString sUrl = wxlua_getwxStringtype(L, 1); // call constructor ! wxURL* returns = new wxURL(sUrl); // add to tracked memory list wxluaO_addtrackedobject(L, returns); Index: wxhtml_html.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxhtml_html.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxhtml_html.cpp 7 Dec 2007 06:44:45 -0000 1.6 --- wxhtml_html.cpp 10 Dec 2007 05:39:08 -0000 1.7 *************** *** 39,43 **** static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L) { - bool returns; // int * pagebreak int pagebreak = (int)wxlua_getintegertype(L, 2); --- 39,42 ---- *************** *** 45,49 **** wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlCell); // call AdjustPagebreak [...2422 lines suppressed...] *** 4922,4926 **** { wxluabind_removetableforcall(L); - wxHtmlHelpController *returns; // get number of arguments int argCount = lua_gettop(L); --- 4804,4807 ---- *************** *** 4928,4932 **** int style = (argCount >= 1 ? (int)wxlua_getnumbertype(L, 1) : wxHF_DEFAULT_STYLE); // call constructor ! returns = new wxHtmlHelpController(style); // add to tracked memory list wxluaO_addtrackedobject(L, returns); --- 4809,4813 ---- int style = (argCount >= 1 ? (int)wxlua_getnumbertype(L, 1) : wxHF_DEFAULT_STYLE); // call constructor ! wxHtmlHelpController* returns = new wxHtmlHelpController(style); // add to tracked memory list wxluaO_addtrackedobject(L, returns); Index: wxcore_clipdrag.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_clipdrag.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxcore_clipdrag.cpp 7 Dec 2007 06:44:43 -0000 1.5 --- wxcore_clipdrag.cpp 10 Dec 2007 05:39:07 -0000 1.6 *************** *** 42,46 **** static int LUACALL wxLua_wxClipboard_AddData(lua_State *L) { - bool returns; // wxDataObject data wxDataObject * data = (wxDataObject *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxDataObject); --- 42,45 ---- *************** *** 49,53 **** wxClipboard * self = (wxClipboard *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxClipboard); // call AddData [...1060 lines suppressed...] *** 2077,2081 **** { wxluabind_removetableforcall(L); - wxMetafileDC *returns; // get number of arguments int argCount = lua_gettop(L); --- 2027,2030 ---- *************** *** 2083,2087 **** const wxString filename = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxEmptyString)); // call constructor ! returns = new wxMetafileDC(filename); // add to tracked memory list wxluaO_addtrackedobject(L, returns); --- 2032,2036 ---- const wxString filename = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxEmptyString)); // call constructor ! wxMetafileDC* returns = new wxMetafileDC(filename); // add to tracked memory list wxluaO_addtrackedobject(L, returns); Index: wxcore_help.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_help.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxcore_help.cpp 7 Dec 2007 06:44:44 -0000 1.5 --- wxcore_help.cpp 10 Dec 2007 05:39:08 -0000 1.6 *************** *** 41,45 **** static int LUACALL wxLua_wxContextHelp_BeginContextHelp(lua_State *L) { - bool returns; // wxWindow win wxWindow * win = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); --- 41,44 ---- *************** *** 47,51 **** wxContextHelp * self = (wxContextHelp *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxContextHelp); // call BeginContextHelp ! returns = (self->BeginContextHelp(win)); // push the result flag lua_pushboolean(L, returns); --- 46,50 ---- wxContextHelp * self = (wxContextHelp *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxContextHelp); // call BeginContextHelp ! bool returns = (self->BeginContextHelp(win)); // push the result flag lua_pushboolean(L, returns); *************** *** 60,68 **** static int LUACALL wxLua_wxContextHelp_EndContextHelp(lua_State *L) { - bool returns; // get this wxContextHelp * self = (wxContextHelp *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxContextHelp); // call EndContextHelp ! returns = (self->EndContextHelp()); // push the result flag lua_pushboolean(L, returns); --- 59,66 ---- static int LUACALL wxLua_wxContextHelp_EndContextHelp(lua_State *L) { // get this wxContextHelp * self = (wxContextHelp *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxContextHelp); // call EndContextHelp ! bool returns = (self->EndContextHelp()); // push the result flag lua_pushboolean(L, returns); *************** *** 93,97 **** { wxluabind_removetableforcall(L); - wxContextHelp *returns; // get number of arguments int argCount = lua_gettop(L); --- 91,94 ---- *************** *** 101,105 **** wxWindow * win = (argCount >= 1 ? (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow) : NULL); // call constructor ! returns = new wxContextHelp(win, beginHelp); // add to tracked memory list wxluaO_addtrackedobject(L, returns); --- 98,102 ---- wxWindow * win = (argCount >= 1 ? (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow) : NULL); // call constructor ! wxContextHelp* returns = new wxContextHelp(win, beginHelp); // add to tracked memory list wxluaO_addtrackedobject(L, returns); *************** *** 144,148 **** { wxluabind_removetableforcall(L); - wxContextHelpButton *returns; // get number of arguments int argCount = lua_gettop(L); --- 141,144 ---- *************** *** 158,162 **** wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor ! returns = new wxContextHelpButton(parent, id, *pos, *size, style); // add to tracked window list, it will check validity wxluaW_addtrackedwindow(L, returns); --- 154,158 ---- wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor ! wxContextHelpButton* returns = new wxContextHelpButton(parent, id, *pos, *size, style); // add to tracked window list, it will check validity wxluaW_addtrackedwindow(L, returns); *************** *** 216,222 **** static int LUACALL wxLua_wxHelpProvider_Get(lua_State *L) { - wxHelpProvider *returns; // call Get ! returns = (wxHelpProvider *)wxHelpProvider::Get(); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxHelpProvider, returns); --- 212,217 ---- static int LUACALL wxLua_wxHelpProvider_Get(lua_State *L) { // call Get ! wxHelpProvider* returns = (wxHelpProvider*)wxHelpProvider::Get(); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxHelpProvider, returns); *************** *** 231,235 **** static int LUACALL wxLua_wxHelpProvider_GetHelp(lua_State *L) { - wxString returns; // const wxWindow window const wxWindow * window = (const wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); --- 226,229 ---- *************** *** 237,241 **** wxHelpProvider * self = (wxHelpProvider *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpProvider); // call GetHelp ! returns = (self->GetHelp(window)); // push the result string wxlua_pushwxString(L, returns); --- 231,235 ---- wxHelpProvider * self = (wxHelpProvider *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpProvider); // call GetHelp ! wxString returns = (self->GetHelp(window)); // push the result string wxlua_pushwxString(L, returns); *************** *** 266,275 **** static int LUACALL wxLua_wxHelpProvider_Set(lua_State *L) { - wxHelpProvider *returns; // wxHelpProvider helpProvider wxHelpProvider * helpProvider = (wxHelpProvider *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpProvider); if (wxluaO_istrackedobject(L, helpProvider)) wxluaO_removetrackedobject(L, helpProvider, wxLUA_UNDELETE_OBJECT); // call Set ! returns = (wxHelpProvider *)wxHelpProvider::Set(helpProvider); if (!wxluaO_istrackedobject(L, returns)) wxluaO_addtrackedobject(L, (void*)returns, new wxLua_wxObject_wxHelpProvider(returns)); // push the result datatype --- 260,268 ---- static int LUACALL wxLua_wxHelpProvider_Set(lua_State *L) { // wxHelpProvider helpProvider wxHelpProvider * helpProvider = (wxHelpProvider *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpProvider); if (wxluaO_istrackedobject(L, helpProvider)) wxluaO_removetrackedobject(L, helpProvider, wxLUA_UNDELETE_OBJECT); // call Set ! wxHelpProvider* returns = (wxHelpProvider*)wxHelpProvider::Set(helpProvider); if (!wxluaO_istrackedobject(L, returns)) wxluaO_addtrackedobject(L, (void*)returns, new wxLua_wxObject_wxHelpProvider(returns)); // push the result datatype *************** *** 285,289 **** static int LUACALL wxLua_wxHelpProvider_ShowHelp(lua_State *L) { - bool returns; // wxWindow window wxWindow * window = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); --- 278,281 ---- *************** *** 291,295 **** wxHelpProvider * self = (wxHelpProvider *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpProvider); // call ShowHelp ! returns = (self->ShowHelp(window)); // push the result flag lua_pushboolean(L, returns); --- 283,287 ---- wxHelpProvider * self = (wxHelpProvider *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpProvider); // call ShowHelp ! bool returns = (self->ShowHelp(window)); // push the result flag lua_pushboolean(L, returns); *************** *** 306,310 **** static int LUACALL wxLua_wxHelpProvider_ShowHelpAtPoint(lua_State *L) { - bool returns; // wxHelpEvent::Origin origin wxHelpEvent::Origin origin = (wxHelpEvent::Origin)wxlua_getintegertype(L, 4); --- 298,301 ---- *************** *** 316,320 **** wxHelpProvider * self = (wxHelpProvider *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpProvider); // call ShowHelpAtPoint ! returns = (self->ShowHelpAtPoint(window, *pt, origin)); // push the result flag lua_pushboolean(L, returns); --- 307,311 ---- wxHelpProvider * self = (wxHelpProvider *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpProvider); // call ShowHelpAtPoint ! bool returns = (self->ShowHelpAtPoint(window, *pt, origin)); // push the result flag lua_pushboolean(L, returns); *************** *** 395,403 **** { wxluabind_removetableforcall(L); - wxSimpleHelpProvider *returns; // call constructor ! returns = new wxSimpleHelpProvider(); // add to tracked memory list ! wxluaO_addtrackedobject(L, (void*)returns, new wxLua_wxObject_wxSimpleHelpProvider((wxSimpleHelpProvider *)returns)); // push the constructed class pointer wxluaT_pushuserdatatype(L, s_wxluatag_wxSimpleHelpProvider, returns); --- 386,393 ---- { wxluabind_removetableforcall(L); // call constructor ! wxSimpleHelpProvider* returns = new wxSimpleHelpProvider(); // add to tracked memory list ! wxluaO_addtrackedobject(L, (void*)returns, new wxLua_wxObject_wxSimpleHelpProvider((wxSimpleHelpProvider*)returns)); // push the constructed class pointer wxluaT_pushuserdatatype(L, s_wxluatag_wxSimpleHelpProvider, returns); *************** *** 436,444 **** static int LUACALL wxLua_wxHelpControllerHelpProvider_GetHelpController(lua_State *L) { - wxHelpController *returns; // get this wxHelpControllerHelpProvider * self = (wxHelpControllerHelpProvider *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerHelpProvider); // call GetHelpController ! returns = (wxHelpController *)self->GetHelpController(); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxHelpController, returns); --- 426,433 ---- static int LUACALL wxLua_wxHelpControllerHelpProvider_GetHelpController(lua_State *L) { // get this wxHelpControllerHelpProvider * self = (wxHelpControllerHelpProvider *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerHelpProvider); // call GetHelpController ! wxHelpController* returns = (wxHelpController*)self->GetHelpController(); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxHelpController, returns); *************** *** 485,489 **** { wxluabind_removetableforcall(L); - wxHelpControllerHelpProvider *returns; // get number of arguments int argCount = lua_gettop(L); --- 474,477 ---- *************** *** 491,497 **** wxHelpController * hc = (argCount >= 1 ? (wxHelpController *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpController) : NULL); // call constructor ! returns = new wxHelpControllerHelpProvider(hc); // add to tracked memory list ! wxluaO_addtrackedobject(L, (void*)returns, new wxLua_wxObject_wxHelpControllerHelpProvider((wxHelpControllerHelpProvider *)returns)); // push the constructed class pointer wxluaT_pushuserdatatype(L, s_wxluatag_wxHelpControllerHelpProvider, returns); --- 479,485 ---- wxHelpController * hc = (argCount >= 1 ? (wxHelpController *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpController) : NULL); // call constructor ! wxHelpControllerHelpProvider* returns = new wxHelpControllerHelpProvider(hc); // add to tracked memory list ! wxluaO_addtrackedobject(L, (void*)returns, new wxLua_wxObject_wxHelpControllerHelpProvider((wxHelpControllerHelpProvider*)returns)); // push the constructed class pointer wxluaT_pushuserdatatype(L, s_wxluatag_wxHelpControllerHelpProvider, returns); *************** *** 532,536 **** static int LUACALL wxLua_wxHelpControllerBase_DisplayBlock(lua_State *L) { - bool returns; // long blockNo long blockNo = (long)wxlua_getnumbertype(L, 2); --- 520,523 ---- *************** *** 538,542 **** wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call DisplayBlock ! returns = (self->DisplayBlock(blockNo)); // push the result flag lua_pushboolean(L, returns); --- 525,529 ---- wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call DisplayBlock ! bool returns = (self->DisplayBlock(blockNo)); // push the result flag lua_pushboolean(L, returns); *************** *** 551,559 **** static int LUACALL wxLua_wxHelpControllerBase_DisplayContents(lua_State *L) { - bool returns; // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call DisplayContents ! returns = (self->DisplayContents()); // push the result flag lua_pushboolean(L, returns); --- 538,545 ---- static int LUACALL wxLua_wxHelpControllerBase_DisplayContents(lua_State *L) { // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call DisplayContents ! bool returns = (self->DisplayContents()); // push the result flag lua_pushboolean(L, returns); *************** *** 568,572 **** static int LUACALL wxLua_wxHelpControllerBase_DisplayContextPopup(lua_State *L) { - bool returns; // int contextId int contextId = (int)wxlua_getnumbertype(L, 2); --- 554,557 ---- *************** *** 574,578 **** wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call DisplayContextPopup ! returns = (self->DisplayContextPopup(contextId)); // push the result flag lua_pushboolean(L, returns); --- 559,563 ---- wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call DisplayContextPopup ! bool returns = (self->DisplayContextPopup(contextId)); // push the result flag lua_pushboolean(L, returns); *************** *** 587,591 **** static int LUACALL wxLua_wxHelpControllerBase_DisplaySection1(lua_State *L) { - bool returns; // const wxString section const wxString section = wxlua_getwxStringtype(L, 2); --- 572,575 ---- *************** *** 593,597 **** wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call DisplaySection ! returns = (self->DisplaySection(section)); // push the result flag lua_pushboolean(L, returns); --- 577,581 ---- wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call DisplaySection ! bool returns = (self->DisplaySection(section)); // push the result flag lua_pushboolean(L, returns); *************** *** 606,610 **** static int LUACALL wxLua_wxHelpControllerBase_DisplaySection(lua_State *L) { - bool returns; // int sectionNo int sectionNo = (int)wxlua_getnumbertype(L, 2); --- 590,593 ---- *************** *** 612,616 **** wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call DisplaySection ! returns = (self->DisplaySection(sectionNo)); // push the result flag lua_pushboolean(L, returns); --- 595,599 ---- wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call DisplaySection ! bool returns = (self->DisplaySection(sectionNo)); // push the result flag lua_pushboolean(L, returns); *************** *** 627,631 **** static int LUACALL wxLua_wxHelpControllerBase_DisplayTextPopup(lua_State *L) { - bool returns; // const wxPoint pos const wxPoint * pos = (const wxPoint *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxPoint); --- 610,613 ---- *************** *** 635,639 **** wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call DisplayTextPopup ! returns = (self->DisplayTextPopup(text, *pos)); // push the result flag lua_pushboolean(L, returns); --- 617,621 ---- wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call DisplayTextPopup ! bool returns = (self->DisplayTextPopup(text, *pos)); // push the result flag lua_pushboolean(L, returns); *************** *** 652,657 **** static int LUACALL wxLua_wxHelpControllerBase_GetFrameParameters(lua_State *L) { - wxFrame *returns; - bool newFrameEachTime = false; wxPoint *pos = new wxPoint(); --- 634,637 ---- *************** *** 660,664 **** wxHelpControllerBase *self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call GetFrameParameters ! returns = self->GetFrameParameters(size, pos, &newFrameEachTime); // push the result datatype --- 640,644 ---- wxHelpControllerBase *self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call GetFrameParameters ! wxFrame *returns = self->GetFrameParameters(size, pos, &newFrameEachTime); // push the result datatype *************** *** 681,689 **** static int LUACALL wxLua_wxHelpControllerBase_GetParentWindow(lua_State *L) { - wxWindow *returns; // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call GetParentWindow ! returns = (wxWindow *)self->GetParentWindow(); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxWindow, returns); --- 661,668 ---- static int LUACALL wxLua_wxHelpControllerBase_GetParentWindow(lua_State *L) { // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call GetParentWindow ! wxWindow* returns = (wxWindow*)self->GetParentWindow(); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxWindow, returns); *************** *** 716,720 **** static int LUACALL wxLua_wxHelpControllerBase_KeywordSearch(lua_State *L) { - bool returns; // get number of arguments int argCount = lua_gettop(L); --- 695,698 ---- *************** *** 726,730 **** wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call KeywordSearch ! returns = (self->KeywordSearch(keyWord, mode)); // push the result flag lua_pushboolean(L, returns); --- 704,708 ---- wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call KeywordSearch ! bool returns = (self->KeywordSearch(keyWord, mode)); // push the result flag lua_pushboolean(L, returns); *************** *** 739,743 **** static int LUACALL wxLua_wxHelpControllerBase_LoadFile(lua_State *L) { - bool returns; // get number of arguments int argCount = lua_gettop(L); --- 717,720 ---- *************** *** 747,751 **** wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call LoadFile ! returns = (self->LoadFile(file)); // push the result flag lua_pushboolean(L, returns); --- 724,728 ---- wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call LoadFile ! bool returns = (self->LoadFile(file)); // push the result flag lua_pushboolean(L, returns); *************** *** 760,768 **** static int LUACALL wxLua_wxHelpControllerBase_Quit(lua_State *L) { - bool returns; // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call Quit ! returns = (self->Quit()); // push the result flag lua_pushboolean(L, returns); --- 737,744 ---- static int LUACALL wxLua_wxHelpControllerBase_Quit(lua_State *L) { // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); // call Quit ! bool returns = (self->Quit()); // push the result flag lua_pushboolean(L, returns); *************** *** 948,954 **** { wxluabind_removetableforcall(L); - wxHelpController *returns; // call constructor ! returns = new wxHelpController(); // add to tracked memory list wxluaO_addtrackedobject(L, returns); --- 924,929 ---- { wxluabind_removetableforcall(L); // call constructor ! wxHelpController* returns = new wxHelpController(); // add to tracked memory list wxluaO_addtrackedobject(L, returns); *************** *** 1004,1010 **** { wxluabind_removetableforcall(L); - wxWinHelpController *returns; // call constructor ! returns = new wxWinHelpController(); // add to tracked memory list wxluaO_addtrackedobject(L, returns); --- 979,984 ---- { wxluabind_removetableforcall(L); // call constructor ! wxWinHelpController* returns = new wxWinHelpController(); // add to tracked memory list wxluaO_addtrackedobject(L, returns); *************** *** 1061,1065 **** { wxluabind_removetableforcall(L); - wxBestHelpController *returns; // get number of arguments int argCount = lua_gettop(L); --- 1035,1038 ---- *************** *** 1069,1073 **** wxWindow * parentWindow = (argCount >= 1 ? (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow) : NULL); // call constructor ! returns = new wxBestHelpController(parentWindow, style); // add to tracked memory list wxluaO_addtrackedobject(L, returns); --- 1042,1046 ---- wxWindow * parentWindow = (argCount >= 1 ? (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow) : NULL); // call constructor ! wxBestHelpController* returns = new wxBestHelpController(parentWindow, style); // add to tracked memory list wxluaO_addtrackedobject(L, returns); *************** *** 1123,1129 **** { wxluabind_removetableforcall(L); - wxExtHelpController *returns; // call constructor ! returns = new wxExtHelpController(); // add to tracked memory list wxluaO_addtrackedobject(L, returns); --- 1096,1101 ---- { wxluabind_removetableforcall(L); // call constructor ! wxExtHelpController* returns = new wxExtHelpController(); // add to tracked memory list wxluaO_addtrackedobject(L, returns); Index: wxadv_adv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_adv.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxadv_adv.cpp 7 Dec 2007 06:44:42 -0000 1.5 --- wxadv_adv.cpp 10 Dec 2007 05:39:06 -0000 1.6 *************** *** 101,112 **** static int LUACALL wxLua_wxAboutDialogInfo_GetArtists(lua_State *L) { - wxArrayString *returns; // get this wxAboutDialogInfo * self = (wxAboutDialogInfo *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxAboutDialogInfo); // call GetArtists // allocate a new object using the copy constructor ! returns = new wxArrayString(self->GetArtists()); // add the new object to the tracked memory list ! wxluaO_addtrackedobject(L, (void*)returns, new wxLua_wxObject_wxArrayString((wxArrayString *)returns)); [...4498 lines suppressed...] // call constructor ! wxWave* returns = new wxWave(fileName, isResource); // add to tracked memory list wxluaO_addtrackedobject(L, returns); *************** *** 7337,7343 **** { wxluabind_removetableforcall(L); - wxWave *returns; // call constructor ! returns = new wxWave(); // add to tracked memory list wxluaO_addtrackedobject(L, returns); --- 7159,7164 ---- { wxluabind_removetableforcall(L); // call constructor ! wxWave* returns = new wxWave(); // add to tracked memory list wxluaO_addtrackedobject(L, returns); Index: wxaui_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxaui_bind.cpp 25 Nov 2007 21:34:05 -0000 1.3 --- wxaui_bind.cpp 10 Dec 2007 05:39:06 -0000 1.4 *************** *** 263,280 **** } - // --------------------------------------------------------------------------- // wxLuaBinding_wxaui() - the binding class // --------------------------------------------------------------------------- - // binding class - extern wxLuaBindClass *wxLuaGetClassList_wxaui(size_t &count); - extern wxLuaBindDefine *wxLuaGetDefineList_wxaui(size_t &count); - extern wxLuaBindString *wxLuaGetStringList_wxaui(size_t &count); - extern wxLuaBindEvent *wxLuaGetEventList_wxaui(size_t &count); - extern wxLuaBindObject *wxLuaGetObjectList_wxaui(size_t &count); - extern wxLuaBindMethod *wxLuaGetFunctionList_wxaui(size_t &count); - - IMPLEMENT_DYNAMIC_CLASS(wxLuaBinding_wxaui, wxLuaBinding) --- 263,270 ---- *************** *** 299,304 **** } - // bind wxLuaBinding_wxaui to a single wxLuaState bool wxLuaBinding_wxaui_bind(const wxLuaState& wxlState_) { --- 289,294 ---- } + // --------------------------------------------------------------------------- bool wxLuaBinding_wxaui_bind(const wxLuaState& wxlState_) { *************** *** 317,321 **** return true; } ! // initialize wxLuaBinding_wxaui for all wxLuaStates bool wxLuaBinding_wxaui_init() { --- 307,311 ---- return true; } ! bool wxLuaBinding_wxaui_init() { Index: wxcore_gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_gdi.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxcore_gdi.cpp 7 Dec 2007 06:44:44 -0000 1.7 --- wxcore_gdi.cpp 10 Dec 2007 05:39:08 -0000 1.8 *************** *** 151,155 **** static int LUACALL wxLua_wxPoint_op_add1(lua_State *L) { - wxPoint *returns; // const wxSize s const wxSize * s = (const wxSize *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxSize); --- 151,154 ---- *************** *** 158,164 **** // call op_add // allocate a new object using the copy constructor [...8208 lines suppressed...] static int LUACALL wxLua_wxRendererNative_Set(lua_State *L) { - wxRendererNative *returns; // wxRendererNative renderer wxRendererNative * renderer = (wxRendererNative *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRendererNative); if (wxluaO_istrackedobject(L, renderer)) wxluaO_removetrackedobject(L, renderer, wxLUA_UNDELETE_OBJECT); // call Set ! returns = (wxRendererNative *)wxRendererNative::Set(renderer); if (!wxluaO_istrackedobject(L, returns)) wxluaO_addtrackedobject(L, (void*)returns, new wxLua_wxObject_wxRendererNative(returns)); // push the result datatype --- 15170,15178 ---- static int LUACALL wxLua_wxRendererNative_Set(lua_State *L) { // wxRendererNative renderer wxRendererNative * renderer = (wxRendererNative *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRendererNative); if (wxluaO_istrackedobject(L, renderer)) wxluaO_removetrackedobject(L, renderer, wxLUA_UNDELETE_OBJECT); // call Set ! wxRendererNative* returns = (wxRendererNative*)wxRendererNative::Set(renderer); if (!wxluaO_istrackedobject(L, returns)) wxluaO_addtrackedobject(L, (void*)returns, new wxLua_wxObject_wxRendererNative(returns)); // push the result datatype Index: wxbase_data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_data.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxbase_data.cpp 7 Dec 2007 06:44:43 -0000 1.8 --- wxbase_data.cpp 10 Dec 2007 05:39:07 -0000 1.9 *************** *** 39,47 **** static int LUACALL wxLua_wxString_GetData(lua_State *L) { - wxString returns; // get this wxString * self = (wxString *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxString); // call GetData ! returns = (self->GetData()); // push the result string wxlua_pushwxString(L, returns); --- 39,46 ---- [...1772 lines suppressed...] // get number of arguments int argCount = lua_gettop(L); --- 2802,2805 ---- *************** *** 2896,2902 **** unsigned long hi = (argCount >= 1 ? (long)wxlua_getnumbertype(L, 1) : 0); // call constructor ! returns = new wxULongLong(hi, lo); // add to tracked memory list ! wxluaO_addtrackedobject(L, (void*)returns, new wxLua_wxObject_wxULongLong((wxULongLong *)returns)); // push the constructed class pointer wxluaT_pushuserdatatype(L, s_wxluatag_wxULongLong, returns); --- 2809,2815 ---- unsigned long hi = (argCount >= 1 ? (long)wxlua_getnumbertype(L, 1) : 0); // call constructor ! wxULongLong* returns = new wxULongLong(hi, lo); // add to tracked memory list ! wxluaO_addtrackedobject(L, (void*)returns, new wxLua_wxObject_wxULongLong((wxULongLong*)returns)); // push the constructed class pointer wxluaT_pushuserdatatype(L, s_wxluatag_wxULongLong, returns); Index: wxgl_gl.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxgl_gl.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxgl_gl.cpp 7 Dec 2007 06:44:45 -0000 1.3 --- wxgl_gl.cpp 10 Dec 2007 05:39:08 -0000 1.4 *************** *** 35,43 **** static int LUACALL wxLua_wxGLCanvas_GetContext(lua_State *L) { - wxGLContext *returns; // get this wxGLCanvas * self = (wxGLCanvas *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGLCanvas); // call GetContext ! returns = (wxGLContext *)self->GetContext(); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxGLContext, returns); --- 35,42 ---- static int LUACALL wxLua_wxGLCanvas_GetContext(lua_State *L) { // get this wxGLCanvas * self = (wxGLCanvas *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGLCanvas); // call GetContext ! wxGLContext* returns = (wxGLContext*)self->GetContext(); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxGLContext, returns); *************** *** 119,123 **** { wxluabind_removetableforcall(L); - wxGLCanvas *returns; // get number of arguments int argCount = lua_gettop(L); --- 118,121 ---- *************** *** 139,143 **** wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor ! returns = new wxGLCanvas(parent, id, attribList, *pos, *size, style, name, *palette); // add to tracked window list, it will check validity wxluaW_addtrackedwindow(L, returns); --- 137,141 ---- wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor ! wxGLCanvas* returns = new wxGLCanvas(parent, id, attribList, *pos, *size, style, name, *palette); // add to tracked window list, it will check validity wxluaW_addtrackedwindow(L, returns); *************** *** 155,159 **** { wxluabind_removetableforcall(L); - wxGLCanvas *returns; // get number of arguments int argCount = lua_gettop(L); --- 153,156 ---- *************** *** 177,181 **** wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor ! returns = new wxGLCanvas(parent, sharedCanvas, id, *pos, *size, style, name, attribList, *palette); // add to tracked window list, it will check validity wxluaW_addtrackedwindow(L, returns); --- 174,178 ---- wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor ! wxGLCanvas* returns = new wxGLCanvas(parent, sharedCanvas, id, *pos, *size, style, name, attribList, *palette); // add to tracked window list, it will check validity wxluaW_addtrackedwindow(L, returns); *************** *** 193,197 **** { wxluabind_removetableforcall(L); - wxGLCanvas *returns; // get number of arguments int argCount = lua_gettop(L); --- 190,193 ---- *************** *** 215,219 **** wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor ! returns = new wxGLCanvas(parent, sharedContext, id, *pos, *size, style, name, attribList, *palette); // add to tracked window list, it will check validity wxluaW_addtrackedwindow(L, returns); --- 211,215 ---- wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor ! wxGLCanvas* returns = new wxGLCanvas(parent, sharedContext, id, *pos, *size, style, name, attribList, *palette); // add to tracked window list, it will check validity wxluaW_addtrackedwindow(L, returns); *************** *** 231,235 **** { wxluabind_removetableforcall(L); - wxGLCanvas *returns; // get number of arguments int argCount = lua_gettop(L); --- 227,230 ---- *************** *** 251,255 **** wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor ! returns = new wxGLCanvas(parent, id, *pos, *size, style, name, attribList, *palette); // add to tracked window list, it will check validity wxluaW_addtrackedwindow(L, returns); --- 246,250 ---- wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); // call constructor ! wxGLCanvas* returns = new wxGLCanvas(parent, id, *pos, *size, style, name, attribList, *palette); // add to tracked window list, it will check validity wxluaW_addtrackedwindow(L, returns); *************** *** 357,365 **** static int LUACALL wxLua_wxGLContext_GetWindow(lua_State *L) { - const wxWindow *returns; // get this wxGLContext * self = (wxGLContext *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGLContext); // call GetWindow ! returns = (const wxWindow *)self->GetWindow(); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxWindow, returns); --- 352,359 ---- static int LUACALL wxLua_wxGLContext_GetWindow(lua_State *L) { // get this wxGLContext * self = (wxGLContext *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGLContext); // call GetWindow ! const wxWindow* returns = (const wxWindow*)self->GetWindow(); // push the result datatype wxluaT_pushuserdatatype(L, s_wxluatag_wxWindow, returns); *************** *** 444,448 **** { wxluabind_removetableforcall(L); - wxGLContext *returns; // get number of arguments int argCount = lua_gettop(L); --- 438,441 ---- *************** *** 456,460 **** bool isRGB = wxlua_getbooleantype(L, 1); // call constructor ! returns = new wxGLContext(isRGB, win, *palette, other); // add to tracked window list, it will check validity wxluaW_addtrackedwindow(L, returns); --- 449,453 ---- bool isRGB = wxlua_getbooleantype(L, 1); // call constructor ! wxGLContext* returns = new wxGLContext(isRGB, win, *palette, other); // add to tracked window list, it will check validity wxluaW_addtrackedwindow(L, returns); *************** *** 472,476 **** { wxluabind_removetableforcall(L); - wxGLContext *returns; // get number of arguments int argCount = lua_gettop(L); --- 465,468 -... [truncated message content] |
