/////////////////////////////////////////////////////////////////////////////
-// Name: dirdlg.cpp
+// Name: src/msw/dirdlg.cpp
// Purpose: wxDirDialog
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "dirdlg.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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 <winreg.h>
-#include <objbase.h>
-#include <shlguid.h>
-#endif
-#include <shlobj.h> // 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
#endif
// ----------------------------------------------------------------------------
-// wxWindows macros
+// wxWidgets macros
// ----------------------------------------------------------------------------
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);
m_message = message;
m_parent = parent;
- SetStyle(style);
+ SetWindowStyle(style);
SetPath(defaultPath);
}
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();
bi.ulFlags |= BIF_EDITBOX;
}
- // normally the commented out part should work -- but in practice
- // BIF_NONEWFOLDERBUTTON doesn't have any effect (Win2k, comctl 5.81) so I
- // have to disable it [for now]
-#if 0
// to have the "New Folder" button we must use the "new" dialog style which
// 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) )
{
- bi.ulFlags |= BIF_NEWDIALOGSTYLE;
-
- // we'll get the "New Folder" button by default now, don't show it if
- // not needed
- if ( !needNewDir )
- bi.ulFlags |= BIF_NONEWFOLDERBUTTON;
- }
-#else
- if ( HasFlag(wxDD_NEW_DIR_BUTTON) && verComCtl32 >= 500 )
- {
- // use the new style to make the "New Folder" button appear
- bi.ulFlags |= BIF_NEWDIALOGSTYLE;
+ if (needNewDir)
+ {
+ bi.ulFlags |= BIF_NEWDIALOGSTYLE;
+ }
+ else
+ {
+ // Versions < 600 doesn't support BIF_NONEWFOLDERBUTTON
+ // The only way to get rid of the Make New Folder button is use
+ // the old dialog style which doesn't have the button thus we
+ // simply don't set the New Dialog Style for such comctl versions.
+ if (verComCtl32 >= 600)
+ {
+ bi.ulFlags |= BIF_NEWDIALOGSTYLE;
+ bi.ulFlags |= BIF_NONEWFOLDERBUTTON;
+ }
+ }
}
-#endif
// 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 )
{
return wxID_CANCEL;
}
- BOOL ok = SHGetPathFromIDList(pidl, wxStringBuffer(m_path, MAX_PATH));
-
- ItemListFree(pidl);
+ m_path = pidl.GetPath();
- 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;
}
// ----------------------------------------------------------------------------
{
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
}
SendMessage(hwnd, BFFM_SETSTATUSTEXT,
- 0, (LPARAM)strDir.c_str());
+ 0, (LPARAM)strDir.wx_str());
}
}
break;
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
projects / wxWidgets.git / blobdiff