cleanup mac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 66297871a4375928766f395b6ed7bb024a8b29ec..0a33d3b00f966a95587b053b3565e47a33418c1b 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -790,12 +790,6 @@ void wxTrap()
 {
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
     DebugBreak();
 {
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
     DebugBreak();

-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-    #if __powerc
-        Debugger();
-    #else
-        SysBreak();
-    #endif

 #elif defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
     Debugger();
 #elif defined(__UNIX__)
 #elif defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
     Debugger();
 #elif defined(__UNIX__)

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index afbb66008ba9e94d9e5f07253420595b0d3cd947..fc3bdeff6211a0de955685a967d3b5ade89c2748 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -565,14 +565,8 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
 
 GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
 {
 
 GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
 {

-#if defined(__WXMAC__) && !defined(__DARWIN__)
-    // NB: wxMac CFM does not have any GUI-specific functions in gsocket.c and
-    //     so it doesn't need this table at all
-    return NULL;
-#else // !__WXMAC__ || __DARWIN__

     static GSocketGUIFunctionsTableConcrete table;
     return &table;
     static GSocketGUIFunctionsTableConcrete table;
     return &table;

-#endif // !__WXMAC__ || __DARWIN__

 }
 
 #endif
 }
 
 #endif

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 22f0636f92b39c3c6e3e66cae81a84df90217dd6..ff3dc70050b2096060951296f1cec0f5d3d2e436 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -97,7 +97,7 @@
 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

-#    include "MoreFilesX.h"
+// #    include "MoreFilesX.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -344,20 +344,9 @@ wxIsAbsolutePath (const wxString& filename)
 {
     if (!filename.empty())
     {
 {
     if (!filename.empty())
     {

-#if defined(__WXMAC__) && !defined(__DARWIN__)
-        // Classic or Carbon CodeWarrior like
-        // Carbon with Apple DevTools is Unix like
-
-        // This seems wrong to me, but there is no fix. since
-        // "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt"
-        // is not. Or maybe ":MyDir:MyText.txt" has to be used? RR.
-        if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':')
-            return true ;
-#else

         // Unix like or Windows
         if (filename[0] == wxT('/'))
             return true;
         // Unix like or Windows
         if (filename[0] == wxT('/'))
             return true;

-#endif

 #ifdef __VMS__
         if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
             return true;
 #ifdef __VMS__
         if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
             return true;


@@ -808,22 +797,12 @@ wxPathOnly (wxChar *path)
         // Search backward for a backward or forward slash
         while (i > -1)
         {
         // Search backward for a backward or forward slash
         while (i > -1)
         {

-#if defined(__WXMAC__) && !defined(__DARWIN__)
-            // Classic or Carbon CodeWarrior like
-            // Carbon with Apple DevTools is Unix like
-            if (path[i] == wxT(':') )
-            {
-                buf[i] = 0;
-                return buf;
-            }
-#else

             // Unix like or Windows
             if (path[i] == wxT('/') || path[i] == wxT('\\'))
             {
                 buf[i] = 0;
                 return buf;
             }
             // Unix like or Windows
             if (path[i] == wxT('/') || path[i] == wxT('\\'))
             {
                 buf[i] = 0;
                 return buf;
             }

-#endif

 #ifdef __VMS__
             if (path[i] == wxT(']'))
             {
 #ifdef __VMS__
             if (path[i] == wxT(']'))
             {


@@ -864,15 +843,6 @@ wxString wxPathOnly (const wxString& path)
         // Search backward for a backward or forward slash
         while (i > -1)
         {
         // Search backward for a backward or forward slash
         while (i > -1)
         {

-#if defined(__WXMAC__) && !defined(__DARWIN__)
-            // Classic or Carbon CodeWarrior like
-            // Carbon with Apple DevTools is Unix like
-            if (path[i] == wxT(':') )
-            {
-                buf[i] = 0;
-                return wxString(buf);
-            }
-#else

             // Unix like or Windows
             if (path[i] == wxT('/') || path[i] == wxT('\\'))
             {
             // Unix like or Windows
             if (path[i] == wxT('/') || path[i] == wxT('\\'))
             {


@@ -882,7 +852,6 @@ wxString wxPathOnly (const wxString& path)
                 buf[i] = 0;
                 return wxString(buf);
             }
                 buf[i] = 0;
                 return wxString(buf);
             }

-#endif

 #ifdef __VMS__
             if (path[i] == wxT(']'))
             {
 #ifdef __VMS__
             if (path[i] == wxT(']'))
             {


@@ -913,11 +882,7 @@ wxString wxPathOnly (const wxString& path)
 
 #if defined(__WXMAC__)
 
 
 #if defined(__WXMAC__)
 

-#if TARGET_API_MAC_OSX

 #define kDefaultPathStyle kCFURLPOSIXPathStyle
 #define kDefaultPathStyle kCFURLPOSIXPathStyle

-#else
-#define kDefaultPathStyle kCFURLHFSPathStyle
-#endif

 
 wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )
 {
 
 wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )
 {


@@ -983,10 +948,11 @@ wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
 
 void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
 {
 
 void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
 {

-    OSStatus err = noErr ;
-    FSRef fsRef ;
-    wxMacPathToFSRef( path , &fsRef ) ;
-    err = FSRefMakeFSSpec( &fsRef , spec ) ;
+    OSStatus err = noErr;
+    FSRef fsRef;
+    wxMacPathToFSRef( path , &fsRef );
+       err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
+    verify_noerr( err );

 }
 #endif
 
 }
 #endif
 


@@ -1542,16 +1508,6 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
     {
     #if defined(_MSC_VER) || defined(__MINGW32__)
         ok = _getcwd(cbuf, sz) != NULL;
     {
     #if defined(_MSC_VER) || defined(__MINGW32__)
         ok = _getcwd(cbuf, sz) != NULL;

-    #elif defined(__WXMAC__) && !defined(__DARWIN__)
-        char lbuf[1024] ;
-        if ( getcwd( lbuf , sizeof( lbuf ) ) )
-        {
-            wxString res( lbuf , *wxConvCurrent ) ;
-            wxStrcpy( buf , res ) ;
-            ok = true;
-        }
-        else
-            ok = false ;

     #elif defined(__OS2__)
         APIRET rc;
         ULONG ulDriveNum = 0;
     #elif defined(__OS2__)
         APIRET rc;
         ULONG ulDriveNum = 0;


@@ -1574,7 +1530,7 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
         ok = getcwd(cbuf, sz) != NULL;
     #endif // platform
 
         ok = getcwd(cbuf, sz) != NULL;
     #endif // platform
 

-    #if wxUSE_UNICODE && !(defined(__WXMAC__) && !defined(__DARWIN__))
+    #if wxUSE_UNICODE

         // finally convert the result to Unicode if needed
         wxConvFile.MB2WC(buf, cbuf, sz);
     #endif // wxUSE_UNICODE
         // finally convert the result to Unicode if needed
         wxConvFile.MB2WC(buf, cbuf, sz);
     #endif // wxUSE_UNICODE

diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index da313ef55fcbfed0796697d72e3ae762a5b06389..1d94e4a0035617373f197e64e037cdd9fda5b63f 100644 (file)
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -28,10 +28,6 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

-#if !defined(wxMAC_USE_CORE_GRAPHICS_BLEND_MODES)
-#define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0
-#endif
-

 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 897414c21d9e0eaff738f7a3543eaad263b11b59..e097ed933988ca533f05aee5c6bb26c6f4448036 100644 (file)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -169,19 +169,6 @@ void wxMessageOutputDebug::Output(const wxString& str)
     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));
     ::OutputDebugString(out.wx_str());
     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));
     ::OutputDebugString(out.wx_str());

-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-    if ( wxIsDebuggerRunning() )
-    {
-        Str255 pstr;
-        wxString output = out + wxT(";g") ;
-        wxMacStringToPascal(output.c_str(), pstr);
-
-        #ifdef __powerc
-            DebugStr(pstr);
-        #else
-            SysBreakStr(pstr);
-        #endif
-    }

 #else
     wxFputs( out , stderr ) ;
     if ( out.Right(1) != wxT("\n") )
 #else
     wxFputs( out , stderr ) ;
     if ( out.Right(1) != wxT("\n") )

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index d7da5b72bc7282c6b489ca6aa175ba340e945ca6..0fe92695f18cad869fdbfa2641584b2f9db47b59 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -42,7 +42,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxIPaddress)
 #if wxUSE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxIPaddress)
 #endif
 #if wxUSE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxIPaddress)
 #endif

-#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) 

 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 


@@ -369,7 +369,7 @@ unsigned short wxIPV6address::Service() const
 
 #endif // wxUSE_IPV6
 
 
 #endif // wxUSE_IPV6
 

-#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) 

 
 // ---------------------------------------------------------------------------
 // wxUNIXaddress
 
 // ---------------------------------------------------------------------------
 // wxUNIXaddress

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index 285810133bfea73f25d9fcfcdd03c8e4a0c197e3..e61654bc511216f4b20cdf50c76515d0befdf45d 100644 (file)
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -86,7 +86,7 @@ static wxSockAddress *
 GetAddressFromName(const wxString& serverName, const wxString& host = wxEmptyString)
 {
     // we always use INET sockets under non-Unix systems
 GetAddressFromName(const wxString& serverName, const wxString& host = wxEmptyString)
 {
     // we always use INET sockets under non-Unix systems

-#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__)

     // under Unix, if the server name looks like a path, create a AF_UNIX
     // socket instead of AF_INET one
     if ( serverName.Find(_T('/')) != wxNOT_FOUND )
     // under Unix, if the server name looks like a path, create a AF_UNIX
     // socket instead of AF_INET one
     if ( serverName.Find(_T('/')) != wxNOT_FOUND )

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 43deb545d3d419d5daf69951d3c58b8b145e9194..4792c10cce76b6e9221dafc9fe54ffafe9e0b1ed 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -322,8 +322,6 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;

-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-        m_mode = wxEOL_MAC;

 #else
         m_mode = wxEOL_UNIX;
 #endif
 #else
         m_mode = wxEOL_UNIX;
 #endif


@@ -344,8 +342,6 @@ void wxTextOutputStream::SetMode(wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;

-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-        m_mode = wxEOL_MAC;

 #else
         m_mode = wxEOL_UNIX;
 #endif
 #else
         m_mode = wxEOL_UNIX;
 #endif