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

Some stubs includes removed from wxMotif; wxNotebook sample hack to make it display;

Browse Source 
changes to defs.h and memory.h etc. for Solaris compilation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-12-11 16:09:06 +00:00
parent 92976ab62b
commit 5dcf05ae08
28 changed files with 96 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/defs.h
View File

@@ -41,6 +41,14 @@
#endif
#endif
#if defined(sun) || defined(__SUN__)
# if !defined(__GNUG__)
# ifndef __SUNCC__
# define __SUNCC__
# endif
# endif
#endif
// suppress some Visual C++ warnings
#ifdef _MSC_VER
# pragma warning(disable:4244) // cobversion from double to float
@@ -114,6 +122,9 @@
#define bool unsigned int
#elif defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
typedef unsigned int bool;
#elif defined(__SUNCC__)
// If we use int, we get identically overloaded functions in config.cpp
typedef unsigned char bool;
#endif
#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__)

12
include/wx/memory.h
View File

@@ -53,17 +53,25 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
#undef new
#endif
#if defined(__SUNCC__)
#define wxUSE_ARRAY_MEMORY_OPERATORS 0
#elif !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) || defined( __MWERKS__)
#define wxUSE_ARRAY_MEMORY_OPERATORS 1
#else
#define wxUSE_ARRAY_MEMORY_OPERATORS 0
#endif
// Added JACS 25/11/98: needed for some compilers
void * operator new (size_t size);
#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) || defined( __MWERKS__)
#if wxUSE_ARRAY_MEMORY_OPERATORS
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) ) || defined( __MWERKS__)
#if wxUSE_ARRAY_MEMORY_OPERATORS
void * operator new[] (size_t size, char * fileName, int lineNum);
void operator delete[] (void * buf);
#endif

5
include/wx/object.h
View File

@@ -197,15 +197,18 @@ class WXDLLEXPORT wxObject
#endif
// Cause problems for VC++
#ifndef _MSC_VER
// #ifndef _MSC_VER
#if !defined(_MSC_VER) && wxUSE_ARRAY_MEMORY_OPERATORS
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