X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/generic/logg.cpp?ds=inline diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index bf9af38c48..c38a09de27 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -45,6 +45,11 @@ #include "wx/file.h" #include "wx/textfile.h" +#ifdef __WXMSW__ + // for OutputDebugString() + #include "wx/msw/private.h" +#endif // Windows + // ---------------------------------------------------------------------------- // global variables // ---------------------------------------------------------------------------- @@ -94,7 +99,7 @@ void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) { wxString msg; TimeStamp(&msg); - msg << szString << T('\n'); + msg << szString << wxT('\n'); m_pTextCtrl->AppendText(msg); } @@ -138,7 +143,7 @@ void wxLogGui::Flush() if ( nLines > 25 ) // don't put too many lines in message box break; - str << m_aMessages[n - 1] << T("\n"); + str << m_aMessages[n - 1] << wxT("\n"); } const wxChar *title; @@ -208,13 +213,13 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t) // debug window anyhow, but do put a timestamp wxString str; TimeStamp(&str); - str << szString << T("\n\r"); + str << szString << wxT("\n\r"); OutputDebugString(str); #else // send them to stderr - wxFprintf(stderr, T("%s: %s\n"), - level == wxLOG_Trace ? T("Trace") - : T("Debug"), + wxFprintf(stderr, wxT("%s: %s\n"), + level == wxLOG_Trace ? wxT("Trace") + : wxT("Debug"), szString); fflush(stderr); #endif @@ -351,7 +356,7 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event)) { // get the file name // ----------------- - const wxChar *szFileName = wxSaveFileSelector(T("log"), T("txt"), T("log.txt")); + const wxChar *szFileName = wxSaveFileSelector(wxT("log"), wxT("txt"), wxT("log.txt")); if ( szFileName == NULL ) { // cancelled return; @@ -511,7 +516,7 @@ void wxLogWindow::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) wxString msg; TimeStamp(&msg); - msg << szString << T('\n'); + msg << szString << wxT('\n'); pText->AppendText(msg);