oops, more fixes needed

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 7509750cd35a37c46c1b0638f500f60998307e88..e762055fc5d673aa4652d001882f4e9a0d328975 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "memory.h"
 #endif
 
@@ -26,7 +26,7 @@
 
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 // #pragma implementation
 #endif
 
@@ -54,7 +54,7 @@
 #include <string.h>
 
 #ifdef __WXMSW__
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
 
 #ifdef GetClassInfo
 #undef GetClassInfo
@@ -768,7 +768,7 @@ bool wxDebugContext::PrintClasses(void)
   }
 
   int n = 0;
-  wxNode *node;
+  wxHashTable::compatibility_iterator node;
   wxClassInfo *info;
 
   wxClassInfo::sm_classTable->BeginFind();
@@ -1075,13 +1075,5 @@ void wxTraceLevel(int, const wxChar * ...)
 #endif
 }
 
-#else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)
-void wxTrace(const char *WXUNUSED(fmt) ...)
-{
-}
-
-void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt) ...)
-{
-}
 #endif