merged Ctrl-Space fix from 2.2 branch

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

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 156dfaa4d40426ebebf9b59ca4cec0686bc63f5f..eed2987eaca79290cea7d4cbf1e21ee52aac87cd 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -27,6 +27,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

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

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


@@ -36,31 +38,21 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

-#if defined(__WIN95__) && \
-    (!defined(__GNUWIN32__) || defined(wxUSE_NORLANDER_HEADERS))
-    #define CAN_COMPILE_DIRDLG
-//#else: we provide a stub version which doesn't do anything
-#endif
-
-#ifdef CAN_COMPILE_DIRDLG
-    #include "shlobj.h" // Win95 shell
-#endif
+#include "shlobj.h" // Win95 shell

 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 #ifndef MAX_PATH
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 #ifndef MAX_PATH

-    #define MAX_PATH 4096      // be generuous
+    #define MAX_PATH 4096      // be generous

 #endif
 
 // ----------------------------------------------------------------------------
 // wxWindows macros
 // ----------------------------------------------------------------------------
 
 #endif
 
 // ----------------------------------------------------------------------------
 // wxWindows macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_CLASS(wxDirDialog, wxDialog)
-#endif
+IMPLEMENT_CLASS(wxDirDialog, wxDialog)

 
 // ----------------------------------------------------------------------------
 // private functions prototypes
 
 // ----------------------------------------------------------------------------
 // private functions prototypes


@@ -73,6 +65,7 @@ static void ItemListFree(LPITEMIDLIST pidl);
 static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp,
                                        LPARAM pData);
 
 static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp,
                                        LPARAM pData);
 

+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -90,11 +83,11 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
     m_message = message;
     m_parent = parent;
     m_path = defaultPath;
     m_message = message;
     m_parent = parent;
     m_path = defaultPath;

+    m_path.Replace(_T("/"), _T("\\")); // SHBrowseForFolder doesn't like '/'s

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

-#ifdef CAN_COMPILE_DIRDLG

     BROWSEINFO bi;
     bi.hwndOwner      = m_parent ? GetHwndOf(m_parent) : NULL;
     bi.pidlRoot       = NULL;
     BROWSEINFO bi;
     bi.hwndOwner      = m_parent ? GetHwndOf(m_parent) : NULL;
     bi.pidlRoot       = NULL;


@@ -124,15 +117,12 @@ int wxDirDialog::ShowModal()
 
     if ( !ok )
     {
 
     if ( !ok )
     {

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

 
         return wxID_CANCEL;
     }
 
     return wxID_OK;
 
         return wxID_CANCEL;
     }
 
     return wxID_OK;

-#else // !CAN_COMPILE_DIRDLG
-    return wxID_CANCEL;
-#endif // CAN_COMPILE_DIRDLG/!CAN_COMPILE_DIRDLG

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


@@ -158,7 +148,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;


@@ -184,8 +181,11 @@ static void ItemListFree(LPITEMIDLIST pidl)
         }
         else
         {
         }
         else
         {

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

         }
     }
 }
 
         }
     }
 }
 

+#else
+    #include "../generic/dirdlgg.cpp"
+#endif // compiler/platform on which the code here compiles