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

modified configure to allow configuration of wxMotif under Darwin/Mac OS X

Browse Source 
wxWindows can be configured as wxMac or wxMotif under Mac OS X
replaced __WXMAC_X__ define by __DARWIN__ (general Darwin related issues)
moved dlopen/dlerror code to dynlib.cpp to make it available for wxMotif


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-07-15 18:47:13 +00:00
parent ee65598f95
commit f11bdd03b9
37 changed files with 815 additions and 838 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
include/wx/defs.h
View File

@@ -112,41 +112,26 @@
#define __HPUX__
#endif // HP-UX
#if defined(__APPLE__)
// MacOS X
#ifndef __WXMAC__
#define __WXMAC__
#endif
#ifndef __WXMAC_X__
// This define really should not be necessary since __WXMAC__
// combined with __UNIX__ is sufficient to differentiate
// Classic Mac OS from Mac OS X. However, some code has been
// added to workaround defects(?) in the bundled gcc compiler
// and these corrections are identified by __WXMAC_X__
#define __WXMAC_X__
#endif
#if defined(__WXMAC__) && defined(__DARWIN__)
// Mac OS X
// Some code has been added to workaround defects(?) in the
// bundled gcc compiler. These corrections are identified by:
// __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif)
#include <Carbon/Carbon.h>
#endif // __APPLE__
#endif // __WXMAC__ && __DARWIN__
#elif defined(applec) || \
defined(THINK_C) || \
(defined(__MWERKS__) && !defined(__INTEL__))
// MacOS
#elif defined(__WXMAC__) && defined(__APPLE__)
// MacOS X
#elif defined(__WXMAC__) && defined(__DARWIN__)
// Mac OS X
#define __UNIX_LIKE__
#ifndef __WXMAC__
#define __WXMAC__
#endif
#ifndef __WXMAC_X__
// This define really should not be necessary since __WXMAC__
// combined with __UNIX__ is sufficient to differentiate
// Classic Mac OS from Mac OS X. However, some code has been
// added to workaround defects(?) in the bundled gcc compiler
// and these corrections are identified by __WXMAC_X__
#define __WXMAC_X__
#endif
// Some code has been added to workaround defects(?) in the
// bundled gcc compiler. These corrections are identified by:
// __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif)
#include <Carbon/Carbon.h>
#elif defined(__OS2__)