Do nothing in wxMemoryDC::SelectObject() if the bitmap is already selected.

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

diff --git a/interface/wx/memory.h b/interface/wx/memory.h
index 88a86afca1afc81431eb835c7dd284de59a579a7..1d5f08afff2a5ebfd88aa95e35a90df16708ad4e 100644 (file)
--- a/interface/wx/memory.h
+++ b/interface/wx/memory.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxDebugContext
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -80,37 +80,6 @@ public:
     */
     static 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();
-
     /**
         Prints a list of the classes declared in this application, giving derivation
         and whether instances of this class can be dynamically created.
@@ -167,15 +136,6 @@ public:
     */
     static 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);
-
     /**
         Sets the debug level (default 1).
 
@@ -199,31 +159,6 @@ public:
         The shutdown function must be take no parameters and return nothing.
     */
     static 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);
 };
 
 
@@ -232,7 +167,7 @@ public:
 // Global functions/macros
 // ============================================================================
 
-/** @ingroup group_funcmacro_log */
+/** @addtogroup group_funcmacro_log */
 //@{
 
 /**