mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-15 22:19:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1 from MaddTheSane/master

Browse source 
OS X changes
This commit is contained in:
fgenesis 2013-10-17 16:14:00 -07:00
commit 61a5f5c35c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
BBGE/Cocoa.mm
View file

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

2
BBGE/Core.cpp
View file

@ -3558,7 +3558,7 @@ void Core::pollEvents()
case SDL_KEYDOWN: case SDL_KEYDOWN:
{ {
#if __APPLE__ #if __APPLE__
if ((event.key.keysym.sym == SDLK_q) && (event.key.keysym.mod & KMOD_META)) if ((event.key.keysym.sym == SDLK_q) && (event.key.keysym.mod & KMOD_GUI))
#else #else
if ((event.key.keysym.sym == SDLK_F4) && (event.key.keysym.mod & KMOD_ALT)) if ((event.key.keysym.sym == SDLK_F4) && (event.key.keysym.mod & KMOD_ALT))
#endif #endif