X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c86f1403c3737c07d58676a203f4707942684a01..6f34921d9369a31de14e4b07e4824e2d701710f0:/src/common/log.cpp?ds=sidebyside diff --git a/src/common/log.cpp b/src/common/log.cpp index 5c9e5f3386..bf1994214f 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -140,7 +140,7 @@ void wxLogStatus(wxFrame *pFrame, const char *szFormat, ...) wxASSERT( gs_pFrame == NULL ); // should be reset! gs_pFrame = pFrame; wxLog::OnLog(wxLOG_Status, s_szBuf); - gs_pFrame = NULL; + gs_pFrame = (wxFrame *) NULL; } } @@ -778,7 +778,7 @@ void wxLogWindow::OnFrameCreate(wxFrame *frame) void wxLogWindow::OnFrameDelete(wxFrame *frame) { - m_pLogFrame = NULL; + m_pLogFrame = (wxLogFrame *) NULL; } wxLogWindow::~wxLogWindow() @@ -796,7 +796,7 @@ wxLogWindow::~wxLogWindow() // ---------------------------------------------------------------------------- // static variables // ---------------------------------------------------------------------------- -wxLog *wxLog::ms_pLogger = NULL; +wxLog *wxLog::ms_pLogger = (wxLog *) NULL; bool wxLog::ms_bAutoCreate = TRUE; wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0;