Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26745/wxLua/modules/wxbind/src Modified Files: wxadv_adv.cpp wxadv_grid.cpp wxaui_aui.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_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: Rename wxlua_getwxstringtype wxlua_getwxStringtype to match other funcs. Fix bug (from w/ last commit) of using wrong key/value indexes in lua_next() loop Index: wxnet_net.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxnet_net.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxnet_net.cpp 7 Dec 2007 02:13:14 -0000 1.4 --- wxnet_net.cpp 7 Dec 2007 06:44:46 -0000 1.5 *************** *** 1134,1138 **** bool returns; // const wxString hostname ! const wxString hostname = wxlua_getwxstringtype(L, 2); // get this wxIPaddress * self = (wxIPaddress *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxIPaddress); --- 1134,1138 ---- bool returns; // const wxString hostname ! const wxString hostname = wxlua_getwxStringtype(L, 2); // get this wxIPaddress * self = (wxIPaddress *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxIPaddress); *************** *** 1240,1244 **** bool returns; // const wxString service ! const wxString service = wxlua_getwxstringtype(L, 2); // get this wxIPaddress * self = (wxIPaddress *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxIPaddress); --- 1240,1244 ---- bool returns; // const wxString service ! const wxString service = wxlua_getwxStringtype(L, 2); // get this wxIPaddress * self = (wxIPaddress *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxIPaddress); *************** *** 1518,1522 **** wxInputStream *returns; // const wxString path ! const wxString path = wxlua_getwxstringtype(L, 2); // get this wxProtocol * self = (wxProtocol *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxProtocol); --- 1518,1522 ---- wxInputStream *returns; // const wxString path ! const wxString path = wxlua_getwxStringtype(L, 2); // get this wxProtocol * self = (wxProtocol *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxProtocol); *************** *** 1555,1559 **** { // const wxString user ! const wxString user = wxlua_getwxstringtype(L, 2); // get this wxProtocol * self = (wxProtocol *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxProtocol); --- 1555,1559 ---- { // const wxString user ! const wxString user = wxlua_getwxStringtype(L, 2); // get this wxProtocol * self = (wxProtocol *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxProtocol); *************** *** 1571,1575 **** { // const wxString user ! const wxString user = wxlua_getwxstringtype(L, 2); // get this wxProtocol * self = (wxProtocol *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxProtocol); --- 1571,1575 ---- { // const wxString user ! const wxString user = wxlua_getwxStringtype(L, 2); // get this wxProtocol * self = (wxProtocol *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxProtocol); *************** *** 1637,1641 **** wxString returns; // const wxString header ! const wxString header = wxlua_getwxstringtype(L, 2); // get this wxHTTP * self = (wxHTTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHTTP); --- 1637,1641 ---- wxString returns; // const wxString header ! const wxString header = wxlua_getwxStringtype(L, 2); // get this wxHTTP * self = (wxHTTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHTTP); *************** *** 1672,1678 **** { // const wxString h_data ! const wxString h_data = wxlua_getwxstringtype(L, 3); // const wxString header ! const wxString header = wxlua_getwxstringtype(L, 2); // get this wxHTTP * self = (wxHTTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHTTP); --- 1672,1678 ---- { // const wxString h_data ! const wxString h_data = wxlua_getwxStringtype(L, 3); // const wxString header ! const wxString header = wxlua_getwxStringtype(L, 2); // get this wxHTTP * self = (wxHTTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHTTP); *************** *** 1750,1754 **** bool returns; // const wxString dir ! const wxString dir = wxlua_getwxstringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); --- 1750,1754 ---- bool returns; // const wxString dir ! const wxString dir = wxlua_getwxStringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); *************** *** 1771,1775 **** char ret = (char)wxlua_getnumbertype(L, 3); // const wxString command ! const wxString command = wxlua_getwxstringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); --- 1771,1775 ---- char ret = (char)wxlua_getnumbertype(L, 3); // const wxString command ! const wxString command = wxlua_getwxStringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); *************** *** 1790,1794 **** bool returns; // const wxString filename ! const wxString filename = wxlua_getwxstringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); --- 1790,1794 ---- bool returns; // const wxString filename ! const wxString filename = wxlua_getwxStringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); *************** *** 1813,1817 **** int argCount = lua_gettop(L); // const wxString wildcard = "" ! const wxString wildcard = (argCount >= 3 ? wxlua_getwxstringtype(L, 3) : wxString(wxEmptyString)); // wxArrayString files wxArrayString * files = (wxArrayString *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxArrayString); --- 1813,1817 ---- int argCount = lua_gettop(L); // const wxString wildcard = "" ! const wxString wildcard = (argCount >= 3 ? wxlua_getwxStringtype(L, 3) : wxString(wxEmptyString)); // wxArrayString files wxArrayString * files = (wxArrayString *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxArrayString); *************** *** 1836,1840 **** int returns; // const wxString filename ! const wxString filename = wxlua_getwxstringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); --- 1836,1840 ---- int returns; // const wxString filename ! const wxString filename = wxlua_getwxStringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); *************** *** 1859,1863 **** int argCount = lua_gettop(L); // const wxString wildcard = "" ! const wxString wildcard = (argCount >= 3 ? wxlua_getwxstringtype(L, 3) : wxString(wxEmptyString)); // wxArrayString files wxArrayString * files = (wxArrayString *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxArrayString); --- 1859,1863 ---- int argCount = lua_gettop(L); // const wxString wildcard = "" ! const wxString wildcard = (argCount >= 3 ? wxlua_getwxStringtype(L, 3) : wxString(wxEmptyString)); // wxArrayString files wxArrayString * files = (wxArrayString *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxArrayString); *************** *** 1901,1905 **** wxOutputStream *returns; // const wxString file ! const wxString file = wxlua_getwxstringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); --- 1901,1905 ---- wxOutputStream *returns; // const wxString file ! const wxString file = wxlua_getwxStringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); *************** *** 1922,1926 **** bool returns; // const wxString dir ! const wxString dir = wxlua_getwxstringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); --- 1922,1926 ---- bool returns; // const wxString dir ! const wxString dir = wxlua_getwxStringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); *************** *** 1958,1964 **** bool returns; // const wxString dst ! const wxString dst = wxlua_getwxstringtype(L, 3); // const wxString src ! const wxString src = wxlua_getwxstringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); --- 1958,1964 ---- bool returns; // const wxString dst ! const wxString dst = wxlua_getwxStringtype(L, 3); // const wxString src ! const wxString src = wxlua_getwxStringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); *************** *** 1979,1983 **** bool returns; // const wxString dir ! const wxString dir = wxlua_getwxstringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); --- 1979,1983 ---- bool returns; // const wxString dir ! const wxString dir = wxlua_getwxStringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); *************** *** 1998,2002 **** bool returns; // const wxString path ! const wxString path = wxlua_getwxstringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); --- 1998,2002 ---- bool returns; // const wxString path ! const wxString path = wxlua_getwxStringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); *************** *** 2017,2021 **** char returns; // const wxString command ! const wxString command = wxlua_getwxstringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); --- 2017,2021 ---- char returns; // const wxString command ! const wxString command = wxlua_getwxStringtype(L, 2); // get this wxFTP * self = (wxFTP *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFTP); *************** *** 2235,2239 **** wxString returns; // const wxString uri ! const wxString uri = wxlua_getwxstringtype(L, 2); // get this wxURI * self = (wxURI *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxURI); --- 2235,2239 ---- wxString returns; // const wxString uri ! const wxString uri = wxlua_getwxStringtype(L, 2); // get this wxURI * self = (wxURI *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxURI); *************** *** 2580,2584 **** wxString returns; // const wxString szEscapedURI ! const wxString szEscapedURI = wxlua_getwxstringtype(L, 1); // call Unescape returns = (wxURI::Unescape(szEscapedURI)); --- 2580,2584 ---- wxString returns; // const wxString szEscapedURI ! const wxString szEscapedURI = wxlua_getwxStringtype(L, 1); // call Unescape returns = (wxURI::Unescape(szEscapedURI)); *************** *** 2672,2676 **** wxURI *returns; // const wxString uri ! const wxString uri = wxlua_getwxstringtype(L, 1); // call constructor returns = new wxURI(uri); --- 2672,2676 ---- wxURI *returns; // const wxString uri ! const wxString uri = wxlua_getwxStringtype(L, 1); // call constructor returns = new wxURI(uri); *************** *** 2856,2860 **** { // const wxString url_proxy ! const wxString url_proxy = wxlua_getwxstringtype(L, 1); // call SetDefaultProxy wxURL::SetDefaultProxy(url_proxy); --- 2856,2860 ---- { // const wxString url_proxy ! const wxString url_proxy = wxlua_getwxStringtype(L, 1); // call SetDefaultProxy wxURL::SetDefaultProxy(url_proxy); *************** *** 2870,2874 **** { // const wxString url_proxy ! const wxString url_proxy = wxlua_getwxstringtype(L, 2); // get this wxURL * self = (wxURL *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxURL); --- 2870,2874 ---- { // const wxString url_proxy ! const wxString url_proxy = wxlua_getwxStringtype(L, 2); // get this wxURL * self = (wxURL *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxURL); *************** *** 2929,2933 **** wxURL *returns; // const wxString sUrl ! const wxString sUrl = wxlua_getwxstringtype(L, 1); // call constructor returns = new wxURL(sUrl); --- 2929,2933 ---- wxURL *returns; // const wxString sUrl ! const wxString sUrl = wxlua_getwxStringtype(L, 1); // call constructor returns = new wxURL(sUrl); Index: wxstc_stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxstc_stc.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxstc_stc.cpp 7 Dec 2007 02:13:14 -0000 1.5 --- wxstc_stc.cpp 7 Dec 2007 06:44:46 -0000 1.6 *************** *** 50,54 **** { // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 50,54 ---- { // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 98,102 **** { // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 98,102 ---- { // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 346,350 **** { // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 346,350 ---- { // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 426,430 **** { // const wxString characterSet ! const wxString characterSet = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 426,430 ---- { // const wxString characterSet ! const wxString characterSet = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 522,526 **** { // const wxString itemList ! const wxString itemList = wxlua_getwxstringtype(L, 3); // int lenEntered int lenEntered = (int)wxlua_getnumbertype(L, 2); --- 522,526 ---- { // const wxString itemList ! const wxString itemList = wxlua_getwxStringtype(L, 3); // int lenEntered int lenEntered = (int)wxlua_getnumbertype(L, 2); *************** *** 540,544 **** { // const wxString characterSet ! const wxString characterSet = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 540,544 ---- { // const wxString characterSet ! const wxString characterSet = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 755,759 **** { // const wxString definition ! const wxString definition = wxlua_getwxstringtype(L, 3); // int pos int pos = (int)wxlua_getnumbertype(L, 2); --- 755,759 ---- { // const wxString definition ! const wxString definition = wxlua_getwxStringtype(L, 3); // int pos int pos = (int)wxlua_getnumbertype(L, 2); *************** *** 1126,1130 **** { // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 3); // int length int length = (int)wxlua_getnumbertype(L, 2); --- 1126,1130 ---- { // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 3); // int length int length = (int)wxlua_getnumbertype(L, 2); *************** *** 1448,1452 **** int flags = (argCount >= 5 ? (int)wxlua_getnumbertype(L, 5) : 0); // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 4); // int maxPos int maxPos = (int)wxlua_getnumbertype(L, 3); --- 1448,1452 ---- int flags = (argCount >= 5 ? (int)wxlua_getnumbertype(L, 5) : 0); // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 4); // int maxPos int maxPos = (int)wxlua_getnumbertype(L, 3); *************** *** 2625,2629 **** wxString returns; // const wxString key ! const wxString key = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 2625,2629 ---- wxString returns; // const wxString key ! const wxString key = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 2644,2648 **** wxString returns; // const wxString key ! const wxString key = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 2644,2648 ---- wxString returns; // const wxString key ! const wxString key = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 2663,2667 **** int returns; // const wxString key ! const wxString key = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 2663,2667 ---- int returns; // const wxString key ! const wxString key = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 3535,3539 **** { // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 3); // int pos int pos = (int)wxlua_getnumbertype(L, 2); --- 3535,3539 ---- { // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 3); // int pos int pos = (int)wxlua_getnumbertype(L, 2); *************** *** 3955,3959 **** bool returns; // const wxString filename ! const wxString filename = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 3955,3959 ---- bool returns; // const wxString filename ! const wxString filename = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 4606,4610 **** { // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 4606,4610 ---- { // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 4623,4627 **** int returns; // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 4623,4627 ---- int returns; // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 4642,4646 **** int returns; // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 4642,4646 ---- int returns; // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 4661,4665 **** bool returns; // const wxString filename ! const wxString filename = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 4661,4665 ---- bool returns; // const wxString filename ! const wxString filename = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 4726,4730 **** int returns; // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 4726,4730 ---- int returns; // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 4745,4749 **** int returns; // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 3); // int flags int flags = (int)wxlua_getnumbertype(L, 2); --- 4745,4749 ---- int returns; // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 3); // int flags int flags = (int)wxlua_getnumbertype(L, 2); *************** *** 4766,4770 **** int returns; // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 3); // int flags int flags = (int)wxlua_getnumbertype(L, 2); --- 4766,4770 ---- int returns; // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 3); // int flags int flags = (int)wxlua_getnumbertype(L, 2); *************** *** 5419,5423 **** { // const wxString keyWords ! const wxString keyWords = wxlua_getwxstringtype(L, 3); // int keywordSet int keywordSet = (int)wxlua_getnumbertype(L, 2); --- 5419,5423 ---- { // const wxString keyWords ! const wxString keyWords = wxlua_getwxStringtype(L, 3); // int keywordSet int keywordSet = (int)wxlua_getnumbertype(L, 2); *************** *** 5485,5489 **** { // const wxString language ! const wxString language = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 5485,5489 ---- { // const wxString language ! const wxString language = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 5787,5793 **** { // const wxString value ! const wxString value = wxlua_getwxstringtype(L, 3); // const wxString key ! const wxString key = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 5787,5793 ---- { // const wxString value ! const wxString value = wxlua_getwxStringtype(L, 3); // const wxString key ! const wxString key = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 6141,6145 **** { // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 6141,6145 ---- { // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 6345,6349 **** { // const wxString characters ! const wxString characters = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 6345,6349 ---- { // const wxString characters ! const wxString characters = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 6383,6387 **** { // const wxString characters ! const wxString characters = wxlua_getwxstringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); --- 6383,6387 ---- { // const wxString characters ! const wxString characters = wxlua_getwxStringtype(L, 2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl); *************** *** 6791,6795 **** { // const wxString fontName ! const wxString fontName = wxlua_getwxstringtype(L, 3); // int style int style = (int)wxlua_getnumbertype(L, 2); --- 6791,6795 ---- { // const wxString fontName ! const wxString fontName = wxlua_getwxStringtype(L, 3); // int style int style = (int)wxlua_getnumbertype(L, 2); *************** *** 6842,6846 **** bool bold = wxlua_getbooleantype(L, 5); // const wxString faceName ! const wxString faceName = wxlua_getwxstringtype(L, 4); // int size int size = (int)wxlua_getnumbertype(L, 3); --- 6842,6846 ---- bool bold = wxlua_getbooleantype(L, 5); // const wxString faceName ! const wxString faceName = wxlua_getwxStringtype(L, 4); // int size int size = (int)wxlua_getnumbertype(L, 3); *************** *** 6957,6961 **** { // const wxString spec ! const wxString spec = wxlua_getwxstringtype(L, 3); // int styleNum int styleNum = (int)wxlua_getnumbertype(L, 2); --- 6957,6961 ---- { // const wxString spec ! const wxString spec = wxlua_getwxStringtype(L, 3); // int styleNum int styleNum = (int)wxlua_getnumbertype(L, 2); *************** *** 7059,7063 **** int returns; // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 3); // int style int style = (int)wxlua_getnumbertype(L, 2); --- 7059,7063 ---- int returns; // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 3); // int style int style = (int)wxlua_getnumbertype(L, 2); *************** *** 7153,7157 **** { // const wxString itemList ! const wxString itemList = wxlua_getwxstringtype(L, 3); // int listType int listType = (int)wxlua_getnumbertype(L, 2); --- 7153,7157 ---- { // const wxString itemList ! const wxString itemList = wxlua_getwxStringtype(L, 3); // int listType int listType = (int)wxlua_getnumbertype(L, 2); *************** *** 7523,7527 **** int argCount = lua_gettop(L); // const wxString name = "wxStyledTextCtrl" ! const wxString name = (argCount >= 6 ? wxlua_getwxstringtype(L, 6) : wxString(wxT("wxStyledTextCtrl"))); // long style = 0 long style = (argCount >= 5 ? (long)wxlua_getnumbertype(L, 5) : 0); --- 7523,7527 ---- int argCount = lua_gettop(L); // const wxString name = "wxStyledTextCtrl" ! const wxString name = (argCount >= 6 ? wxlua_getwxStringtype(L, 6) : wxString(wxT("wxStyledTextCtrl"))); // long style = 0 long style = (argCount >= 5 ? (long)wxlua_getnumbertype(L, 5) : 0); *************** *** 8558,8562 **** { // const wxString val ! const wxString val = wxlua_getwxstringtype(L, 2); // get this wxStyledTextEvent * self = (wxStyledTextEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextEvent); --- 8558,8562 ---- { // const wxString val ! const wxString val = wxlua_getwxStringtype(L, 2); // get this wxStyledTextEvent * self = (wxStyledTextEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextEvent); *************** *** 8782,8786 **** { // const wxString t ! const wxString t = wxlua_getwxstringtype(L, 2); // get this wxStyledTextEvent * self = (wxStyledTextEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextEvent); --- 8782,8786 ---- { // const wxString t ! const wxString t = wxlua_getwxStringtype(L, 2); // get this wxStyledTextEvent * self = (wxStyledTextEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextEvent); Index: wxxrc_xrc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxxrc_xrc.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxxrc_xrc.cpp 7 Dec 2007 02:13:14 -0000 1.4 --- wxxrc_xrc.cpp 7 Dec 2007 06:44:46 -0000 1.5 *************** *** 43,47 **** wxWindow * control = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); // const wxString name ! const wxString name = wxlua_getwxstringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); --- 43,47 ---- wxWindow * control = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); // const wxString name ! const wxString name = wxlua_getwxStringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); *************** *** 153,157 **** int value_if_not_found = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxID_NONE); // const wxString stringID ! const wxString stringID = wxlua_getwxstringtype(L, 1); // call GetXRCID returns = (wxXmlResource::GetXRCID(stringID, value_if_not_found)); --- 153,157 ---- int value_if_not_found = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxID_NONE); // const wxString stringID ! const wxString stringID = wxlua_getwxStringtype(L, 1); // call GetXRCID returns = (wxXmlResource::GetXRCID(stringID, value_if_not_found)); *************** *** 184,188 **** bool returns; // const wxString filemask ! const wxString filemask = wxlua_getwxstringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); --- 184,188 ---- bool returns; // const wxString filemask ! const wxString filemask = wxlua_getwxStringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); *************** *** 205,209 **** wxBitmap *returns; // const wxString name ! const wxString name = wxlua_getwxstringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); --- 205,209 ---- wxBitmap *returns; // const wxString name ! const wxString name = wxlua_getwxStringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); *************** *** 230,234 **** bool returns; // const wxString name ! const wxString name = wxlua_getwxstringtype(L, 4); // wxWindow parent wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); --- 230,234 ---- bool returns; // const wxString name ! const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); *************** *** 253,257 **** wxDialog *returns; // const wxString name ! const wxString name = wxlua_getwxstringtype(L, 3); // wxWindow parent wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); --- 253,257 ---- wxDialog *returns; // const wxString name ! const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); *************** *** 277,281 **** bool returns; // const wxString name ! const wxString name = wxlua_getwxstringtype(L, 4); // wxWindow parent wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); --- 277,281 ---- bool returns; // const wxString name ! const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); *************** *** 303,307 **** wxIcon *returns; // const wxString name ! const wxString name = wxlua_getwxstringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); --- 303,307 ---- wxIcon *returns; // const wxString name ! const wxString name = wxlua_getwxStringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); *************** *** 328,332 **** wxMenu *returns; // const wxString name ! const wxString name = wxlua_getwxstringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); --- 328,332 ---- wxMenu *returns; // const wxString name ! const wxString name = wxlua_getwxStringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); *************** *** 347,351 **** wxMenuBar *returns; // const wxString name ! const wxString name = wxlua_getwxstringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); --- 347,351 ---- wxMenuBar *returns; // const wxString name ! const wxString name = wxlua_getwxStringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); *************** *** 366,370 **** wxMenuBar *returns; // const wxString name ! const wxString name = wxlua_getwxstringtype(L, 3); // wxWindow parent wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); --- 366,370 ---- wxMenuBar *returns; // const wxString name ! const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); *************** *** 389,393 **** bool returns; // const wxString name ! const wxString name = wxlua_getwxstringtype(L, 4); // wxWindow parent wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); --- 389,393 ---- bool returns; // const wxString name ! const wxString name = wxlua_getwxStringtype(L, 4); // wxWindow parent wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxWindow); *************** *** 412,416 **** wxPanel *returns; // const wxString name ! const wxString name = wxlua_getwxstringtype(L, 3); // wxWindow parent wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); --- 412,416 ---- wxPanel *returns; // const wxString name ! const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); *************** *** 435,439 **** wxToolBar *returns; // const wxString name ! const wxString name = wxlua_getwxstringtype(L, 3); // wxWindow parent wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); --- 435,439 ---- wxToolBar *returns; // const wxString name ! const wxString name = wxlua_getwxStringtype(L, 3); // wxWindow parent wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); *************** *** 476,480 **** { // const wxString domain ! const wxString domain = wxlua_getwxstringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); --- 476,480 ---- { // const wxString domain ! const wxString domain = wxlua_getwxStringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); *************** *** 509,513 **** bool returns; // const wxString filename ! const wxString filename = wxlua_getwxstringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); --- 509,513 ---- bool returns; // const wxString filename ! const wxString filename = wxlua_getwxStringtype(L, 2); // get this wxXmlResource * self = (wxXmlResource *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlResource); *************** *** 546,554 **** int argCount = lua_gettop(L); // const wxString domain = "" ! const wxString domain = (argCount >= 3 ? wxlua_getwxstringtype(L, 3) : wxString(wxEmptyString)); // int flags = wxXRC_USE_LOCALE int flags = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxXRC_USE_LOCALE); // const wxString filemask ! const wxString filemask = wxlua_getwxstringtype(L, 1); // call constructor returns = new wxXmlResource(filemask, flags, domain); --- 546,554 ---- int argCount = lua_gettop(L); // const wxString domain = "" ! const wxString domain = (argCount >= 3 ? wxlua_getwxStringtype(L, 3) : wxString(wxEmptyString)); // int flags = wxXRC_USE_LOCALE int flags = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxXRC_USE_LOCALE); // const wxString filemask ! const wxString filemask = wxlua_getwxStringtype(L, 1); // call constructor returns = new wxXmlResource(filemask, flags, domain); *************** *** 572,576 **** int argCount = lua_gettop(L); // const wxString domain = "" ! const wxString domain = (argCount >= 2 ? wxlua_getwxstringtype(L, 2) : wxString(wxEmptyString)); // int flags = wxXRC_USE_LOCALE int flags = (argCount >= 1 ? (int)wxlua_getnumbertype(L, 1) : wxXRC_USE_LOCALE); --- 572,576 ---- int argCount = lua_gettop(L); // const wxString domain = "" ! const wxString domain = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString)); // int flags = wxXRC_USE_LOCALE int flags = (argCount >= 1 ? (int)wxlua_getnumbertype(L, 1) : wxXRC_USE_LOCALE); Index: wxcore_core.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_core.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxcore_core.cpp 7 Dec 2007 02:13:12 -0000 1.4 --- wxcore_core.cpp 7 Dec 2007 06:44:44 -0000 1.5 *************** *** 224,228 **** bool bShow = (argCount >= 3 ? wxlua_getbooleantype(L, 3) : true); // const wxString szTitle ! const wxString szTitle = wxlua_getwxstringtype(L, 2); // wxWindow pParent wxWindow * pParent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); --- 224,228 ---- bool bShow = (argCount >= 3 ? wxlua_getbooleantype(L, 3) : true); // const wxString szTitle ! const wxString szTitle = wxlua_getwxStringtype(L, 2); // wxWindow pParent wxWindow * pParent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow); Index: wxcore_clipdrag.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_clipdrag.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxcore_clipdrag.cpp 7 Dec 2007 02:13:12 -0000 1.4 --- wxcore_clipdrag.cpp 7 Dec 2007 06:44:43 -0000 1.5 *************** *** 397,401 **** { // const wxString format ! const wxString format = wxlua_getwxstringtype(L, 2); // get this wxDataFormat * self = (wxDataFormat *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDataFormat); --- 397,401 ---- { // const wxString format ! const wxString format = wxlua_getwxStringtype(L, 2); // get this wxDataFormat * self = (wxDataFormat *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDataFormat); *************** *** 465,469 **** wxDataFormat *returns; // const wxString format ! const wxString format = wxlua_getwxstringtype(L, 1); // call constructor returns = new wxDataFormat(format); --- 465,469 ---- wxDataFormat *returns; // const wxString format ! const wxString format = wxlua_getwxStringtype(L, 1); // call constructor returns = new wxDataFormat(format); *************** *** 1038,1042 **** { // const wxString file ! const wxString file = wxlua_getwxstringtype(L, 2); // get this wxFileDataObject * self = (wxFileDataObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileDataObject); --- 1038,1042 ---- { // const wxString file ! const wxString file = wxlua_getwxStringtype(L, 2); // get this wxFileDataObject * self = (wxFileDataObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileDataObject); *************** *** 1174,1178 **** { // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 2); // get this wxTextDataObject * self = (wxTextDataObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxTextDataObject); --- 1174,1178 ---- { // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 2); // get this wxTextDataObject * self = (wxTextDataObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxTextDataObject); *************** *** 1209,1213 **** int argCount = lua_gettop(L); // const wxString text = "" ! const wxString text = (argCount >= 1 ? wxlua_getwxstringtype(L, 1) : wxString(wxEmptyString)); // call constructor returns = new wxTextDataObject(text); --- 1209,1213 ---- int argCount = lua_gettop(L); // const wxString text = "" ! const wxString text = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxEmptyString)); // call constructor returns = new wxTextDataObject(text); *************** *** 1382,1386 **** { // const wxString url ! const wxString url = wxlua_getwxstringtype(L, 2); // get this wxURLDataObject * self = (wxURLDataObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxURLDataObject); --- 1382,1386 ---- { // const wxString url ! const wxString url = wxlua_getwxStringtype(L, 2); // get this wxURLDataObject * self = (wxURLDataObject *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxURLDataObject); *************** *** 1417,1421 **** int argCount = lua_gettop(L); // const wxString url = "" ! const wxString url = (argCount >= 1 ? wxlua_getwxstringtype(L, 1) : wxString(wxEmptyString)); // call constructor returns = new wxURLDataObject(url); --- 1417,1421 ---- int argCount = lua_gettop(L); // const wxString url = "" ! const wxString url = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxEmptyString)); // call constructor returns = new wxURLDataObject(url); *************** *** 1992,1996 **** int argCount = lua_gettop(L); // const wxString filename = "" ! const wxString filename = (argCount >= 1 ? wxlua_getwxstringtype(L, 1) : wxString(wxEmptyString)); // call constructor returns = new wxMetafile(filename); --- 1992,1996 ---- int argCount = lua_gettop(L); // const wxString filename = "" ! const wxString filename = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxEmptyString)); // call constructor returns = new wxMetafile(filename); *************** *** 2081,2085 **** int argCount = lua_gettop(L); // const wxString filename = "" ! const wxString filename = (argCount >= 1 ? wxlua_getwxstringtype(L, 1) : wxString(wxEmptyString)); // call constructor returns = new wxMetafileDC(filename); --- 2081,2085 ---- int argCount = lua_gettop(L); // const wxString filename = "" ! const wxString filename = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxEmptyString)); // call constructor returns = new wxMetafileDC(filename); Index: wxcore_help.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_help.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxcore_help.cpp 7 Dec 2007 02:13:12 -0000 1.4 --- wxcore_help.cpp 7 Dec 2007 06:44:44 -0000 1.5 *************** *** 200,204 **** { // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 3); // wxWindow window wxWindow * window = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); --- 200,204 ---- { // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 3); // wxWindow window wxWindow * window = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); *************** *** 589,593 **** bool returns; // const wxString section ! const wxString section = wxlua_getwxstringtype(L, 2); // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); --- 589,593 ---- bool returns; // const wxString section ! const wxString section = wxlua_getwxStringtype(L, 2); // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); *************** *** 631,635 **** const wxPoint * pos = (const wxPoint *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxPoint); // const wxString text ! const wxString text = wxlua_getwxstringtype(L, 2); // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); --- 631,635 ---- const wxPoint * pos = (const wxPoint *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxPoint); // const wxString text ! const wxString text = wxlua_getwxStringtype(L, 2); // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); *************** *** 701,705 **** { // const wxString file ! const wxString file = wxlua_getwxstringtype(L, 2); // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); --- 701,705 ---- { // const wxString file ! const wxString file = wxlua_getwxStringtype(L, 2); // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); *************** *** 722,726 **** wxHelpSearchMode mode = (argCount >= 3 ? (wxHelpSearchMode)wxlua_getintegertype(L, 3) : wxHELP_SEARCH_ALL); // const wxString keyWord ! const wxString keyWord = wxlua_getwxstringtype(L, 2); // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); --- 722,726 ---- wxHelpSearchMode mode = (argCount >= 3 ? (wxHelpSearchMode)wxlua_getintegertype(L, 3) : wxHELP_SEARCH_ALL); // const wxString keyWord ! const wxString keyWord = wxlua_getwxStringtype(L, 2); // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); *************** *** 743,747 **** int argCount = lua_gettop(L); // const wxString file = "" ! const wxString file = (argCount >= 2 ? wxlua_getwxstringtype(L, 2) : wxString(wxEmptyString)); // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); --- 743,747 ---- int argCount = lua_gettop(L); // const wxString file = "" ! const wxString file = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString)); // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); *************** *** 788,792 **** const wxSize * size = (const wxSize *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxSize); // const wxString title ! const wxString title = wxlua_getwxstringtype(L, 2); // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); --- 788,792 ---- const wxSize * size = (const wxSize *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxSize); // const wxString title ! const wxString title = wxlua_getwxStringtype(L, 2); // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); *************** *** 827,831 **** long flags = (long)wxlua_getnumbertype(L, 3); // const wxString viewer ! const wxString viewer = wxlua_getwxstringtype(L, 2); // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); --- 827,831 ---- long flags = (long)wxlua_getnumbertype(L, 3); // const wxString viewer ! const wxString viewer = wxlua_getwxStringtype(L, 2); // get this wxHelpControllerBase * self = (wxHelpControllerBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHelpControllerBase); Index: wxcore_gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_gdi.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxcore_gdi.cpp 7 Dec 2007 02:13:12 -0000 1.6 --- wxcore_gdi.cpp 7 Dec 2007 06:44:44 -0000 1.7 *************** *** 3686,3690 **** wxFontEncoding encoding = (argCount >= 5 ? (wxFontEncoding)wxlua_getintegertype(L, 5) : wxFONTENCODING_DEFAULT); // const wxString faceName = "" ! const wxString faceName = (argCount >= 4 ? wxlua_getwxstringtype(L, 4) : wxString(wxEmptyString)); // int flags = wxFONTFLAG_DEFAULT int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : wxFONTFLAG_DEFAULT); --- 3686,3690 ---- wxFontEncoding encoding = (argCount >= 5 ? (wxFontEncoding)wxlua_getintegertype(L, 5) : wxFONTENCODING_DEFAULT); // const wxString faceName = "" ! const wxString faceName = (argCount >= 4 ? wxlua_getwxStringtype(L, 4) : wxString(wxEmptyString)); // int flags = wxFONTFLAG_DEFAULT int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : wxFONTFLAG_DEFAULT); *************** *** 3714,3718 **** wxFontEncoding encoding = (argCount >= 7 ? (wxFontEncoding)wxlua_getintegertype(L, 7) : wxFONTENCODING_DEFAULT); // const wxString faceName = "" ! const wxString faceName = (argCount >= 6 ? wxlua_getwxstringtype(L, 6) : wxString(wxEmptyString)); // const bool underline = false const bool underline = (argCount >= 5 ? wxlua_getbooleantype(L, 5) : false); --- 3714,3718 ---- wxFontEncoding encoding = (argCount >= 7 ? (wxFontEncoding)wxlua_getintegertype(L, 7) : wxFONTENCODING_DEFAULT); // const wxString faceName = "" ! const wxString faceName = (argCount >= 6 ? wxlua_getwxStringtype(L, 6) : wxString(wxEmptyString)); // const bool underline = false const bool underline = (argCount >= 5 ? wxlua_getbooleantype(L, 5) : false); *************** *** 3749,3753 **** wxFontEncoding encoding = (argCount >= 5 ? (wxFontEncoding)wxlua_getintegertype(L, 5) : wxFONTENCODING_DEFAULT); // const wxString faceName = "" ! const wxString faceName = (argCount >= 4 ? wxlua_getwxstringtype(L, 4) : wxString(wxEmptyString)); // int flags = wxFONTFLAG_DEFAULT int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : wxFONTFLAG_DEFAULT); --- 3749,3753 ---- wxFontEncoding encoding = (argCount >= 5 ? (wxFontEncoding)wxlua_getintegertype(L, 5) : wxFONTENCODING_DEFAULT); // const wxString faceName = "" ! const wxString faceName = (argCount >= 4 ? wxlua_getwxStringtype(L, 4) : wxString(wxEmptyString)); // int flags = wxFONTFLAG_DEFAULT int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : wxFONTFLAG_DEFAULT); *************** *** 3777,3781 **** wxFontEncoding encoding = (argCount >= 7 ? (wxFontEncoding)wxlua_getintegertype(L, 7) : wxFONTENCODING_DEFAULT); // const wxString faceName = "" ! const wxString faceName = (argCount >= 6 ? wxlua_getwxstringtype(L, 6) : wxString(wxEmptyString)); // const bool underline = false const bool underline = (argCount >= 5 ? wxlua_getbooleantype(L, 5) : false); --- 3777,3781 ---- wxFontEncoding encoding = (argCount >= 7 ? (wxFontEncoding)wxlua_getintegertype(L, 7) : wxFONTENCODING_DEFAULT); // const wxString faceName = "" ! const wxString faceName = (argCount >= 6 ? wxlua_getwxStringtype(L, 6) : wxString(wxEmptyString)); // const bool underline = false const bool underline = (argCount >= 5 ? wxlua_getbooleantype(L, 5) : false); *************** *** 3843,3847 **** bool returns; // const wxString faceName ! const wxString faceName = wxlua_getwxstringtype(L, 2); // get this wxFont * self = (wxFont *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFont); --- 3843,3847 ---- bool returns; // const wxString faceName ! const wxString faceName = wxlua_getwxStringtype(L, 2); // get this wxFont * self = (wxFont *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFont); *************** *** 3864,3868 **** { // const wxString faceName ! const wxString faceName = wxlua_getwxstringtype(L, 2); // get this wxFont * self = (wxFont *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFont); --- 3864,3868 ---- { // const wxString faceName ! const wxString faceName = wxlua_getwxStringtype(L, 2); // get this wxFont * self = (wxFont *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFont); *************** *** 3901,3905 **** bool returns; // const wxString info ! const wxString info = wxlua_getwxstringtype(L, 2); // get this wxFont * self = (wxFont *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFont); --- 3901,3905 ---- bool returns; // const wxString info ! const wxString info = wxlua_getwxStringtype(L, 2); // get this wxFont * self = (wxFont *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFont); *************** *** 3922,3926 **** { // const wxString info ! const wxString info = wxlua_getwxstringtype(L, 2); // get this wxFont * self = (wxFont *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFont); --- 3922,3926 ---- { // const wxString info ! const wxString info = wxlua_getwxStringtype(L, 2); // get this wxFont * self = (wxFont *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFont); *************** *** 3942,3946 **** bool returns; // const wxString info ! const wxString info = wxlua_getwxstringtype(L, 2); // get this wxFont * self = (wxFont *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFont); --- 3942,3946 ---- bool returns; // const wxString info ! const wxString info = wxlua_getwxStringtype(L, 2); // get this wxFont * self = (wxFont *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFont); *************** *** 4108,4112 **** wxFontEncoding encoding = (argCount >= 7 ? (wxFontEncoding)wxlua_getintegertype(L, 7) : wxFONTENCODING_DEFAULT); // const wxString faceName = "" ! const wxString faceName = (argCount >= 6 ? wxlua_getwxstringtype(L, 6) : wxString(wxEmptyString)); // const bool underline = false const bool underline = (argCount >= 5 ? wxlua_getbooleantype(L, 5) : false); --- 4108,4112 ---- wxFontEncoding encoding = (argCount >= 7 ? (wxFontEncoding)wxlua_getintegertype(L, 7) : wxFONTENCODING_DEFAULT); // const wxString faceName = "" ! const wxString faceName = (argCount >= 6 ? wxlua_getwxStringtype(L, 6) : wxString(wxEmptyString)); // const bool underline = false const bool underline = (argCount >= 5 ? wxlua_getbooleantype(L, 5) : false); *************** *** 4265,4269 **** bool returns; // const wxString s ! const wxString s = wxlua_getwxstringtype(L, 2); // get this wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxNativeFontInfo); --- 4265,4269 ---- bool returns; // const wxString s ! const wxString s = wxlua_getwxStringtype(L, 2); // get this wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxNativeFontInfo); *************** *** 4284,4288 **** bool returns; // const wxString s ! const wxString s = wxlua_getwxstringtype(L, 2); // get this wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxNativeFontInfo); --- 4284,4288 ---- bool returns; // const wxString s ! const wxString s = wxlua_getwxStringtype(L, 2); // get this wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxNativeFontInfo); *************** *** 4489,4493 **** { // const wxString facename ! const wxString facename = wxlua_getwxstringtype(L, 2); // get this wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxNativeFontInfo); --- 4489,4493 ---- { // const wxString facename ! const wxString facename = wxlua_getwxStringtype(L, 2); // get this wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxNativeFontInfo); *************** *** 4509,4513 **** bool returns; // const wxString facename ! const wxString facename = wxlua_getwxstringtype(L, 2); // get this wxNativeFontInfo * self = (wxNativeFontInfo *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxNativeFontInfo); --- 4509,4513 ---- bool returns; // const wxString facename ! const wxString facename = wxlua_getwxStringtype(L, 2); // get this ... [truncated message content] |