Added (and documented) GetTraceMasks so userspace can probe the currently

allowed masks.  IMO its omission is a bug and it's non-threatening to
the freeze, so..

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

diff --git a/docs/latex/wx/log.tex b/docs/latex/wx/log.tex
index 67038849f570b0779c0bb2ff22aac5629f43d165..1a883331827a664282740b1b42411384b1e59e8f 100644 (file)
--- a/docs/latex/wx/log.tex
+++ b/docs/latex/wx/log.tex
@@ -151,6 +151,7 @@ window on the corresponding error message. If you wish to enable it, please use
 \helpref{AddTraceMask}{wxlogaddtracemask}\\
 \helpref{RemoveTraceMask}{wxlogremovetracemask}\\
 \helpref{ClearTraceMasks}{wxlogcleartracemasks}\\
+\helpref{GetTraceMasks}{wxloggettracemasks}\\
 \helpref{IsAllowedTraceMask}{wxlogisallowedtracemask}\\
 \helpref{SetVerbose}{wxlogsetverbose}\\
 \helpref{GetVerbose}{wxloggetverbose}\\
@@ -173,7 +174,9 @@ window on the corresponding error message. If you wish to enable it, please use
 Add the {\it mask} to the list of allowed masks for 
 \helpref{wxLogTrace}{wxlogtrace}.
 
-See also: \helpref{RemoveTraceMask}{wxlogremovetracemask}
+\wxheading{See also}
+\helpref{RemoveTraceMask}{wxlogremovetracemask}
+\helpref{GetTraceMasks}{wxloggettracemasks}
 
 \membersection{wxLog::ClearTraceMasks}\label{wxlogcleartracemasks}
 
@@ -182,7 +185,17 @@ See also: \helpref{RemoveTraceMask}{wxlogremovetracemask}
 Removes all trace masks previously set with 
 \helpref{AddTraceMask}{wxlogaddtracemask}.
 
-See also: \helpref{RemoveTraceMask}{wxlogremovetracemask}
+\wxheading{See also}
+\helpref{RemoveTraceMask}{wxlogremovetracemask}
+
+\membersection{wxLog::GetTraceMasks}\label{wxloggettracemasks}
+
+\func{static const wxArrayString &}{GetTraceMasks}{\void}
+
+Returns the currently allowed list of string trace masks.
+
+\wxheading{See also}
+\helpref{AddTraceMask}{wxlogaddtracemask}.
 
 \membersection{wxLog::OnLog}\label{wxlogonlog}
 

diff --git a/include/wx/log.h b/include/wx/log.h
index 2de7fe1e4b38a8f32af2edd87d253af50791bd0c..a93daa1585f73db4a8b3b317a083dd720fcedb1c 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -177,6 +177,8 @@ public:
     static void RemoveTraceMask(const wxString& str);
         // remove all string trace masks
     static void ClearTraceMasks();
+       // get string trace masks
+    static const wxArrayString &GetTraceMasks() { return ms_aTraceMasks; }
 
         // sets the timestamp string: this is used as strftime() format string
         // for the log targets which add time stamps to the messages - set it
@@ -596,3 +598,4 @@ void WXDLLEXPORT wxSafeShowMessage(const wxString& title, const wxString& text);
 
 #endif  // _WX_LOG_H_
 
+// vi:sts=4:sw=4:et