From eb16e49f1fef3e282cb211f7e7231bcf422ff73f Mon Sep 17 00:00:00 2001 From: klugier Date: Sat, 11 Jun 2016 10:53:47 +0000 Subject: [PATCH] .ide NewFile menu bar creation now uses lambda git-svn-id: svn://ultimatepp.org/upp/trunk@9918 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/UppWspc.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/uppsrc/ide/UppWspc.cpp b/uppsrc/ide/UppWspc.cpp index b3f18e1d5..fa30ab006 100644 --- a/uppsrc/ide/UppWspc.cpp +++ b/uppsrc/ide/UppWspc.cpp @@ -922,14 +922,13 @@ void WorkspaceWork::FileMenu(Bar& menu) void WorkspaceWork::NewMenu(Bar& bar) { - bar.Add("File", CtrlImg::File(), THISBACK2(NewPackageFile, "New file", "")); - bar.Add("Separator", THISBACK(AddSeparator)) + bar.Add("File", CtrlImg::File(), [=] { NewPackageFile("New file", ""); }); + bar.Add("Separator", [=] { AddSeparator(); }) .Help("Add text separator line"); bar.Separator(); for (int i = 0; i < categories.GetCount(); i++) { - Callback1 barCallback; - barCallback << [&, i](Bar& subBar) { + bar.Sub(categories.GetKey(i), [=](Bar& subBar) { for (FileType& fileType : categories[i]) { String name = fileType.GetName(); String extension = fileType.GetExtension(); @@ -937,11 +936,9 @@ void WorkspaceWork::NewMenu(Bar& bar) if (fileType.IsSeparator()) subBar.Separator(); else - subBar.Add(name, fileType.GetImage(), THISBACK2(NewPackageFile, "New " + name, extension)); + subBar.Add(name, fileType.GetImage(), [=] { NewPackageFile("New " + name, extension); }); } - }; - - bar.Add(categories.GetKey(i), barCallback); + }); } }