Return non-const pointer from wxDataViewRendererBase::GetView().

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

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 4c8cba7388963550c8fea40129e533ef54b1779f..9d3b47205831e6efa98459510c0877204109e4ff 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dirdlg.cpp
+// Name:        src/msw/dirdlg.cpp
 // Purpose:     wxDirDialog
 // Author:      Julian Smart
 // Modified by:
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dirdlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,35 +24,27 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_DIRDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
+#if wxUSE_DIRDLG
+
+#if wxUSE_OLE && !defined(__GNUWIN32_OLD__) && (!defined(__WXWINCE__) || \
+    (defined(__HANDHELDPC__) && (_WIN32_WCE >= 500)))
 
-#if defined(__WIN95__) && !defined(__GNUWIN32_OLD__) && wxUSE_OLE
+#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
@@ -79,9 +67,6 @@ 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);
@@ -106,7 +91,7 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
     m_message = message;
     m_parent = parent;
 
-    SetStyle(style);
+    SetWindowStyle(style);
     SetPath(defaultPath);
 }
 
@@ -115,20 +100,18 @@ 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() )
+    m_path.Replace(wxT("/"), wxT("\\"));
+
+    while ( !m_path.empty() && (*(m_path.end() - 1) == wxT('\\')) )
     {
-        while ( *(m_path.end() - 1) == _T('\\') )
-        {
-            m_path.erase(m_path.length() - 1);
-        }
+        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('\\');
-        }
+    // but the root drive should have a trailing slash (again, this is just
+    // the way the native dialog works)
+    if ( !m_path.empty() && (*(m_path.end() - 1) == wxT(':')) )
+    {
+        m_path += wxT('\\');
     }
 }
 
@@ -140,14 +123,16 @@ int wxDirDialog::ShowModal()
     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();
 
@@ -162,7 +147,7 @@ int wxDirDialog::ShowModal()
     // 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) )
     {
         if (needNewDir)
@@ -184,12 +169,9 @@ int wxDirDialog::ShowModal()
     }
 
     // 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 )
     {
@@ -197,18 +179,13 @@ int wxDirDialog::ShowModal()
         return wxID_CANCEL;
     }
 
-    BOOL ok = SHGetPathFromIDList(pidl, wxStringBuffer(m_path, MAX_PATH));
-
-    ItemListFree(pidl);
+    m_path = pidl.GetPath();
 
-    if ( !ok )
-    {
-        wxLogLastError(wxT("SHGetPathFromIDList"));
+    // change current working directory if asked so
+    if (HasFlag(wxDD_CHANGE_DIR))
+        wxSetWorkingDirectory(m_path);
 
-        return wxID_CANCEL;
-    }
-
-    return wxID_OK;
+    return m_path.empty() ? wxID_CANCEL : wxID_OK;
 }
 
 // ----------------------------------------------------------------------------
@@ -220,15 +197,16 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
 {
     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
             break;
+#endif // BFFM_SETSELECTION
+
 
         case BFFM_SELCHANGED:
             // note that this doesn't work with the new style UI (MSDN doesn't
@@ -254,7 +232,7 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
                     }
 
                     SendMessage(hwnd, BFFM_SETSTATUSTEXT,
-                                0, (LPARAM)strDir.c_str());
+                                0, (LPARAM)strDir.wx_str());
                 }
             }
             break;
@@ -266,27 +244,6 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
     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 && !(__SMARTPHONE__ && __WXWINCE__)
+#endif // wxUSE_DIRDLG