X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/478e6b717c8cdbb35d993d5224895a0663c36bd1..bb80bb5b30d7b16f39e6c1c63637f98fdf4ff63a:/src/common/memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 6679675ab0..5302fe214d 100644
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -40,11 +40,14 @@
 
 #include "wx/ioswrap.h"
 
+// Obsolete
+#if 0
 #if wxUSE_IOSTREAMH
     #include <fstream.h>
 #else
     #include <fstream>
 #endif
+#endif
 
 #if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
      && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
@@ -465,8 +468,11 @@ wxMemStruct *wxDebugContext::m_tail = NULL;
 // wxSTD streambuf *wxDebugContext::m_streamBuf = NULL;
 
 // Must initialise these in wxEntry, and then delete them just before wxEntry exits
+// Obsolete
+#if 0
 wxSTD streambuf *wxDebugContext::m_streamBuf = NULL;
 wxSTD ostream *wxDebugContext::m_debugStream = NULL;
+#endif
 
 bool wxDebugContext::m_checkPrevious = FALSE;
 int wxDebugContext::debugLevel = 1;
@@ -486,7 +492,7 @@ wxDebugContext::wxDebugContext(void)
 
 wxDebugContext::~wxDebugContext(void)
 {
-  SetStream(NULL, NULL);
+//  SetStream(NULL, NULL);
 }
 
 /*
@@ -494,6 +500,8 @@ wxDebugContext::~wxDebugContext(void)
  * between SetFile and SetStream.
  */
 
+// Obsolete
+#if 0
 void wxDebugContext::SetStream(wxSTD ostream *str, wxSTD streambuf *buf)
 {
   if (m_debugStream)
@@ -548,7 +556,8 @@ bool wxDebugContext::SetStandardError(void)
 #endif
   return FALSE;
 }
-
+#endif
+    // 0
 
 /*
   Work out the positions of the markers by creating an array of 2 markers
@@ -687,7 +696,7 @@ bool wxDebugContext::Dump(void)
 
 //  if (TRUE)
   {
-    wxChar* appName = wxT("application");
+    wxChar* appName = (wxChar*) wxT("application");
     wxString appNameStr("");
     if (wxTheApp)
     {
@@ -746,7 +755,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
 
 //  if (TRUE)
   {
-    wxChar* appName = wxT("application");
+    wxChar* appName = (wxChar*) wxT("application");
     wxString appNameStr(wxT(""));
     if (wxTheApp)
     {
@@ -780,7 +789,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
 //    if (detailed && (data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
       if (detailed && (data != (void*) wxLog::GetActiveTarget()))
     {
-      wxChar *className = wxT("nonobject");
+      wxChar *className = (wxChar*) wxT("nonobject");
       if (st->m_isObject && st->GetActualData())
       {
         wxObject *obj = (wxObject *)st->GetActualData();
@@ -846,7 +855,7 @@ bool wxDebugContext::PrintClasses(void)
 
 //  if (TRUE)
   {
-    wxChar* appName = wxT("application");
+    wxChar* appName = (wxChar*) wxT("application");
     wxString appNameStr(wxT(""));
     if (wxTheApp)
     {