new makefile

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

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 460491c1f3b01bef59c52aa71cdbd0ba4dfe8756..7e4d4208471db63bce669d6666300ec8b2cc5b11 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -16,6 +16,7 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

+

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


@@ -27,8 +28,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if defined(__WIN95__) && \
-    (!defined(__GNUWIN32__) || defined(wxUSE_NORLANDER_HEADERS))
+#if wxUSE_DIRDLG
+
+#if defined(__WIN95__) && !defined(__GNUWIN32_OLD__) && wxUSE_OLE

 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"


@@ -39,7 +41,7 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

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

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


@@ -83,14 +85,38 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
 {
     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
+    
+    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();


@@ -118,7 +144,7 @@ int wxDirDialog::ShowModal()
 
     if ( !ok )
     {
 
     if ( !ok )
     {

-        wxLogLastError("SHGetPathFromIDList");
+        wxLogLastError(wxT("SHGetPathFromIDList"));

 
         return wxID_CANCEL;
     }
 
         return wxID_CANCEL;
     }


@@ -149,7 +175,14 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
                 TCHAR szDir[MAX_PATH];
                 if ( SHGetPathFromIDList((LPITEMIDLIST)lp, szDir) )
                 {
                 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;
                 }
             }
             break;


@@ -175,7 +208,7 @@ static void ItemListFree(LPITEMIDLIST pidl)
         }
         else
         {
         }
         else
         {

-            wxLogLastError("SHGetMalloc");
+            wxLogLastError(wxT("SHGetMalloc"));

         }
     }
 }
         }
     }
 }


@@ -183,3 +216,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