X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff3e84ffdc91ee8a52b3ab646e48d44d62de80e1..87fe783d01a93eb067bbe54b72afcd75c07062a2:/src/msw/dirdlg.cpp diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp index 8c8591fd67..d483be374e 100644 --- a/src/msw/dirdlg.cpp +++ b/src/msw/dirdlg.cpp @@ -29,10 +29,11 @@ #if wxUSE_OLE && !defined(__GNUWIN32_OLD__) && (!defined(__WXWINCE__) || \ (defined(__HANDHELDPC__) && (_WIN32_WCE >= 500))) +#include "wx/dirdlg.h" + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/dialog.h" - #include "wx/dirdlg.h" #include "wx/log.h" #include "wx/app.h" // for GetComCtl32Version() #endif @@ -133,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(); @@ -233,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; @@ -248,4 +249,3 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData) #endif // compiler/platform on which the code here compiles #endif // wxUSE_DIRDLG -