Merge continued

git-svn-id: svn://ultimatepp.org/upp/trunk@10263 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-10-04 08:34:39 +00:00
parent adf46bd64e
commit 2e4b276e07
3860 changed files with 1161787 additions and 438 deletions

4
tutorial/Gui10/init Normal file
View file

@ -0,0 +1,4 @@
#ifndef _Gui10_icpp_init_stub
#define _Gui10_icpp_init_stub
#include "CtrlLib/init"
#endif

View file

@ -15,19 +15,15 @@ struct MyAppWindow : TopWindow {
}
void SubMenu(Bar& bar) {
bar.Add("Exit", TutorialImg::Exit(), THISBACK(Exit));
bar.Add("Exit", TutorialImg::Exit(), [=] { Exit(); });
}
void MainMenu(Bar& bar) {
bar.Add("Menu", THISBACK(SubMenu));
}
typedef MyAppWindow CLASSNAME;
MyAppWindow() {
Title("My application with menu and images").Sizeable();
AddFrame(menu);
menu.Set(THISBACK(MainMenu));
menu.Set([=](Bar& bar) {
bar.Sub("Menu", [=](Bar& bar) { SubMenu(bar); });
});
}
};