allow to use any window, not just wxFrame, as wxLogFrame parent (patch from Paul Gammans)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
a62848fdba
commit
55c9a18696
@ -88,7 +88,7 @@ protected:
|
||||
class WXDLLEXPORT wxLogWindow : public wxLogPassThrough
|
||||
{
|
||||
public:
|
||||
wxLogWindow(wxFrame *pParent, // the parent frame (can be NULL)
|
||||
wxLogWindow(wxWindow *pParent, // the parent frame (can be NULL)
|
||||
const wxChar *szTitle, // the title of the frame
|
||||
bool bShow = true, // show window immediately?
|
||||
bool bPassToOld = true); // pass messages to the old target?
|
||||
|
@ -76,6 +76,7 @@ typedef unsigned long wxLogLevel;
|
||||
class WXDLLIMPEXP_CORE wxTextCtrl;
|
||||
class WXDLLIMPEXP_CORE wxLogFrame;
|
||||
class WXDLLIMPEXP_CORE wxFrame;
|
||||
class WXDLLIMPEXP_CORE wxWindow;
|
||||
#endif // wxUSE_GUI
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -434,7 +434,7 @@ class wxLogFrame : public wxFrame
|
||||
{
|
||||
public:
|
||||
// ctor & dtor
|
||||
wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle);
|
||||
wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle);
|
||||
virtual ~wxLogFrame();
|
||||
|
||||
// menu callbacks
|
||||
@ -478,7 +478,7 @@ BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
|
||||
EVT_CLOSE(wxLogFrame::OnCloseWindow)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle)
|
||||
wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle)
|
||||
: wxFrame(pParent, wxID_ANY, szTitle)
|
||||
{
|
||||
m_log = log;
|
||||
@ -585,7 +585,7 @@ wxLogFrame::~wxLogFrame()
|
||||
// wxLogWindow
|
||||
// -----------
|
||||
|
||||
wxLogWindow::wxLogWindow(wxFrame *pParent,
|
||||
wxLogWindow::wxLogWindow(wxWindow *pParent,
|
||||
const wxChar *szTitle,
|
||||
bool bShow,
|
||||
bool bDoPass)
|
||||
|
Loading…
Reference in New Issue
Block a user