X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9419379a37aaa7d5ac7b92187b9f296cd46f9e81..372208c2e650c4f41f7607d024b57718ed61ba59:/src/common/memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 0af3fa2c1a..29b31bdfeb 100644
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "memory.h"
 #endif
 
@@ -26,13 +26,14 @@
 
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 // #pragma implementation
 #endif
 
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/app.h"
+#include "wx/hash.h"
 #endif
 
 #if wxUSE_THREADS
@@ -53,7 +54,7 @@
 #include <string.h>
 
 #ifdef __WXMSW__
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
 
 #ifdef GetClassInfo
 #undef GetClassInfo
@@ -767,14 +768,14 @@ bool wxDebugContext::PrintClasses(void)
   }
 
   int n = 0;
-  wxNode *node;
+  wxHashTable::compatibility_iterator node;
   wxClassInfo *info;
 
   wxClassInfo::sm_classTable->BeginFind();
   node = wxClassInfo::sm_classTable->Next();
   while (node)
   {
-    info = (wxClassInfo *)node->Data();
+    info = (wxClassInfo *)node->GetData();
     if (info->GetClassName())
     {
         wxString msg(info->GetClassName());
@@ -1075,6 +1076,8 @@ void wxTraceLevel(int, const wxChar * ...)
 }
 
 #else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)
+// Already defined in memory.h
+#if 0
 void wxTrace(const char *WXUNUSED(fmt) ...)
 {
 }
@@ -1083,4 +1086,5 @@ void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt) ...)
 {
 }
 #endif
+#endif