X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/563a24f061c2830499871ee9c5883c1262ba366a..3cfde7c049bddf6fd3b4c2e35a6b8ecdcdc1d74f:/utils/wxrc/wxrc.cpp diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index fef806dec4..620e8d025c 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -273,7 +273,7 @@ int XmlResApp::OnRun() wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY }, - wxCMD_LINE_DESC_END + wxCMD_LINE_DESC_END }; wxCmdLineParser parser(cmdLineDesc, argc, argv); @@ -416,7 +416,7 @@ wxArrayString XmlResApp::PrepareTempFiles() } wxString name, ext, path; - wxSplitPath(parFiles[i], &path, &name, &ext); + wxFileName::SplitPath(parFiles[i], &path, &name, &ext); FindFilesInXML(doc.GetRoot(), flist, path); if (flagH) @@ -581,7 +581,7 @@ static wxString FileToCppArray(wxString filename, int num) wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") ); const size_t lng = wx_truncate_cast(size_t, offset); - wxASSERT_MSG( wx_static_cast(wxFileOffset, lng) == offset, + wxASSERT_MSG( static_cast(lng) == offset, wxT("Huge file not supported") ); snum.Printf(_T("%i"), num); @@ -735,7 +735,7 @@ static wxString FileToPythonArray(wxString filename, int num) wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") ); const size_t lng = wx_truncate_cast(size_t, offset); - wxASSERT_MSG( wx_static_cast(wxFileOffset, lng) == offset, + wxASSERT_MSG( static_cast(lng) == offset, wxT("Huge file not supported") ); snum.Printf(_T("%i"), num);