// wxWindows
#ifndef WX_PRECOMP
- #include <wx/string.h>
#include <wx/app.h>
+ #include <wx/string.h>
+ #include <wx/intl.h>
+ #include <wx/menu.h>
+ #include <wx/frame.h>
+
#include <wx/generic/msgdlgg.h>
-#endif
+ #include <wx/filedlg.h>
+ #include <wx/textctrl.h>
+#endif //WX_PRECOMP
-#include <wx/intl.h>
+#include <wx/file.h>
+#include <wx/textfile.h>
+#include <wx/utils.h>
#include <wx/log.h>
// other standard headers
#include <stdlib.h>
#include <time.h>
-// C++ headers
-#include <iostream.h>
-
-// _WINDOWS_ is defined when windows.h is included,
-// __WINDOWS__ is defined for MS Windows compilation
-#if defined(__WINDOWS__) && !defined(_WINDOWS_)
-#include <windows.h>
-#endif //windows.h
+#ifdef __WXMSW__
+ #include <windows.h>
+#else //Unix
+ #include <signal.h>
+#endif //Win/Unix
// ----------------------------------------------------------------------------
// non member functions
// define this to enable wrapping of log messages
//#define LOG_PRETTY_WRAP
-#ifdef LOG_PRETTY_WRAP
+#ifdef LOG_PRETTY_WRAP
static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz);
#endif
+// ----------------------------------------------------------------------------
+// global variables
+// ----------------------------------------------------------------------------
+
+// we use a global variable to store the frame pointer for wxLogStatus - bad,
+// but it's he easiest way
+static wxFrame *gs_pFrame;
+
// ============================================================================
// implementation
// ============================================================================
static char s_szBuf[LOG_BUFFER_SIZE];
// generic log function
-void wxLogGeneric(wxLog::Level level, wxTString strFormat, ...)
+void wxLogGeneric(wxLogLevel level, const char *szFormat, ...)
{
- if ( wxLog::GetActiveTarget() != NULL ) {
- va_list argptr;
- va_start(argptr, strFormat);
- vsprintf(s_szBuf, strFormat, argptr);
- va_end(argptr);
-
- wxLog::OnLog(level, s_szBuf);
- }
+ if ( wxLog::GetActiveTarget() != NULL ) {
+ va_list argptr;
+ va_start(argptr, szFormat);
+ vsprintf(s_szBuf, szFormat, argptr);
+ va_end(argptr);
+
+ wxLog::OnLog(level, s_szBuf);
+ }
}
#define IMPLEMENT_LOG_FUNCTION(level) \
- void wxLog##level(wxTString strFormat, ...) \
+ void wxLog##level(const char *szFormat, ...) \
{ \
if ( wxLog::GetActiveTarget() != NULL ) { \
va_list argptr; \
- va_start(argptr, strFormat); \
- vsprintf(s_szBuf, strFormat, argptr); \
+ va_start(argptr, szFormat); \
+ vsprintf(s_szBuf, szFormat, argptr); \
va_end(argptr); \
\
- wxLog::OnLog(wxLog::level, s_szBuf); \
+ wxLog::OnLog(wxLOG_##level, s_szBuf); \
} \
}
IMPLEMENT_LOG_FUNCTION(Info)
IMPLEMENT_LOG_FUNCTION(Status)
-// debug functions don't use wxTString
-#undef IMPLEMENT_LOG_FUNCTION
-#define IMPLEMENT_LOG_FUNCTION(level) \
+// accepts an additional argument which tells to which frame the output should
+// be directed
+void wxLogStatus(wxFrame *pFrame, const char *szFormat, ...)
+{
+ wxLog *pLog = wxLog::GetActiveTarget();
+ if ( pLog != NULL ) {
+ va_list argptr;
+ va_start(argptr, szFormat);
+ vsprintf(s_szBuf, szFormat, argptr);
+ va_end(argptr);
+
+ wxASSERT( gs_pFrame == NULL ); // should be reset!
+ gs_pFrame = pFrame;
+ wxLog::OnLog(wxLOG_Status, s_szBuf);
+ gs_pFrame = NULL;
+ }
+}
+
+// same as info, but only if 'verbose' mode is on
+void wxLogVerbose(const char *szFormat, ...)
+{
+ wxLog *pLog = wxLog::GetActiveTarget();
+ if ( pLog != NULL && pLog->GetVerbose() ) {
+ va_list argptr;
+ va_start(argptr, szFormat);
+ vsprintf(s_szBuf, szFormat, argptr);
+ va_end(argptr);
+
+ wxLog::OnLog(wxLOG_Info, s_szBuf);
+ }
+}
+
+// debug functions
+#ifdef __WXDEBUG__
+#define IMPLEMENT_LOG_DEBUG_FUNCTION(level) \
void wxLog##level(const char *szFormat, ...) \
{ \
if ( wxLog::GetActiveTarget() != NULL ) { \
vsprintf(s_szBuf, szFormat, argptr); \
va_end(argptr); \
\
- wxLog::OnLog(wxLog::level, s_szBuf); \
+ wxLog::OnLog(wxLOG_##level, s_szBuf); \
} \
}
-IMPLEMENT_LOG_FUNCTION(Debug)
-IMPLEMENT_LOG_FUNCTION(Trace)
+ void wxLogTrace(wxTraceMask mask, const char *szFormat, ...)
+ {
+ wxLog *pLog = wxLog::GetActiveTarget();
-void wxLogVerbose(wxTString strFormat, ...)
-{
- if ( wxLog::GetVerbose() && wxLog::GetActiveTarget() != NULL ) {
- va_list argptr;
- va_start(argptr, strFormat);
- vsprintf(s_szBuf, strFormat, argptr);
- va_end(argptr);
-
- wxLog::OnLog(wxLog::Info, s_szBuf);
- }
-}
-
-void wxLogSysError(wxTString str, ...)
-{
- if ( wxLog::GetActiveTarget() != NULL ) {
- va_list argptr;
- va_start(argptr, str);
- vsprintf(s_szBuf, str, argptr);
- va_end(argptr);
-
- char szErrMsg[LOG_BUFFER_SIZE / 2];
- sprintf(szErrMsg, _(" (error %ld: %s)"), wxSysErrorCode(), wxSysErrorMsg());
- strncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - strlen(s_szBuf));
+ // we check that all of mask bits are set in the current mask, so
+ // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
+ // if both bits are set.
+ if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) {
+ va_list argptr;
+ va_start(argptr, szFormat);
+ vsprintf(s_szBuf, szFormat, argptr);
+ va_end(argptr);
- wxLog::OnLog(wxLog::Error, s_szBuf);
+ wxLog::OnLog(wxLOG_Trace, s_szBuf);
+ }
}
+
+#else // release
+ #define IMPLEMENT_LOG_DEBUG_FUNCTION(level)
+#endif
+
+IMPLEMENT_LOG_DEBUG_FUNCTION(Debug)
+IMPLEMENT_LOG_DEBUG_FUNCTION(Trace)
+
+// wxLogSysError: one uses the last error code, for other you must give it
+// explicitly
+
+// 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));
+
+ wxLog::OnLog(wxLOG_Error, s_szBuf);
}
-void WXDLLEXPORT wxLogSysError(long lErrCode, wxTString strFormat, ...)
+void WXDLLEXPORT wxLogSysError(const char *szFormat, ...)
{
- if ( wxLog::GetActiveTarget() != NULL ) {
- va_list argptr;
- va_start(argptr, strFormat);
- vsprintf(s_szBuf, strFormat, argptr);
- va_end(argptr);
+ va_list argptr;
+ va_start(argptr, szFormat);
+ vsprintf(s_szBuf, szFormat, argptr);
+ va_end(argptr);
- char szErrMsg[LOG_BUFFER_SIZE / 2];
- sprintf(szErrMsg, _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
- strncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - strlen(s_szBuf));
+ wxLogSysErrorHelper(wxSysErrorCode());
+}
- wxLog::OnLog(wxLog::Error, s_szBuf);
- }
+void WXDLLEXPORT wxLogSysError(long lErrCode, const char *szFormat, ...)
+{
+ va_list argptr;
+ va_start(argptr, szFormat);
+ vsprintf(s_szBuf, szFormat, argptr);
+ va_end(argptr);
+
+ wxLogSysErrorHelper(lErrCode);
}
// ----------------------------------------------------------------------------
wxLog::wxLog()
{
m_bHasMessages = FALSE;
+ m_bVerbose = FALSE;
+ m_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";
}
-wxLog *wxLog::GetActiveTarget()
-{
- if ( !ms_bInitialized ) {
- // prevent infinite recursion if someone calls wxLogXXX() from wxApp
- ms_bInitialized = TRUE;
-
- // ask the application to create a log target for us if it exists
- if ( wxTheApp != NULL )
- ms_pLogger = wxTheApp->CreateLogTarget();
- else
- ms_pLogger = new wxLogStderr;
+wxLog *wxLog::GetActiveTarget()
+{
+ if ( ms_bAutoCreate && ms_pLogger == NULL ) {
+ // prevent infinite recursion if someone calls wxLogXXX() from
+ // wxApp::CreateLogTarget()
+ static bool s_bInGetActiveTarget = FALSE;
+ if ( !s_bInGetActiveTarget ) {
+ s_bInGetActiveTarget = TRUE;
+
+ #ifdef WX_TEST_MINIMAL
+ ms_pLogger = new wxLogStderr;
+ #else
+ // ask the application to create a log target for us
+ if ( wxTheApp != NULL )
+ ms_pLogger = wxTheApp->CreateLogTarget();
+ #endif
- // do nothing if it fails - what can we do?
+ // do nothing if it fails - what can we do?
+ }
}
- return ms_pLogger;
+ return ms_pLogger;
}
wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
-{
+{
// flush the old messages before changing
if ( ms_pLogger != NULL )
ms_pLogger->Flush();
- ms_bInitialized = TRUE;
-
- wxLog *pOldLogger = ms_pLogger;
- ms_pLogger = pLogger;
- return pOldLogger;
+ wxLog *pOldLogger = ms_pLogger;
+ ms_pLogger = pLogger;
+ return pOldLogger;
}
-void wxLog::DoLog(Level level, const char *szString)
+wxString wxLog::TimeStamp() const
{
- char szBuf[128];
- time_t timeNow;
- struct tm *ptmNow;
+ wxString str;
- time(&timeNow);
- ptmNow = localtime(&timeNow);
+ if ( !IsEmpty(m_szTimeFormat) ) {
+ char szBuf[128];
+ time_t timeNow;
+ struct tm *ptmNow;
- strftime(szBuf, WXSIZEOF(szBuf), ms_szTimeFormat, ptmNow);
- wxString str = szBuf;
+ time(&timeNow);
+ ptmNow = localtime(&timeNow);
+
+ strftime(szBuf, WXSIZEOF(szBuf), m_szTimeFormat, ptmNow);
+ str = szBuf;
+ }
+
+ return str;
+}
+
+void wxLog::DoLog(wxLogLevel level, const char *szString)
+{
+ // prepend a timestamp if not disabled
+ wxString str = TimeStamp();
switch ( level ) {
- case FatalError:
+ case wxLOG_FatalError:
DoLogString(str << _("Fatal error: ") << szString);
DoLogString(_("Program aborted."));
Flush();
abort();
break;
- case Error:
+ case wxLOG_Error:
DoLogString(str << _("Error: ") << szString);
break;
- case Warning:
+ case wxLOG_Warning:
DoLogString(str << _("Warning: ") << szString);
break;
- case Info:
+ case wxLOG_Info:
if ( GetVerbose() )
- case Message:
+ case wxLOG_Message:
DoLogString(str + szString);
// fall through
- case Status:
+ case wxLOG_Status:
// nothing to do
break;
- case Trace:
- case Debug:
- #ifdef __DEBUG__
- #ifdef __WIN32__
- // in addition to normal logging, also send the string to debugger
- // (don't prepend "Debug" here: it will go to debug window anyhow)
- ::OutputDebugString(str + szString + "\n\r");
- #endif //Win32
- DoLogString(str << (level == Trace ? _("Trace") : _("Debug"))
+ case wxLOG_Trace:
+ case wxLOG_Debug:
+ #ifdef __WXDEBUG__
+ DoLogString(str << (level == wxLOG_Trace ? _("Trace") : _("Debug"))
<< ": " << szString);
#endif
-
+
break;
default:
- wxFAIL_MSG("unknown log level in wxLog::DoLog");
+ wxFAIL_MSG(_("unknown log level in wxLog::DoLog"));
}
}
void wxLog::DoLogString(const char *WXUNUSED(szString))
{
- wxFAIL_MSG("DoLogString must be overrided if it's called.");
+ wxFAIL_MSG(_("DoLogString must be overrided if it's called."));
}
void wxLog::Flush()
// ----------------------------------------------------------------------------
// wxLogTextCtrl implementation
// ----------------------------------------------------------------------------
-
-/*
wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
+// @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf
+
+// Also, in DLL mode in wxMSW, can't use it.
+#if defined(NO_TEXT_WINDOW_STREAM)
+#else
: wxLogStream(new ostream(pTextCtrl))
+#endif
{
}
{
delete m_ostr;
}
-*/
// ----------------------------------------------------------------------------
// wxLogGui implementation
return;
// @@@ ugly...
-
+
// concatenate all strings (but not too many to not overfill the msg box)
wxString str;
- uint nLines = 0,
+ uint nLines = 0,
nMsgCount = m_aMessages.Count();
// start from the most recent message
// the default behaviour is to discard all informational messages if there
// are any errors/warnings.
-void wxLogGui::DoLog(Level level, const char *szString)
+void wxLogGui::DoLog(wxLogLevel level, const char *szString)
{
switch ( level ) {
- case Info:
+ case wxLOG_Info:
if ( GetVerbose() )
- case Message:
+ case wxLOG_Message:
if ( !m_bErrors ) {
m_aMessages.Add(szString);
m_bHasMessages = TRUE;
}
break;
- case Status:
+ case wxLOG_Status:
{
// find the top window and set it's status text if it has any
- wxWindow *pWin = wxTheApp->GetTopWindow();
- if ( pWin != NULL && pWin->IsKindOf(CLASSINFO(wxFrame)) ) {
- wxFrame *pFrame = (wxFrame *)pWin;
- pFrame->SetStatusText(szString);
+ wxFrame *pFrame = gs_pFrame;
+ if ( pFrame == NULL ) {
+ wxWindow *pWin = wxTheApp->GetTopWindow();
+ if ( pWin != NULL && pWin->IsKindOf(CLASSINFO(wxFrame)) ) {
+ pFrame = (wxFrame *)pWin;
+ }
}
+
+ if ( pFrame != NULL )
+ pFrame->SetStatusText(szString);
}
break;
- case Trace:
- case Debug:
- #ifdef __DEBUG__
- #ifdef __WIN32__
- OutputDebugString(szString);
- OutputDebugString("\n\r");
- #else //!WIN32
- // send them to stderr
- printf(stderr, level == Trace ? "Trace: %s\n"
- : "Debug: %s\n", szString);
- fflush(stderr);
- #endif // WIN32
+ case wxLOG_Trace:
+ case wxLOG_Debug:
+ #ifdef __WXDEBUG__
+ {
+ wxString strTime = TimeStamp();
+
+ #if defined(__WIN32__) && !defined(__WXSTUBS__)
+ // don't prepend debug/trace here: it goes to the debug window
+ // anyhow, but do put a timestamp
+ OutputDebugString(strTime + szString + "\n\r");
+ #else //!WIN32
+ // send them to stderr
+ fprintf(stderr, "%s %s: %s\n",
+ strTime.c_str(),
+ level == wxLOG_Trace ? _("Trace") : _("Debug"),
+ szString);
+ fflush(stderr);
+ #endif // WIN32
+ }
#endif
break;
- case FatalError:
+ case wxLOG_FatalError:
// show this one immediately
- wxMessageBox(szString, "Fatal error", wxICON_HAND);
+ wxMessageBox(szString, _("Fatal error"), wxICON_HAND);
break;
- case Error:
- case Warning:
+ case wxLOG_Error:
+ case wxLOG_Warning:
// discard earlier informational messages if this is the 1st error
if ( !m_bErrors ) {
m_aMessages.Empty();
m_aMessages.Add(szString);
break;
-
+
default:
- wxFAIL_MSG("unknown log level in wxLogGui::DoLog");
+ wxFAIL_MSG(_("unknown log level in wxLogGui::DoLog"));
}
}
+// ----------------------------------------------------------------------------
+// wxLogWindow and wxLogFrame implementation
+// ----------------------------------------------------------------------------
+
+// log frame class
+// ---------------
+class wxLogFrame : public wxFrame
+{
+public:
+ // ctor & dtor
+ wxLogFrame(wxFrame *pParent, wxLogWindow *log, const char *szTitle);
+ virtual ~wxLogFrame();
+
+ // menu callbacks
+ void OnClose(wxCommandEvent& event);
+ void OnCloseWindow(wxCloseEvent& event);
+ void OnSave (wxCommandEvent& event);
+ void OnClear(wxCommandEvent& event);
+
+ void OnIdle(wxIdleEvent&);
+
+ // accessors
+ wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
+
+private:
+ enum
+ {
+ Menu_Close = 100,
+ Menu_Save,
+ Menu_Clear
+ };
+
+ // instead of closing just hide the window to be able to Show() it later
+ void DoClose() { Show(FALSE); }
+
+ wxTextCtrl *m_pTextCtrl;
+ wxLogWindow *m_log;
+
+ DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
+ // wxLogWindow menu events
+ EVT_MENU(Menu_Close, wxLogFrame::OnClose)
+ EVT_MENU(Menu_Save, wxLogFrame::OnSave)
+ EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
+
+ EVT_CLOSE(wxLogFrame::OnCloseWindow)
+END_EVENT_TABLE()
+
+wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const char *szTitle)
+ : wxFrame(pParent, -1, szTitle)
+{
+ m_log = log;
+
+ // @@ kludge: wxSIMPLE_BORDER is simply to prevent wxWindows from creating
+ // a rich edit control instead of a normal one we want in wxMSW
+ m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition,
+ wxDefaultSize,
+ //wxSIMPLE_BORDER |
+ wxTE_MULTILINE |
+ wxHSCROLL |
+ wxTE_READONLY);
+
+ // create menu
+ wxMenuBar *pMenuBar = new wxMenuBar;
+ wxMenu *pMenu = new wxMenu;
+ pMenu->Append(Menu_Save, _("&Save..."), _("Save log contents to file"));
+ pMenu->Append(Menu_Clear, _("C&lear"), _("Clear the log contents"));
+ pMenu->AppendSeparator();
+ pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));
+ pMenuBar->Append(pMenu, _("&Log"));
+ SetMenuBar(pMenuBar);
+
+ // status bar for menu prompts
+ CreateStatusBar();
+
+ m_log->OnFrameCreate(this);
+}
+
+void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event))
+{
+ DoClose();
+}
+
+void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
+{
+ DoClose();
+}
+
+void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
+{
+ // get the file name
+ // -----------------
+ const char *szFileName = wxSaveFileSelector("log", "txt", "log.txt");
+ if ( szFileName == NULL ) {
+ // cancelled
+ return;
+ }
+
+ // open file
+ // ---------
+ wxFile file;
+ bool bOk = FALSE;
+ if ( wxFile::Exists(szFileName) ) {
+ bool bAppend = FALSE;
+ wxString strMsg;
+ strMsg.Printf(_("Append log to file '%s' "
+ "(choosing [No] will overwrite it)?"), szFileName);
+ switch ( wxMessageBox(strMsg, _("Question"), wxYES_NO | wxCANCEL) ) {
+ case wxYES:
+ bAppend = TRUE;
+ break;
+
+ case wxNO:
+ bAppend = FALSE;
+ break;
+
+ case wxCANCEL:
+ return;
+
+ default:
+ wxFAIL_MSG(_("invalid message box return value"));
+ }
+
+ if ( bAppend ) {
+ bOk = file.Open(szFileName, wxFile::write_append);
+ }
+ else {
+ bOk = file.Create(szFileName, TRUE /* overwrite */);
+ }
+ }
+ else {
+ bOk = file.Create(szFileName);
+ }
+
+ // retrieve text and save it
+ // -------------------------
+#ifdef __WXGTK__
+ // @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet
+ wxLogError(_("Sorry, this function is not implemented under GTK"));
+#else
+ int nLines = m_pTextCtrl->GetNumberOfLines();
+ for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) {
+ bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + wxTextFile::GetEOL());
+ }
+#endif //GTK
+
+ if ( bOk )
+ bOk = file.Close();
+
+ if ( !bOk ) {
+ wxLogError(_("Can't save log contents to file."));
+ return;
+ }
+}
+
+void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))
+{
+ m_pTextCtrl->Clear();
+}
+
+wxLogFrame::~wxLogFrame()
+{
+ m_log->OnFrameDelete(this);
+}
+
+// wxLogWindow
+// -----------
+wxLogWindow::wxLogWindow(wxFrame *pParent,
+ const char *szTitle,
+ bool bShow,
+ bool bDoPass)
+{
+ m_bPassMessages = bDoPass;
+
+ m_pLogFrame = new wxLogFrame(pParent, this, szTitle);
+ m_pOldLog = wxLog::SetActiveTarget(this);
+
+ if ( bShow )
+ m_pLogFrame->Show(TRUE);
+}
+
+void wxLogWindow::Show(bool bShow)
+{
+ m_pLogFrame->Show(bShow);
+}
+
+void wxLogWindow::Flush()
+{
+ if ( m_pOldLog != NULL )
+ m_pOldLog->Flush();
+
+ m_bHasMessages = FALSE;
+}
+
+void wxLogWindow::DoLog(wxLogLevel level, const char *szString)
+{
+ // first let the previous logger show it
+ if ( m_pOldLog != NULL && m_bPassMessages ) {
+ // @@@ why can't we access protected wxLog method from here (we derive
+ // from wxLog)? gcc gives "DoLog is protected in this context", what
+ // does this mean? Anyhow, the cast is harmless and let's us do what
+ // we want.
+ ((wxLogWindow *)m_pOldLog)->DoLog(level, szString);
+ }
+
+ // don't put trace messages in the text window for 2 reasons:
+ // 1) there are too many of them
+ // 2) they may provoke other trace messages thus sending a program into an
+ // infinite loop
+ if ( m_pLogFrame && level != wxLOG_Trace ) {
+ // and this will format it nicely and call our DoLogString()
+ wxLog::DoLog(level, szString);
+ }
+
+ m_bHasMessages = TRUE;
+}
+
+void wxLogWindow::DoLogString(const char *szString)
+{
+ // put the text into our window
+ wxTextCtrl *pText = m_pLogFrame->TextCtrl();
+
+ // remove selection (WriteText is in fact ReplaceSelection)
+ #ifdef __WXMSW__
+ long nLen = pText->GetLastPosition();
+ pText->SetSelection(nLen, nLen);
+ #endif // Windows
+
+ pText->WriteText(szString);
+ pText->WriteText("\n"); // "\n" ok here (_not_ "\r\n")
+
+ // ensure that the line can be seen
+ // @@@ TODO
+}
+
+wxFrame *wxLogWindow::GetFrame() const
+{
+ return m_pLogFrame;
+}
+
+void wxLogWindow::OnFrameCreate(wxFrame *frame)
+{
+}
+
+void wxLogWindow::OnFrameDelete(wxFrame *frame)
+{
+ m_pLogFrame = NULL;
+}
+
+wxLogWindow::~wxLogWindow()
+{
+ // may be NULL if log frame already auto destroyed itself
+ delete m_pLogFrame;
+}
+
#endif //WX_TEST_MINIMAL
// ============================================================================
// static variables
// ----------------------------------------------------------------------------
wxLog *wxLog::ms_pLogger = NULL;
-bool wxLog::ms_bInitialized = FALSE;
-bool wxLog::ms_bVerbose = FALSE;
-const char *wxLog::ms_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";
+bool wxLog::ms_bAutoCreate = TRUE;
+wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0;
// ----------------------------------------------------------------------------
// stdout error logging helper
// (looks more pretty on the terminal). Also adds newline at the end.
//
// @@ this is now disabled until I find a portable way of determining the
-// terminal window size
-
+// terminal window size (ok, I found it but does anybody really cares?)
#ifdef LOG_PRETTY_WRAP
static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
{
// get error code from syste
unsigned long wxSysErrorCode()
{
- #ifdef __WINDOWS__
+ #ifdef __WXMSW__
#ifdef __WIN32__
return ::GetLastError();
#else //WIN16
if ( nErrCode == 0 )
nErrCode = wxSysErrorCode();
-#ifdef __WINDOWS__
-#ifdef __WIN32__
- static char s_szBuf[LOG_BUFFER_SIZE / 2];
-
- // get error message from system
- LPVOID lpMsgBuf;
- FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
- NULL, nErrCode,
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR)&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';
- 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);
- if ( len > 0 ) {
- // truncate string
- if ( s_szBuf[len - 2] == '\r' )
- s_szBuf[len - 2] = '\0';
- }
+ #ifdef __WXMSW__
+ #ifdef __WIN32__
+ static char s_szBuf[LOG_BUFFER_SIZE / 2];
+
+ // get error message from system
+ LPVOID lpMsgBuf;
+ FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+ NULL, nErrCode,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPTSTR)&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';
+ LocalFree(lpMsgBuf);
+
+ // returned string is capitalized and ended with '\r\n' - bad
+ s_szBuf[0] = (char)wxToLower(s_szBuf[0]);
+ size_t len = strlen(s_szBuf);
+ if ( len > 0 ) {
+ // truncate string
+ if ( s_szBuf[len - 2] == '\r' )
+ s_szBuf[len - 2] = '\0';
+ }
- return s_szBuf;
-#else
- // TODO: Windows 3.1
- return NULL;
-#endif
-#else
- return strerror(nErrCode);
-#endif
+ return s_szBuf;
+ #else //Win16
+ // TODO @@@@
+ return NULL;
+ #endif // Win16/32
+ #else // Unix
+ return strerror(nErrCode);
+ #endif // Win/Unix
}
// ----------------------------------------------------------------------------
// debug helper
// ----------------------------------------------------------------------------
-#ifdef __DEBUG__
+#ifdef __WXDEBUG__
+
+void Trap()
+{
+ #ifdef __WXMSW__
+ DebugBreak();
+ #elif defined(__WXSTUBS__)
+ // TODO
+ #else // Unix
+ raise(SIGTRAP);
+ #endif // Win/Unix
+}
// this function is called when an assert fails
void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
{
// this variable can be set to true to suppress "assert failure" messages
- static s_bNoAsserts = FALSE;
+ static bool s_bNoAsserts = FALSE;
+ static bool s_bInAssert = FALSE;
+
+ if ( s_bInAssert ) {
+ // He-e-e-e-elp!! we're trapped in endless loop
+ Trap();
+ }
+
+ s_bInAssert = TRUE;
char szBuf[LOG_BUFFER_SIZE];
sprintf(szBuf, _("Assert failed in file %s at line %d"), szFile, nLine);
strcat(szBuf, ".");
}
- // send it to the normal log destination
- wxLogDebug(szBuf);
+ if ( !s_bNoAsserts ) {
+ // send it to the normal log destination
+ wxLogDebug(szBuf);
- #ifdef __WINDOWS__
- if ( !s_bNoAsserts ) {
- strcat(szBuf, _("\nDo you want to stop the program?"
- "\nYou can also choose [Cancel] to suppress "
- "further warnings."));
+ strcat(szBuf, _("\nDo you want to stop the program?"
+ "\nYou can also choose [Cancel] to suppress "
+ "further warnings."));
- switch ( ::MessageBox(NULL, szBuf, _("Debug"),
- MB_YESNOCANCEL | MB_ICONINFORMATION) ) {
- case IDYES:
- DebugBreak();
- break;
+ switch ( wxMessageBox(szBuf, _("Debug"),
+ wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
+ case wxYES:
+ Trap();
+ break;
- case IDCANCEL:
- s_bNoAsserts = TRUE;
- break;
- }
+ case wxCANCEL:
+ s_bNoAsserts = TRUE;
+ break;
+
+ //case wxNO: nothing to do
}
- #else
- // @@@@ don't know how to start the debugger under generic Unix
- s_bNoAsserts = TRUE; // suppress 'unused var' warning
- abort();
- #endif
+ }
+
+ s_bInAssert = FALSE;
}
-#endif //DEBUG
+#endif //WXDEBUG
projects / wxWidgets.git / blobdiff