Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src wxadv_adv.cpp, 1.8, 1.9 wxadv_grid.cpp, 1.7, 1.8 wxaui_aui.cpp, 1.12, 1.13 wxbase_base.cpp, 1.8, 1.9 wxbase_config.cpp, 1.8, 1.9 wxbase_data.cpp, 1.10, 1.11 wxbase_datetime.cpp, 1.8, 1.9 wxbase_file.cpp, 1.8, 1.9 wxcore_appframe.cpp, 1.6, 1.7 wxcore_clipdrag.cpp, 1.8, 1.9 wxcore_controls.cpp, 1.8, 1.9 wxcore_core.cpp, 1.7, 1.8 wxcore_defsutils.cpp, 1.7, 1.8 wxcore_dialogs.cpp, 1.7, 1.8 wxcore_event.cpp, 1.9, 1.10 wxcore_gdi.cpp, 1.11, 1.12 wxcore_geometry.cpp, 1.6, 1.7 wxcore_help.cpp, 1.8, 1.9 wxcore_image.cpp, 1.10, 1.11 wxcore_mdi.cpp, 1.8, 1.9 wxcore_menutool.cpp, 1.8, 1.9 wxcore_picker.cpp, 1.7, 1.8 wxcore_print.cpp, 1.8, 1.9 wxcore_sizer.cpp, 1.8, 1.9 wxcore_windows.cpp, 1.9, 1.10 wxgl_gl.cpp, 1.4, 1.5 wxhtml_html.cpp, 1.8, 1.9 wxmedia_media.cpp, 1.7, 1.8 wxnet_net.cpp, 1.7, 1.8 wxstc_stc.cpp, 1.9, 1.10 wxxml_xml.cpp, 1.9, 1.10 wxxrc_xrc.cpp, 1.8, 1.9
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8597/wxLua/modules/wxbind/src Modified Files: wxadv_adv.cpp wxadv_grid.cpp wxaui_aui.cpp wxbase_base.cpp wxbase_config.cpp wxbase_data.cpp wxbase_datetime.cpp wxbase_file.cpp wxcore_appframe.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 wxgl_gl.cpp wxhtml_html.cpp wxmedia_media.cpp wxnet_net.cpp wxstc_stc.cpp wxxml_xml.cpp wxxrc_xrc.cpp Log Message: - Removed wxluabind_removetableforcall(L) used in the bindings to determine if the function was called from the tables used for class constructors. It makes more sense to call an intermediatary function to remove the table before calling the real function. - Removed the wxLuaFunction class since we no longer need it. It was a userdata with a __call metatable to call the real function we want. We now push the actual function or an overload function helper with the wxLuaBindMethod struct as an upvalue to give better error messages. The new way should be faster since it doesn't generate as much garbage. - Added wxlua_argerror(L, stack_idx, type_str) to give a far more informative message from the bindings when the wrong type is an arg to a function. - Renamed WXLUAARG_XXX to WXLUA_TXXX to match LUA_TXXX. * Do not create a separate overload function in the bindings since we can just as easily check for multiple functions using the wxLuaBindMethod and call the generic overload function or just the single function. Index: wxnet_net.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_net.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxnet_net.cpp 13 Dec 2007 00:47:51 -0000 1.7 --- wxnet_net.cpp 20 Dec 2007 02:26:57 -0000 1.8 *************** *** 727,731 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketClient_delete[] = { &s_wxluatag_wxSocketClient, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketClient_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxSocketClient_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketClient_constructor[] = { &s_wxluaarg_Integer, NULL }; --- 727,731 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketClient_delete[] = { &s_wxluatag_wxSocketClient, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketClient_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxSocketClient_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketClient_constructor[] = { &s_wxluaarg_Integer, NULL }; *************** *** 735,739 **** static int LUACALL wxLua_wxSocketClient_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 735,738 ---- *************** *** 841,845 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketServer_delete[] = { &s_wxluatag_wxSocketServer, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketServer_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxSocketServer_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketServer_constructor[] = { &s_wxluatag_wxSockAddress, &s_wxluaarg_Integer, NULL }; --- 840,844 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketServer_delete[] = { &s_wxluatag_wxSocketServer, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketServer_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxSocketServer_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketServer_constructor[] = { &s_wxluatag_wxSockAddress, &s_wxluaarg_Integer, NULL }; *************** *** 849,853 **** static int LUACALL wxLua_wxSocketServer_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 848,851 ---- *************** *** 942,946 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketEvent_delete[] = { &s_wxluatag_wxSocketEvent, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketEvent_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxSocketEvent_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketEvent_constructor[] = { &s_wxluaarg_Number, NULL }; --- 940,944 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketEvent_delete[] = { &s_wxluatag_wxSocketEvent, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSocketEvent_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxSocketEvent_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketEvent_constructor[] = { &s_wxluaarg_Number, NULL }; *************** *** 950,954 **** static int LUACALL wxLua_wxSocketEvent_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 948,951 ---- *************** *** 1180,1184 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxIPaddress_delete[] = { &s_wxluatag_wxIPaddress, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxIPaddress_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxIPaddress_delete }}; --- 1177,1181 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxIPaddress_delete[] = { &s_wxluatag_wxIPaddress, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxIPaddress_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxIPaddress_delete }}; *************** *** 1186,1210 **** #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) - static int LUACALL wxLua_wxIPaddress_Hostname_overload(lua_State *L); // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxIPaddress_Hostname_overload[] = { - { wxLua_wxIPaddress_Hostname_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 1, 2, s_wxluaargArray_None }, { wxLua_wxIPaddress_Hostname1, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxIPaddress_Hostname1 }, { wxLua_wxIPaddress_Hostname, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxIPaddress_Hostname }, }; static int s_wxluafunc_wxLua_wxIPaddress_Hostname_overload_count = sizeof(s_wxluafunc_wxLua_wxIPaddress_Hostname_overload)/sizeof(wxLuaBindCFunc); ! // Overloaded function for wxIPaddress::Hostname ! static int LUACALL wxLua_wxIPaddress_Hostname_overload(lua_State *L) ! { ! static wxLuaBindMethod overload_method = ! { "Hostname", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxIPaddress_Hostname_overload, s_wxluafunc_wxLua_wxIPaddress_Hostname_overload_count, 0 }; ! return wxlua_CallOverloadedFunction(L, &overload_method); ! } ! static int LUACALL wxLua_wxIPaddress_Service_overload(lua_State *L); // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxIPaddress_Service_overload[] = { - { wxLua_wxIPaddress_Service_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 1, 2, s_wxluaargArray_None }, { wxLua_wxIPaddress_Service2, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxIPaddress_Service2 }, { wxLua_wxIPaddress_Service1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxIPaddress_Service1 }, --- 1183,1197 ---- #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxIPaddress_Hostname_overload[] = { { wxLua_wxIPaddress_Hostname1, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxIPaddress_Hostname1 }, { wxLua_wxIPaddress_Hostname, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxIPaddress_Hostname }, }; static int s_wxluafunc_wxLua_wxIPaddress_Hostname_overload_count = sizeof(s_wxluafunc_wxLua_wxIPaddress_Hostname_overload)/sizeof(wxLuaBindCFunc); ! // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxIPaddress_Service_overload[] = { { wxLua_wxIPaddress_Service2, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxIPaddress_Service2 }, { wxLua_wxIPaddress_Service1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxIPaddress_Service1 }, *************** *** 1212,1222 **** }; static int s_wxluafunc_wxLua_wxIPaddress_Service_overload_count = sizeof(s_wxluafunc_wxLua_wxIPaddress_Service_overload)/sizeof(wxLuaBindCFunc); ! // Overloaded function for wxIPaddress::Service ! static int LUACALL wxLua_wxIPaddress_Service_overload(lua_State *L) ! { ! static wxLuaBindMethod overload_method = ! { "Service", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxIPaddress_Service_overload, s_wxluafunc_wxLua_wxIPaddress_Service_overload_count, 0 }; ! return wxlua_CallOverloadedFunction(L, &overload_method); ! } #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) --- 1199,1203 ---- }; static int s_wxluafunc_wxLua_wxIPaddress_Service_overload_count = sizeof(s_wxluafunc_wxLua_wxIPaddress_Service_overload)/sizeof(wxLuaBindCFunc); ! #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) *************** *** 1274,1278 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxIPV4address_delete[] = { &s_wxluatag_wxIPV4address, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxIPV4address_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxIPV4address_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxIPV4address_constructor1[] = { &s_wxluatag_wxIPV4address, NULL }; --- 1255,1259 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxIPV4address_delete[] = { &s_wxluatag_wxIPV4address, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxIPV4address_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxIPV4address_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxIPV4address_constructor1[] = { &s_wxluatag_wxIPV4address, NULL }; *************** *** 1282,1286 **** static int LUACALL wxLua_wxIPV4address_constructor1(lua_State *L) { - wxluabind_removetableforcall(L); // const wxIPV4address other const wxIPV4address * other = (const wxIPV4address *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxIPV4address); --- 1263,1266 ---- *************** *** 1300,1304 **** static int LUACALL wxLua_wxIPV4address_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // call constructor wxIPV4address* returns = new wxIPV4address(); --- 1280,1283 ---- *************** *** 1315,1334 **** #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) - static int LUACALL wxLua_wxIPV4address_constructor_overload(lua_State *L); // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxIPV4address_constructor_overload[] = { - { wxLua_wxIPV4address_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 1, s_wxluaargArray_None }, { wxLua_wxIPV4address_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxIPV4address_constructor1 }, { wxLua_wxIPV4address_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; static int s_wxluafunc_wxLua_wxIPV4address_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxIPV4address_constructor_overload)/sizeof(wxLuaBindCFunc); ! // Overloaded function for wxIPV4address::wxIPV4address ! static int LUACALL wxLua_wxIPV4address_constructor_overload(lua_State *L) ! { ! static wxLuaBindMethod overload_method = ! { "wxIPV4address", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxIPV4address_constructor_overload, s_wxluafunc_wxLua_wxIPV4address_constructor_overload_count, 0 }; ! return wxlua_CallOverloadedFunction(L, &overload_method); ! } #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) --- 1294,1305 ---- #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxIPV4address_constructor_overload[] = { { wxLua_wxIPV4address_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxIPV4address_constructor1 }, { wxLua_wxIPV4address_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; static int s_wxluafunc_wxLua_wxIPV4address_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxIPV4address_constructor_overload)/sizeof(wxLuaBindCFunc); ! #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) *************** *** 1477,1481 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxProtocol_delete[] = { &s_wxluatag_wxProtocol, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxProtocol_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxProtocol_delete }}; --- 1448,1452 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxProtocol_delete[] = { &s_wxluatag_wxProtocol, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxProtocol_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxProtocol_delete }}; *************** *** 1566,1570 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxHTTP_delete[] = { &s_wxluatag_wxHTTP, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxHTTP_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxHTTP_delete }}; static int LUACALL wxLua_wxHTTP_constructor(lua_State *L); --- 1537,1541 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxHTTP_delete[] = { &s_wxluatag_wxHTTP, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxHTTP_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxHTTP_delete }}; static int LUACALL wxLua_wxHTTP_constructor(lua_State *L); *************** *** 1573,1577 **** static int LUACALL wxLua_wxHTTP_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // call constructor wxHTTP* returns = new wxHTTP(); --- 1544,1547 ---- *************** *** 1950,1954 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxFTP_delete[] = { &s_wxluatag_wxFTP, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxFTP_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxFTP_delete }}; static int LUACALL wxLua_wxFTP_constructor(lua_State *L); --- 1920,1924 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxFTP_delete[] = { &s_wxluatag_wxFTP, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxFTP_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxFTP_delete }}; static int LUACALL wxLua_wxFTP_constructor(lua_State *L); *************** *** 1957,1961 **** static int LUACALL wxLua_wxFTP_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // call constructor wxFTP* returns = new wxFTP(); --- 1927,1930 ---- *************** *** 2407,2411 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxURI_delete[] = { &s_wxluatag_wxURI, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxURI_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxURI_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxURI_op_eq[] = { &s_wxluatag_wxURI, &s_wxluatag_wxURI, NULL }; --- 2376,2380 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxURI_delete[] = { &s_wxluatag_wxURI, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxURI_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxURI_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxURI_op_eq[] = { &s_wxluatag_wxURI, &s_wxluatag_wxURI, NULL }; *************** *** 2452,2456 **** static int LUACALL wxLua_wxURI_constructor2(lua_State *L) { - wxluabind_removetableforcall(L); // const wxURI uri const wxURI * uri = (const wxURI *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxURI); --- 2421,2424 ---- *************** *** 2471,2475 **** static int LUACALL wxLua_wxURI_constructor1(lua_State *L) { - wxluabind_removetableforcall(L); // const wxString uri const wxString uri = wxlua_getwxStringtype(L, 1); --- 2439,2442 ---- *************** *** 2489,2493 **** static int LUACALL wxLua_wxURI_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // call constructor wxURI* returns = new wxURI(); --- 2456,2459 ---- *************** *** 2504,2512 **** #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) - static int LUACALL wxLua_wxURI_constructor_overload(lua_State *L); // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxURI_constructor_overload[] = { - { wxLua_wxURI_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 1, s_wxluaargArray_None }, { wxLua_wxURI_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxURI_constructor2 }, { wxLua_wxURI_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxURI_constructor1 }, --- 2470,2476 ---- *************** *** 2514,2524 **** }; static int s_wxluafunc_wxLua_wxURI_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxURI_constructor_overload)/sizeof(wxLuaBindCFunc); ! // Overloaded function for wxURI::wxURI ! static int LUACALL wxLua_wxURI_constructor_overload(lua_State *L) ! { ! static wxLuaBindMethod overload_method = ! { "wxURI", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxURI_constructor_overload, s_wxluafunc_wxLua_wxURI_constructor_overload_count, 0 }; ! return wxlua_CallOverloadedFunction(L, &overload_method); ! } #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) --- 2478,2482 ---- }; static int s_wxluafunc_wxLua_wxURI_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxURI_constructor_overload)/sizeof(wxLuaBindCFunc); ! #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) *************** *** 2678,2682 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxURL_delete[] = { &s_wxluatag_wxURL, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxURL_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxURL_delete }}; --- 2636,2640 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxURL_delete[] = { &s_wxluatag_wxURL, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxURL_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxURL_delete }}; *************** *** 2688,2692 **** static int LUACALL wxLua_wxURL_constructor1(lua_State *L) { - wxluabind_removetableforcall(L); // const wxURI url const wxURI * url = (const wxURI *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxURI); --- 2646,2649 ---- *************** *** 2709,2713 **** static int LUACALL wxLua_wxURL_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // const wxString sUrl const wxString sUrl = wxlua_getwxStringtype(L, 1); --- 2666,2669 ---- *************** *** 2726,2734 **** #if (((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS))||((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) - static int LUACALL wxLua_wxURL_constructor_overload(lua_State *L); // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxURL_constructor_overload[] = { - { wxLua_wxURL_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 1, 1, s_wxluaargArray_None }, #if ((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS) --- 2682,2688 ---- *************** *** 2738,2748 **** }; static int s_wxluafunc_wxLua_wxURL_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxURL_constructor_overload)/sizeof(wxLuaBindCFunc); ! // Overloaded function for wxURL::wxURL ! static int LUACALL wxLua_wxURL_constructor_overload(lua_State *L) ! { ! static wxLuaBindMethod overload_method = ! { "wxURL", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxURL_constructor_overload, s_wxluafunc_wxLua_wxURL_constructor_overload_count, 0 }; ! return wxlua_CallOverloadedFunction(L, &overload_method); ! } #endif // (((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS))||((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) --- 2692,2696 ---- }; static int s_wxluafunc_wxLua_wxURL_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxURL_constructor_overload)/sizeof(wxLuaBindCFunc); ! #endif // (((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) && (wxLUA_USE_wxSocket && wxUSE_SOCKETS))||((wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_URL)) Index: wxstc_stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_stc.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxstc_stc.cpp 18 Dec 2007 01:03:34 -0000 1.9 --- wxstc_stc.cpp 20 Dec 2007 02:26:57 -0000 1.10 *************** *** 7364,7368 **** static int LUACALL wxLua_wxStyledTextCtrl_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 7364,7367 ---- *************** *** 8662,8666 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextEvent_delete[] = { &s_wxluatag_wxStyledTextEvent, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextEvent_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; --- 8661,8665 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextEvent_delete[] = { &s_wxluatag_wxStyledTextEvent, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxStyledTextEvent_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; *************** *** 8670,8674 **** static int LUACALL wxLua_wxStyledTextEvent_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 8669,8672 ---- Index: wxxrc_xrc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_xrc.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxxrc_xrc.cpp 13 Dec 2007 06:23:54 -0000 1.8 --- wxxrc_xrc.cpp 20 Dec 2007 02:26:57 -0000 1.9 *************** *** 501,505 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_delete[] = { &s_wxluatag_wxXmlResource, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_constructor1[] = { &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; --- 501,505 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_delete[] = { &s_wxluatag_wxXmlResource, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_constructor1[] = { &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; *************** *** 509,513 **** static int LUACALL wxLua_wxXmlResource_constructor1(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 509,512 ---- *************** *** 534,538 **** static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 533,536 ---- *************** *** 555,563 **** #if ((wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC)) - static int LUACALL wxLua_wxXmlResource_LoadDialog_overload(lua_State *L); // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadDialog_overload[] = { - { wxLua_wxXmlResource_LoadDialog_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 3, 4, s_wxluaargArray_None }, #if (wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC) --- 553,559 ---- *************** *** 570,588 **** }; static int s_wxluafunc_wxLua_wxXmlResource_LoadDialog_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_LoadDialog_overload)/sizeof(wxLuaBindCFunc); ! // Overloaded function for wxXmlResource::LoadDialog ! static int LUACALL wxLua_wxXmlResource_LoadDialog_overload(lua_State *L) ! { ! static wxLuaBindMethod overload_method = ! { "LoadDialog", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxXmlResource_LoadDialog_overload, s_wxluafunc_wxLua_wxXmlResource_LoadDialog_overload_count, 0 }; ! return wxlua_CallOverloadedFunction(L, &overload_method); ! } #endif // ((wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC)) #if ((wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC)) - static int LUACALL wxLua_wxXmlResource_LoadMenuBar_overload(lua_State *L); // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar_overload[] = { - { wxLua_wxXmlResource_LoadMenuBar_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 2, 3, s_wxluaargArray_None }, #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) --- 566,576 ---- }; static int s_wxluafunc_wxLua_wxXmlResource_LoadDialog_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_LoadDialog_overload)/sizeof(wxLuaBindCFunc); ! #endif // ((wxLUA_USE_wxDialog) && (wxLUA_USE_wxXRC && wxUSE_XRC)) #if ((wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar_overload[] = { #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC) *************** *** 595,640 **** }; static int s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar_overload)/sizeof(wxLuaBindCFunc); ! // Overloaded function for wxXmlResource::LoadMenuBar ! static int LUACALL wxLua_wxXmlResource_LoadMenuBar_overload(lua_State *L) ! { ! static wxLuaBindMethod overload_method = ! { "LoadMenuBar", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar_overload, s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar_overload_count, 0 }; ! return wxlua_CallOverloadedFunction(L, &overload_method); ! } #endif // ((wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC)) #if (wxLUA_USE_wxXRC && wxUSE_XRC) - static int LUACALL wxLua_wxXmlResource_LoadPanel_overload(lua_State *L); // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload[] = { - { wxLua_wxXmlResource_LoadPanel_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 3, 4, s_wxluaargArray_None }, { wxLua_wxXmlResource_LoadPanel1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel1 }, { wxLua_wxXmlResource_LoadPanel, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel }, }; static int s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload)/sizeof(wxLuaBindCFunc); ! // Overloaded function for wxXmlResource::LoadPanel ! static int LUACALL wxLua_wxXmlResource_LoadPanel_overload(lua_State *L) ! { ! static wxLuaBindMethod overload_method = ! { "LoadPanel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload, s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload_count, 0 }; ! return wxlua_CallOverloadedFunction(L, &overload_method); ! } ! static int LUACALL wxLua_wxXmlResource_constructor_overload(lua_State *L); // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor_overload[] = { - { wxLua_wxXmlResource_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 3, s_wxluaargArray_None }, { wxLua_wxXmlResource_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatagArray_wxLua_wxXmlResource_constructor1 }, { wxLua_wxXmlResource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxXmlResource_constructor }, }; static int s_wxluafunc_wxLua_wxXmlResource_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_constructor_overload)/sizeof(wxLuaBindCFunc); ! // Overloaded function for wxXmlResource::wxXmlResource ! static int LUACALL wxLua_wxXmlResource_constructor_overload(lua_State *L) ! { ! static wxLuaBindMethod overload_method = ! { "wxXmlResource", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxXmlResource_constructor_overload, s_wxluafunc_wxLua_wxXmlResource_constructor_overload_count, 0 }; ! return wxlua_CallOverloadedFunction(L, &overload_method); ! } #endif // (wxLUA_USE_wxXRC && wxUSE_XRC) --- 583,606 ---- }; static int s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar_overload)/sizeof(wxLuaBindCFunc); ! #endif // ((wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXRC && wxUSE_XRC)) #if (wxLUA_USE_wxXRC && wxUSE_XRC) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload[] = { { wxLua_wxXmlResource_LoadPanel1, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel1 }, { wxLua_wxXmlResource_LoadPanel, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel }, }; static int s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload)/sizeof(wxLuaBindCFunc); ! // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxXmlResource_constructor_overload[] = { { wxLua_wxXmlResource_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 3, s_wxluatagArray_wxLua_wxXmlResource_constructor1 }, { wxLua_wxXmlResource_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxXmlResource_constructor }, }; static int s_wxluafunc_wxLua_wxXmlResource_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxXmlResource_constructor_overload)/sizeof(wxLuaBindCFunc); ! #endif // (wxLUA_USE_wxXRC && wxUSE_XRC) Index: wxcore_core.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_core.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxcore_core.cpp 13 Dec 2007 00:47:49 -0000 1.7 --- wxcore_core.cpp 20 Dec 2007 02:26:56 -0000 1.8 *************** *** 36,40 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxLogGui_delete[] = { &s_wxluatag_wxLogGui, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogGui_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLogGui_delete }}; static int LUACALL wxLua_wxLogGui_constructor(lua_State *L); --- 36,40 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLogGui_delete[] = { &s_wxluatag_wxLogGui, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogGui_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLogGui_delete }}; static int LUACALL wxLua_wxLogGui_constructor(lua_State *L); *************** *** 43,47 **** static int LUACALL wxLua_wxLogGui_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // call constructor wxLogGui* returns = new wxLogGui(); --- 43,46 ---- *************** *** 79,83 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxLogTextCtrl_delete[] = { &s_wxluatag_wxLogTextCtrl, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogTextCtrl_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLogTextCtrl_delete }}; --- 78,82 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLogTextCtrl_delete[] = { &s_wxluatag_wxLogTextCtrl, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogTextCtrl_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLogTextCtrl_delete }}; *************** *** 89,93 **** static int LUACALL wxLua_wxLogTextCtrl_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // wxTextCtrl textCtrl wxTextCtrl * textCtrl = (wxTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxTextCtrl); --- 88,91 ---- *************** *** 168,172 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxLogWindow_delete[] = { &s_wxluatag_wxLogWindow, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogWindow_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLogWindow_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxLogWindow_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, NULL }; --- 166,170 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLogWindow_delete[] = { &s_wxluatag_wxLogWindow, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogWindow_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLogWindow_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxLogWindow_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, NULL }; *************** *** 176,180 **** static int LUACALL wxLua_wxLogWindow_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 174,177 ---- *************** *** 611,615 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxTextValidator_delete[] = { &s_wxluatag_wxTextValidator, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextValidator_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxTextValidator_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxTextValidator_constructor[] = { &s_wxluaarg_Number, &s_wxluatag_wxLuaObject, NULL }; --- 608,612 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxTextValidator_delete[] = { &s_wxluatag_wxTextValidator, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextValidator_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxTextValidator_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxTextValidator_constructor[] = { &s_wxluaarg_Number, &s_wxluatag_wxLuaObject, NULL }; *************** *** 620,625 **** static int LUACALL wxLua_wxTextValidator_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - wxTextValidator *returns; // get number of arguments --- 617,620 ---- *************** *** 682,686 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxGenericValidator_delete[] = { &s_wxluatag_wxGenericValidator, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxGenericValidator_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxGenericValidator_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxGenericValidatorArrayInt_constructor[] = { &s_wxluatag_wxLuaObject, NULL }; --- 677,681 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxGenericValidator_delete[] = { &s_wxluatag_wxGenericValidator, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxGenericValidator_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxGenericValidator_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxGenericValidatorArrayInt_constructor[] = { &s_wxluatag_wxLuaObject, NULL }; *************** *** 691,696 **** static int LUACALL wxLua_wxGenericValidatorArrayInt_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // wxLuaObject *valPtr wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaObject); --- 686,689 ---- *************** *** 713,718 **** static int LUACALL wxLua_wxGenericValidatorBool_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // wxLuaObject *boolPtr wxLuaObject *boolPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaObject); --- 706,709 ---- *************** *** 735,740 **** static int LUACALL wxLua_wxGenericValidatorInt_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // wxLuaObject *valPtr wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaObject); --- 726,729 ---- *************** *** 757,762 **** static int LUACALL wxLua_wxGenericValidatorString_constructor(lua_State *L) { - wxluabind_removetableforcall(L); - // wxLuaObject *valPtr wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaObject); --- 746,749 ---- Index: wxcore_clipdrag.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_clipdrag.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxcore_clipdrag.cpp 13 Dec 2007 06:23:54 -0000 1.8 --- wxcore_clipdrag.cpp 20 Dec 2007 02:26:56 -0000 1.9 *************** *** 286,290 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxClipboardTextEvent_delete[] = { &s_wxluatag_wxClipboardTextEvent, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxClipboardTextEvent_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxClipboardTextEvent_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxClipboardTextEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; --- 286,290 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxClipboardTextEvent_delete[] = { &s_wxluatag_wxClipboardTextEvent, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxClipboardTextEvent_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxClipboardTextEvent_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxClipboardTextEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; *************** *** 294,298 **** static int LUACALL wxLua_wxClipboardTextEvent_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 294,297 ---- *************** *** 400,404 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxDataFormat_delete[] = { &s_wxluatag_wxDataFormat, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxDataFormat_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxDataFormat_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxDataFormat_op_eq[] = { &s_wxluatag_wxDataFormat, &s_wxluatag_wxDataFormat, NULL }; --- 399,403 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxDataFormat_delete[] = { &s_wxluatag_wxDataFormat, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxDataFormat_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxDataFormat_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxDataFormat_op_eq[] = { &s_wxluatag_wxDataFormat, &s_wxluatag_wxDataFormat, NULL }; *************** *** 426,430 **** static int LUACALL wxLua_wxDataFormat_constructor1(lua_State *L) { - wxluabind_removetableforcall(L); // const wxString format const wxString format = wxlua_getwxStringtype(L, 1); --- 425,428 ---- *************** *** 445,449 **** static int LUACALL wxLua_wxDataFormat_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 443,446 ---- *************** *** 464,483 **** #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) - static int LUACALL wxLua_wxDataFormat_constructor_overload(lua_State *L); // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxDataFormat_constructor_overload[] = { - { wxLua_wxDataFormat_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 1, s_wxluaargArray_None }, { wxLua_wxDataFormat_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxDataFormat_constructor1 }, { wxLua_wxDataFormat_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxDataFormat_constructor }, }; static int s_wxluafunc_wxLua_wxDataFormat_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxDataFormat_constructor_overload)/sizeof(wxLuaBindCFunc); ! // Overloaded function for wxDataFormat::wxDataFormat ! static int LUACALL wxLua_wxDataFormat_constructor_overload(lua_State *L) ! { ! static wxLuaBindMethod overload_method = ! { "wxDataFormat", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDataFormat_constructor_overload, s_wxluafunc_wxLua_wxDataFormat_constructor_overload_count, 0 }; ! return wxlua_CallOverloadedFunction(L, &overload_method); ! } #endif // (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) --- 461,472 ---- #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxDataFormat_constructor_overload[] = { { wxLua_wxDataFormat_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxDataFormat_constructor1 }, { wxLua_wxDataFormat_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxDataFormat_constructor }, }; static int s_wxluafunc_wxLua_wxDataFormat_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxDataFormat_constructor_overload)/sizeof(wxLuaBindCFunc); ! #endif // (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) *************** *** 811,815 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxDataObjectSimple_delete[] = { &s_wxluatag_wxDataObjectSimple, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxDataObjectSimple_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxDataObjectSimple_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxDataObjectSimple_constructor[] = { &s_wxluatag_wxDataFormat, NULL }; --- 800,804 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxDataObjectSimple_delete[] = { &s_wxluatag_wxDataObjectSimple, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxDataObjectSimple_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxDataObjectSimple_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxDataObjectSimple_constructor[] = { &s_wxluatag_wxDataFormat, NULL }; *************** *** 819,823 **** static int LUACALL wxLua_wxDataObjectSimple_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 808,811 ---- *************** *** 908,912 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxDataObjectComposite_delete[] = { &s_wxluatag_wxDataObjectComposite, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxDataObjectComposite_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxDataObjectComposite_delete }}; static int LUACALL wxLua_wxDataObjectComposite_constructor(lua_State *L); --- 896,900 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxDataObjectComposite_delete[] = { &s_wxluatag_wxDataObjectComposite, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxDataObjectComposite_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxDataObjectComposite_delete }}; static int LUACALL wxLua_wxDataObjectComposite_constructor(lua_State *L); *************** *** 915,919 **** static int LUACALL wxLua_wxDataObjectComposite_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // call constructor wxDataObjectComposite* returns = new wxDataObjectComposite(); --- 903,906 ---- *************** *** 996,1000 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDataObject_delete[] = { &s_wxluatag_wxFileDataObject, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileDataObject_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxFileDataObject_delete }}; static int LUACALL wxLua_wxFileDataObject_constructor(lua_State *L); --- 983,987 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxFileDataObject_delete[] = { &s_wxluatag_wxFileDataObject, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileDataObject_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxFileDataObject_delete }}; static int LUACALL wxLua_wxFileDataObject_constructor(lua_State *L); *************** *** 1003,1007 **** static int LUACALL wxLua_wxFileDataObject_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // call constructor wxFileDataObject* returns = new wxFileDataObject(); --- 990,993 ---- *************** *** 1093,1097 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxTextDataObject_delete[] = { &s_wxluatag_wxTextDataObject, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextDataObject_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxTextDataObject_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxTextDataObject_constructor[] = { &s_wxluaarg_String, NULL }; --- 1079,1083 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxTextDataObject_delete[] = { &s_wxluatag_wxTextDataObject, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextDataObject_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxTextDataObject_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxTextDataObject_constructor[] = { &s_wxluaarg_String, NULL }; *************** *** 1101,1105 **** static int LUACALL wxLua_wxTextDataObject_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 1087,1090 ---- *************** *** 1182,1186 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxBitmapDataObject_delete[] = { &s_wxluatag_wxBitmapDataObject, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapDataObject_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxBitmapDataObject_delete }}; --- 1167,1171 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxBitmapDataObject_delete[] = { &s_wxluatag_wxBitmapDataObject, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapDataObject_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxBitmapDataObject_delete }}; *************** *** 1192,1196 **** static int LUACALL wxLua_wxBitmapDataObject_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 1177,1180 ---- *************** *** 1273,1277 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxURLDataObject_delete[] = { &s_wxluatag_wxURLDataObject, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxURLDataObject_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxURLDataObject_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxURLDataObject_constructor[] = { &s_wxluaarg_String, NULL }; --- 1257,1261 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxURLDataObject_delete[] = { &s_wxluatag_wxURLDataObject, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxURLDataObject_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxURLDataObject_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxURLDataObject_constructor[] = { &s_wxluaarg_String, NULL }; *************** *** 1281,1285 **** static int LUACALL wxLua_wxURLDataObject_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 1265,1268 ---- *************** *** 1440,1444 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_delete[] = { &s_wxluatag_wxDropSource, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxDropSource_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxDropSource_delete }}; --- 1423,1427 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_delete[] = { &s_wxluatag_wxDropSource, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxDropSource_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxDropSource_delete }}; *************** *** 1450,1454 **** static int LUACALL wxLua_wxDropSource_constructor3(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 1433,1436 ---- *************** *** 1482,1486 **** static int LUACALL wxLua_wxDropSource_constructor2(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 1464,1467 ---- *************** *** 1514,1518 **** static int LUACALL wxLua_wxDropSource_constructor1(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 1495,1498 ---- *************** *** 1544,1548 **** static int LUACALL wxLua_wxDropSource_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 1524,1527 ---- *************** *** 1570,1578 **** #if ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) - static int LUACALL wxLua_wxDropSource_constructor_overload(lua_State *L); // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxDropSource_constructor_overload[] = { - { wxLua_wxDropSource_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 5, s_wxluaargArray_None }, #if (((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) --- 1549,1555 ---- *************** *** 1593,1603 **** }; static int s_wxluafunc_wxLua_wxDropSource_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxDropSource_constructor_overload)/sizeof(wxLuaBindCFunc); ! // Overloaded function for wxDropSource::wxDropSource ! static int LUACALL wxLua_wxDropSource_constructor_overload(lua_State *L) ! { ! static wxLuaBindMethod overload_method = ! { "wxDropSource", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxDropSource_constructor_overload, s_wxluafunc_wxLua_wxDropSource_constructor_overload_count, 0 }; ! return wxlua_CallOverloadedFunction(L, &overload_method); ! } #endif // ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) --- 1570,1574 ---- }; static int s_wxluafunc_wxLua_wxDropSource_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxDropSource_constructor_overload)/sizeof(wxLuaBindCFunc); ! #endif // ((((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ))||(((((defined(__WXMSW__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) && (wxLUA_USE_wxCursor))||(((wxLUA_USE_wxIcon) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)) && ((defined(__WXGTK__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)))||(((wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP) && (wxLUA_USE_wxCursor)) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP))) *************** *** 1706,1710 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxDropFilesEvent_delete[] = { &s_wxluatag_wxDropFilesEvent, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxDropFilesEvent_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxDropFilesEvent_delete }}; --- 1677,1681 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxDropFilesEvent_delete[] = { &s_wxluatag_wxDropFilesEvent, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxDropFilesEvent_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxDropFilesEvent_delete }}; *************** *** 1799,1803 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafile_delete[] = { &s_wxluatag_wxMetafile, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxMetafile_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxMetafile_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafile_constructor[] = { &s_wxluaarg_String, NULL }; --- 1770,1774 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafile_delete[] = { &s_wxluatag_wxMetafile, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxMetafile_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxMetafile_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafile_constructor[] = { &s_wxluaarg_String, NULL }; *************** *** 1807,1811 **** static int LUACALL wxLua_wxMetafile_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 1778,1781 ---- *************** *** 1874,1878 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafileDC_delete[] = { &s_wxluatag_wxMetafileDC, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxMetafileDC_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxMetafileDC_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafileDC_constructor[] = { &s_wxluaarg_String, NULL }; --- 1844,1848 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafileDC_delete[] = { &s_wxluatag_wxMetafileDC, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxMetafileDC_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxMetafileDC_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxMetafileDC_constructor[] = { &s_wxluaarg_String, NULL }; *************** *** 1882,1886 **** static int LUACALL wxLua_wxMetafileDC_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 1852,1855 ---- Index: wxcore_help.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_help.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxcore_help.cpp 13 Dec 2007 06:23:54 -0000 1.8 --- wxcore_help.cpp 20 Dec 2007 02:26:57 -0000 1.9 *************** *** 70,74 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxContextHelp_delete[] = { &s_wxluatag_wxContextHelp, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxContextHelp_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxContextHelp_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxContextHelp_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Boolean, NULL }; --- 70,74 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxContextHelp_delete[] = { &s_wxluatag_wxContextHelp, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxContextHelp_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxContextHelp_delete }}; static wxLuaArgTag s_wxluatagArray_wxLua_wxContextHelp_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Boolean, NULL }; *************** *** 78,82 **** static int LUACALL wxLua_wxContextHelp_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 78,81 ---- *************** *** 128,132 **** static int LUACALL wxLua_wxContextHelpButton_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // get number of arguments int argCount = lua_gettop(L); --- 127,130 ---- *************** *** 305,309 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxHelpProvider_delete[] = { &s_wxluatag_wxHelpProvider, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxHelpProvider_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxHelpProvider_delete }}; --- 303,307 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxHelpProvider_delete[] = { &s_wxluatag_wxHelpProvider, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxHelpProvider_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxHelpProvider_delete }}; *************** *** 342,346 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxSimpleHelpProvider_delete[] = { &s_wxluatag_wxSimpleHelpProvider, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSimpleHelpProvider_delete[1] = {{ wxLua_wxluabind_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxSimpleHelpProvider_delete }}; static int LUACALL wxLua_wxSimpleHelpProvider_constructor(lua_State *L); --- 340,344 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxSimpleHelpProvider_delete[] = { &s_wxluatag_wxSimpleHelpProvider, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSimpleHelpProvider_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxSimpleHelpProvider_delete }}; static int LUACALL wxLua_wxSimpleHelpProvider_constructor(lua_State *L); *************** *** 349,353 **** static int LUACALL wxLua_wxSimpleHelpProvider_constructor(lua_State *L) { - wxluabind_removetableforcall(L); // call constructor wxSimpleHelpProvider* returns = new wxSimpleHelpProvider(); --- 347,350 ---- *************** *** 417,421 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxHelpControllerHelpProvider_delete[] = { &s_wxluatag_wxHelpControllerHelpProvider, NULL }; ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxHelpControllerHelpProvider_delete[1] = {{ wxLua_wxluabind_delet... [truncated message content] |
