X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..903972f99993e6f31a31b66d1866f6fc982a1c43:/include/wx/object.h?ds=inline diff --git a/include/wx/object.h b/include/wx/object.h index be4a7bbc3f..8dd677333c 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -45,11 +45,6 @@ class WXDLLEXPORT wxClassInfo; class WXDLLEXPORT wxHashTable; class WXDLLEXPORT wxObjectRefData; -#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT) - #include "wx/ioswrap.h" -#endif - - // ---------------------------------------------------------------------------- // wxClassInfo // ---------------------------------------------------------------------------- @@ -326,18 +321,6 @@ inline void wxCheckCast(void *ptr) #endif // __WXDEBUG__ - -// for some reason Borland seems to need this include. -#if wxUSE_STD_IOSTREAM \ - && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT) \ - && defined(__BORLANDC__) - #if wxUSE_IOSTREAMH - #include - #else - #include - #endif -#endif // wxUSE_IOSTREAMH - // ---------------------------------------------------------------------------- // set up memory debugging macros // ---------------------------------------------------------------------------- @@ -396,6 +379,10 @@ inline void wxCheckCast(void *ptr) #endif // WXDEBUG && wxUSE_MEMORY_TRACING +#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT) +// needed by wxObject::Dump +#include "wx/iosfwrap.h" +#endif // ---------------------------------------------------------------------------- // wxObject: the root class of wxWindows object hierarchy