Border corrections

[wxWidgets.git] / src / generic / logg.cpp

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index ab86120d6370467f6ea4e134fcae4bc1043c91c6..235e067769a58e04b624eaa762ce6664726827bd 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -275,15 +275,9 @@ void wxLogGui::Flush()
     // do it right now to block any new calls to Flush() while we're here
     m_bHasMessages = false;
 
-    unsigned repeatCount = 0;
-    if ( wxLog::GetRepetitionCounting() )
-    {
-        repeatCount = wxLog::DoLogNumberOfRepeats();
-    }
+    const unsigned repeatCount = LogLastRepetitionCountIfNeeded();
 
-    wxString appName = wxTheApp->GetAppName();
-    if ( !appName.empty() )
-        appName[0u] = (wxChar)wxToupper(appName[0u]);
+    wxString appName = wxTheApp->GetAppDisplayName();
 
     long style;
     wxString titleFormat;
@@ -319,7 +313,11 @@ void wxLogGui::Flush()
 #if wxUSE_LOG_DIALOG
 
         if ( repeatCount > 0 )
-            m_aMessages[nMsgCount-1] += wxString::Format(wxT(" (%s)"), m_aMessages[nMsgCount-2].c_str());
+        {
+            m_aMessages[nMsgCount - 1]
+                << " (" << m_aMessages[nMsgCount - 2] << ")";
+        }
+
         wxLogDialog dlg(NULL,
                         m_aMessages, m_aSeverity, m_aTimes,
                         title, style);
@@ -407,7 +405,7 @@ void wxLogGui::DoLog(wxLogLevel level, const wxString& szString, time_t t)
                     // don't prepend debug/trace here: it goes to the
                     // debug window anyhow
                     str += wxT("\r\n");
-                    OutputDebugString(str);
+                    OutputDebugString(str.wx_str());
                 #else
                     // send them to stderr
                     wxFprintf(stderr, wxT("[%s] %s\n"),
@@ -469,7 +467,7 @@ class wxLogFrame : public wxFrame
 {
 public:
     // ctor & dtor
-    wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle);
+    wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle);
     virtual ~wxLogFrame();
 
     // menu callbacks
@@ -513,7 +511,7 @@ BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
     EVT_CLOSE(wxLogFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
-wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle)
+wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle)
           : wxFrame(pParent, wxID_ANY, szTitle)
 {
     m_log = log;
@@ -621,7 +619,7 @@ wxLogFrame::~wxLogFrame()
 // -----------
 
 wxLogWindow::wxLogWindow(wxWindow *pParent,
-                         const wxChar *szTitle,
+                         const wxString& szTitle,
                          bool bShow,
                          bool bDoPass)
 {