Fixed toolbar crash for MinGW/Cygwin

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

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 460491c1f3b01bef59c52aa71cdbd0ba4dfe8756..30d39f5902cbb4e8e969da1d3deb07822cb9862e 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,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if defined(__WIN95__) && \
-    (!defined(__GNUWIN32__) || defined(wxUSE_NORLANDER_HEADERS))
+#include "wx/setup.h"
+
+#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"


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

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

 
         return wxID_CANCEL;
     }
 
         return wxID_CANCEL;
     }


@@ -149,7 +153,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 +186,7 @@ static void ItemListFree(LPITEMIDLIST pidl)
         }
         else
         {
         }
         else
         {

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

         }
     }
 }
         }
     }
 }


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