many changes; major ones:
1. start of !wxUSE_GUI support 2. _T() macro renamed to T() 3. wxConvertWX2MB and MB2WX macro added git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -27,8 +27,8 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#ifdef wxUSE_NOGUI
|
||||
#error "This file can't be compiled in NOGUI mode!"
|
||||
#if !wxUSE_GUI
|
||||
#error "This file can't be compiled without GUI!"
|
||||
#endif
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
@@ -94,7 +94,7 @@ void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
|
||||
{
|
||||
wxString msg;
|
||||
TimeStamp(&msg);
|
||||
msg << szString << _T('\n');
|
||||
msg << szString << T('\n');
|
||||
|
||||
m_pTextCtrl->AppendText(msg);
|
||||
}
|
||||
@@ -138,7 +138,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] << T("\n");
|
||||
}
|
||||
|
||||
const wxChar *title;
|
||||
@@ -208,13 +208,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 << T("\n\r");
|
||||
OutputDebugString(str);
|
||||
#else
|
||||
// send them to stderr
|
||||
wxFprintf(stderr, _T("%s: %s\n"),
|
||||
level == wxLOG_Trace ? _T("Trace")
|
||||
: _T("Debug"),
|
||||
wxFprintf(stderr, T("%s: %s\n"),
|
||||
level == wxLOG_Trace ? T("Trace")
|
||||
: T("Debug"),
|
||||
szString);
|
||||
fflush(stderr);
|
||||
#endif
|
||||
@@ -351,7 +351,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(T("log"), T("txt"), T("log.txt"));
|
||||
if ( szFileName == NULL ) {
|
||||
// cancelled
|
||||
return;
|
||||
@@ -511,7 +511,7 @@ void wxLogWindow::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
|
||||
|
||||
wxString msg;
|
||||
TimeStamp(&msg);
|
||||
msg << szString << _T('\n');
|
||||
msg << szString << T('\n');
|
||||
|
||||
pText->AppendText(msg);
|
||||
|
||||
|
Reference in New Issue
Block a user