compilation fixes after c_str() changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
4af1a3931e
commit
48eba62925
@ -323,7 +323,7 @@ wxString RegExTestCase::quote(const wxString& arg)
|
||||
wxString str;
|
||||
|
||||
for (size_t i = 0; i < arg.length(); i++) {
|
||||
wxUChar ch = arg[i];
|
||||
wxChar ch = arg[i];
|
||||
const wxChar *p = wxStrchr(needEscape, ch);
|
||||
|
||||
if (p)
|
||||
|
@ -337,7 +337,8 @@ void GetVolumeInfo(const wxString& path)
|
||||
}
|
||||
|
||||
// NULL means the current volume
|
||||
const wxChar *pVol = vol.empty() ? NULL : vol.c_str();
|
||||
const wxChar *pVol = vol.empty() ? (wxChar *)NULL
|
||||
: vol.c_str();
|
||||
|
||||
if (!::GetVolumeInformation(pVol, NULL, 0, NULL, NULL,
|
||||
&volumeFlags,
|
||||
|
Loading…
Reference in New Issue
Block a user