From: Francesco M. <fr...@us...> - 2006-05-24 16:56:55
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7938 Modified Files: override.hpp Log Message: fixing borland builds Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** override.hpp 24 May 2006 15:45:52 -0000 1.43 --- override.hpp 24 May 2006 16:56:45 -0000 1.44 *************** *** 1968,1972 **** int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxT("")); // wxString * filename wxString filename; --- 1968,1972 ---- 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; *************** *** 2234,2238 **** bool interactive = (argCount >= 5 ? wxlState.GetBooleanType(4) : true); // const wxString &faceName = wxEmptyString ! wxString faceName = (argCount >= 4 ? lua2wx(wxlState.GetStringType(3)) : wxT("")); // wxFontEncoding *altEncoding wxFontEncoding altEncoding; --- 2234,2238 ---- bool interactive = (argCount >= 5 ? wxlState.GetBooleanType(4) : true); // const wxString &faceName = wxEmptyString ! wxString faceName = (argCount >= 4 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxT(""))); // wxFontEncoding *altEncoding wxFontEncoding altEncoding; *************** *** 3276,3280 **** long style = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& title = "" ! wxString title = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxT("")); // int table if (lua_istable(L, 1)) --- 3276,3280 ---- long style = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& title = "" ! wxString title = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxT(""))); // int table if (lua_istable(L, 1)) |