diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/log.cpp | 17 |
2 files changed, 18 insertions, 6 deletions
@@ -1,4 +1,9 @@ -2007-02-17 Bjørn Lindeijer <bjorn@lindeijer.nl> +2007-02-20 Bjørn Lindeijer <bjorn@lindeijer.nl> + + * src/log.cpp: Applied patch by trapdoor to fix the usage of a + deprecated function on MacOS X 10.4 and later. + +2007-02-17 Bjørn Lindeijer <bjorn@lindeijer.nl> * data/help/header.txt, NEWS, README: Updated release date. * data/graphics/sprites/Makefile.am, diff --git a/src/log.cpp b/src/log.cpp index b7a0545a..0d54a368 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -20,11 +20,13 @@ */ #include "log.h" + #ifdef WIN32 - #include "utils/wingettimeofday.h" +#include "utils/wingettimeofday.h" #else - #include <sys/time.h> +#include <sys/time.h> #endif + #ifdef __APPLE__ #include <Carbon/Carbon.h> #endif @@ -101,9 +103,14 @@ void Logger::error(const std::string &error_text) MessageBox(NULL, error_text.c_str(), "Error", MB_ICONERROR | MB_OK); #elif defined __APPLE__ Str255 msg; - c2pstrcpy(msg, error_text.c_str()); - StandardAlert(kAlertStopAlert, "\pError", - (ConstStr255Param)msg, NULL, NULL); + CFStringRef error; + error = CFStringCreateWithCString(NULL, + error_text.c_str(), + kCFStringEncodingMacRoman); + CFStringGetPascalString(error, msg, 255, kCFStringEncodingMacRoman); + StandardAlert(kAlertStopAlert, + "\pError", + (ConstStr255Param) msg, NULL, NULL); #else std::cerr << "Error: " << error_text << std::endl; #endif |