Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CodeWarrior Support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
1998-12-10 17:16:12 +00:00
parent 4bb19cfb3a
commit 27198be4ef
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/defs.h
View File

@@ -104,7 +104,7 @@
// VC++ 4.0 is 1000.
// 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;
#endif

4
include/wx/memory.h
View File

@@ -56,14 +56,14 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
// Added JACS 25/11/98: needed for some compilers
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);
#endif
void * operator new (size_t size, char * fileName, int lineNum);
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 delete[] (void * buf);
#endif

9
include/wx/object.h
View File

@@ -190,18 +190,23 @@ class WXDLLEXPORT wxObject
#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
void operator delete (void * buf);
// VC++ 6.0
#if _MSC_VER >= 1200
void operator delete(void *buf, char*, int);
#endif
// Cause problems for VC++
#ifndef _MSC_VER
#ifndef _MSC_VER
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
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT