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@11065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 4e4699db1df73493cb160cbff05c14cf03ad546d..5cc6077376e0a553283aaf0161c3eac0979b4d92 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -40,7 +40,7 @@
 
 // mac
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #if __option(profile)
        #include <profiler.h>
   #endif
@@ -52,7 +52,7 @@
 #include "wx/mac/macnotfy.h"
 
 #if wxUSE_SOCKETS
-    #ifdef __APPLE__
+    #ifdef __DARWIN__
         #include <CoreServices/CoreServices.h>
     #else
         #include <OpenTransport.h>
@@ -374,7 +374,7 @@ bool wxApp::Initialize()
 #endif
 
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   // test the minimal configuration necessary
 
        #if !TARGET_CARBON
@@ -427,7 +427,7 @@ bool wxApp::Initialize()
          return FALSE ;
   }
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #if __option(profile)
        ProfilerInit( collectDetailed, bestTimeBase , 20000 , 40 ) ;
   #endif
@@ -435,7 +435,7 @@ bool wxApp::Initialize()
 
   // now avoid exceptions thrown for new (bad_alloc)
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   std::__throws_bad_alloc = FALSE ;
 #endif
 
@@ -544,7 +544,7 @@ void wxApp::CleanUp()
 
   wxClassInfo::CleanUpClasses();
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #if __option(profile)
   ProfilerDump( "\papp.prof" ) ;
   ProfilerTerm() ;

diff --git a/src/mac/bitmap.cpp b/src/mac/bitmap.cpp
index 409d2fb3a82799c6abd6f96ac07250f56c689dc7..ff66eaff0f8b56eeae679bb11aedcb0830287f0b 100644 (file)
--- a/src/mac/bitmap.cpp
+++ b/src/mac/bitmap.cpp
@@ -29,7 +29,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase , wxGDIObject )
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandlerBase, wxObject ) 
 #endif
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
     #include <ApplicationServices/ApplicationServices.h>
 #else
     #include <PictUtils.h>
@@ -841,7 +841,7 @@ PicHandle wxBitmap::GetPict() const
 
    if( mask )
    {
-#ifdef __UNIX__
+#ifdef __DARWIN__
        RGBColor trans = white;
 #else
        RGBBackColor( &gray );

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index d4837fd54a90709aaeb3b6b281215ff1785f7ddd..363789a94521f979fce8ee9dfeba079f9c44fee1 100644 (file)
--- a/src/mac/button.cpp
+++ b/src/mac/button.cpp
@@ -57,7 +57,7 @@ void wxButton::SetDefault()
         panel->SetDefaultItem(this);
     }
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
        Boolean inData;
        if ( btnOldDefault && btnOldDefault->m_macControl )
        {

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 4e4699db1df73493cb160cbff05c14cf03ad546d..5cc6077376e0a553283aaf0161c3eac0979b4d92 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -40,7 +40,7 @@
 
 // mac
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #if __option(profile)
        #include <profiler.h>
   #endif
@@ -52,7 +52,7 @@
 #include "wx/mac/macnotfy.h"
 
 #if wxUSE_SOCKETS
-    #ifdef __APPLE__
+    #ifdef __DARWIN__
         #include <CoreServices/CoreServices.h>
     #else
         #include <OpenTransport.h>
@@ -374,7 +374,7 @@ bool wxApp::Initialize()
 #endif
 
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   // test the minimal configuration necessary
 
        #if !TARGET_CARBON
@@ -427,7 +427,7 @@ bool wxApp::Initialize()
          return FALSE ;
   }
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #if __option(profile)
        ProfilerInit( collectDetailed, bestTimeBase , 20000 , 40 ) ;
   #endif
@@ -435,7 +435,7 @@ bool wxApp::Initialize()
 
   // now avoid exceptions thrown for new (bad_alloc)
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   std::__throws_bad_alloc = FALSE ;
 #endif
 
@@ -544,7 +544,7 @@ void wxApp::CleanUp()
 
   wxClassInfo::CleanUpClasses();
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #if __option(profile)
   ProfilerDump( "\papp.prof" ) ;
   ProfilerTerm() ;

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 409d2fb3a82799c6abd6f96ac07250f56c689dc7..ff66eaff0f8b56eeae679bb11aedcb0830287f0b 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -29,7 +29,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase , wxGDIObject )
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandlerBase, wxObject ) 
 #endif
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
     #include <ApplicationServices/ApplicationServices.h>
 #else
     #include <PictUtils.h>
