// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
+
#ifdef __GNUG__
#pragma implementation "dirdlg.h"
#endif
#pragma hdrstop
#endif
-#if defined(__WIN95__) && !defined(__GNUWIN32_OLD__)
+#if wxUSE_DIRDLG
+
+#if defined(__WIN95__) && !defined(__GNUWIN32_OLD__) && wxUSE_OLE
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/msw/private.h"
-#include "shlobj.h" // Win95 shell
+#include <shlobj.h> // Win95 shell
// ----------------------------------------------------------------------------
// constants
m_message = message;
m_parent = parent;
m_path = defaultPath;
- m_path.Replace(_T("/"), _T("\\")); // SHBrowseForFolder doesn't like '/'s
+
+ // SHBrowseForFolder doesn't like '/'s nor the trailing backslashes
+ m_path.Replace(_T("/"), _T("\\"));
+ if ( *m_path.end() == _T('\\') )
+ {
+ m_path.erase(m_path.length() - 1);
+ }
}
int wxDirDialog::ShowModal()
TCHAR szDir[MAX_PATH];
if ( SHGetPathFromIDList((LPITEMIDLIST)lp, szDir) )
{
- SendMessage(hwnd, BFFM_SETSTATUSTEXT, 0, (LPARAM)szDir);
+ wxString strDir(szDir);
+ int maxChars = 40; // Have to truncate string else it displays incorrectly
+ if (strDir.Len() > (size_t) (maxChars - 3))
+ {
+ strDir = strDir.Right(maxChars - 3);
+ strDir = wxString(wxT("...")) + strDir;
+ }
+ SendMessage(hwnd, BFFM_SETSTATUSTEXT, 0, (LPARAM) (const wxChar*) strDir);
}
}
break;
#else
#include "../generic/dirdlgg.cpp"
#endif // compiler/platform on which the code here compiles
+
+#endif // wxUSE_DIRDLG