diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-03-11 19:59:55 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-03-11 19:59:55 +0000 |
| commit | fc63e88f869919a8b035a5c41db8d05626526bde (patch) | |
| tree | 8f1928d082ebbffc549c712a3f406c2141f43e01 /src/log.cpp | |
| parent | 7b0f0ec315e66dcbdda58ada8b09a59bc5dcf6c9 (diff) | |
| download | mana-client-fc63e88f869919a8b035a5c41db8d05626526bde.tar.gz mana-client-fc63e88f869919a8b035a5c41db8d05626526bde.tar.bz2 mana-client-fc63e88f869919a8b035a5c41db8d05626526bde.tar.xz mana-client-fc63e88f869919a8b035a5c41db8d05626526bde.zip | |
Merged 0.0 changes from revision 3065 to 3177 to trunk.
Diffstat (limited to 'src/log.cpp')
| -rw-r--r-- | src/log.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/log.cpp b/src/log.cpp index 3a3c91b8..224736bd 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 @@ -110,9 +112,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 |