@@ -841,7 +841,7 @@ PicHandle wxBitmap::GetPict() const
 
    if( mask )
    {
-#ifdef __UNIX__
+#ifdef __DARWIN__
        RGBColor trans = white;
 #else
        RGBBackColor( &gray );

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index d4837fd54a90709aaeb3b6b281215ff1785f7ddd..363789a94521f979fce8ee9dfeba079f9c44fee1 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -57,7 +57,7 @@ void wxButton::SetDefault()
         panel->SetDefaultItem(this);
     }
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
        Boolean inData;
        if ( btnOldDefault && btnOldDefault->m_macControl )
        {

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index f66cf2735707d1f84c08d27210acdf99f6fd80dd..f4bf8ea95c72269bdc1947e08f90faed117f3efd 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -38,7 +38,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #define twips2mm               0.0176388888889
 #define mm2pt                  2.83464566929
 #define pt2mm                  0.352777777778
-#ifndef __UNIX__
+#ifndef __DARWIN__
 const double M_PI = 3.14159265358979 ;
 #endif
 const double RAD2DEG  = 180.0 / M_PI;

diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp
index d1d906478ce833ffb79c69b4ad8c44231a1774d1..83533f1236711365c82828ecadfabb3b500e8d2c 100644 (file)
--- a/src/mac/carbon/dirdlg.cpp
+++ b/src/mac/carbon/dirdlg.cpp
@@ -20,7 +20,7 @@
 
 #include "wx/cmndata.h"
 
-#if defined(__UNIX__)
+#ifdef __DARWIN__
   #include <Carbon/Carbon.h>
 #else
   #include <Navigation.h>

diff --git a/src/mac/carbon/dirmac.cpp b/src/mac/carbon/dirmac.cpp
index 2a3e4c7221b64db7bb4dfa4eb64c7391b821b6b0..36835cd68cb7ec10f1ed124310adb4aa51634412 100644 (file)
--- a/src/mac/carbon/dirmac.cpp
+++ b/src/mac/carbon/dirmac.cpp
@@ -36,11 +36,11 @@
 #include "wx/dir.h"
 #include "wx/filefn.h"          // for wxPathExists()
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
   #include <windows.h>
 #endif
 
-#if defined(__WXMAC__) && !defined(__UNIX__)
+#ifndef __DARWIN__
   #include "morefile.h"
   #include "moreextr.h"
   #include "fullpath.h"
@@ -118,7 +118,7 @@ wxDirData::wxDirData(const wxString& dirname)
        m_CPB.hFileInfo.ioNamePtr = m_name ;
        m_index = 0 ;
 
-#ifdef __WXMAC_X__
+#ifdef __DARWIN__
        // TODO: what are we supposed to do for Mac OS X
 #else
        FSpGetDirectoryID( &fsspec , &m_dirId , &m_isDir ) ;

diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index ece56ce7d352f24c871a019997c5c9c2c7207ad7..42b397d59031448a039532faf35f513a1b90976a 100644 (file)
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -39,7 +39,7 @@ wxDropTarget::~wxDropTarget()
 // ----------------------------------------------------------------------------
 // wxTextDropTarget
 // ----------------------------------------------------------------------------
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 bool wxTextDropTarget::OnDrop( wxCoord x, wxCoord y, const void *pData )
 {
   OnDropText( x, y, (const char*)pData );
@@ -54,7 +54,7 @@ bool wxTextDropTarget::OnDropText( wxCoord x, wxCoord y, const wxString &psz )
   return TRUE;
 };
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 size_t wxTextDropTarget::GetFormatCount() const
 {
   return 1;
@@ -70,7 +70,7 @@ wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const
 // wxFileDropTarget
 // ----------------------------------------------------------------------------
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 bool wxFileDropTarget::OnDropFiles( wxCoord x, wxCoord y, size_t nFiles, const char * const WXUNUSED(aszFiles)[] )
 {
   printf( "Got %d dropped files.\n", (int)nFiles );
@@ -84,7 +84,7 @@ bool wxFileDropTarget::OnDrop(wxCoord x, wxCoord y, const wxArrayString& filenam
   return OnDropFiles(x, y, 1, &filenames); 
 }
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 size_t wxFileDropTarget::GetFormatCount() const
 {
   return 1;

diff --git a/src/mac/carbon/gsocket.c b/src/mac/carbon/gsocket.c
index 20e4049f58bdecc3f973f16f4d7358602485bae6..10ee5d838dbbcc4cdb7a38276b2dfd6ae2897035 100644 (file)
--- a/src/mac/carbon/gsocket.c
+++ b/src/mac/carbon/gsocket.c
@@ -19,7 +19,7 @@
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
   #include <CoreServices/CoreServices.h>
 
   #ifndef FALSE
@@ -80,7 +80,7 @@ void wxCYield() ;
 #define qDebug2 1
 extern pascal void OTDebugStr(const char* str);
 #endif
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #include <OTDebug.h>
 #endif
 InetSvcRef gInetSvcRef = 0 ;
@@ -121,7 +121,7 @@ OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode)
        ret.opt.maxlen = kOTFourByteOptionSize;
 
        opt->level      = INET_IP;                                      // dealing with an IP Level function
-#ifdef __UNIX__
+#ifdef __DARWIN__
        opt->name       = kIP_REUSEADDR;
 #else
        opt->name       = IP_REUSEADDR;

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 4624d820db78118eedba18893cf8806bef05d971..4e737dc2f64ddce2994df3a26e5a367528421688 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -20,7 +20,7 @@
 #include "wx/log.h"
 
 #include "wx/utils.h"
-#ifdef __UNIX__
+#ifdef __DARWIN__
   #include "ldef/extldef.h"
 #else
   #include "extldef.h"

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index d1d5a8477190f5060b1a025fefb1b0ddb236774a..6956a0987adde5647ae5fdcb9f865e69a8697e6c 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -56,7 +56,7 @@ const short kwxMacAppleMenuId = 1 ;
 
 // Construct a menu with optional title (then use append)
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
 short wxMenu::s_macNextMenuId = 3 ;
 #else
 short wxMenu::s_macNextMenuId = 2 ;
@@ -450,7 +450,7 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
                        return true ;
                }
        }
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
        else if ( macMenuId == kHMHelpMenuID )
        {
                int menuItem = formerHelpMenuItems ;
@@ -499,7 +499,7 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
                        }
          }
        }
