github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Developing Cocoa

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12591 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-11-30 11:47:50 +00:00
parent 3608334fbb
commit 60244e3729
3 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Value.cpp
View file

@ -343,7 +343,7 @@ void Value::Serialize(Stream& s) {
if(st == STRING)
s % data;
else
if(st < 255 && svo[st]) {
if(st >= 0 && st < 255 && svo[st]) {
data.SetSpecial((byte)type);
svo[st]->Serialize(&data, s);
}

2
uppsrc/CtrlCore/CocoProc.mm
View file

@ -180,12 +180,14 @@ struct MMImp {
}
Upp::Ctrl::SyncAppIcon();
Upp::TopWindow::SyncMainMenu(false);
Upp::Ctrl::ReleaseCtrlCapture();
}
static void ResignKey(Upp::Ctrl *ctrl)
{
LLOG("Resign key " << Upp::Name(ctrl));
ctrl->KillFocusWnd();
Upp::Ctrl::ReleaseCtrlCapture();
}
static void DoClose(Upp::Ctrl *ctrl)

34
uppsrc/ide/Builders/GccBuilder.cpp
View file

@ -562,24 +562,28 @@ bool GccBuilder::Link(const Vector<String>& linkfile, const String& linkoptions,
CustomStep(".pre-link", Null, error);
if(!error && Execute(lnk) == 0) {
if(HasFlag("OSX") && HasFlag("GUI")) {
if(IsNull(Info_plist)) {
if(IsNull(Info_plist))
Info_plist
<< "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
<< "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
<< "<plist version=\"1.0\">\n"
<< "<dict>\n"
<< " <key>CFBundleExecutable</key>\n"
<< " <string>" << GetFileName(target) << "</string>\n"
<< " <key>NSHighResolutionCapable</key>\n"
<< " <string>True</string>\n"
<< "</dict>\n"
<< "</plist>\n"
<< "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
<< "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
<< "<plist version=\"1.0\">\n"
<< "<dict>\n"
<< " <key>CFBundleExecutable</key>\n"
<< " <string>Test" << GetFileName(target) << "</string>\n"
<< " <key>NSHighResolutionCapable</key>\n"
<< " <string>True</string>\n"
<< " <key>LSMinimumSystemVersion</key>\n"
<< " <string>10.13</string>\n"
<< "</dict>\n"
<< "</plist>\n"
;
}
String Info_plist_path = GetFileFolder(GetFileFolder(target)) + "/Info.plist";
PutConsole("Saving " << Info_plist_path);
if(SaveChangedFile(Info_plist_path, Info_plist))
Execute("defaults read " + Info_plist_path); // Force MacOS to reload plist
if(LoadFile(Info_plist_path) != Info_plist) {
if(FileExists(Info_plist_path))
Execute("defaults delete " + Info_plist_path); // Force MacOS to reload plist
SaveFile(Info_plist_path, Info_plist);
PutConsole("Saving " << Info_plist_path);
}
}
CustomStep(".post-link", Null, error);
PutConsole(String().Cat() << GetHostPath(target) << " (" << GetFileInfo(target).length