Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/log.h b/interface/wx/log.h
index 3be28347e7ac5ce4b7f0ecb00922de400e460b77..26f9180ce0c073fd6d4aaa923d4344bce7551e71 100644 (file)
--- a/interface/wx/log.h
+++ b/interface/wx/log.h
@@ -747,7 +747,7 @@ public:
         Note that the latter must be called the same number of times as the former
         to undo it, i.e. if you call Suspend() twice you must call Resume() twice as well.
 
         Note that the latter must be called the same number of times as the former
         to undo it, i.e. if you call Suspend() twice you must call Resume() twice as well.
 

-        Note that suspending the logging means that the log sink won't be be flushed
+        Note that suspending the logging means that the log sink won't be flushed

         periodically, it doesn't have any effect if the current log target does the
         logging immediately without waiting for Flush() to be called (the standard
         GUI log target only shows the log dialog when it is flushed, so Suspend()
         periodically, it doesn't have any effect if the current log target does the
         logging immediately without waiting for Flush() to be called (the standard
         GUI log target only shows the log dialog when it is flushed, so Suspend()


@@ -869,7 +869,7 @@ public:
     /**
         Sets the timestamp format prepended by the default log targets to all
         messages. The string may contain any normal characters as well as %
     /**
         Sets the timestamp format prepended by the default log targets to all
         messages. The string may contain any normal characters as well as %

-        prefixed format specificators, see @e strftime() manual for details.
+        prefixed format specifiers, see @e strftime() manual for details.

         Passing an empty string to this function disables message time stamping.
     */
     static void SetTimestamp(const wxString& format);
         Passing an empty string to this function disables message time stamping.
     */
     static void SetTimestamp(const wxString& format);


@@ -959,7 +959,7 @@ protected:
     //@{
 
     /**
     //@{
 
     /**

-        Called to created log a new record.
+        Called to log a new record.

 
         Any log message created by wxLogXXX() functions is passed to this
         method of the active log target. The default implementation prepends
 
         Any log message created by wxLogXXX() functions is passed to this
         method of the active log target. The default implementation prepends


@@ -1180,7 +1180,7 @@ void wxVLogError(const char* formatString, va_list argPtr);
 /** @addtogroup group_funcmacro_log */
 //@{
 /**
 /** @addtogroup group_funcmacro_log */
 //@{
 /**

-    Log a message at wxLOG_Trace log level.
+    Log a message at @c wxLOG_Trace log level (see ::wxLogLevelValues enum).

 
     Notice that the use of trace masks is not recommended any more as setting
     the log components (please see @ref overview_log_enable) provides a way to
 
     Notice that the use of trace masks is not recommended any more as setting
     the log components (please see @ref overview_log_enable) provides a way to


@@ -1192,30 +1192,10 @@ void wxVLogError(const char* formatString, va_list argPtr);
     function is that usually there are a lot of trace messages, so it might
     make sense to separate them from other debug messages.
 
     function is that usually there are a lot of trace messages, so it might
     make sense to separate them from other debug messages.
 

-    wxLogTrace(const char*,const char*,...) and can be used instead of
-    wxLogDebug() if you would like to be able to separate trace messages into
-    different categories which can be enabled or disabled with
-    wxLog::AddTraceMask() and wxLog::RemoveTraceMask().
-
-    @header{wx/log.h}
-*/
-void wxLogTrace(const char *mask, const char* formatString, ... );
-void wxVLogTrace(const char *mask, const char* formatString, va_list argPtr);
-//@}
-
-/** @addtogroup group_funcmacro_log */
-//@{
-/**
-    Like wxLogDebug(), trace functions only do something in debug builds and
-    expand to nothing in the release one. The reason for making it a separate
-    function is that usually there are a lot of trace messages, so it might
-    make sense to separate them from other debug messages.
-
-    In this version of wxLogTrace(), trace messages can be separated into
-    different categories and calls using this function only log the message if
-    the given @a mask is currently enabled in wxLog. This lets you selectively
-    trace only some operations and not others by enabling the desired trace
-    masks with wxLog::AddTraceMask() or by setting the
+    Trace messages can be separated into different categories; these functions in facts
+    only log the message if the given @a mask is currently enabled in wxLog. 
+    This lets you selectively trace only some operations and not others by enabling the 
+    desired trace masks with wxLog::AddTraceMask() or by setting the

     @ref overview_envvars "@c WXTRACE environment variable".
 
     The predefined string trace masks used by wxWidgets are:
     @ref overview_envvars "@c WXTRACE environment variable".
 
     The predefined string trace masks used by wxWidgets are:


@@ -1228,22 +1208,10 @@ void wxVLogTrace(const char *mask, const char* formatString, va_list argPtr);
     @itemdef{ wxTRACE_OleCalls, Trace OLE method calls (Win32 only) }
     @endDefList
 
     @itemdef{ wxTRACE_OleCalls, Trace OLE method calls (Win32 only) }
     @endDefList
 

-    @note Since both the mask and the format string are strings, this might
-          lead to function signature confusion in some cases: if you intend to
-          call the format string only version of wxLogTrace(), add a "%s"
-          format string parameter and then supply a second string parameter for
-          that "%s", the string mask version of wxLogTrace() will erroneously
-          get called instead, since you are supplying two string parameters to
-          the function. In this case you'll unfortunately have to avoid having
-          two leading string parameters, e.g. by adding a bogus integer (with
-          its "%d" format string).
-

     @header{wx/log.h}
 */
 void wxLogTrace(const char* mask, const char* formatString, ... );
     @header{wx/log.h}
 */
 void wxLogTrace(const char* mask, const char* formatString, ... );

-void wxVLogTrace(const char* mask,
-                  const char* formatString,
-                  va_list argPtr);
+void wxVLogTrace(const char* mask, const char* formatString, va_list argPtr);

 //@}
 
 /** @addtogroup group_funcmacro_log */
 //@}
 
 /** @addtogroup group_funcmacro_log */