diff options
| author | David Athay <ko2fan@gmail.com> | 2011-01-27 20:38:07 -0600 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2011-01-27 20:38:07 -0600 |
| commit | 66bd56ebec2bff48fb1484603b41643fd89bf4d6 (patch) | |
| tree | 0136c1e0d1381d400897227d812cfa160e7d28b1 /src/log.cpp | |
| parent | e5ecfdfd67b806c76cbcc57f0df8e2ddda75ac2e (diff) | |
| download | mana-66bd56ebec2bff48fb1484603b41643fd89bf4d6.tar.gz mana-66bd56ebec2bff48fb1484603b41643fd89bf4d6.tar.bz2 mana-66bd56ebec2bff48fb1484603b41643fd89bf4d6.tar.xz mana-66bd56ebec2bff48fb1484603b41643fd89bf4d6.zip | |
Moved bundle resource path to Cocoa. Moved alert to Cocoa. Added changing dock icon at runtime.
Diffstat (limited to 'src/log.cpp')
| -rw-r--r-- | src/log.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/log.cpp b/src/log.cpp index 5880e108..acb9f67c 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -26,7 +26,8 @@ #ifdef WIN32 #include <windows.h> #elif __APPLE__ -#include <Carbon/Carbon.h> +//#include <Carbon/Carbon.h> +#include "window.h" #endif #include <sys/time.h> @@ -114,7 +115,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; + /*Str255 msg; CFStringRef error; error = CFStringCreateWithCString(NULL, error_text.c_str(), @@ -122,7 +123,8 @@ void Logger::error(const std::string &error_text) CFStringGetPascalString(error, msg, 255, kCFStringEncodingMacRoman); StandardAlert(kAlertStopAlert, "\pError", - (ConstStr255Param) msg, NULL, NULL); + (ConstStr255Param) msg, NULL, NULL);*/ + windowAlert(error_text.c_str()); #elif defined __linux__ || __linux std::cerr << "Error: " << error_text << std::endl; std::string msg="xmessage \"" + error_text + "\""; |