From 17a691c1efcf3ded480a877e5d788066882e286f Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 7 Jul 2007 12:31:03 +0000 Subject: [PATCH] added missing wx_str() (patch #1749398) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/debughlp.cpp | 2 +- src/msw/volume.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/msw/debughlp.cpp b/src/msw/debughlp.cpp index 726900c638..3fd7b88a4b 100644 --- a/src/msw/debughlp.cpp +++ b/src/msw/debughlp.cpp @@ -145,7 +145,7 @@ const wxString& wxDbgHelpDLL::GetErrorMessage() void wxDbgHelpDLL::LogError(const wxChar *func) { ::OutputDebugString(wxString::Format(_T("dbghelp: %s() failed: %s\r\n"), - func, wxSysErrorMsg(::GetLastError()))); + func, wxSysErrorMsg(::GetLastError())).wx_str()); } // ---------------------------------------------------------------------------- diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp index 086c3ee1d7..fb471ddf5f 100644 --- a/src/msw/volume.cpp +++ b/src/msw/volume.cpp @@ -272,7 +272,7 @@ static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc, // The filter function will not know mounted from unmounted, and neither do we unless // we are iterating using RESOURCE_CONNECTED, in which case they all are mounted. // Volumes on disconnected servers, however, will correctly show as unmounted. - FilteredAdd(list, filename, flagsSet, flagsUnset&~wxFS_VOL_MOUNTED); + FilteredAdd(list, filename.wx_str(), flagsSet, flagsUnset&~wxFS_VOL_MOUNTED); if (scope == RESOURCE_GLOBALNET) s_fileInfo[filename].m_flags &= ~wxFS_VOL_MOUNTED; } @@ -486,7 +486,7 @@ bool wxFSVolumeBase::Create(const wxString& name) // Display name. SHFILEINFO fi; - long rc = SHGetFileInfo(m_volName, 0, &fi, sizeof(fi), SHGFI_DISPLAYNAME); + long rc = SHGetFileInfo(m_volName.wx_str(), 0, &fi, sizeof(fi), SHGFI_DISPLAYNAME); if (!rc) { wxLogError(_("Cannot read typename from '%s'!"), m_volName.c_str()); @@ -596,7 +596,7 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const } SHFILEINFO fi; - long rc = SHGetFileInfo(m_volName, 0, &fi, sizeof(fi), flags); + long rc = SHGetFileInfo(m_volName.wx_str(), 0, &fi, sizeof(fi), flags); m_icons[type].SetHICON((WXHICON)fi.hIcon); if (!rc || !fi.hIcon) wxLogError(_("Cannot load icon from '%s'."), m_volName.c_str()); -- 2.47.2