From be24ef46cee8aeb6759d9a0638d0c7279f5c9023 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 9 Dec 2018 17:32:27 +0000
Subject: [PATCH] ide: Now with macstyle menu

git-svn-id: svn://ultimatepp.org/upp/trunk@12610 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/MacMenu.mm          | 1 +
 uppsrc/ide/Builders/GccBuilder.cpp | 2 +-
 uppsrc/ide/idebar.cpp              | 5 +++++
 uppsrc/ide/idewin.cpp              | 9 +++++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/uppsrc/CtrlLib/MacMenu.mm b/uppsrc/CtrlLib/MacMenu.mm
index dd82e0454..8d0921283 100644
--- a/uppsrc/CtrlLib/MacMenu.mm
+++ b/uppsrc/CtrlLib/MacMenu.mm
@@ -100,6 +100,7 @@ void CocoMenuBar::Set(Event<Bar&> bar)
 {
 	if(lock) return;
 	lock++;
+	[cocomenu removeAllItems];
 	bar(*this);
 	lock--;
 }
diff --git a/uppsrc/ide/Builders/GccBuilder.cpp b/uppsrc/ide/Builders/GccBuilder.cpp
index d60a52853..0a9c02d2a 100644
--- a/uppsrc/ide/Builders/GccBuilder.cpp
+++ b/uppsrc/ide/Builders/GccBuilder.cpp
@@ -569,7 +569,7 @@ bool GccBuilder::Link(const Vector<String>& linkfile, const String& linkoptions,
 							<< "<plist version=\"1.0\">\n"
 							<< "<dict>\n"
 							<< "    <key>CFBundleExecutable</key>\n"
-							<< "    <string>Test" << GetFileName(target) << "</string>\n"
+							<< "    <string>" << GetFileName(target) << "</string>\n"
 							<< "    <key>NSHighResolutionCapable</key>\n"
 						    << "    <string>True</string>\n"
 						    << "	<key>LSMinimumSystemVersion</key>\n"
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index 1baa89694..a7c620d96 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -871,7 +871,12 @@ void Ide::SetBar()
 
 void Ide::SetMenuBar()
 {
+#ifdef PLATFORM_COCOA
+	SetMainMenu(THISBACK(MainMenu));
+	menubar.Hide();
+#else
 	menubar.Set(THISBACK(MainMenu));
+#endif
 }
 
 void Ide::SetToolBar()
diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp
index 63ee498ec..9e96bb29b 100644
--- a/uppsrc/ide/idewin.cpp
+++ b/uppsrc/ide/idewin.cpp
@@ -325,6 +325,14 @@ void Ide::SetupBars()
 	ClearFrames();
 	int r = HorzLayoutZoom(170);
 	int l = HorzLayoutZoom(350);
+#ifdef PLATFORM_COCOA
+	int tcy = max(mainconfiglist.GetStdSize().cy + DPI(2), toolbar.GetStdHeight());
+	bararea.Add(toolbar.HSizePos(0, r).VCenterPos(tcy));
+	bararea.Add(display.RightPos(4, r).VSizePos(2, 3));
+	bararea.Height(tcy);
+	AddFrame(bararea);
+	toolbar.NoTransparent();
+#else
 	menubar.Transparent();
 	if(toolbar_in_row) {
 		toolbar.SetFrame(NullFrame());
@@ -345,6 +353,7 @@ void Ide::SetupBars()
 		AddFrame(toolbar);
 		toolbar.NoTransparent();
 	}
+#endif
 	AddFrame(statusbar);
 	SetBar();
 }