CodeWarrior Support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -104,7 +104,7 @@
|
|||||||
// VC++ 4.0 is 1000.
|
// VC++ 4.0 is 1000.
|
||||||
|
|
||||||
// Add more tests here for compilers that don't already define bool.
|
// Add more tests here for compilers that don't already define bool.
|
||||||
#if ( defined(_MSC_VER) && (_MSC_VER <= 1000) ) || (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
|
#if ( defined(_MSC_VER) && (_MSC_VER <= 1000) && !defined( __MWERKS__ ) ) || (defined(__BORLANDC__) && (__BORLANDC__ < 0x500)) || ( __MWERKS__ < 0x1000 || !__option(bool) )
|
||||||
typedef unsigned int bool;
|
typedef unsigned int bool;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -56,14 +56,14 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
|
|||||||
// Added JACS 25/11/98: needed for some compilers
|
// Added JACS 25/11/98: needed for some compilers
|
||||||
void * operator new (size_t size);
|
void * operator new (size_t size);
|
||||||
|
|
||||||
#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
|
#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) || defined( __MWERKS__)
|
||||||
void * operator new[] (size_t size);
|
void * operator new[] (size_t size);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void * operator new (size_t size, char * fileName, int lineNum);
|
void * operator new (size_t size, char * fileName, int lineNum);
|
||||||
void operator delete (void * buf);
|
void operator delete (void * buf);
|
||||||
|
|
||||||
#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
|
#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) || defined( __MWERKS__)
|
||||||
void * operator new[] (size_t size, char * fileName, int lineNum);
|
void * operator new[] (size_t size, char * fileName, int lineNum);
|
||||||
void operator delete[] (void * buf);
|
void operator delete[] (void * buf);
|
||||||
#endif
|
#endif
|
||||||
|
@@ -202,6 +202,11 @@ class WXDLLEXPORT wxObject
|
|||||||
void operator delete[] (void * buf);
|
void operator delete[] (void * buf);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __MWERKS__
|
||||||
|
void * operator new[] (size_t size, char * fileName , int lineNum = 0);
|
||||||
|
void operator delete[] (void * buf);
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
|
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
|
||||||
|
Reference in New Issue
Block a user