X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ab440bc203fc700744039abdcff12bdd6ac6f0a..b50e6e416e2b4cdc849ea6f24181094c0957d904:/src/msw/dirdlg.cpp diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp index f379d76255..1885114647 100644 --- a/src/msw/dirdlg.cpp +++ b/src/msw/dirdlg.cpp @@ -100,19 +100,19 @@ void wxDirDialog::SetPath(const wxString& path) m_path = path; // SHBrowseForFolder doesn't like '/'s nor the trailing backslashes - m_path.Replace(_T("/"), _T("\\")); + m_path.Replace(wxT("/"), wxT("\\")); if ( !m_path.empty() ) { - while ( *(m_path.end() - 1) == _T('\\') ) + while ( *(m_path.end() - 1) == wxT('\\') ) { m_path.erase(m_path.length() - 1); } // but the root drive should have a trailing slash (again, this is just // the way the native dialog works) - if ( *(m_path.end() - 1) == _T(':') ) + if ( *(m_path.end() - 1) == wxT(':') ) { - m_path += _T('\\'); + m_path += wxT('\\'); } } } @@ -134,7 +134,7 @@ int wxDirDialog::ShowModal() #endif bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT; bi.lpfn = BrowseCallbackProc; - bi.lParam = (LPARAM)m_path.c_str(); // param for the callback + bi.lParam = (LPARAM)m_path.wx_str(); // param for the callback static const int verComCtl32 = wxApp::GetComCtl32Version(); @@ -234,7 +234,7 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData) } SendMessage(hwnd, BFFM_SETSTATUSTEXT, - 0, (LPARAM)strDir.c_str()); + 0, (LPARAM)strDir.wx_str()); } } break;