X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a67a93b17c37c018f60e662645ee2a44ba4e58e..94e2ed3b8db0220160c0b939782cd46914ec073a:/src/mac/utils.cpp

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 28c069a63a..6016d24d81 100644
--- 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)
@@ -104,7 +104,7 @@ bool wxGetUserName(char *buf, int maxSize)
   return TRUE;
 }
 
-int wxKill(long pid, int sig)
+int wxKill(long pid, wxSignal sig)
 {
     // TODO
     return 0;
@@ -157,7 +157,8 @@ void wxDebugMsg(const char *fmt ...)
 
   vsprintf(buffer,fmt,ap) ;
   strcat(buffer,";g") ;
-  debugstr(buffer) ;
+  c2pstr(buffer) ;
+  DebugStr((unsigned char*) buffer) ;
 
   va_end(ap);
 }
@@ -177,7 +178,7 @@ void wxFatalError(const wxString& msg, const wxString& title)
   wxMessageBox(wxBuffer);
   wxExit();
 }
-#endif // !__UNIX__
+#endif // !__DARWIN__
 
 // Emit a beeeeeep
 void wxBell()
@@ -314,7 +315,7 @@ bool wxIsBusy()
   return (wxBusyCursorCount > 0);
 }
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
 wxString wxMacFindFolder( short 					vol,
 								 OSType 				folderType,
 								 Boolean 				createFolder)
@@ -328,14 +329,14 @@ wxString wxMacFindFolder( short 					vol,
 		FSSpec file ;
 		if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
 		{
-			strDir = wxMacFSSpec2UnixFilename( &file ) + "/" ;
+			strDir = wxMacFSSpec2MacFilename( &file ) + ":" ;
 		}
 	}
 	return strDir ;
 }
 #endif
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
 char *wxGetUserHome (const wxString& user)
 {
     // TODO