#define LOG_BUFFER_SIZE (4096)
// static buffer for error messages (FIXME MT-unsafe)
-static char s_szBuf[LOG_BUFFER_SIZE];
+static wxChar s_szBuf[LOG_BUFFER_SIZE];
// generic log function
-void wxLogGeneric(wxLogLevel level, const char *szFormat, ...)
+void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
{
if ( wxLog::GetActiveTarget() != NULL ) {
va_list argptr;
va_start(argptr, szFormat);
- vsprintf(s_szBuf, szFormat, argptr);
+ wxVsprintf(s_szBuf, szFormat, argptr);
va_end(argptr);
wxLog::OnLog(level, s_szBuf, time(NULL));
}
#define IMPLEMENT_LOG_FUNCTION(level) \
- void wxLog##level(const char *szFormat, ...) \
+ void wxLog##level(const wxChar *szFormat, ...) \
{ \
if ( wxLog::GetActiveTarget() != NULL ) { \
va_list argptr; \
va_start(argptr, szFormat); \
- vsprintf(s_szBuf, szFormat, argptr); \
+ wxVsprintf(s_szBuf, szFormat, argptr); \
va_end(argptr); \
\
wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL)); \
// accepts an additional argument which tells to which frame the output should
// be directed
-void wxLogStatus(wxFrame *pFrame, const char *szFormat, ...)
+void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
{
wxLog *pLog = wxLog::GetActiveTarget();
if ( pLog != NULL ) {
va_list argptr;
va_start(argptr, szFormat);
- vsprintf(s_szBuf, szFormat, argptr);
+ wxVsprintf(s_szBuf, szFormat, argptr);
va_end(argptr);
wxASSERT( gs_pFrame == NULL ); // should be reset!
}
// same as info, but only if 'verbose' mode is on
-void wxLogVerbose(const char *szFormat, ...)
+void wxLogVerbose(const wxChar *szFormat, ...)
{
wxLog *pLog = wxLog::GetActiveTarget();
if ( pLog != NULL && pLog->GetVerbose() ) {
va_list argptr;
va_start(argptr, szFormat);
- vsprintf(s_szBuf, szFormat, argptr);
+ wxVsprintf(s_szBuf, szFormat, argptr);
va_end(argptr);
wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL));
// debug functions
#ifdef __WXDEBUG__
#define IMPLEMENT_LOG_DEBUG_FUNCTION(level) \
- void wxLog##level(const char *szFormat, ...) \
+ void wxLog##level(const wxChar *szFormat, ...) \
{ \
if ( wxLog::GetActiveTarget() != NULL ) { \
va_list argptr; \
va_start(argptr, szFormat); \
- vsprintf(s_szBuf, szFormat, argptr); \
+ wxVsprintf(s_szBuf, szFormat, argptr); \
va_end(argptr); \
\
wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL)); \
} \
}
- void wxLogTrace(const char *mask, const char *szFormat, ...)
+ void wxLogTrace(const wxChar *mask, const wxChar *szFormat, ...)
{
wxLog *pLog = wxLog::GetActiveTarget();
if ( pLog != NULL && wxLog::IsAllowedTraceMask(mask) ) {
va_list argptr;
va_start(argptr, szFormat);
- vsprintf(s_szBuf, szFormat, argptr);
+ wxVsprintf(s_szBuf, szFormat, argptr);
va_end(argptr);
wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
}
}
- void wxLogTrace(wxTraceMask mask, const char *szFormat, ...)
+ void wxLogTrace(wxTraceMask mask, const wxChar *szFormat, ...)
{
wxLog *pLog = wxLog::GetActiveTarget();
if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) {
va_list argptr;
va_start(argptr, szFormat);
- vsprintf(s_szBuf, szFormat, argptr);
+ wxVsprintf(s_szBuf, szFormat, argptr);
va_end(argptr);
wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
// common part of both wxLogSysError
void wxLogSysErrorHelper(long lErrCode)
{
- char szErrMsg[LOG_BUFFER_SIZE / 2];
- sprintf(szErrMsg, _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
- strncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - strlen(s_szBuf));
+ wxChar szErrMsg[LOG_BUFFER_SIZE / 2];
+ wxSprintf(szErrMsg, _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
+ wxStrncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - wxStrlen(s_szBuf));
wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL));
}
-void WXDLLEXPORT wxLogSysError(const char *szFormat, ...)
+void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
{
va_list argptr;
va_start(argptr, szFormat);
- vsprintf(s_szBuf, szFormat, argptr);
+ wxVsprintf(s_szBuf, szFormat, argptr);
va_end(argptr);
wxLogSysErrorHelper(wxSysErrorCode());
}
-void WXDLLEXPORT wxLogSysError(long lErrCode, const char *szFormat, ...)
+void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
{
va_list argptr;
va_start(argptr, szFormat);
- vsprintf(s_szBuf, szFormat, argptr);
+ wxVsprintf(s_szBuf, szFormat, argptr);
va_end(argptr);
wxLogSysErrorHelper(lErrCode);
ms_aTraceMasks.Remove((size_t)index);
}
-void wxLog::DoLog(wxLogLevel level, const char *szString, time_t t)
+void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
{
- wxString str;
-
switch ( level ) {
case wxLOG_FatalError:
- DoLogString(str << _("Fatal error: ") << szString, t);
+ DoLogString(wxString(_("Fatal error: ")) + szString, t);
DoLogString(_("Program aborted."), t);
Flush();
abort();
break;
case wxLOG_Error:
- DoLogString(str << _("Error: ") << szString, t);
+ DoLogString(wxString(_("Error: ")) + szString, t);
break;
case wxLOG_Warning:
- DoLogString(str << _("Warning: ") << szString, t);
+ DoLogString(wxString(_("Warning: ")) + szString, t);
break;
case wxLOG_Info:
- case wxLOG_Message:
if ( GetVerbose() )
- DoLogString(str + szString, t);
+ case wxLOG_Message:
+ default: // log unknown log levels too
+ DoLogString(szString, t);
// fall through
case wxLOG_Status:
#ifdef __WXDEBUG__
DoLogString(szString, t);
#endif
-
break;
-
- default:
- wxFAIL_MSG(_("unknown log level in wxLog::DoLog"));
}
}
-void wxLog::DoLogString(const char *WXUNUSED(szString), time_t t)
+void wxLog::DoLogString(const wxChar *WXUNUSED(szString), time_t WXUNUSED(t))
{
- wxFAIL_MSG("DoLogString must be overriden if it's called.");
+ wxFAIL_MSG(_T("DoLogString must be overriden if it's called."));
}
void wxLog::Flush()
m_fp = fp;
}
-void wxLogStderr::DoLogString(const char *szString, time_t t)
+void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
{
wxString str(szString);
- str << '\n';
+ str << _T('\n');
- fputs(str, m_fp);
+ fputs(str.mb_str(), m_fp);
fflush(m_fp);
// under Windows, programs usually don't have stderr at all, so make show the
// messages also under debugger
#ifdef __WXMSW__
- OutputDebugString(str + '\r');
+ OutputDebugString(str + _T('\r'));
#endif // MSW
}
m_ostr = ostr;
}
-void wxLogStream::DoLogString(const char *szString, time_t t)
+void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
{
- (*m_ostr) << szString << endl << flush;
+ (*m_ostr) << wxConv_libc.cWX2MB(szString) << endl << flush;
}
#endif // wxUSE_STD_IOSTREAM
if ( nLines > 25 ) // don't put too many lines in message box
break;
- str << m_aMessages[n - 1] << "\n";
+ str << m_aMessages[n - 1] << _T("\n");
}
- const char *title;
+ const wxChar *title;
long style;
if ( m_bErrors ) {
// the default behaviour is to discard all informational messages if there
// are any errors/warnings.
-void wxLogGui::DoLog(wxLogLevel level, const char *szString, time_t t)
+void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
{
switch ( level ) {
case wxLOG_Info:
#ifdef __WXMSW__
// don't prepend debug/trace here: it goes to the
// debug window anyhow, but do put a timestamp
- OutputDebugString(wxString(szString) + "\n\r");
+ OutputDebugString(wxString(szString) + _T("\n\r"));
#else
// send them to stderr
- fprintf(stderr, "%s: %s\n",
- level == wxLOG_Trace ? "Trace" : "Debug",
+ wxFprintf(stderr, _T("%s: %s\n"),
+ level == wxLOG_Trace ? _T("Trace") : _T("Debug"),
szString);
fflush(stderr);
#endif
m_aMessages.Add(szString);
m_aTimes.Add((long)t);
break;
-
- default:
- wxFAIL_MSG(_("unknown log level in wxLogGui::DoLog"));
}
}
{
public:
// ctor & dtor
- wxLogFrame(wxFrame *pParent, wxLogWindow *log, const char *szTitle);
+ wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle);
virtual ~wxLogFrame();
// menu callbacks
EVT_CLOSE(wxLogFrame::OnCloseWindow)
END_EVENT_TABLE()
-wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const char *szTitle)
+wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle)
: wxFrame(pParent, -1, szTitle)
{
m_log = log;
{
// get the file name
// -----------------
- const char *szFileName = wxSaveFileSelector("log", "txt", "log.txt");
+ const wxChar *szFileName = wxSaveFileSelector(_T("log"), _T("txt"), _T("log.txt"));
if ( szFileName == NULL ) {
// cancelled
return;
// wxLogWindow
// -----------
wxLogWindow::wxLogWindow(wxFrame *pParent,
- const char *szTitle,
+ const wxChar *szTitle,
bool bShow,
bool bDoPass)
{
m_bHasMessages = FALSE;
}
-void wxLogWindow::DoLog(wxLogLevel level, const char *szString, time_t t)
+void wxLogWindow::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
{
// first let the previous logger show it
if ( m_pOldLog != NULL && m_bPassMessages ) {
case wxLOG_Status:
// by default, these messages are ignored by wxLog, so process
// them ourselves
+ if ( !wxIsEmpty(szString) )
{
wxString str;
str << _("Status: ") << szString;
m_bHasMessages = TRUE;
}
-void wxLogWindow::DoLogString(const char *szString, time_t t)
+void wxLogWindow::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
{
// put the text into our window
wxTextCtrl *pText = m_pLogFrame->TextCtrl();
#endif // Windows
pText->WriteText(szString);
- pText->WriteText("\n"); // "\n" ok here (_not_ "\r\n")
+ pText->WriteText(_T("\n")); // "\n" ok here (_not_ "\r\n")
// TODO ensure that the line can be seen
}
}
// get error message from system
-const char *wxSysErrorMsg(unsigned long nErrCode)
+const wxChar *wxSysErrorMsg(unsigned long nErrCode)
{
if ( nErrCode == 0 )
nErrCode = wxSysErrorCode();
#ifdef __WXMSW__
#ifdef __WIN32__
- static char s_szBuf[LOG_BUFFER_SIZE / 2];
+ static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
// get error message from system
LPVOID lpMsgBuf;
0, NULL);
// copy it to our buffer and free memory
- strncpy(s_szBuf, (const char *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
- s_szBuf[WXSIZEOF(s_szBuf) - 1] = '\0';
+ wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
+ s_szBuf[WXSIZEOF(s_szBuf) - 1] = _T('\0');
LocalFree(lpMsgBuf);
// returned string is capitalized and ended with '\r\n' - bad
- s_szBuf[0] = (char)tolower(s_szBuf[0]);
- size_t len = strlen(s_szBuf);
+ s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
+ size_t len = wxStrlen(s_szBuf);
if ( len > 0 ) {
// truncate string
- if ( s_szBuf[len - 2] == '\r' )
- s_szBuf[len - 2] = '\0';
+ if ( s_szBuf[len - 2] == _T('\r') )
+ s_szBuf[len - 2] = _T('\0');
}
return s_szBuf;
return NULL;
#endif // Win16/32
#else // Unix
+#if wxUSE_UNICODE
+ static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
+ wxConv_libc.MB2WC(s_szBuf, strerror(nErrCode), WXSIZEOF(s_szBuf) -1);
+ return s_szBuf;
+#else
return strerror(nErrCode);
+#endif
#endif // Win/Unix
}
}
// this function is called when an assert fails
-void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
+void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
{
// this variable can be set to true to suppress "assert failure" messages
static bool s_bNoAsserts = FALSE;
s_bInAssert = TRUE;
- char szBuf[LOG_BUFFER_SIZE];
+ wxChar szBuf[LOG_BUFFER_SIZE];
// make life easier for people using VC++ IDE: clicking on the message
// will take us immediately to the place of the failed assert
#ifdef __VISUALC__
- sprintf(szBuf, "%s(%d): assert failed", szFile, nLine);
+ wxSprintf(szBuf, _T("%s(%d): assert failed"), szFile, nLine);
#else // !VC++
// make the error message more clear for all the others
- sprintf(szBuf, "Assert failed in file %s at line %d", szFile, nLine);
+ wxSprintf(szBuf, _T("Assert failed in file %s at line %d"), szFile, nLine);
#endif // VC/!VC
if ( szMsg != NULL ) {
- strcat(szBuf, ": ");
- strcat(szBuf, szMsg);
+ wxStrcat(szBuf, _T(": "));
+ wxStrcat(szBuf, szMsg);
}
else {
- strcat(szBuf, ".");
+ wxStrcat(szBuf, _T("."));
}
if ( !s_bNoAsserts ) {
#else
// this message is intentionally not translated - it is for
// developpers only
- strcat(szBuf, "\nDo you want to stop the program?"
+ wxStrcat(szBuf, _T("\nDo you want to stop the program?"
"\nYou can also choose [Cancel] to suppress "
- "further warnings.");
+ "further warnings."));
switch ( wxMessageBox(szBuf, _("Debug"),
wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
projects / wxWidgets.git / blobdiff