wxNotebook interface (it may change!), implementation file is not yet

[wxWidgets.git] / include / wx / log.h

diff --git a/include/wx/log.h b/include/wx/log.h
index 6934ffedf7aa3a077ce3ebff71ffc4e606621085..99ed98ee67a1255270e5b81777a9a2a4be364972 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -50,7 +50,6 @@ typedef unsigned long wxTraceMask;
 typedef unsigned long wxLogLevel;
 
 // ----------------------------------------------------------------------------
->>>>>>> 1.2
 // derive from this class to redirect (or suppress, or ...) log messages
 // normally, only a single instance of this class exists but it's not enforced
 // ----------------------------------------------------------------------------
@@ -197,7 +196,7 @@ class wxLogFrame;
 class WXDLLEXPORT wxLogWindow : public wxLog
 {
 public:
-  wxLogWindow(const wxTString& strTitle);
+  wxLogWindow(const wxTString& strTitle, bool bShow = TRUE);
   ~wxLogWindow();
   
   // show/hide the log window