other misc fixes

[wxWidgets.git] / interface / memory.h

diff --git a/interface/memory.h b/interface/memory.h
index d04ce2ae1db604c0d9c7f617c7e356f68dadf5ad..0ffb85394a24e12e1d0b13ae0e9169bd75cd4285 100644 (file)
--- a/interface/memory.h
+++ b/interface/memory.h
@@ -238,31 +238,58 @@ public:
 // Global functions/macros
 // ============================================================================
 
+/** @ingroup group_funcmacro_log */
+//@{
+
 /**
-    @b NB: This function is now obsolete, replaced by @ref overview_logfunctions
-    "Log functions".
-    Calls wxTraceLevel with printf-style variable argument syntax. Output
-    is directed to the current output stream (see wxDebugContext).
-    The first argument should be the level at which this information is appropriate.
-    It will only be output if the level returned by wxDebugContext::GetLevel is
-    equal to or greater than
-    this value.
+    @deprecated Use one of the wxLogTrace() functions or one of the
+                wxVLogTrace() functions instead.
+
+    Calls wxTrace() with printf-style variable argument syntax. Output is
+    directed to the current output stream (see wxDebugContext).
+
+    @header{wx/memory.h}
 */
-#define WXTRACELEVEL()     /* implementation is private */
+#define WXTRACE(format, ...)
 
 /**
-    @b NB: This function is now obsolete, replaced by @ref overview_logfunctions
-    "Log functions".
-    Takes printf-style variable argument syntax. Output
-    is directed to the current output stream (see wxDebugContext).
+    @deprecated Use one of the wxLogTrace() functions or one of the
+                wxVLogTrace() functions instead.
+
+    Calls wxTraceLevel with printf-style variable argument syntax. Output is
+    directed to the current output stream (see wxDebugContext). The first
+    argument should be the level at which this information is appropriate. It
+    will only be output if the level returned by wxDebugContext::GetLevel is
+    equal to or greater than this value.
+
+    @header{wx/memory.h}
 */
-void wxTrace(const wxString& fmt, ... );
+#define WXTRACELEVEL(level, format, ...)
 
 /**
-    @b NB: This macro is now obsolete, replaced by @ref overview_logfunctions "Log
-    functions".
-    Calls wxTrace with printf-style variable argument syntax. Output
-    is directed to the current output stream (see wxDebugContext).
+    @deprecated Use one of the wxLogTrace() functions or one of the
+                wxVLogTrace() functions instead.
+
+    Takes printf-style variable argument syntax. Output is directed to the
+    current output stream (see wxDebugContext).
+
+    @header{wx/memory.h}
 */
-#define Include files WXTRACE()     /* implementation is private */
+void wxTrace(const wxString& format, ...);
+
+/**
+    @deprecated Use one of the wxLogTrace() functions or one of the
+                wxVLogTrace() functions instead.
+
+    Takes @e printf() style variable argument syntax. Output is directed to the
+    current output stream (see wxDebugContext). The first argument should be
+    the level at which this information is appropriate. It will only be output
+    if the level returned by wxDebugContext::GetLevel() is equal to or greater
+    than this value.
+
+    @header{wx/memory.h}
+*/
+void wxTraceLevel(int level, const wxString& format, ...);
+
+//@}