From: Stefan Csomor Date: Thu, 22 Nov 2007 14:21:36 +0000 (+0000) Subject: cleanup mac X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0ad76eea22da59402cfe063f0c41803e5dce277a?ds=sidebyside 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 66297871a4..0a33d3b00f 100644 --- a/src/common/appbase.cpp +++ b/src/common/appbase.cpp @@ -790,12 +790,6 @@ void wxTrap() { #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__) diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index afbb66008b..fc3bdeff62 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -565,14 +565,8 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object) 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; -#endif // !__WXMAC__ || __DARWIN__ } #endif diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 22f0636f92..ff3dc70050 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -97,7 +97,7 @@ #endif #ifdef __WXMAC__ -# include "MoreFilesX.h" +// # include "MoreFilesX.h" #endif // ---------------------------------------------------------------------------- @@ -344,20 +344,9 @@ wxIsAbsolutePath (const wxString& filename) { 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; -#endif #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) { -#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; } -#endif #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) { -#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('\\')) { @@ -882,7 +852,6 @@ wxString wxPathOnly (const wxString& path) buf[i] = 0; return wxString(buf); } -#endif #ifdef __VMS__ if (path[i] == wxT(']')) { @@ -913,11 +882,7 @@ wxString wxPathOnly (const wxString& path) #if defined(__WXMAC__) -#if TARGET_API_MAC_OSX #define kDefaultPathStyle kCFURLPOSIXPathStyle -#else -#define kDefaultPathStyle kCFURLHFSPathStyle -#endif wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent ) { @@ -983,10 +948,11 @@ wxString wxMacFSSpec2MacFilename( const 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 @@ -1542,16 +1508,6 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz) { #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; @@ -1574,7 +1530,7 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz) 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 diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp index da313ef55f..1d94e4a003 100644 --- a/src/common/graphcmn.cpp +++ b/src/common/graphcmn.cpp @@ -28,10 +28,6 @@ #include "wx/log.h" #endif -#if !defined(wxMAC_USE_CORE_GRAPHICS_BLEND_MODES) -#define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0 -#endif - //----------------------------------------------------------------------------- // constants //----------------------------------------------------------------------------- diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index 897414c21d..e097ed9339 100644 --- 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()); -#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") ) diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index d7da5b72bc..0fe92695f1 100644 --- 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 defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) +#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) #endif @@ -369,7 +369,7 @@ unsigned short wxIPV6address::Service() const #endif // wxUSE_IPV6 -#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) +#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) // --------------------------------------------------------------------------- // wxUNIXaddress diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp index 285810133b..e61654bc51 100644 --- 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 -#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 ) diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp index 43deb545d3..4792c10cce 100644 --- 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; -#elif defined(__WXMAC__) && !defined(__DARWIN__) - m_mode = wxEOL_MAC; #else m_mode = wxEOL_UNIX; #endif @@ -344,8 +342,6 @@ void wxTextOutputStream::SetMode(wxEOL mode) { #if defined(__WXMSW__) || defined(__WXPM__) m_mode = wxEOL_DOS; -#elif defined(__WXMAC__) && !defined(__DARWIN__) - m_mode = wxEOL_MAC; #else m_mode = wxEOL_UNIX; #endif