From 06db8ebd739ef04221063a5296d6725be53a4988 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 4 Aug 1998 16:42:34 +0000 Subject: [PATCH] added wxLogWindow::GetFrame() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/log.h | 16 +++++++++++----- src/common/log.cpp | 5 +++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/include/wx/log.h b/include/wx/log.h index db850ff128..573d180eb3 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -16,6 +16,8 @@ #pragma interface "log.h" #endif +#include "wx/intl.h" + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -68,7 +70,7 @@ public: // (FILE and iostream logs don't need it, but wxGuiLog does to avoid // showing 17 modal dialogs one after another) virtual void Flush(); - // call to Flush() may be optimized: call it only if this function + // call to Flush() may be optimized: call it only if this function // returns true (although Flush() also returns immediately if there // is no messages, this functions is more efficient because inline) bool HasPendingMessages() const { return m_bHasMessages; } @@ -119,7 +121,7 @@ protected: // default DoLogString does nothing but is not pure virtual because if // you override DoLog() you might not need it at all virtual void DoLogString(const char *szString); - + private: // static variables // ---------------- @@ -197,14 +199,18 @@ protected: // close it, clear the log contents or save it to the file. // ---------------------------------------------------------------------------- class wxLogFrame; +class wxFrame; class WXDLLEXPORT wxLogWindow : public wxLog { public: wxLogWindow(const char *szTitle, bool bShow = TRUE); ~wxLogWindow(); - - // show/hide the log window + + // window operations + // show/hide the log window void Show(bool bShow = TRUE); + // get the frame pointer (you shouldn't close it!) + wxFrame *GetFrame() const; // accessors wxLog *GetOldLog() const { return m_pOldLog; } @@ -212,7 +218,7 @@ public: protected: virtual void DoLog(wxLogLevel level, const char *szString); virtual void DoLogString(const char *szString); - + private: wxLog *m_pOldLog; // previous log target wxLogFrame *m_pLogFrame; // the log frame diff --git a/src/common/log.cpp b/src/common/log.cpp index 94e4db061f..66b2caa787 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -655,6 +655,11 @@ void wxLogWindow::Show(bool bShow) m_pLogFrame->Show(bShow); } +wxFrame *wxLogWindow::GetFrame() const +{ + return m_pLogFrame; +} + void wxLogWindow::DoLog(wxLogLevel level, const char *szString) { // first let the previous logger show it -- 2.45.2