cvs incorrectly merged my last change somehow (there a\were 2

SetActiveTargets), corrected.

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

diff --git a/include/wx/log.h b/include/wx/log.h
index 944df18f394b90294b3d2c1ae50eda8316f49ce0..5d492339b84d560e03a0c53b952674e40a5c2903 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -82,10 +82,7 @@ public:
   bool HasPendingMessages() const { return m_bHasMessages; }
 
   // only one sink is active at each moment
   bool HasPendingMessages() const { return m_bHasMessages; }
 
   // only one sink is active at each moment

-    // get current log target, will call wxApp::CreateLogTarget() to create one
-    // if 
-  static wxLog *GetActiveTarget();
-    // change log target, pLogger = NULL disables logging. if bNoFlashOld is true, 
+    // change log target, pLogger = NULL disables logging. if bNoFlashOld is true,

     // the old log target isn't flashed which might lead to loss of messages!
     // returns the previous log target
   static wxLog *SetActiveTarget(wxLog *pLogger, bool bNoFlashOld = FALSE);
     // the old log target isn't flashed which might lead to loss of messages!
     // returns the previous log target
   static wxLog *SetActiveTarget(wxLog *pLogger, bool bNoFlashOld = FALSE);