make it possible to use wxToolBarSimple as wxToolBar with wxUniv

[wxWidgets.git] / src / mac / utils.cpp

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 28c069a63abecaa35c86c4e17391d770cd7f7884..1a71c0c7840173ec28e56c6a1a8418bc9fada85f 100644 (file)
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -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);
 }
@@ -328,7 +329,7 @@ wxString wxMacFindFolder( short                                     vol,
                FSSpec file ;
                if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
                {
-                       strDir = wxMacFSSpec2UnixFilename( &file ) + "/" ;
+                       strDir = wxMacFSSpec2MacFilename( &file ) + ":" ;
                }
        }
        return strDir ;