Fixed operator[] recursion

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 7509750cd35a37c46c1b0638f500f60998307e88..ce4051ad8404440ac3d7a42633855ec57924491a 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -54,7 +54,7 @@
 #include <string.h>
 
 #ifdef __WXMSW__
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
 
 #ifdef GetClassInfo
 #undef GetClassInfo
@@ -1076,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) ...)
 {
 }
@@ -1084,4 +1086,5 @@ void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt) ...)
 {
 }
 #endif
+#endif