Compilation fix for r74440 and STL builds.

[wxWidgets.git] / src / common / filehistorycmn.cpp

diff --git a/src/common/filehistorycmn.cpp b/src/common/filehistorycmn.cpp
index 9775f167b487cfc69980ee860c421a5656b6fa4c..54931463372f417c23ae653fa89bb5b458d12482 100644 (file)
--- a/src/common/filehistorycmn.cpp
+++ b/src/common/filehistorycmn.cpp
@@ -68,15 +68,36 @@ wxFileHistoryBase::wxFileHistoryBase(size_t maxFiles, wxWindowID idBase)
     m_idBase = idBase;
 }
 
     m_idBase = idBase;
 }
 

+/* static */
+wxString wxFileHistoryBase::NormalizeFileName(const wxFileName& fn)
+{
+    // We specifically exclude wxPATH_NORM_LONG here as it can take a long time
+    // (several seconds) for network file paths under MSW, resulting in huge
+    // delays when opening a program using wxFileHistory. We also exclude
+    // wxPATH_NORM_ENV_VARS as the file names here are supposed to be "real"
+    // file names and not have any environment variables in them.
+    wxFileName fnNorm(fn);
+    fnNorm.Normalize(wxPATH_NORM_DOTS |
+                     wxPATH_NORM_TILDE |
+                     wxPATH_NORM_CASE |
+                     wxPATH_NORM_ABSOLUTE);
+    return fnNorm.GetFullPath();
+}
+

 void wxFileHistoryBase::AddFileToHistory(const wxString& file)
 {
 void wxFileHistoryBase::AddFileToHistory(const wxString& file)
 {

-    // check if we don't already have this file
+    // Check if we don't already have this file. Notice that we avoid
+    // wxFileName::operator==(wxString) here as it converts the string to
+    // wxFileName and then normalizes it using all normalizations which is too
+    // slow (see the comment above), so we use our own quick normalization
+    // functions and a string comparison.

     const wxFileName fnNew(file);
     const wxFileName fnNew(file);

+    const wxString newFile = NormalizeFileName(fnNew);

     size_t i,
            numFiles = m_fileHistory.size();
     for ( i = 0; i < numFiles; i++ )
     {
     size_t i,
            numFiles = m_fileHistory.size();
     for ( i = 0; i < numFiles; i++ )
     {

-        if ( fnNew == m_fileHistory[i] )
+        if ( newFile == NormalizeFileName(m_fileHistory[i]) )

         {
             // we do have it, move it to the top of the history
             RemoveFileFromHistory(i);
         {
             // we do have it, move it to the top of the history
             RemoveFileFromHistory(i);