mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-10-05 05:42:18 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into experimental

Browse source
This commit is contained in:
C.W. Betts 2014-04-06 23:26:38 -06:00
commit 87bc46abf6
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
BBGE/Cocoa.mm
View file

@ -12,9 +12,9 @@
void cocoaMessageBox(const std::string &title, const std::string &msg) void cocoaMessageBox(const std::string &title, const std::string &msg)
{ {
@autoreleasepool { @autoreleasepool {
NSString *nstitle = [NSString stringWithUTF8String:title.c_str()]; NSString *nstitle = @(title.c_str());
NSString *nsmsg = [NSString stringWithUTF8String:msg.c_str()]; NSString *nsmsg = @(msg.c_str());
NSRunAlertPanel(nstitle, nsmsg, nil, nil, nil); NSRunAlertPanel(nstitle, @"%@", nil, nil, nil, nsmsg);
} }
} }

4
BBGE/Core.cpp
View file

@ -63,6 +63,10 @@ Core *core = 0;
HICON icon_windows = 0; HICON icon_windows = 0;
#endif #endif
#ifndef KMOD_GUI
#define KMOD_GUI KMOD_META
#endif
void Core::initIcon() void Core::initIcon()
{ {
#ifdef BBGE_BUILD_WINDOWS #ifdef BBGE_BUILD_WINDOWS