From: Gilles Depeyrot <gilles_depeyrot@mac.com>
Date: Sun, 15 Jul 2001 21:04:44 +0000 (+0000)
Subject: modified configure to allow configuration of wxMotif under Darwin/Mac OS X
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6e040042bae080a3fe8907e3772c103deab91c13?ds=sidebyside

modified configure to allow configuration of wxMotif under Darwin/Mac OS X
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@11063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 144e7636b3..6ac8eb2c0c 100644
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -24,7 +24,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 #elif defined(__WXQT__)
 #include "wx/qt/dirdlg.h"
 #elif defined(__WXMAC__)
-#ifdef __WXMAC_X__
+#ifdef __DARWIN__
 #include "wx/generic/dirdlgg.h"
 #else
 #include "wx/mac/dirdlg.h"
diff --git a/include/wx/mac/dnd.h b/include/wx/mac/dnd.h
index 2b0f35375d..0afea150b9 100644
--- a/include/wx/mac/dnd.h
+++ b/include/wx/mac/dnd.h
@@ -25,7 +25,7 @@
 
 class WXDLLEXPORT wxWindow;
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 class WXDLLEXPORT wxDataObject;
 class WXDLLEXPORT wxTextDataObject;
 class WXDLLEXPORT wxFileDataObject;
@@ -37,7 +37,7 @@ class WXDLLEXPORT wxFileDropTarget;
 
 class WXDLLEXPORT wxDropSource;
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 //-------------------------------------------------------------------------
 // wxDataObject
 //-------------------------------------------------------------------------
@@ -168,7 +168,7 @@ class WXDLLEXPORT wxDropTarget: public wxObject
     virtual wxDataFormat GetFormat(size_t n) const = 0;
 };
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 //-------------------------------------------------------------------------
 // wxTextDropTarget
 //-------------------------------------------------------------------------
diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index 6133502a6b..ed8cc1997f 100644
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -21,10 +21,10 @@
 #define UMA_USE_8_6 1 
 #endif
 
-#if defined(__POWERPC__) || defined(__APPLE__)
+#if defined(__POWERPC__)
     #define UMA_USE_APPEARANCE 1
     #define UMA_USE_WINDOWMGR 1
-    #if defined(__APPLE__)
+    #if defined(__DARWIN__)
         #include <Carbon/Carbon.h>
     #endif
 #else
diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 26ce087d2e..54f09d2f03 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -266,7 +266,7 @@ typedef  _TUCHAR     wxUChar;
 #    if defined(__VISUALC__) && (__VISUALC__ < 900)
 #      define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5
 #    elif defined(__UNIX__)
-#      if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__))
+#      if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || (defined(__DARWIN__))
 #        define wxUSE_WCHAR_T 1
 #      else
 #        define wxUSE_WCHAR_T 0
@@ -289,7 +289,7 @@ typedef  _TUCHAR     wxUChar;
 #    ifdef HAVE_WCSTR_H
 #      include <wcstr.h>
 #    else
-#      if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__))
+#      if defined(__FreeBSD__) || defined(__DARWIN__)
 #        include <stdlib.h>
 #        define wxNEED_WCSLEN
 #      else
@@ -379,7 +379,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #     define wxUChar unsigned char
 #   endif
 
-#   if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__))
+#   if defined(__FreeBSD__) || defined(__DARWIN__)
 #     undef _T
 #   endif