Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.32, 1.33 clipdrag.cpp, 1.28, 1.29 config.cpp, 1.25, 1.26 controls.cpp, 1.40, 1.41 data.cpp, 1.31, 1.32 datetime.cpp, 1.26, 1.27 dialogs.cpp, 1.26, 1.27 event.cpp, 1.33, 1.34 file.cpp, 1.29, 1.30 gdi.cpp, 1.46, 1.47 grid.cpp, 1.24, 1.25 help.cpp, 1.21, 1.22 html.cpp, 1.26, 1.27 image.cpp, 1.24, 1.25 mdi.cpp, 1.23, 1.24 menutool.cpp, 1.25, 1.26 print.cpp, 1.25, 1.26 regex.cpp, 1.19, 1.20 socket.cpp, 1.25, 1.26 wave.cpp, 1.23, 1.24 windows.cpp, 1.37, 1.38 wx_bind.cpp, 1.75, 1.76 wxlhtmlwin.cpp, 1.13, 1.14 wxlua.cpp, 1.26, 1.27 xml.cpp, 1.20, 1.21
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28638/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp dialogs.cpp event.cpp file.cpp gdi.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp socket.cpp wave.cpp windows.cpp wx_bind.cpp wxlhtmlwin.cpp wxlua.cpp xml.cpp Log Message: use wxLuaState::GetwxStringType instead of lua2wx use wxLuaState::lua_PushString instead of wx2lua fix name == nil when adding notebook page to the wxLua editor Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** xml.cpp 22 Feb 2007 00:01:36 -0000 1.20 --- xml.cpp 22 Feb 2007 05:40:53 -0000 1.21 *************** *** 212,216 **** returns = self->GetName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 212,216 ---- returns = self->GetName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 227,231 **** returns = self->GetContent(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 227,231 ---- returns = self->GetContent(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 302,306 **** wxString value; // const wxString& propName ! wxString propName = lua2wx(wxlState.GetStringType(2)); // get this wxXmlNode *self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); --- 302,306 ---- wxString value; // const wxString& propName ! wxString propName = wxlState.GetwxStringType(2); // get this wxXmlNode *self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); *************** *** 310,314 **** lua_pushboolean(L, returns); // push the result string ! lua_pushstring(L, wx2lua(value)); // return the number of parameters return 2; --- 310,314 ---- lua_pushboolean(L, returns); // push the result string ! wxlState.lua_PushString(value); // return the number of parameters return 2; *************** *** 330,334 **** returns = self->GetPropVal(propName, defaultVal); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 330,334 ---- returns = self->GetPropVal(propName, defaultVal); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 605,609 **** returns = self->GetName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 605,609 ---- returns = self->GetName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 620,624 **** returns = self->GetValue(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 620,624 ---- returns = self->GetValue(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 861,865 **** returns = self->GetVersion(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 861,865 ---- returns = self->GetVersion(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 876,880 **** returns = self->GetFileEncoding(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 876,880 ---- returns = self->GetFileEncoding(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1091,1095 **** returns = new wxDialog; // const wxString& name ! wxString name = lua2wx(wxlState.GetStringType(3)); // wxWindow* parent wxWindow *parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 1091,1095 ---- returns = new wxDialog; // const wxString& name ! wxString name = wxlState.GetwxStringType(3); // wxWindow* parent wxWindow *parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 1143,1147 **** returns = new wxFrame; // const wxString& name ! wxString name = lua2wx(wxlState.GetStringType(3)); // wxWindow* parent wxWindow *parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 1143,1147 ---- returns = new wxFrame; // const wxString& name ! wxString name = wxlState.GetwxStringType(3); // wxWindow* parent wxWindow *parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 1438,1442 **** int returns; // const wxString &stringID ! wxString stringID = lua2wx(wxlState.GetStringType(2)); // call GetXRCID returns = wxXmlResource::GetXRCID(stringID); --- 1438,1442 ---- int returns; // const wxString &stringID ! wxString stringID = wxlState.GetwxStringType(2); // call GetXRCID returns = wxXmlResource::GetXRCID(stringID); Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** dialogs.cpp 22 Feb 2007 00:01:34 -0000 1.26 --- dialogs.cpp 22 Feb 2007 05:40:52 -0000 1.27 *************** *** 199,203 **** returns = self->GetTitle(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 199,203 ---- returns = self->GetTitle(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 463,467 **** returns = self->GetName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 463,467 ---- returns = self->GetName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 508,512 **** returns = self->GetVersion(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 508,512 ---- returns = self->GetVersion(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 553,557 **** returns = self->GetDescription(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 553,557 ---- returns = self->GetDescription(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 598,602 **** returns = self->GetCopyright(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 598,602 ---- returns = self->GetCopyright(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 658,662 **** returns = self->GetLicence(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 658,662 ---- returns = self->GetLicence(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 722,726 **** returns = self->GetWebSiteURL(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 722,726 ---- returns = self->GetWebSiteURL(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 737,741 **** returns = self->GetWebSiteDescription(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 737,741 ---- returns = self->GetWebSiteDescription(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1395,1399 **** returns = self->GetDirectory(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1395,1399 ---- returns = self->GetDirectory(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1410,1414 **** returns = self->GetFilename(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1410,1414 ---- returns = self->GetFilename(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1440,1444 **** returns = self->GetMessage(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1440,1444 ---- returns = self->GetMessage(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1455,1459 **** returns = self->GetPath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1455,1459 ---- returns = self->GetPath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1470,1474 **** returns = self->GetWildcard(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1470,1474 ---- returns = self->GetWildcard(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1706,1710 **** returns = self->GetPath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1706,1710 ---- returns = self->GetPath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1721,1725 **** returns = self->GetMessage(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1721,1725 ---- returns = self->GetMessage(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1988,1994 **** int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(4, choices); // const wxString caption ! const wxString caption = lua2wx(wxlState.GetStringType(3)); // const wxString message ! const wxString message = lua2wx(wxlState.GetStringType(2)); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); --- 1988,1994 ---- int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(4, choices); // const wxString caption ! const wxString caption = wxlState.GetwxStringType(3); // const wxString message ! const wxString message = wxlState.GetwxStringType(2); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); *************** *** 2031,2035 **** returns = self->GetStringSelection(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2031,2035 ---- returns = self->GetStringSelection(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2131,2135 **** returns = self->GetValue(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2131,2135 ---- returns = self->GetValue(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2802,2806 **** returns = self->GetFindString(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2802,2806 ---- returns = self->GetFindString(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2817,2821 **** returns = self->GetReplaceString(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2817,2821 ---- returns = self->GetReplaceString(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2985,2989 **** returns = self->GetFindString(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2985,2989 ---- returns = self->GetFindString(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3000,3004 **** returns = self->GetReplaceString(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 3000,3004 ---- returns = self->GetReplaceString(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3176,3180 **** int argCount = lua_gettop(L); // const wxString newmsg = "" ! const wxString newmsg = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxEmptyString)); // int value = -1 int value = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : -1); --- 3176,3180 ---- int argCount = lua_gettop(L); // const wxString newmsg = "" ! const wxString newmsg = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); // int value = -1 int value = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : -1); Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxlua.cpp 7 Feb 2007 18:39:12 -0000 1.26 --- wxlua.cpp 22 Feb 2007 05:40:53 -0000 1.27 *************** *** 236,240 **** wxLuaObject * pObject = (argCount >= 2 ? (wxLuaObject *)wxlState.GetUserDataType(2, s_wxluatag_wxLuaObject) : NULL); // const wxString title = "Printout" ! const wxString title = (argCount >= 1 ? lua2wx(wxlState.GetStringType(1)) : wxString(wxT("Printout"))); // call constructor returns = new wxLuaPrintout(wxlState, title, pObject); --- 236,240 ---- wxLuaObject * pObject = (argCount >= 2 ? (wxLuaObject *)wxlState.GetUserDataType(2, s_wxluatag_wxLuaObject) : NULL); // const wxString title = "Printout" ! const wxString title = (argCount >= 1 ? wxlState.GetwxStringType(1) : wxString(wxT("Printout"))); // call constructor returns = new wxLuaPrintout(wxlState, title, pObject); *************** *** 345,349 **** int argCount = lua_gettop(L); // const wxString name = "wxLuaHtmlWindow" ! const wxString name = (argCount >= 6 ? lua2wx(wxlState.GetStringType(6)) : wxString(wxT("wxLuaHtmlWindow"))); // long style = wxHW_SCROLLBAR_AUTO long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxHW_SCROLLBAR_AUTO); --- 345,349 ---- int argCount = lua_gettop(L); // const wxString name = "wxLuaHtmlWindow" ! const wxString name = (argCount >= 6 ? wxlState.GetwxStringType(6) : wxString(wxT("wxLuaHtmlWindow"))); // long style = wxHW_SCROLLBAR_AUTO long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxHW_SCROLLBAR_AUTO); Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** image.cpp 22 Feb 2007 00:01:35 -0000 1.24 --- image.cpp 22 Feb 2007 05:40:53 -0000 1.25 *************** *** 602,606 **** returns = wxImage::GetImageExtWildcard(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 602,606 ---- returns = wxImage::GetImageExtWildcard(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 894,898 **** returns = self->GetOption(name); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 894,898 ---- returns = self->GetOption(name); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1666,1670 **** returns = self->GetName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1666,1670 ---- returns = self->GetName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1681,1685 **** returns = self->GetExtension(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1681,1685 ---- returns = self->GetExtension(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1711,1715 **** returns = self->GetMimeType(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1711,1715 ---- returns = self->GetMimeType(); // push the result string ! wxlState.lua_PushString(returns); return 1; Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mdi.cpp 22 Feb 2007 00:01:35 -0000 1.23 --- mdi.cpp 22 Feb 2007 05:40:53 -0000 1.24 *************** *** 1130,1134 **** returns = self->GetLastDirectory(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1130,1134 ---- returns = self->GetLastDirectory(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1173,1177 **** bool returns; // wxString buf ! wxString buf = lua2wx(wxlState.GetStringType(2)); // get this wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); --- 1173,1177 ---- bool returns; // wxString buf ! wxString buf = wxlState.GetwxStringType(2); // get this wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); *************** *** 1180,1184 **** // push the result flag lua_pushboolean(L, returns); ! lua_pushstring(L, wx2lua(buf)); return 2; --- 1180,1184 ---- // push the result flag lua_pushboolean(L, returns); ! wxlState.lua_PushString(buf); return 2; *************** *** 1599,1603 **** returns = self->GetDefaultExtension(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1599,1603 ---- returns = self->GetDefaultExtension(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1614,1618 **** returns = self->GetDescription(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1614,1618 ---- returns = self->GetDescription(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1629,1633 **** returns = self->GetDirectory(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1629,1633 ---- returns = self->GetDirectory(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1659,1663 **** returns = self->GetDocumentName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1659,1663 ---- returns = self->GetDocumentName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1674,1678 **** returns = self->GetFileFilter(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1674,1678 ---- returns = self->GetFileFilter(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1704,1708 **** returns = self->GetViewName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1704,1708 ---- returns = self->GetViewName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2094,2098 **** returns = self->GetDocumentName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2094,2098 ---- returns = self->GetDocumentName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2124,2128 **** returns = self->GetFilename(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2124,2128 ---- returns = self->GetFilename(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2151,2160 **** wxLuaState wxlState(L); // wxString name ! wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetPrintableName self->GetPrintableName(name); ! lua_pushstring(L, wx2lua(name)); return 1; --- 2151,2160 ---- wxLuaState wxlState(L); // wxString name ! wxString name = wxlState.GetwxStringType(2); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetPrintableName self->GetPrintableName(name); ! wxlState.lua_PushString(name); return 1; *************** *** 2171,2175 **** returns = self->GetTitle(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2171,2175 ---- returns = self->GetTitle(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2657,2661 **** returns = self->GetViewName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2657,2661 ---- returns = self->GetViewName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2991,2995 **** returns = self->GetRedoAccelerator(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2991,2995 ---- returns = self->GetRedoAccelerator(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3006,3010 **** returns = self->GetRedoMenuLabel(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 3006,3010 ---- returns = self->GetRedoMenuLabel(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3021,3025 **** returns = self->GetUndoAccelerator(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 3021,3025 ---- returns = self->GetUndoAccelerator(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3036,3040 **** returns = self->GetUndoMenuLabel(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 3036,3040 ---- returns = self->GetUndoMenuLabel(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3269,3273 **** returns = self->GetName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 3269,3273 ---- returns = self->GetName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3463,3467 **** returns = self->GetHistoryFile(index); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 3463,3467 ---- returns = self->GetHistoryFile(index); // push the result string ! wxlState.lua_PushString(returns); return 1; Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** config.cpp 22 Feb 2007 00:01:34 -0000 1.25 --- config.cpp 22 Feb 2007 05:40:52 -0000 1.26 *************** *** 80,90 **** long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE); // const wxString& globalFilename = "" ! wxString globalFilename = (argCount >= 4 ? lua2wx(lua_tostring(L, 4)) : wxString(wxEmptyString)); // const wxString& localFilename = "", ! wxString localFilename = (argCount >= 3 ? lua2wx(lua_tostring(L, 3)) : wxString(wxEmptyString)); // const wxString& vendorName = "" ! wxString vendorName = (argCount >= 2 ? lua2wx(lua_tostring(L, 2)) : wxString(wxEmptyString)); // const wxString& appName = "" ! wxString appName = (argCount >= 1 ? lua2wx(lua_tostring(L, 1)) : wxString(wxEmptyString)); // call constructor returns = (wxConfigBase*)new wxFileConfig(appName, vendorName, localFilename, globalFilename, style); --- 80,90 ---- long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE); // const wxString& globalFilename = "" ! wxString globalFilename = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxString(wxEmptyString)); // const wxString& localFilename = "", ! wxString localFilename = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); // const wxString& vendorName = "" ! wxString vendorName = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString)); // const wxString& appName = "" ! wxString appName = (argCount >= 1 ? wxlState.GetwxStringType(1) : wxString(wxEmptyString)); // call constructor returns = (wxConfigBase*)new wxFileConfig(appName, vendorName, localFilename, globalFilename, style); *************** *** 235,239 **** returns = self->GetAppName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 235,239 ---- returns = self->GetAppName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 268,272 **** // these are optional and are not used anyway long index = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); ! wxString str = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxEmptyString)); // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); --- 268,272 ---- // these are optional and are not used anyway long index = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); ! wxString str = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString)); // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); *************** *** 276,280 **** lua_pushboolean(L, returns); // push the result string ! lua_pushstring(L, wx2lua(str)); // push the next index lua_pushnumber(L, index); --- 276,280 ---- lua_pushboolean(L, returns); // push the result string ! wxlState.lua_PushString(str); // push the next index lua_pushnumber(L, index); *************** *** 293,297 **** // these are optional and are not used anyway long index = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); ! wxString str = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxEmptyString)); // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); --- 293,297 ---- // these are optional and are not used anyway long index = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); ! wxString str = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString)); // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); *************** *** 301,305 **** lua_pushboolean(L, returns); // push the next string ! lua_pushstring(L, wx2lua(str)); // push the next index lua_pushnumber(L, index); --- 301,305 ---- lua_pushboolean(L, returns); // push the next string ! wxlState.lua_PushString(str); // push the next index lua_pushnumber(L, index); *************** *** 324,328 **** lua_pushboolean(L, returns); // push the next result string ! lua_pushstring(L, wx2lua(str)); // push the next index lua_pushnumber(L, index); --- 324,328 ---- lua_pushboolean(L, returns); // push the next result string ! wxlState.lua_PushString(str); // push the next index lua_pushnumber(L, index); *************** *** 348,352 **** lua_pushboolean(L, returns); // push the result string ! lua_pushstring(L, wx2lua(str)); // push the next index lua_pushnumber(L, index); --- 348,352 ---- lua_pushboolean(L, returns); // push the result string ! wxlState.lua_PushString(str); // push the next index lua_pushnumber(L, index); *************** *** 405,409 **** returns = self->GetPath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 405,409 ---- returns = self->GetPath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 420,424 **** returns = self->GetVendorName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 420,424 ---- returns = self->GetVendorName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 501,507 **** int argCount = lua_gettop(L); // wxString defaultVal ! wxString defaultVal = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxEmptyString)); // const wxString& key ! wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); --- 501,507 ---- int argCount = lua_gettop(L); // wxString defaultVal ! wxString defaultVal = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); // const wxString& key ! wxString key = wxlState.GetwxStringType(2); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); *************** *** 509,513 **** bool ret = self->Read(key, &returns, defaultVal); // push the result number ! lua_pushstring(L, wx2lua(returns)); // push the result bool lua_pushboolean(L, ret); --- 509,513 ---- bool ret = self->Read(key, &returns, defaultVal); // push the result number ! wxlState.lua_PushString(returns); // push the result bool lua_pushboolean(L, ret); *************** *** 528,532 **** long defaultVal = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& key ! wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); --- 528,532 ---- long defaultVal = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& key ! wxString key = wxlState.GetwxStringType(2); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); *************** *** 553,557 **** double defaultVal = (argCount >= 3 ? (double)wxlState.GetNumberType(3) : 0); // const wxString& key ! wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); --- 553,557 ---- double defaultVal = (argCount >= 3 ? (double)wxlState.GetNumberType(3) : 0); // const wxString& key ! wxString key = wxlState.GetwxStringType(2); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** grid.cpp 22 Feb 2007 00:01:34 -0000 1.24 --- grid.cpp 22 Feb 2007 05:40:52 -0000 1.25 *************** *** 2001,2005 **** returns = self->GetValue(row, col); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2001,2005 ---- returns = self->GetValue(row, col); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2040,2044 **** returns = self->GetTypeName(row, col); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2040,2044 ---- returns = self->GetTypeName(row, col); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2389,2393 **** returns = self->GetRowLabelValue(row); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2389,2393 ---- returns = self->GetRowLabelValue(row); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2407,2411 **** returns = self->GetColLabelValue(col); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2407,2411 ---- returns = self->GetColLabelValue(col); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 4632,4636 **** returns = self->GetRowLabelValue(row); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 4632,4636 ---- returns = self->GetRowLabelValue(row); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 4650,4654 **** returns = self->GetColLabelValue(col); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 4650,4654 ---- returns = self->GetColLabelValue(col); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 5854,5858 **** returns = self->GetCellValue(row, col); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 5854,5858 ---- returns = self->GetCellValue(row, col); // push the result string ! wxlState.lua_PushString(returns); return 1; Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** file.cpp 22 Feb 2007 00:01:34 -0000 1.29 --- file.cpp 22 Feb 2007 05:40:52 -0000 1.30 *************** *** 163,167 **** returns = wxFileName::CreateTempFileName(prefix, fileTemp); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 163,167 ---- returns = wxFileName::CreateTempFileName(prefix, fileTemp); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 580,584 **** returns = wxFileName::GetCwd(volume); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 580,584 ---- returns = wxFileName::GetCwd(volume); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 610,614 **** returns = self->GetExt(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 610,614 ---- returns = self->GetExt(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 628,632 **** returns = wxFileName::GetForbiddenChars(format); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 628,632 ---- returns = wxFileName::GetForbiddenChars(format); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 661,665 **** returns = self->GetFullName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 661,665 ---- returns = self->GetFullName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 681,685 **** returns = self->GetFullPath(format); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 681,685 ---- returns = self->GetFullPath(format); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 694,698 **** returns = wxFileName::GetHomeDir(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 694,698 ---- returns = wxFileName::GetHomeDir(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 709,713 **** returns = self->GetLongPath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 709,713 ---- returns = self->GetLongPath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 724,728 **** returns = self->GetName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 724,728 ---- returns = self->GetName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 746,750 **** returns = self->GetPath(flags, format); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 746,750 ---- returns = self->GetPath(flags, format); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 782,786 **** returns = wxFileName::GetPathSeparators(format); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 782,786 ---- returns = wxFileName::GetPathSeparators(format); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 800,804 **** returns = wxFileName::GetPathTerminators(format); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 800,804 ---- returns = wxFileName::GetPathTerminators(format); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 815,819 **** returns = self->GetShortPath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 815,819 ---- returns = self->GetShortPath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 830,834 **** returns = self->GetVolume(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 830,834 ---- returns = self->GetVolume(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 848,852 **** returns = wxFileName::GetVolumeSeparator(format); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 848,852 ---- returns = wxFileName::GetVolumeSeparator(format); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1335,1345 **** wxString path; // const wxString& fullpath ! wxString fullpath = lua2wx(wxlState.GetStringType(2)); // call SplitPath wxFileName::SplitPath(fullpath, &path, &name, &ext, format); // push the result strings ! lua_pushstring(L, wx2lua(path)); ! lua_pushstring(L, wx2lua(name)); ! lua_pushstring(L, wx2lua(ext)); // return the number of parameters return 3; --- 1335,1345 ---- wxString path; // const wxString& fullpath ! wxString fullpath = wxlState.GetwxStringType(2); // call SplitPath wxFileName::SplitPath(fullpath, &path, &name, &ext, format); // push the result strings ! wxlState.lua_PushString(path); ! wxlState.lua_PushString(name); ! wxlState.lua_PushString(ext); // return the number of parameters return 3; *************** *** 1361,1372 **** wxString volume; // const wxString& fullpath ! wxString fullpath = lua2wx(wxlState.GetStringType(2)); // call SplitPath wxFileName::SplitPath(fullpath, &volume, &path, &name, &ext, format); // push the result strings ! lua_pushstring(L, wx2lua(volume)); ! lua_pushstring(L, wx2lua(path)); ! lua_pushstring(L, wx2lua(name)); ! lua_pushstring(L, wx2lua(ext)); // return the number of parameters return 4; --- 1361,1372 ---- wxString volume; // const wxString& fullpath ! wxString fullpath = wxlState.GetwxStringType(2); // call SplitPath wxFileName::SplitPath(fullpath, &volume, &path, &name, &ext, format); // push the result strings ! wxlState.lua_PushString(volume); ! wxlState.lua_PushString(path); ! wxlState.lua_PushString(name); ! wxlState.lua_PushString(ext); // return the number of parameters return 4; *************** *** 1384,1388 **** wxPathFormat format = (argCount >= 3 ? (wxPathFormat)wxlState.GetEnumerationType(3) : wxPATH_NATIVE); // const wxString fullpath ! const wxString fullpath = lua2wx(wxlState.GetStringType(2)); wxString volume; wxString path; --- 1384,1388 ---- wxPathFormat format = (argCount >= 3 ? (wxPathFormat)wxlState.GetEnumerationType(3) : wxPATH_NATIVE); // const wxString fullpath ! const wxString fullpath = wxlState.GetwxStringType(2); wxString volume; wxString path; *************** *** 1390,1395 **** wxFileName::SplitVolume(fullpath, &volume, &path, format); // push the result strings ! lua_pushstring(L, wx2lua(volume)); ! lua_pushstring(L, wx2lua(path)); return 2; } --- 1390,1395 ---- wxFileName::SplitVolume(fullpath, &volume, &path, format); // push the result strings ! wxlState.lua_PushString(volume); ! wxlState.lua_PushString(path); return 2; } *************** *** 2056,2064 **** int flags = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxT(""))); // wxArrayString *files wxArrayString files; // const wxString& dirname ! wxString dirname = lua2wx(wxlState.GetStringType(2)); // call GetAllFiles returns = wxDir::GetAllFiles(dirname, &files, filespec, flags); --- 2056,2064 ---- int flags = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxT(""))); // wxArrayString *files wxArrayString files; // const wxString& dirname ! wxString dirname = wxlState.GetwxStringType(2); // call GetAllFiles returns = wxDir::GetAllFiles(dirname, &files, filespec, flags); *************** *** 2133,2137 **** int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxT(""))); // wxString * filename wxString filename; --- 2133,2137 ---- int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxT(""))); // wxString * filename wxString filename; *************** *** 2142,2146 **** lua_pushboolean(L, returns); // push the result number ! lua_pushstring(L, wx2lua(filename)); // return the number of parameters return 2; --- 2142,2146 ---- lua_pushboolean(L, returns); // push the result number ! wxlState.lua_PushString(filename); // return the number of parameters return 2; *************** *** 2162,2166 **** lua_pushboolean(L, returns); // push the result number ! lua_pushstring(L, wx2lua(filename)); // return the number of parameters return 2; --- 2162,2166 ---- lua_pushboolean(L, returns); // push the result number ! wxlState.lua_PushString(filename); // return the number of parameters return 2; Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** data.cpp 22 Feb 2007 00:01:34 -0000 1.31 --- data.cpp 22 Feb 2007 05:40:52 -0000 1.32 *************** *** 43,47 **** int argCount = lua_gettop(L); // const wxString str = "" ! const wxString str = (argCount >= 1 ? lua2wx(wxlState.GetStringType(1)) : wxString(wxEmptyString)); // call constructor returns = new wxString(str); --- 43,47 ---- int argCount = lua_gettop(L); // const wxString str = "" ! const wxString str = (argCount >= 1 ? wxlState.GetwxStringType(1) : wxString(wxEmptyString)); // call constructor returns = new wxString(str); *************** *** 64,68 **** returns = self->GetData(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 64,68 ---- returns = self->GetData(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 141,145 **** returns = self->GetData(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 141,145 ---- returns = self->GetData(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 461,465 **** wxClassInfo *returns; // const wxString &name ! wxString name = lua2wx(wxlState.GetStringType(1)); // call constructor returns = wxClassInfo::FindClass((wxChar *)name.c_str()); --- 461,465 ---- wxClassInfo *returns; // const wxString &name ! wxString name = wxlState.GetwxStringType(1); // call constructor returns = wxClassInfo::FindClass((wxChar *)name.c_str()); *************** *** 496,500 **** returns = self->GetBaseClassName1(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 496,500 ---- returns = self->GetBaseClassName1(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 511,515 **** returns = self->GetBaseClassName2(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 511,515 ---- returns = self->GetBaseClassName2(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 526,530 **** returns = self->GetClassName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 526,530 ---- returns = self->GetClassName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 823,827 **** // call constructor if (argCount >= 2) ! returns = new wxLuaTextValidator(style, lua2wx(wxlState.GetStringType(2))); else returns = new wxLuaTextValidator(style); --- 823,827 ---- // call constructor if (argCount >= 2) ! returns = new wxLuaTextValidator(style, wxlState.GetwxStringType(2)); else returns = new wxLuaTextValidator(style); *************** *** 2181,2185 **** returns = self->Item(nIndex); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2181,2185 ---- returns = self->Item(nIndex); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2196,2200 **** returns = self->Last(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2196,2200 ---- returns = self->Last(); // push the result string ! wxlState.lua_PushString(returns); return 1; Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** controls.cpp 22 Feb 2007 00:01:34 -0000 1.40 --- controls.cpp 22 Feb 2007 05:40:52 -0000 1.41 *************** *** 1038,1042 **** returns = self->GetString(n); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1038,1042 ---- returns = self->GetString(n); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1053,1057 **** returns = self->GetStringSelection(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1053,1057 ---- returns = self->GetStringSelection(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1659,1663 **** returns = self->GetValue(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1659,1663 ---- returns = self->GetValue(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3304,3308 **** returns = self->GetItemText(item); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 3304,3308 ---- returns = self->GetItemText(item); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 4464,4468 **** returns = self->GetText(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 4464,4468 ---- returns = self->GetText(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 4876,4880 **** returns = self->GetLabel(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 4876,4880 ---- returns = self->GetLabel(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 4891,4895 **** returns = self->GetText(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 4891,4895 ---- returns = self->GetText(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 5485,5489 **** returns = self->GetStringSelection(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 5485,5489 ---- returns = self->GetStringSelection(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 5503,5507 **** returns = self->GetString(n); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 5503,5507 ---- returns = self->GetString(n); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 7446,7450 **** returns = self->GetLineText(lineNo); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 7446,7450 ---- returns = self->GetLineText(lineNo); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 7481,7485 **** returns = self->GetRange(from, to); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 7481,7485 ---- returns = self->GetRange(from, to); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 7514,7518 **** returns = self->GetStringSelection(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 7514,7518 ---- returns = self->GetStringSelection(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 7549,7553 **** returns = self->GetValue(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 7549,7553 ---- returns = self->GetValue(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 9301,9305 **** returns = self->GetItemText(*item); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 9301,9305 ---- returns = self->GetItemText(*item); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 10987,10991 **** returns = self->GetLabel(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 10987,10991 ---- returns = self->GetLabel(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 11273,11277 **** returns = self->GetDefaultPath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 11273,11277 ---- returns = self->GetDefaultPath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 11288,11292 **** returns = self->GetPath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 11288,11292 ---- returns = self->GetPath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 11303,11307 **** returns = self->GetFilePath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 11303,11307 ---- returns = self->GetFilePath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 11318,11322 **** returns = self->GetFilter(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 11318,11322 ---- returns = self->GetFilter(); // push the result string ! wxlState.lua_PushString(returns); return 1; Index: regex.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/regex.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** regex.cpp 22 Feb 2007 00:01:35 -0000 1.19 --- regex.cpp 22 Feb 2007 05:40:53 -0000 1.20 *************** *** 126,130 **** returns = self->GetMatch(text, index); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 126,130 ---- returns = self->GetMatch(text, index); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 208,214 **** size_t maxMatches = (argCount >= 4 ? (size_t)wxlState.GetNumberType(4) : 0); // const wxString& replacement ! wxString replacement = lua2wx(wxlState.GetStringType(3)); // wxString* text ! wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); --- 208,214 ---- size_t maxMatches = (argCount >= 4 ? (size_t)wxlState.GetNumberType(4) : 0); // const wxString& replacement ! wxString replacement = wxlState.GetwxStringType(3); // wxString* text ! wxString text = wxlState.GetwxStringType(2); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); *************** *** 218,222 **** lua_pushnumber(L, returns); // push the result text ! lua_pushstring(L, wx2lua(text)); // return the number of parameters return 2; --- 218,222 ---- lua_pushnumber(L, returns); // push the result text ! wxlState.lua_PushString(text); // return the number of parameters return 2; *************** *** 231,237 **** int returns; // const wxString& replacement ! wxString replacement = lua2wx(wxlState.GetStringType(3)); // wxString* text ! wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); --- 231,237 ---- int returns; // const wxString& replacement ! wxString replacement = wxlState.GetwxStringType(3); // wxString* text ! wxString text = wxlState.GetwxStringType(2); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); *************** *** 241,245 **** lua_pushnumber(L, returns); // push the result text ! lua_pushstring(L, wx2lua(text)); // return the number of parameters return 2; --- 241,245 ---- lua_pushnumber(L, returns); // push the result text ! wxlState.lua_PushString(text); // return the number of parameters return 2; *************** *** 254,260 **** int returns; // const wxString& replacement ! wxString replacement = lua2wx(wxlState.GetStringType(3)); // wxString* text ! wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); --- 254,260 ---- int returns; // const wxString& replacement ! wxString replacement = wxlState.GetwxStringType(3); // wxString* text ! wxString text = wxlState.GetwxStringType(2); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); *************** *** 264,268 **** lua_pushnumber(L, returns); // push the result text ! lua_pushstring(L, wx2lua(text)); // return the number of parameters return 2; --- 264,268 ---- lua_pushnumber(L, returns); // push the result text ! wxlState.lua_PushString(text); // return the number of parameters return 2; Index: socket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/socket.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** socket.cpp 22 Feb 2007 00:01:35 -0000 1.25 --- socket.cpp 22 Feb 2007 05:40:53 -0000 1.26 *************** *** 1080,1084 **** returns = self->Hostname(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1080,1084 ---- returns = self->Hostname(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1095,1099 **** returns = ... [truncated message content] |
