undo the last change as it results in buildbot configuration error

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

diff --git a/interface/wx/memory.h b/interface/wx/memory.h
index d4d27991cae3d57468ceb0bdbbda30559e1bc371..c45072ef108e2429389800d8af25265d04cb5e0c 100644 (file)
--- a/interface/wx/memory.h
+++ b/interface/wx/memory.h
@@ -33,7 +33,7 @@ public:
                 success. Returns -1 if an error was detected that prevents
                 further checking.
     */
                 success. Returns -1 if an error was detected that prevents
                 further checking.
     */

-    int Check();
+    static int Check(bool checkAll = false);

 
     /**
         Performs a memory dump from the currently set checkpoint, writing to the
 
     /**
         Performs a memory dump from the currently set checkpoint, writing to the


@@ -42,7 +42,7 @@ public:
 
         @return @true if the function succeeded, @false otherwise.
     */
 
         @return @true if the function succeeded, @false otherwise.
     */

-    bool Dump();
+    static bool Dump();

 
     /**
         Returns @true if the memory allocator checks all previous memory blocks for
 
     /**
         Returns @true if the memory allocator checks all previous memory blocks for


@@ -52,7 +52,7 @@ public:
 
         @see SetCheckPrevious()
     */
 
         @see SetCheckPrevious()
     */

-    bool GetCheckPrevious();
+    static bool GetCheckPrevious();

 
     /**
         Returns @true if debug mode is on.
 
     /**
         Returns @true if debug mode is on.


@@ -63,7 +63,7 @@ public:
 
         @see SetDebugMode()
     */
 
         @see SetDebugMode()
     */

-    bool GetDebugMode();
+    static bool GetDebugMode();

 
     /**
         Gets the debug level (default 1).
 
     /**
         Gets the debug level (default 1).


@@ -78,38 +78,7 @@ public:
 
         @see SetLevel()
     */
 
         @see SetLevel()
     */

-    int GetLevel();
-
-    /**
-        Returns the output stream associated with the debug context.
-
-        @deprecated
-        This is obsolete, replaced by wxLog functionality.
-
-        @see SetStream()
-    */
-    ostream GetStream();
-
-    /**
-        Returns a pointer to the output stream buffer associated with the debug context.
-        There may not necessarily be a stream buffer if the stream has been set
-        by the user.
-
-        @deprecated
-        This is obsolete, replaced by wxLog functionality.
-    */
-    streambuf* GetStreamBuf();
-
-    /**
-        Returns @true if there is a stream currently associated
-        with the debug context.
-
-        @deprecated
-        This is obsolete, replaced by wxLog functionality.
-
-        @see SetStream(), GetStream()
-    */
-    bool HasStream();
+    static int GetLevel();

 
     /**
         Prints a list of the classes declared in this application, giving derivation
 
     /**
         Prints a list of the classes declared in this application, giving derivation


@@ -117,7 +86,7 @@ public:
 
         @see PrintStatistics()
     */
 
         @see PrintStatistics()
     */

-    bool PrintClasses();
+    static bool PrintClasses();

 
     /**
         Performs a statistics analysis from the currently set checkpoint, writing
 
     /**
         Performs a statistics analysis from the currently set checkpoint, writing


@@ -130,7 +99,7 @@ public:
 
         @see PrintStatistics()
     */
 
         @see PrintStatistics()
     */

-    bool PrintStatistics(bool detailed = true);
+    static bool PrintStatistics(bool detailed = true);

 
     /**
         Tells the memory allocator to check all previous memory blocks for errors.
 
     /**
         Tells the memory allocator to check all previous memory blocks for errors.


@@ -138,7 +107,7 @@ public:
 
         @see GetCheckPrevious()
     */
 
         @see GetCheckPrevious()
     */

-    void SetCheckPrevious(bool check);
+    static void SetCheckPrevious(bool check);

 
     /**
         Sets the current checkpoint: Dump and PrintStatistics operations will
 
     /**
         Sets the current checkpoint: Dump and PrintStatistics operations will


@@ -149,7 +118,7 @@ public:
             If @true, the checkpoint is reset to include all memory allocations
             since the program started.
     */
             If @true, the checkpoint is reset to include all memory allocations
             since the program started.
     */

-    void SetCheckpoint(bool all = false);
+    static void SetCheckpoint(bool all = false);

 
     /**
         Sets the debug mode on or off.
 
     /**
         Sets the debug mode on or off.


@@ -165,16 +134,7 @@ public:
 
         @see GetDebugMode()
     */
 
         @see GetDebugMode()
     */

-    void SetDebugMode(bool debug);
-
-    /**
-        Sets the current debug file and creates a stream.
-        This will delete any existing stream and stream buffer.
-
-        By default, the debug context stream outputs to the debugger (Windows)
-        or standard error (other platforms).
-    */
-    bool SetFile(const wxString& filename);
+    static void SetDebugMode(bool debug);

 
     /**
         Sets the debug level (default 1).
 
     /**
         Sets the debug level (default 1).


@@ -189,7 +149,7 @@ public:
 
         @see GetLevel()
     */
 
         @see GetLevel()
     */

-    void SetLevel(int level);
+    static void SetLevel(int level);

 
     /**
         Installs a function to be called at the end of wxWidgets shutdown.
 
     /**
         Installs a function to be called at the end of wxWidgets shutdown.


@@ -198,32 +158,7 @@ public:
 
         The shutdown function must be take no parameters and return nothing.
     */
 
         The shutdown function must be take no parameters and return nothing.
     */

-    void SetShutdownNotifyFunction(wxShutdownNotifyFunction func);
-
-    /**
-        Sets the debugging stream to be the debugger (Windows) or standard error (other
-        platforms).
-
-        This is the default setting. The existing stream will be flushed and deleted.
-
-        @deprecated
-        This is obsolete, replaced by wxLog functionality.
-    */
-    bool SetStandardError();
-
-    /**
-        Sets the stream and optionally, stream buffer associated with the debug context.
-        This operation flushes and deletes the existing stream (and stream buffer if any).
-
-        @deprecated
-        This is obsolete, replaced by wxLog functionality.
-
-        @param stream
-            Stream to associate with the debug context. Do not set this to @NULL.
-        @param streamBuf
-            Stream buffer to associate with the debug context.
-    */
-    void SetStream(ostream* stream, streambuf* streamBuf = NULL);
+    static void SetShutdownNotifyFunction(wxShutdownNotifyFunction func);

 };
 
 
 };
 
 


@@ -232,7 +167,7 @@ public:
 // Global functions/macros
 // ============================================================================
 
 // Global functions/macros
 // ============================================================================
 

-/** @ingroup group_funcmacro_log */
+/** @addtogroup group_funcmacro_log */

 //@{
 
 /**
 //@{
 
 /**