Try to find comctl32.dll version even if we don't have shlwapi.h available,

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

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 0c61464260741c4cfe7eb57b53f1d1ffa20318b4..f01131140705d4b517aa9271746fcac28f294efb 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

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


@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_DIRDLG
+#if wxUSE_DIRDLG && (!defined(__WXWINCE__) || defined(__HANDHELDPC__))

 
 #if defined(__WIN95__) && !defined(__GNUWIN32_OLD__) && wxUSE_OLE
 
 
 #if defined(__WIN95__) && !defined(__GNUWIN32_OLD__) && wxUSE_OLE
 


@@ -41,17 +41,12 @@
 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

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

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

-#ifndef MAX_PATH
-    #define MAX_PATH 4096      // be generous
-#endif
-

 #ifndef BIF_NEWDIALOGSTYLE
     #define BIF_NEWDIALOGSTYLE 0x0040
 #endif
 #ifndef BIF_NEWDIALOGSTYLE
     #define BIF_NEWDIALOGSTYLE 0x0040
 #endif


@@ -65,7 +60,7 @@
 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

-// wxWindows macros
+// wxWidgets macros

 // ----------------------------------------------------------------------------
 
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)


@@ -74,9 +69,6 @@ IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 // private functions prototypes
 // ----------------------------------------------------------------------------
 
 // 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);
 // the callback proc for the dir dlg
 static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp,
                                        LPARAM pData);


@@ -135,7 +127,13 @@ int wxDirDialog::ShowModal()
     bi.hwndOwner      = parent ? GetHwndOf(parent) : NULL;
     bi.pidlRoot       = NULL;
     bi.pszDisplayName = NULL;
     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();
     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_RETURNONLYFSDIRS | BIF_STATUSTEXT;
     bi.lpfn           = BrowseCallbackProc;
     bi.lParam         = (LPARAM)m_path.c_str();    // param for the callback


@@ -149,10 +147,6 @@ int wxDirDialog::ShowModal()
         bi.ulFlags |= BIF_EDITBOX;
     }
 
         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
     //
     // to have the "New Folder" button we must use the "new" dialog style which
     // is also the only way to have a resizable dialog
     //


@@ -160,28 +154,28 @@ int wxDirDialog::ShowModal()
     const bool needNewDir = HasFlag(wxDD_NEW_DIR_BUTTON);
     if ( (needNewDir || HasFlag(wxRESIZE_BORDER)) && (verComCtl32 >= 500) )
     {
     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
 
     // 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 )
     {
 
     if ( !pidl )
     {


@@ -189,18 +183,9 @@ int wxDirDialog::ShowModal()
         return wxID_CANCEL;
     }
 
         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;
-    }
-
-    return wxID_OK;
+    return m_path.empty() ? wxID_CANCEL : wxID_OK;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -212,13 +197,16 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
 {
     switch(uMsg)
     {
 {
     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
         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

-            SendMessage(hwnd, BFFM_SETSELECTION, TRUE, pData);
+            ::SendMessage(hwnd, BFFM_SETSELECTION, TRUE, pData);

             break;
             break;

+#endif // BFFM_SETSELECTION
+

 
         case BFFM_SELCHANGED:
             // note that this doesn't work with the new style UI (MSDN doesn't
 
         case BFFM_SELCHANGED:
             // note that this doesn't work with the new style UI (MSDN doesn't


@@ -257,26 +245,8 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
 }
 
 
 }
 
 

-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
 
 #else
     #include "../generic/dirdlgg.cpp"
 #endif // compiler/platform on which the code here compiles
 

-#endif // wxUSE_DIRDLG
+#endif // wxUSE_DIRDLG && !(__SMARTPHONE__ && __WXWINCE__)