mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2024-12-25 14:15:46 +00:00
Merge branch 'master' into experimental
This commit is contained in:
commit
87bc46abf6
2 changed files with 7 additions and 3 deletions
|
@ -12,9 +12,9 @@
|
|||
void cocoaMessageBox(const std::string &title, const std::string &msg)
|
||||
{
|
||||
@autoreleasepool {
|
||||
NSString *nstitle = [NSString stringWithUTF8String:title.c_str()];
|
||||
NSString *nsmsg = [NSString stringWithUTF8String:msg.c_str()];
|
||||
NSRunAlertPanel(nstitle, nsmsg, nil, nil, nil);
|
||||
NSString *nstitle = @(title.c_str());
|
||||
NSString *nsmsg = @(msg.c_str());
|
||||
NSRunAlertPanel(nstitle, @"%@", nil, nil, nil, nsmsg);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -63,6 +63,10 @@ Core *core = 0;
|
|||
HICON icon_windows = 0;
|
||||
#endif
|
||||
|
||||
#ifndef KMOD_GUI
|
||||
#define KMOD_GUI KMOD_META
|
||||
#endif
|
||||
|
||||
void Core::initIcon()
|
||||
{
|
||||
#ifdef BBGE_BUILD_WINDOWS
|
||||
|
|
Loading…
Reference in a new issue