compilation fix

[wxWidgets.git] / src / msw / dirdlg.cpp

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index fed0b69a8b5b5efe155baf0b5112de24895385ba..0c61464260741c4cfe7eb57b53f1d1ffa20318b4 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -16,6 +16,7 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

+

 #ifdef __GNUG__
     #pragma implementation "dirdlg.h"
 #endif
 #ifdef __GNUG__
     #pragma implementation "dirdlg.h"
 #endif


@@ -27,18 +28,21 @@
     #pragma hdrstop
 #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/dialog.h"
     #include "wx/dirdlg.h"
     #include "wx/log.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"
 
 #endif
 
 #include "wx/msw/private.h"
 

-#include "shlobj.h" // Win95 shell
+#include <shlobj.h> // Win95 shell

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -48,6 +52,18 @@
     #define MAX_PATH 4096      // be generous
 #endif
 
     #define MAX_PATH 4096      // be generous
 #endif
 

+#ifndef BIF_NEWDIALOGSTYLE
+    #define BIF_NEWDIALOGSTYLE 0x0040
+#endif
+
+#ifndef BIF_NONEWFOLDERBUTTON
+    #define BIF_NONEWFOLDERBUTTON  0x0200
+#endif
+
+#ifndef BIF_EDITBOX
+    #define BIF_EDITBOX 16
+#endif
+

 // ----------------------------------------------------------------------------
 // wxWindows macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWindows macros
 // ----------------------------------------------------------------------------


@@ -77,19 +93,46 @@ static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp,
 wxDirDialog::wxDirDialog(wxWindow *parent,
                          const wxString& message,
                          const wxString& defaultPath,
 wxDirDialog::wxDirDialog(wxWindow *parent,
                          const wxString& message,
                          const wxString& defaultPath,

-                         long WXUNUSED(style),
-                         const wxPoint& WXUNUSED(pos))
+                         long style,
+                         const wxPoint& WXUNUSED(pos),
+                         const wxSize& WXUNUSED(size),
+                         const wxString& WXUNUSED(name))

 {
     m_message = message;
     m_parent = parent;
 {
     m_message = message;
     m_parent = parent;

-    m_path = defaultPath;
-    m_path.Replace(_T("/"), _T("\\")); // SHBrowseForFolder doesn't like '/'s
+
+    SetStyle(style);
+    SetPath(defaultPath);
+}
+
+void wxDirDialog::SetPath(const wxString& path)
+{
+    m_path = path;
+
+    // SHBrowseForFolder doesn't like '/'s nor the trailing backslashes
+    m_path.Replace(_T("/"), _T("\\"));
+    if ( !m_path.empty() )
+    {
+        while ( *(m_path.end() - 1) == _T('\\') )
+        {
+            m_path.erase(m_path.length() - 1);
+        }
+
+        // but the root drive should have a trailing slash (again, this is just
+        // the way the native dialog works)
+        if ( *(m_path.end() - 1) == _T(':') )
+        {
+            m_path += _T('\\');
+        }
+    }

 }
 
 int wxDirDialog::ShowModal()
 {
 }
 
 int wxDirDialog::ShowModal()
 {

+    wxWindow *parent = GetParent();
+

     BROWSEINFO bi;
     BROWSEINFO bi;

-    bi.hwndOwner      = m_parent ? GetHwndOf(m_parent) : NULL;
+    bi.hwndOwner      = parent ? GetHwndOf(parent) : NULL;

     bi.pidlRoot       = NULL;
     bi.pszDisplayName = NULL;
     bi.lpszTitle      = m_message.c_str();
     bi.pidlRoot       = NULL;
     bi.pszDisplayName = NULL;
     bi.lpszTitle      = m_message.c_str();


@@ -97,6 +140,42 @@ int wxDirDialog::ShowModal()
     bi.lpfn           = BrowseCallbackProc;
     bi.lParam         = (LPARAM)m_path.c_str();    // param for the callback
 
     bi.lpfn           = BrowseCallbackProc;
     bi.lParam         = (LPARAM)m_path.c_str();    // param for the callback
 

+    static const int verComCtl32 = wxApp::GetComCtl32Version();
+
+    // we always add the edit box (it doesn't hurt anybody, does it?) if it is
+    // supported by the system
+    if ( verComCtl32 >= 471 )
+    {
+        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);
+    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;
+    }
+#endif
+
+    // do show the dialog

     LPITEMIDLIST pidl = SHBrowseForFolder(&bi);
 
     if ( bi.pidlRoot )
     LPITEMIDLIST pidl = SHBrowseForFolder(&bi);
 
     if ( bi.pidlRoot )


@@ -110,8 +189,7 @@ int wxDirDialog::ShowModal()
         return wxID_CANCEL;
     }
 
         return wxID_CANCEL;
     }
 

-    BOOL ok = SHGetPathFromIDList(pidl, m_path.GetWriteBuf(MAX_PATH));
-    m_path.UngetWriteBuf();
+    BOOL ok = SHGetPathFromIDList(pidl, wxStringBuffer(m_path, MAX_PATH));

 
     ItemListFree(pidl);
 
 
     ItemListFree(pidl);
 


@@ -143,12 +221,30 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
             break;
 
         case BFFM_SELCHANGED:
             break;
 
         case BFFM_SELCHANGED:

+            // note that this doesn't work with the new style UI (MSDN doesn't
+            // say anything about it, but the comments in shlobj.h do!) but we
+            // still execute this code in case it starts working again with the
+            // "new new UI" (or would it be "NewUIEx" according to tradition?)

             {
                 // Set the status window to the currently selected path.
             {
                 // Set the status window to the currently selected path.

-                TCHAR szDir[MAX_PATH];
-                if ( SHGetPathFromIDList((LPITEMIDLIST)lp, szDir) )
+                wxString strDir;
+                if ( SHGetPathFromIDList((LPITEMIDLIST)lp,
+                                         wxStringBuffer(strDir, MAX_PATH)) )

                 {
                 {

-                    SendMessage(hwnd, BFFM_SETSTATUSTEXT, 0, (LPARAM)szDir);
+                    // NB: this shouldn't be necessary with the new style box
+                    //     (which is resizable), but as for now it doesn't work
+                    //     anyhow (see the comment above) no harm in doing it
+
+                    // need to truncate or it displays incorrectly
+                    static const size_t maxChars = 37;
+                    if ( strDir.length() > maxChars )
+                    {
+                        strDir = strDir.Right(maxChars);
+                        strDir = wxString(wxT("...")) + strDir;
+                    }
+
+                    SendMessage(hwnd, BFFM_SETSTATUSTEXT,
+                                0, (LPARAM)strDir.c_str());

                 }
             }
             break;
                 }
             }
             break;


@@ -182,3 +278,5 @@ static void ItemListFree(LPITEMIDLIST pidl)
 #else
     #include "../generic/dirdlgg.cpp"
 #endif // compiler/platform on which the code here compiles
 #else
     #include "../generic/dirdlgg.cpp"
 #endif // compiler/platform on which the code here compiles

+
+#endif // wxUSE_DIRDLG