allow to use any window, not just wxFrame, as wxLogFrame parent (patch from Paul...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h
index 16418df233846102dac9a6cb300cd02958cc48d6..26caf21bb01b2592342bb816b854a735d9c08db5 100644 (file)
--- a/include/wx/generic/logg.h
+++ b/include/wx/generic/logg.h
@@ -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?

diff --git a/include/wx/log.h b/include/wx/log.h
index 89e0d41dc27cab54e7e21f66e61c127e4f4ef3fd..08e21c171718d168e9a34df52365a38e16de9c51 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -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
 
 // ----------------------------------------------------------------------------

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 27e75a909749c9d7e524010e353494c00a17fddb..a0b7a1aa5cf5544c3c4035dc8542c75e6ea7bf40 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -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)