-#endif // __WXMAC_X__
+#endif // __DARWIN__
 
   for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) 
   {    
@@ -898,7 +898,7 @@ void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId,
          for (int i = 0; i < m_menus.GetCount() ; i++)
          {
                if ( m_menus[i]->MacGetMenuId() == macMenuId
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
                     || 
                        ( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?"  || m_titles[i] == wxApp::s_macHelpMenuTitleName ) )
 #endif

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 496c75fe5b4c737872720a0c5131f366465bce9a..6f555d06c9cd7e56e141d6051e344889e73ca47c 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -32,7 +32,7 @@
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
 
-#ifdef __WXMAC_X__
+#ifdef __DARWIN__
   // I got these values for Mac OS X from the Appearance mgr docs. (Mark Newsam)
 const short kwxMacTabLeftMargin = 20 ;
 const short kwxMacTabTopMargin = 38 ;
@@ -76,7 +76,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 // common part of all ctors
 void wxNotebook::Init()
 {
-#ifdef __WXMAC_X__
+#ifdef __DARWIN__
     m_macHorizontalBorder = 7;
     m_macVerticalBorder = 8;
 #endif

diff --git a/src/mac/carbon/pnghand.cpp b/src/mac/carbon/pnghand.cpp
index 90b59669f0f9b09db8a669a73ea599adb3d5e940..358515d2838c5e47c0a3a12990142c030cd9d8f5 100644 (file)
--- a/src/mac/carbon/pnghand.cpp
+++ b/src/mac/carbon/pnghand.cpp
@@ -31,7 +31,7 @@
 #   include <fstream>
 #endif
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 #  include <windows.h>
 #endif
 #include "wx/msgdlg.h"

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 0724fe9da9a8cc4d921d0ad7c8fd010de92b8378..cda4bcd0de5e581b3a3e8e64bee03f5fd38f3826 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -13,7 +13,7 @@
 #pragma implementation "textctrl.h"
 #endif
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
   #include <sys/types.h>
   #include <sys/stat.h>
 #else
@@ -34,7 +34,7 @@
 
 #if defined(__BORLANDC__) && !defined(__WIN32__)
   #include <alloc.h>
-#elif !defined(__MWERKS__) && !defined(__GNUWIN32) && !defined(__WXMAC_X__)
+#elif !defined(__MWERKS__) && !defined(__GNUWIN32) && !defined(__DARWIN__)
   #include <malloc.h>
 #endif
 

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 52e0497c558d7000867570bcd526b1fc038ac60f..2c70ef47b762087471d27444223f1671164acb1b 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -3,7 +3,7 @@
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #include <Navigation.h>
 #endif
 
@@ -84,7 +84,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 #endif // UMA_USE_WINDOWMGR
 #endif
                
-#ifndef __UNIX__
+#ifndef __DARWIN__
 #if TARGET_CARBON
 // Call currently implicitely done :           InitFloatingWindows() ;
 #else

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 1a71c0c7840173ec28e56c6a1a8418bc9fada85f..6016d24d816041290f2519833865cfc1773f630b 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
 
 // get full hostname (with domain name if possible)
@@ -178,7 +178,7 @@ void wxFatalError(const wxString& msg, const wxString& title)
   wxMessageBox(wxBuffer);
   wxExit();
 }
-#endif // !__UNIX__
+#endif // !__DARWIN__
 
 // Emit a beeeeeep
 void wxBell()
@@ -315,7 +315,7 @@ bool wxIsBusy()
   return (wxBusyCursorCount > 0);
 }
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
 wxString wxMacFindFolder( short                                        vol,
                                                                 OSType                                 folderType,
                                                                 Boolean                                createFolder)
@@ -336,7 +336,7 @@ wxString wxMacFindFolder( short                                     vol,
 }
 #endif
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
 char *wxGetUserHome (const wxString& user)
 {
     // TODO

diff --git a/src/mac/carbon/utilsexc.cpp b/src/mac/carbon/utilsexc.cpp
index 624a9c05249a3061ccc3d7828dbfcaec8461f65a..3b4903212c6ba5dacc30fb2a2ba8925b8261ce01 100644 (file)
--- a/src/mac/carbon/utilsexc.cpp
+++ b/src/mac/carbon/utilsexc.cpp
@@ -14,7 +14,7 @@
 #endif
 
 #include "wx/utils.h"
-#ifdef __UNIX__
+#ifdef __DARWIN__
 #include "wx/unix/execute.h"
 #endif
 
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
 #define wxEXECUTE_WIN_MESSAGE 10000
 
 long wxExecute(const wxString& command, bool sync, wxProcess *handler)
@@ -32,10 +32,10 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
 }
 #endif
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 {
    wxFAIL_MSG(wxT("wxAddProcessCallback() function not ready"));
    return 0;
 }
-#endif
\ No newline at end of file
+#endif

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index f66cf2735707d1f84c08d27210acdf99f6fd80dd..f4bf8ea95c72269bdc1947e08f90faed117f3efd 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -38,7 +38,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #define twips2mm               0.0176388888889
 #define mm2pt                  2.83464566929
 #define pt2mm                  0.352777777778
-#ifndef __UNIX__
+#ifndef __DARWIN__
 const double M_PI = 3.14159265358979 ;
 #endif
 const double RAD2DEG  = 180.0 / M_PI;

diff --git a/src/mac/dirdlg.cpp b/src/mac/dirdlg.cpp
index d1d906478ce833ffb79c69b4ad8c44231a1774d1..83533f1236711365c82828ecadfabb3b500e8d2c 100644 (file)
--- a/src/mac/dirdlg.cpp
+++ b/src/mac/dirdlg.cpp
@@ -20,7 +20,7 @@
 
 #include "wx/cmndata.h"
 
-#if defined(__UNIX__)
+#ifdef __DARWIN__
   #include <Carbon/Carbon.h>
 #else
   #include <Navigation.h>

diff --git a/src/mac/dirmac.cpp b/src/mac/dirmac.cpp
index 2a3e4c7221b64db7bb4dfa4eb64c7391b821b6b0..36835cd68cb7ec10f1ed124310adb4aa51634412 100644 (file)
--- a/src/mac/dirmac.cpp
+++ b/src/mac/dirmac.cpp
@@ -36,11 +36,11 @@
 #include "wx/dir.h"
 #include "wx/filefn.h"          // for wxPathExists()
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
   #include <windows.h>
 #endif
 
-#if defined(__WXMAC__) && !defined(__UNIX__)
+#ifndef __DARWIN__
   #include "morefile.h"
   #include "moreextr.h"
   #include "fullpath.h"
@@ -118,7 +118,7 @@ wxDirData::wxDirData(const wxString& dirname)
        m_CPB.hFileInfo.ioNamePtr = m_name ;
        m_index = 0 ;
 
-#ifdef __WXMAC_X__
+#ifdef __DARWIN__
        // TODO: what are we supposed to do for Mac OS X
 #else
        FSpGetDirectoryID( &fsspec , &m_dirId , &m_isDir ) ;

diff --git a/src/mac/dnd.cpp b/src/mac/dnd.cpp
index ece56ce7d352f24c871a019997c5c9c2c7207ad7..42b397d59031448a039532faf35f513a1b90976a 100644 (file)
--- a/src/mac/dnd.cpp
+++ b/src/mac/dnd.cpp
@@ -39,7 +39,7 @@ wxDropTarget::~wxDropTarget()
 // ----------------------------------------------------------------------------
 // wxTextDropTarget
 // ----------------------------------------------------------------------------
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 bool wxTextDropTarget::OnDrop( wxCoord x, wxCoord y, const void *pData )
 {
   OnDropText( x, y, (const char*)pData );
@@ -54,7 +54,7 @@ bool wxTextDropTarget::OnDropText( wxCoord x, wxCoord y, const wxString &psz )
   return TRUE;
 };
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 size_t wxTextDropTarget::GetFormatCount() const
 {
   return 1;
@@ -70,7 +70,7 @@ wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const
 // wxFileDropTarget
 // ----------------------------------------------------------------------------
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 bool wxFileDropTarget::OnDropFiles( wxCoord x, wxCoord y, size_t nFiles, const char * const WXUNUSED(aszFiles)[] )
 {
   printf( "Got %d dropped files.\n", (int)nFiles );
@@ -84,7 +84,7 @@ bool wxFileDropTarget::OnDrop(wxCoord x, wxCoord y, const wxArrayString& filenam
   return OnDropFiles(x, y, 1, &filenames); 
 }
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 size_t wxFileDropTarget::GetFormatCount() const
 {
   return 1;

diff --git a/src/mac/gsocket.c b/src/mac/gsocket.c
index 20e4049f58bdecc3f973f16f4d7358602485bae6..10ee5d838dbbcc4cdb7a38276b2dfd6ae2897035 100644 (file)
--- a/src/mac/gsocket.c
+++ b/src/mac/gsocket.c
@@ -19,7 +19,7 @@
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
   #include <CoreServices/CoreServices.h>
 
   #ifndef FALSE
@@ -80,7 +80,7 @@ void wxCYield() ;
 #define qDebug2 1
 extern pascal void OTDebugStr(const char* str);
 #endif
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #include <OTDebug.h>
 #endif
 InetSvcRef gInetSvcRef = 0 ;
@@ -121,7 +121,7 @@ OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode)
        ret.opt.maxlen = kOTFourByteOptionSize;
 
        opt->level      = INET_IP;                                      // dealing with an IP Level function
-#ifdef __UNIX__
+#ifdef __DARWIN__
        opt->name       = kIP_REUSEADDR;
 #else
        opt->name       = IP_REUSEADDR;

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index 4624d820db78118eedba18893cf8806bef05d971..4e737dc2f64ddce2994df3a26e5a367528421688 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -20,7 +20,7 @@
 #include "wx/log.h"
 
 #include "wx/utils.h"
-#ifdef __UNIX__
+#ifdef __DARWIN__
   #include "ldef/extldef.h"
 #else
   #include "extldef.h"

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index d1d5a8477190f5060b1a025fefb1b0ddb236774a..6956a0987adde5647ae5fdcb9f865e69a8697e6c 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -56,7 +56,7 @@ const short kwxMacAppleMenuId = 1 ;
 
 // Construct a menu with optional title (then use append)
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
 short wxMenu::s_macNextMenuId = 3 ;
 #else
 short wxMenu::s_macNextMenuId = 2 ;
@@ -450,7 +450,7 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
                        return true ;
                }
        }
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
        else if ( macMenuId == kHMHelpMenuID )
        {
                int menuItem = formerHelpMenuItems ;
@@ -499,7 +499,7 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
                        }
          }
        }
-#endif // __WXMAC_X__
+#endif // __DARWIN__
 
   for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) 
   {    
@@ -898,7 +898,7 @@ void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId,
          for (int i = 0; i < m_menus.GetCount() ; i++)
          {
                if ( m_menus[i]->MacGetMenuId() == macMenuId
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
                     || 
                        ( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?"  || m_titles[i] == wxApp::s_macHelpMenuTitleName ) )
 #endif

diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp
index 496c75fe5b4c737872720a0c5131f366465bce9a..6f555d06c9cd7e56e141d6051e344889e73ca47c 100644 (file)
--- a/src/mac/notebmac.cpp
+++ b/src/mac/notebmac.cpp
@@ -32,7 +32,7 @@
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
 
-#ifdef __WXMAC_X__
+#ifdef __DARWIN__
   // I got these values for Mac OS X from the Appearance mgr docs. (Mark Newsam)
 const short kwxMacTabLeftMargin = 20 ;
 const short kwxMacTabTopMargin = 38 ;
@@ -76,7 +76,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 // common part of all ctors
 void wxNotebook::Init()
 {
-#ifdef __WXMAC_X__
+#ifdef __DARWIN__
     m_macHorizontalBorder = 7;
     m_macVerticalBorder = 8;
 #endif

diff --git a/src/mac/pnghand.cpp b/src/mac/pnghand.cpp
index 90b59669f0f9b09db8a669a73ea599adb3d5e940..358515d2838c5e47c0a3a12990142c030cd9d8f5 100644 (file)
--- a/src/mac/pnghand.cpp
+++ b/src/mac/pnghand.cpp
@@ -31,7 +31,7 @@
 #   include <fstream>
 #endif
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 #  include <windows.h>
 #endif
 #include "wx/msgdlg.h"

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index 0724fe9da9a8cc4d921d0ad7c8fd010de92b8378..cda4bcd0de5e581b3a3e8e64bee03f5fd38f3826 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -13,7 +13,7 @@
 #pragma implementation "textctrl.h"
 #endif
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
   #include <sys/types.h>
   #include <sys/stat.h>
 #else
@@ -34,7 +34,7 @@
 
 #if defined(__BORLANDC__) && !defined(__WIN32__)
   #include <alloc.h>
-#elif !defined(__MWERKS__) && !defined(__GNUWIN32) && !defined(__WXMAC_X__)
+#elif !defined(__MWERKS__) && !defined(__GNUWIN32) && !defined(__DARWIN__)
   #include <malloc.h>
 #endif
 

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index 52e0497c558d7000867570bcd526b1fc038ac60f..2c70ef47b762087471d27444223f1671164acb1b 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -3,7 +3,7 @@
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #include <Navigation.h>
 #endif
 
@@ -84,7 +84,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 #endif // UMA_USE_WINDOWMGR
 #endif
                
-#ifndef __UNIX__
+#ifndef __DARWIN__
 #if TARGET_CARBON
 // Call currently implicitely done :           InitFloatingWindows() ;
 #else

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 1a71c0c7840173ec28e56c6a1a8418bc9fada85f..6016d24d816041290f2519833865cfc1773f630b 100644 (file)
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
 
 // get full hostname (with domain name if possible)
@@ -178,7 +178,7 @@ void wxFatalError(const wxString& msg, const wxString& title)
   wxMessageBox(wxBuffer);
   wxExit();
 }
-#endif // !__UNIX__
+#endif // !__DARWIN__
 
 // Emit a beeeeeep
 void wxBell()
@@ -315,7 +315,7 @@ bool wxIsBusy()
   return (wxBusyCursorCount > 0);
 }
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
 wxString wxMacFindFolder( short                                        vol,
                                                                 OSType                                 folderType,
                                                                 Boolean                                createFolder)
@@ -336,7 +336,7 @@ wxString wxMacFindFolder( short                                     vol,
 }
 #endif
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
 char *wxGetUserHome (const wxString& user)
 {
     // TODO

diff --git a/src/mac/utilsexc.cpp b/src/mac/utilsexc.cpp
index 624a9c05249a3061ccc3d7828dbfcaec8461f65a..3b4903212c6ba5dacc30fb2a2ba8925b8261ce01 100644 (file)
--- a/src/mac/utilsexc.cpp
+++ b/src/mac/utilsexc.cpp
@@ -14,7 +14,7 @@
 #endif
 
 #include "wx/utils.h"
-#ifdef __UNIX__
+#ifdef __DARWIN__
 #include "wx/unix/execute.h"
 #endif
 
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
 #define wxEXECUTE_WIN_MESSAGE 10000
 
 long wxExecute(const wxString& command, bool sync, wxProcess *handler)
@@ -32,10 +32,10 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
 }
 #endif
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 {
    wxFAIL_MSG(wxT("wxAddProcessCallback() function not ready"));
    return 0;
 }
-#endif
\ No newline at end of file
+#endif