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:
Vadim Zeitlin 2007-03-18 14:29:30 +00:00
parent 4af1a3931e
commit 48eba62925
2 changed files with 3 additions and 2 deletions

View File

@ -323,7 +323,7 @@ wxString RegExTestCase::quote(const wxString& arg)
wxString str; wxString str;
for (size_t i = 0; i < arg.length(); i++) { for (size_t i = 0; i < arg.length(); i++) {
wxUChar ch = arg[i]; wxChar ch = arg[i];
const wxChar *p = wxStrchr(needEscape, ch); const wxChar *p = wxStrchr(needEscape, ch);
if (p) if (p)

View File

@ -337,7 +337,8 @@ void GetVolumeInfo(const wxString& path)
} }
// NULL means the current volume // 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, if (!::GetVolumeInformation(pVol, NULL, 0, NULL, NULL,
&volumeFlags, &volumeFlags,