From 9cc790869ed3905c78c7eeeb0bb44f800b3f2af4 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:11:09 +0200
Subject: 3.15

---
 ui/progress_indicator.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'ui/progress_indicator.cpp')

diff --git a/ui/progress_indicator.cpp b/ui/progress_indicator.cpp
index 7431a4c1..6e86fbba 100644
--- a/ui/progress_indicator.cpp
+++ b/ui/progress_indicator.cpp
@@ -450,27 +450,24 @@ private:
 
         const std::vector<wxString>& messages = log_.getFormattedMessages(includedTypes);
 
-        wxString newLogText;
+
+        zxString newLogText; //perf: wxString doesn't model exponential growth and so is out
 
         if (!messages.empty())
             for (std::vector<wxString>::const_iterator i = messages.begin(); i != messages.end(); ++i)
             {
-                newLogText += *i;
+                newLogText += wxToZx(*i);
                 newLogText += wxT("\n\n");
             }
         else //if no messages match selected view filter, show final status message at least
         {
             const std::vector<wxString>& allMessages = log_.getFormattedMessages();
             if (!allMessages.empty())
-                newLogText = allMessages.back();
+                newLogText = wxToZx(allMessages.back());
         }
 
-#ifndef _MSC_VER
-#warning design okay?
-#endif
-
         wxWindowUpdateLocker dummy(m_textCtrlInfo);
-        m_textCtrlInfo->ChangeValue(newLogText);
+        m_textCtrlInfo->ChangeValue(zxToWx(newLogText));
         m_textCtrlInfo->ShowPosition(m_textCtrlInfo->GetLastPosition());
     }
 
-- 
cgit