Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added missing wx_str() (patch #1749398)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-07-07 12:31:03 +00:00
parent f5595af61e
commit 17a691c1ef
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/debughlp.cpp
View File

@@ -145,7 +145,7 @@ const wxString& wxDbgHelpDLL::GetErrorMessage()
void wxDbgHelpDLL::LogError(const wxChar *func) void wxDbgHelpDLL::LogError(const wxChar *func)
{ {
::OutputDebugString(wxString::Format(_T("dbghelp: %s() failed: %s\r\n"), ::OutputDebugString(wxString::Format(_T("dbghelp: %s() failed: %s\r\n"),
func, wxSysErrorMsg(::GetLastError()))); func, wxSysErrorMsg(::GetLastError())).wx_str());
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

6
src/msw/volume.cpp
View File

@@ -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 // 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. // we are iterating using RESOURCE_CONNECTED, in which case they all are mounted.
// Volumes on disconnected servers, however, will correctly show as unmounted. // 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) if (scope == RESOURCE_GLOBALNET)
s_fileInfo[filename].m_flags &= ~wxFS_VOL_MOUNTED; s_fileInfo[filename].m_flags &= ~wxFS_VOL_MOUNTED;
} }
@@ -486,7 +486,7 @@ bool wxFSVolumeBase::Create(const wxString& name)
// Display name. // Display name.
SHFILEINFO fi; 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) if (!rc)
{ {
wxLogError(_("Cannot read typename from '%s'!"), m_volName.c_str()); wxLogError(_("Cannot read typename from '%s'!"), m_volName.c_str());
@@ -596,7 +596,7 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
} }
SHFILEINFO fi; 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); m_icons[type].SetHICON((WXHICON)fi.hIcon);
if (!rc || !fi.hIcon) if (!rc || !fi.hIcon)
wxLogError(_("Cannot load icon from '%s'."), m_volName.c_str()); wxLogError(_("Cannot load icon from '%s'."), m_volName.c_str());