X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..950905affdfa9041316f82308e1a11e82c783070:/src/msw/dirdlg.cpp diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp index 30a877ce83..d483be374e 100644 --- a/src/msw/dirdlg.cpp +++ b/src/msw/dirdlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dirdlg.cpp +// Name: src/msw/dirdlg.cpp // Purpose: wxDirDialog // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dirdlg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,33 +26,25 @@ #if wxUSE_DIRDLG -#if defined(__WIN95__) && !defined(__GNUWIN32_OLD__) && wxUSE_OLE +#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 #include "wx/msw/private.h" - -#ifdef __WXWINCE__ -#include -#include -#include -#endif -#include // Win95 shell +#include "wx/msw/wrapshl.h" // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- -#ifndef MAX_PATH - #define MAX_PATH 4096 // be generous -#endif - #ifndef BIF_NEWDIALOGSTYLE #define BIF_NEWDIALOGSTYLE 0x0040 #endif @@ -79,9 +67,6 @@ IMPLEMENT_CLASS(wxDirDialog, wxDialog) // private functions prototypes // ---------------------------------------------------------------------------- -// free the parameter -static void ItemListFree(LPITEMIDLIST pidl); - // the callback proc for the dir dlg static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData); @@ -106,7 +91,7 @@ wxDirDialog::wxDirDialog(wxWindow *parent, m_message = message; m_parent = parent; - SetStyle(style); + SetWindowStyle(style); SetPath(defaultPath); } @@ -140,14 +125,16 @@ int wxDirDialog::ShowModal() bi.hwndOwner = parent ? GetHwndOf(parent) : NULL; bi.pidlRoot = NULL; bi.pszDisplayName = NULL; -#ifdef __WXWINCE__ + // Please don't change this without checking it compiles + // with eVC++ first. +#if defined(__POCKETPC__) || defined(__SMARTPHONE__) bi.lpszTitle = m_message.mb_str(); #else bi.lpszTitle = m_message.c_str(); #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(); @@ -162,7 +149,7 @@ int wxDirDialog::ShowModal() // is also the only way to have a resizable dialog // // "new" style is only available in the version 5.0+ of comctl32.dll - const bool needNewDir = HasFlag(wxDD_NEW_DIR_BUTTON); + const bool needNewDir = !HasFlag(wxDD_DIR_MUST_EXIST); if ( (needNewDir || HasFlag(wxRESIZE_BORDER)) && (verComCtl32 >= 500) ) { if (needNewDir) @@ -184,12 +171,9 @@ int wxDirDialog::ShowModal() } // do show the dialog - LPITEMIDLIST pidl = SHBrowseForFolder(&bi); + wxItemIdList pidl(SHBrowseForFolder(&bi)); - if ( bi.pidlRoot ) - { - ItemListFree((LPITEMIDLIST)bi.pidlRoot); - } + wxItemIdList::Free((LPITEMIDLIST)bi.pidlRoot); if ( !pidl ) { @@ -197,18 +181,13 @@ int wxDirDialog::ShowModal() return wxID_CANCEL; } - BOOL ok = SHGetPathFromIDList(pidl, wxStringBuffer(m_path, MAX_PATH)); + m_path = pidl.GetPath(); - ItemListFree(pidl); - - if ( !ok ) - { - wxLogLastError(wxT("SHGetPathFromIDList")); - - return wxID_CANCEL; - } + // change current working directory if asked so + if (HasFlag(wxDD_CHANGE_DIR)) + wxSetWorkingDirectory(m_path); - return wxID_OK; + return m_path.empty() ? wxID_CANCEL : wxID_OK; } // ---------------------------------------------------------------------------- @@ -220,15 +199,16 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData) { switch(uMsg) { +#ifdef BFFM_SETSELECTION case BFFM_INITIALIZED: // sent immediately after initialisation and so we may set the // initial selection here // // wParam = TRUE => lParam is a string and not a PIDL -#ifndef __WXWINCE__ - SendMessage(hwnd, BFFM_SETSELECTION, TRUE, pData); -#endif + ::SendMessage(hwnd, BFFM_SETSELECTION, TRUE, pData); break; +#endif // BFFM_SETSELECTION + case BFFM_SELCHANGED: // note that this doesn't work with the new style UI (MSDN doesn't @@ -254,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; @@ -266,27 +246,6 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData) return 0; } - -static void ItemListFree(LPITEMIDLIST pidl) -{ - if ( pidl ) - { - LPMALLOC pMalloc; - SHGetMalloc(&pMalloc); - if ( pMalloc ) - { - pMalloc->Free(pidl); - pMalloc->Release(); - } - else - { - wxLogLastError(wxT("SHGetMalloc")); - } - } -} - -#else - #include "../generic/dirdlgg.cpp" #endif // compiler/platform on which the code here compiles #endif // wxUSE_DIRDLG