#include <stdlib.h>
#include <time.h>
-// _WINDOWS_ is defined when windows.h is included,
-// __WINDOWS__ is defined for MS Windows compilation
-#if defined(__WINDOWS__) && !defined(_WINDOWS_)
+#ifdef __WXMSW__
#include <windows.h>
-#endif //windows.h
+#else //Unix
+ #include <signal.h>
+#endif //Win/Unix
// ----------------------------------------------------------------------------
// non member functions
}
// debug functions
-#ifdef __DEBUG__
+#ifdef __WXDEBUG__
#define IMPLEMENT_LOG_DEBUG_FUNCTION(level) \
void wxLog##level(const char *szFormat, ...) \
{ \
m_bHasMessages = FALSE;
m_bVerbose = FALSE;
m_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";
- m_ulTraceMask = (wxTraceMask)-1; // set all bits
+ m_ulTraceMask = (wxTraceMask)0; // -1 to set all bits
}
wxLog *wxLog::GetActiveTarget()
case wxLOG_Trace:
case wxLOG_Debug:
- #ifdef __DEBUG__
+ #ifdef __WXDEBUG__
#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)
// ----------------------------------------------------------------------------
wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
// @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf
-#ifndef __GTK__
+#ifndef __WXGTK__
: wxLogStream(new ostream(pTextCtrl))
#endif //GTK
{
wxLogTextCtrl::~wxLogTextCtrl()
{
- #ifndef __GTK__
+ #ifndef __WXGTK__
delete m_ostr;
#endif //GTK
}
case wxLOG_Trace:
case wxLOG_Debug:
- #ifdef __DEBUG__
+ #ifdef __WXDEBUG__
#ifdef __WIN32__
OutputDebugString(szString);
OutputDebugString("\n\r");
// menu callbacks
void OnClose(wxCommandEvent& event);
+ void OnCloseWindow(wxCloseEvent& event);
void OnSave (wxCommandEvent& event);
void OnClear(wxCommandEvent& event);
EVT_MENU(Menu_Save, wxLogFrame::OnSave)
EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
- EVT_CLOSE(wxLogFrame::OnClose)
+ EVT_CLOSE(wxLogFrame::OnCloseWindow)
END_EVENT_TABLE()
wxLogFrame::wxLogFrame(const char *szTitle)
: wxFrame(NULL, -1, szTitle)
{
+ // we don't want to be a top-level frame because it would prevent the
+ // application termination when all other frames are closed
+ wxTopLevelWindows.DeleteObject(this);
+
// @@ kludge: wxSIMPLE_BORDER is simply to prevent wxWindows from creating
// a rich edit control instead of a normal one we want
m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition,
Show(FALSE);
}
+void wxLogFrame::OnCloseWindow(wxCloseEvent& event)
+{
+ // just hide the window
+ Show(FALSE);
+}
+
void wxLogFrame::OnSave(wxCommandEvent& event)
{
// get the file name
// open file
// ---------
wxFile file;
- Bool bOk;
+ bool bOk;
if ( wxFile::Exists(szFileName) ) {
- Bool bAppend;
+ bool bAppend;
wxString strMsg;
strMsg.Printf(_("Append log to file '%s' "
"(choosing [No] will overwrite it)?"), szFileName);
// retrieve text and save it
// -------------------------
+#ifdef __WXGTK__
// @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet
-#ifndef __GTK__
+ 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());
m_pTextCtrl->Clear();
}
-wxLogWindow::wxLogWindow(const wxTString& strTitle)
+wxLogWindow::wxLogWindow(const wxTString& strTitle, bool bShow)
{
m_pOldLog = wxLog::GetActiveTarget();
m_pLogFrame = new wxLogFrame(strTitle);
+
+ if ( bShow )
+ m_pLogFrame->Show(TRUE);
}
-void wxLogWindow::Show(Bool bShow)
+void wxLogWindow::Show(bool bShow)
{
m_pLogFrame->Show(bShow);
}
wxTextCtrl *pText = m_pLogFrame->TextCtrl();
// remove selection (WriteText is in fact ReplaceSelection)
- long nLen = pText->GetLastPosition();
- pText->SetSelection(nLen, nLen);
+ #ifdef __WXMSW__
+ long nLen = pText->GetLastPosition();
+ pText->SetSelection(nLen, nLen);
+ #endif // Windows
pText->WriteText(szString);
pText->WriteText("\n"); // "\n" ok here (_not_ "\r\n")
// 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 __WXMSW__
#ifdef __WIN32__
static char s_szBuf[LOG_BUFFER_SIZE / 2];
// debug helper
// ----------------------------------------------------------------------------
-#ifdef __DEBUG__
+#ifdef __WXDEBUG__
// this function is called when an assert fails
void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
// 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."));
+ if ( !s_bNoAsserts ) {
+ 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:
+ switch ( wxMessageBox(szBuf, _("Debug"),
+ wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
+ case wxYES:
+ #ifdef __WXMSW__
DebugBreak();
- break;
+ #else // Unix
+ raise(SIGTRAP);
+ #endif // Win/Unix
+ break;
- case IDCANCEL:
- s_bNoAsserts = TRUE;
- break;
- }
+ case wxCANCEL:
+ s_bNoAsserts = TRUE;
+ break;
+
+ //case wxNO: nothing to do
}
- #else // !Windows
- // @@@@ don't know how to start the debugger under generic Unix
- s_bNoAsserts = TRUE; // suppress 'unused var' warning
- abort();
- #endif // Windows/!Windows
+ }
}
-#endif //DEBUG
+#endif //WXDEBUG
projects / wxWidgets.git / blobdiff