added an error message if a bitmap can't be addedto the image list

[wxWidgets.git] / src / common / memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 85efd2cf3ba8d7857e4f2202131dd836a38564ad..e89bd8835c7ecf758a47dc93ccf8921f9f530ac7 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -49,7 +49,7 @@
 #  endif
 #endif
 
-#if !defined(__WATCOMC__) && !defined(__VMS__)
+#if !defined(__WATCOMC__) && !defined(__VMS__) && !defined( __MWERKS__ )
 #include <memory.h>
 #endif
 
@@ -532,6 +532,8 @@ bool wxDebugContext::SetFile(const wxString& file)
 
 bool wxDebugContext::SetStandardError(void)
 {
+    // Obsolete
+#if 0
 #if !defined(_WINDLL)
   wxDebugStreamBuf *buf = new wxDebugStreamBuf;
   ostream *stream = new ostream(m_streamBuf);
@@ -540,6 +542,8 @@ bool wxDebugContext::SetStandardError(void)
 #else
   return FALSE;
 #endif
+#endif
+  return FALSE;
 }
 
 
@@ -909,7 +913,7 @@ int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
   wxMemStruct *from = NULL;
   if (sinceCheckpoint && checkPoint)
     from = checkPoint->m_next;
-  if (from == (wxMemStruct*) NULL)
+  else
     from = wxDebugContext::GetHead () ;
 
   for (wxMemStruct * st = from; st != 0; st = st->m_next)