diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-04-02 20:35:41 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-04-02 20:35:41 +0200 |
| commit | 31010d6d3ba6600860a9f6dd925ac3d8e3f2c830 (patch) | |
| tree | 88e0c06f16f00e635860f1ecc7d65d8e0cf4d1de /src/log.cpp | |
| parent | bbb4c1c61863b9032af2291bff20814733995391 (diff) | |
| parent | 9015268746ed9052a9dc83839b2834b5feeab166 (diff) | |
| download | mana-31010d6d3ba6600860a9f6dd925ac3d8e3f2c830.tar.gz mana-31010d6d3ba6600860a9f6dd925ac3d8e3f2c830.tar.bz2 mana-31010d6d3ba6600860a9f6dd925ac3d8e3f2c830.tar.xz mana-31010d6d3ba6600860a9f6dd925ac3d8e3f2c830.zip | |
Merge branch '0.6'
Diffstat (limited to 'src/log.cpp')
| -rw-r--r-- | src/log.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/log.cpp b/src/log.cpp index fc36ea75..eae0a82b 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -24,7 +24,7 @@ #ifdef _WIN32 #include <windows.h> #elif __APPLE__ -#include <Carbon/Carbon.h> +void MacDialogBox(const std::string &error); #endif #include <sys/time.h> @@ -109,15 +109,7 @@ void Logger::error(const std::string &error_text) #ifdef _WIN32 MessageBox(NULL, error_text.c_str(), "Error", MB_ICONERROR | MB_OK); #elif defined __APPLE__ - Str255 msg; - CFStringRef error; - error = CFStringCreateWithCString(NULL, - error_text.c_str(), - kCFStringEncodingMacRoman); - CFStringGetPascalString(error, msg, 255, kCFStringEncodingMacRoman); - StandardAlert(kAlertStopAlert, - "\pError", - (ConstStr255Param) msg, NULL, NULL); + MacDialogBox(error_text); #elif defined __linux__ || __linux std::cerr << "Error: " << error_text << std::endl; std::string msg="xmessage \"" + error_text + "\""; |