// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dirdlg.h"
#endif
#pragma hdrstop
#endif
-#if wxUSE_DIRDLG
+#if wxUSE_DIRDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
#if defined(__WIN95__) && !defined(__GNUWIN32_OLD__) && wxUSE_OLE
#include "wx/msw/private.h"
+#ifdef __WXWINCE__
+#include <winreg.h>
+#include <objbase.h>
+#include <shlguid.h>
+#endif
#include <shlobj.h> // Win95 shell
// ----------------------------------------------------------------------------
#define BIF_NONEWFOLDERBUTTON 0x0200
#endif
+#ifndef BIF_EDITBOX
+ #define BIF_EDITBOX 16
+#endif
+
// ----------------------------------------------------------------------------
-// wxWindows macros
+// wxWidgets macros
// ----------------------------------------------------------------------------
IMPLEMENT_CLASS(wxDirDialog, wxDialog)
bi.hwndOwner = parent ? GetHwndOf(parent) : NULL;
bi.pidlRoot = NULL;
bi.pszDisplayName = NULL;
+ // 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.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
//
const bool needNewDir = HasFlag(wxDD_NEW_DIR_BUTTON);
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);
// initial selection here
//
// wParam = TRUE => lParam is a string and not a PIDL
- SendMessage(hwnd, BFFM_SETSELECTION, TRUE, pData);
+#ifndef __WXWINCE__
+ ::SendMessage(hwnd, BFFM_SETSELECTION, TRUE, pData);
+#endif
break;
case BFFM_SELCHANGED:
#include "../generic/dirdlgg.cpp"
#endif // compiler/platform on which the code here compiles
-#endif // wxUSE_DIRDLG
+#endif // wxUSE_DIRDLG && !(__SMARTPHONE__ && __WXWINCE__)