diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/widgets/scrollarea.cpp | 2 | ||||
-rw-r--r-- | src/log.cpp | 12 | ||||
-rw-r--r-- | src/log.mm | 36 | ||||
-rw-r--r-- | src/net/manaserv/connection.h | 1 |
4 files changed, 40 insertions, 11 deletions
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index 716dc7bc..d5e824e1 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -212,7 +212,7 @@ void ScrollArea::logic() void ScrollArea::updateAlpha() { - float alpha = std::max(config.getFloatValue("guialpha"), + float alpha = std::max(config.getFloatValue("guialpha"), Theme::instance()->getMinimumOpacity()); if (alpha != mAlpha) 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 + "\""; diff --git a/src/log.mm b/src/log.mm new file mode 100644 index 00000000..ae241c59 --- /dev/null +++ b/src/log.mm @@ -0,0 +1,36 @@ +/* + * The Mana Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2012 The Mana Developers + * + * This file is part of The Mana Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#import <AppKit/AppKit.h> +#include <string> + +void MacDialogBox(const std::string &error) +{ + NSString *errorMessage = [NSString stringWithCString:error.c_str() + encoding:[NSString defaultCStringEncoding]]; + NSAlert *alert = [NSAlert alertWithMessageText:errorMessage + defaultButton:@"OK" + alternateButton:nil + otherButton:nil + informativeTextWithFormat:@""]; + + [alert runModal]; +} diff --git a/src/net/manaserv/connection.h b/src/net/manaserv/connection.h index 954849de..42932c47 100644 --- a/src/net/manaserv/connection.h +++ b/src/net/manaserv/connection.h @@ -23,6 +23,7 @@ #define NET_MANASERV_CONNECTION_H #include <enet/enet.h> +#include "net/manaserv/network.h" #include <iosfwd> |