added default parameter values to the overloaded Show() and Enable() versions

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index dab00aeccac93b3b771d17ac4cc1810fb6f9bc40..782559b5dd8603585a3e19eec78126350162e194 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -28,6 +28,8 @@
 
 #include <stddef.h>
 
+// Obsolete
+#if 0
 #if wxUSE_IOSTREAMH
     // N.B. BC++ doesn't have istream.h, ostream.h
 #   include <iostream.h>
@@ -37,6 +39,7 @@
 //        using namespace std;
 #   endif
 #endif
+#endif
 
 #ifdef __WXDEBUG__
 
@@ -112,8 +115,8 @@ inline void operator delete[] (void * buf)
 }
 #endif
 
-// VC++ 6.0
-#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
+// VC++ 6.0 and MWERKS
+#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || defined(__MWERKS__)
 inline void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
 {
   wxDebugFree(pData, FALSE);
@@ -227,8 +230,11 @@ protected:
     // Traverse the list.
     static void TraverseList (PmSFV, wxMemStruct *from = NULL);
 
+    // Obsolete
+#if 0
     static wxSTD streambuf *m_streamBuf;
     static wxSTD ostream *m_debugStream;
+#endif
 
     static int debugLevel;
     static bool debugOn;
@@ -243,12 +249,15 @@ public:
     wxDebugContext(void);
     ~wxDebugContext(void);
 
+    // Obsolete
+#if 0
     static bool HasStream(void) { return (m_debugStream != NULL); };
     static wxSTD ostream& GetStream(void) { return *m_debugStream; }
     static wxSTD streambuf *GetStreamBuf(void) { return m_streamBuf; }
     static void SetStream(wxSTD ostream *stream, wxSTD streambuf *buf = NULL);
     static bool SetFile(const wxString& file);
     static bool SetStandardError(void);
+#endif
 
     static int GetLevel(void) { return debugLevel; }
     static void SetLevel(int level) { debugLevel = level; }