X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f4a0c5be34be837210768501c13dbcff81e533c..33d28952b29818b6931d91984a7b612a072d843d:/include/wx/object.h diff --git a/include/wx/object.h b/include/wx/object.h index abd725a3f2..a335a1dfcc 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -34,6 +34,7 @@ class WXDLLEXPORT wxObject; class WXDLLEXPORT wxClassInfo; class WXDLLEXPORT wxInputStream; +class WXDLLEXPORT wxOutputStream; class WXDLLEXPORT wxObjectInputStream; class WXDLLEXPORT wxObjectOutputStream; class WXDLLEXPORT wxHashTable; @@ -203,17 +204,15 @@ class WXDLLEXPORT wxObject #endif // Causes problems for VC++ -#if wxUSE_ARRAY_MEMORY_OPERATORS && !defined(__VISUALC__) +#if wxUSE_ARRAY_MEMORY_OPERATORS && !defined(__VISUALC__) && !defined( __MWERKS__) void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0); void operator delete[] (void * buf); #endif -/* #ifdef __MWERKS__ void * operator new[] (size_t size, char * fileName , int lineNum = 0); void operator delete[] (void * buf); #endif -*/ #endif // Debug & memory tracing