X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8898456df4728afe7d100011e0e23b0ffb9a6341..6a6c9417a880900ac40ce031d2aa4a19658171e9:/src/common/memory.cpp?ds=sidebyside diff --git a/src/common/memory.cpp b/src/common/memory.cpp index 7c062d71a7..72169f2735 100644 --- a/src/common/memory.cpp +++ b/src/common/memory.cpp @@ -18,17 +18,22 @@ #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT +#include "wx/memory.h" + #ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" + #endif #include "wx/utils.h" #include "wx/app.h" #include "wx/hash.h" + #include "wx/log.h" #endif #if wxUSE_THREADS #include "wx/thread.h" #endif -#include "wx/log.h" #include #include "wx/ioswrap.h" @@ -41,21 +46,6 @@ #include #include -#ifdef __WXMSW__ -#include "wx/msw/wrapwin.h" - -#ifdef GetClassInfo -#undef GetClassInfo -#endif - -#ifdef GetClassName -#undef GetClassName -#endif - -#endif - -#include "wx/memory.h" - #if wxUSE_THREADS && defined(__WXDEBUG__) #define USE_THREADSAFE_MEMORY_ALLOCATION 1 #else