github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Merge continued

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
tutorial/Gui07/init Normal file
View file

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

6
tutorial/Gui07/main.cpp
View file

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

11
tutorial/Gui07a/Gui07a.upp Normal file
View file

@ -0,0 +1,11 @@
description "Menu - as single lambda\377";
uses
CtrlLib;
file
main.cpp;
mainconfig
"" = "GUI";

4
tutorial/Gui07a/init Normal file
View file

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

32
tutorial/Gui07a/main.cpp Normal file
View file

@ -0,0 +1,32 @@
#include <CtrlLib/CtrlLib.h>
using namespace Upp;
struct MyAppWindow : TopWindow {
MenuBar menu;
MyAppWindow() {
Title("My application with menu").Sizeable();
AddFrame(menu);
menu.Set(
[=](Bar& bar) {
bar.Sub("Menu",
[=](Bar& bar) {
bar.Add("Exit",
[=] {
if(PromptOKCancel("Exit MyApp?"))
Break();
}
);
}
);
}
);
}
};
GUI_APP_MAIN
{
MyAppWindow app;
app.Run();
}

4
tutorial/Gui08/init Normal file
View file

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

12
tutorial/Gui08/main.cpp
View file

@ -8,16 +8,14 @@ struct MyAppWindow : TopWindow {
Break();
}
void LocalMenu(Bar& bar) {
bar.Add("Exit", THISBACK(Exit));
}
void RightDown(Point, dword) {
MenuBar::Execute(THISBACK(LocalMenu));
MenuBar::Execute(
[=](Bar& bar) {
bar.Add("Exit", [=] { Exit(); });
}
);
}
typedef MyAppWindow CLASSNAME;
MyAppWindow() {
Title("My application with local menu").Sizeable();
}

4
tutorial/Gui09/init Normal file
View file

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

8
tutorial/Gui09/main.cpp
View file

@ -9,19 +9,17 @@ struct MyAppWindow : TopWindow {
}
void RightDown(Point, dword) {
CallbackArgTarget<int> result;
int result = Null;
MenuBar menu;
for(int i = 0; i < 10; i++)
menu.Add(AsString(i), result[i]);
menu.Add(AsString(i), [=, &result] { result = i; });
menu.Separator();
menu.Add("Exit", THISBACK(Exit));
menu.Add("Exit", [=] { Exit(); });
menu.Execute();
if(!IsNull(result))
PromptOK("You have selected " + AsString((int)result));
}
typedef MyAppWindow CLASSNAME;
MyAppWindow() {
Title("My application with context menu").Sizeable();
}

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

12
tutorial/Gui10/main.cpp
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); });
});
}
};