From c8dbd68e1db4d1351410cfffb8bb00bdaf47525b Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 5 Oct 2016 18:59:04 +0000 Subject: [PATCH] .reference git-svn-id: svn://ultimatepp.org/upp/trunk@10274 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- reference/AK/AK.upp | 2 +- reference/AK/init | 7 ++++ reference/AK/main.cpp | 10 +++--- reference/AK/setup.cpp | 8 ++--- reference/AnimatedClip/AnimatedClip.h | 4 --- reference/AnimatedClip/AnimatedClip.upp | 2 ++ reference/AnimatedClip/main.cpp | 32 ++++--------------- reference/ArrayCtrl/main.cpp | 4 +-- reference/ArrayCtrlDnD/main.cpp | 12 +++---- reference/ArrayCtrlEdits/main.cpp | 1 - .../ArrayCtrlSetCtrl/ArrayCtrlSetCtrl.upp | 2 +- reference/ArrayCtrlSetCtrl/init | 4 +++ reference/ArrayCtrlSetCtrl/main.cpp | 4 +-- reference/ArrayHideShowColumnMenu/init | 4 +++ reference/ArrayHideShowColumnMenu/main.cpp | 5 ++- reference/Chameleon/Chameleon.upp | 2 +- reference/Chameleon/init | 4 +++ reference/Chameleon/main.cpp | 15 ++++----- 18 files changed, 55 insertions(+), 67 deletions(-) create mode 100644 reference/AK/init create mode 100644 reference/ArrayCtrlSetCtrl/init create mode 100644 reference/ArrayHideShowColumnMenu/init create mode 100644 reference/Chameleon/init diff --git a/reference/AK/AK.upp b/reference/AK/AK.upp index f44ecde59..ca46a5e65 100644 --- a/reference/AK/AK.upp +++ b/reference/AK/AK.upp @@ -1,4 +1,4 @@ -description "The definition and use of redefinable key accelerators"; +description "The definition and use of redefinable key accelerators\377"; uses CtrlLib; diff --git a/reference/AK/init b/reference/AK/init new file mode 100644 index 000000000..753ba5c28 --- /dev/null +++ b/reference/AK/init @@ -0,0 +1,7 @@ +#ifndef _AK_icpp_init_stub +#define _AK_icpp_init_stub +#include "CtrlLib/init" +#define BLITZ_INDEX__ Fd9b2e96dcfffad7e520d84eddd91da83 +#include "ak.icpp" +#undef BLITZ_INDEX__ +#endif diff --git a/reference/AK/main.cpp b/reference/AK/main.cpp index 153b5a2a5..25ff14d59 100644 --- a/reference/AK/main.cpp +++ b/reference/AK/main.cpp @@ -14,15 +14,15 @@ void App::Fn(String text) void App::AkMenu(Bar& menu) { - menu.Add(AK_FN1, THISBACK1(Fn, "1")); - menu.Add(AK_FN2, THISBACK1(Fn, "2")); - menu.Add(AK_EXIT, THISBACK(Close)); + menu.Add(AK_FN1, [=] { Fn("1"); }); + menu.Add(AK_FN2, [=] { Fn("2"); }); + menu.Add(AK_EXIT, [=] { Close(); }); } void App::MainMenu(Bar& menu) { - menu.Add("AK", THISBACK(AkMenu)); - menu.Add(t_("Setup"), THISBACK(SetupMenu)); + menu.Sub("AK", [=](Bar& bar) { AkMenu(bar); }); + menu.Sub(t_("Setup"), [=](Bar& bar) { SetupMenu(bar); }); } App::App() diff --git a/reference/AK/setup.cpp b/reference/AK/setup.cpp index e157c9fd8..d64792d9a 100644 --- a/reference/AK/setup.cpp +++ b/reference/AK/setup.cpp @@ -7,15 +7,15 @@ void App::SetLang(int lang) { SetLanguage(lang); - menubar.Set(THISBACK(MainMenu)); + menubar.Set([=] (Bar& bar) { MainMenu(bar); }); } void App::SetupMenu(Bar& menu) { - menu.Add(AK_ENGLISH, THISBACK1(SetLang, LNGC_('E','N','U','S', CHARSET_UTF8))) + menu.Add(AK_ENGLISH, [=] { SetLang(LNGC_('E','N','U','S', CHARSET_UTF8)); }) .Radio(GetCurrentLanguage() == LNGC_('E','N','U','S', CHARSET_UTF8)); - menu.Add(AK_CZECH, THISBACK1(SetLang, LNGC_('C','S','C','Z', CHARSET_UTF8))) + menu.Add(AK_CZECH, [=] { SetLang(LNGC_('C','S','C','Z', CHARSET_UTF8)); }) .Radio(GetCurrentLanguage() == LNGC_('C','S','C','Z', CHARSET_UTF8)); menu.Separator(); - menu.Add(AK_KEYS, callback(EditKeys)); + menu.Add(AK_KEYS, [=] { EditKeys(); }); } diff --git a/reference/AnimatedClip/AnimatedClip.h b/reference/AnimatedClip/AnimatedClip.h index 5b2749962..c77b8e2f0 100644 --- a/reference/AnimatedClip/AnimatedClip.h +++ b/reference/AnimatedClip/AnimatedClip.h @@ -10,10 +10,6 @@ public: AnimatedClip(); void Browse(); - void Play(); - void Stop(); - void OpenNext(); - void ChangeThreads(); void OnShown(); }; diff --git a/reference/AnimatedClip/AnimatedClip.upp b/reference/AnimatedClip/AnimatedClip.upp index 7586b9190..5f39cd0e3 100644 --- a/reference/AnimatedClip/AnimatedClip.upp +++ b/reference/AnimatedClip/AnimatedClip.upp @@ -11,6 +11,8 @@ file main.cpp, AnimatedClip.lay, AnimatedClip.brc, + arkearth_e0.gif, + arrtan_e0.gif, Credits.txt; mainconfig diff --git a/reference/AnimatedClip/main.cpp b/reference/AnimatedClip/main.cpp index 312793119..7c9c91326 100644 --- a/reference/AnimatedClip/main.cpp +++ b/reference/AnimatedClip/main.cpp @@ -9,17 +9,17 @@ using namespace Upp; AnimatedClip::AnimatedClip() { CtrlLayout(*this, "RasterPlayer demo"); - browse <<= THISBACK(Browse); - play <<= THISBACK(Play); - stop <<= THISBACK(Stop); - openNext <<= THISBACK(OpenNext); + browse << [=] { Browse(); }; + play << [=] { clip.Play(); }; + stop << [=] { clip.Stop(); }; + openNext << [=] { clip.NextFrame(); }; + numThreads << [=] { clip.SetMT(numThreads == 1); }; numThreads = 0; - numThreads <<= THISBACK(ChangeThreads); #ifndef _MULTITHREADED numThreads.EnableCase(1, false); #endif - clip.WhenShown = THISBACK(OnShown); + clip.WhenShown << [=] { openedPage = FormatInt(clip.GetPage()); }; arrows.LoadBuffer(String(animatedArrow, animatedArrow_length)); arrows.Play(); earth.LoadBuffer(String(animatedEarth, animatedEarth_length)); @@ -45,26 +45,6 @@ void AnimatedClip::Browse() { openedPage = FormatInt(clip.GetPage()); } -void AnimatedClip::Play() { - clip.Play(); -} - -void AnimatedClip::Stop() { - clip.Stop(); -} - -void AnimatedClip::OpenNext() { - clip.NextFrame(); -} - -void AnimatedClip::OnShown() { - openedPage = FormatInt(clip.GetPage()); -} - -void AnimatedClip::ChangeThreads() { - clip.SetMT(numThreads == 1); -} - GUI_APP_MAIN { AnimatedClip().Run(); } diff --git a/reference/ArrayCtrl/main.cpp b/reference/ArrayCtrl/main.cpp index 6260d1ad8..460c6f7f2 100644 --- a/reference/ArrayCtrl/main.cpp +++ b/reference/ArrayCtrl/main.cpp @@ -10,8 +10,6 @@ struct ArrayCtrlExample : public WithDlgLayout { void DoubleClick(); - typedef ArrayCtrlExample CLASSNAME; - ArrayCtrlExample(); }; @@ -51,7 +49,7 @@ ArrayCtrlExample::ArrayCtrlExample() array.AddColumn("with display").SetDisplay(Single()); array.AddCtrl(editor); array.AddRowNumColumn("rownum"); - array.WhenLeftDouble = THISBACK(DoubleClick); + array.WhenLeftDouble = [=] { DoubleClick(); }; array.ColumnWidths("51 120 60 102 62"); for(int i = 0; i < 20; i++) diff --git a/reference/ArrayCtrlDnD/main.cpp b/reference/ArrayCtrlDnD/main.cpp index bccf31b42..d756ba239 100644 --- a/reference/ArrayCtrlDnD/main.cpp +++ b/reference/ArrayCtrlDnD/main.cpp @@ -56,19 +56,17 @@ struct App : TopWindow { b.RemoveSelection(); } - typedef App CLASSNAME; - App() { a.AddColumn("You can paste the text here too"); a.MultiSelect(); - a.WhenDropInsert = THISBACK(DnDInsert); - a.WhenDrop = THISBACK(DnD); - a.WhenDrag = THISBACK(Drag); + a.WhenDropInsert = [=](int line, PasteClip& d) { DnDInsert(line, d); }; + a.WhenDrop = [=] (PasteClip& d) { DnD(d); }; + a.WhenDrag = [=] { Drag(); }; b.AddColumn("Roman numbers"); b.MultiSelect(); - b.WhenDropInsert = THISBACK(DnDInsertB); - b.WhenDrag = THISBACK(DragB); + b.WhenDropInsert = [=](int line, PasteClip& d) { DnDInsertB(line, d); }; + b.WhenDrag = [=] { DragB(); }; Add(s.Horz(a, b)); for(int i = 0; i < 200; i++) { diff --git a/reference/ArrayCtrlEdits/main.cpp b/reference/ArrayCtrlEdits/main.cpp index f34da4e79..510703cf7 100644 --- a/reference/ArrayCtrlEdits/main.cpp +++ b/reference/ArrayCtrlEdits/main.cpp @@ -8,7 +8,6 @@ using namespace Upp; struct App : public WithAppLayout { EditDouble editdbl; - typedef App CLASSNAME; App(); }; diff --git a/reference/ArrayCtrlSetCtrl/ArrayCtrlSetCtrl.upp b/reference/ArrayCtrlSetCtrl/ArrayCtrlSetCtrl.upp index 7543eaf9a..b6a196dd7 100644 --- a/reference/ArrayCtrlSetCtrl/ArrayCtrlSetCtrl.upp +++ b/reference/ArrayCtrlSetCtrl/ArrayCtrlSetCtrl.upp @@ -1,4 +1,4 @@ -description "Embedding non-owned widgets into ArrayCtrl"; +description "Embedding non-owned widgets into ArrayCtrl\377"; uses CtrlLib; diff --git a/reference/ArrayCtrlSetCtrl/init b/reference/ArrayCtrlSetCtrl/init new file mode 100644 index 000000000..c5cb89ef3 --- /dev/null +++ b/reference/ArrayCtrlSetCtrl/init @@ -0,0 +1,4 @@ +#ifndef _ArrayCtrlSetCtrl_icpp_init_stub +#define _ArrayCtrlSetCtrl_icpp_init_stub +#include "CtrlLib/init" +#endif diff --git a/reference/ArrayCtrlSetCtrl/main.cpp b/reference/ArrayCtrlSetCtrl/main.cpp index cacdc4a0f..14c0696da 100644 --- a/reference/ArrayCtrlSetCtrl/main.cpp +++ b/reference/ArrayCtrlSetCtrl/main.cpp @@ -13,14 +13,12 @@ struct App : TopWindow { option[i].Enable(i == ii || option[ii]); } - typedef App CLASSNAME; - App() { a.AddColumn("Option"); for(int i = 0; i < 300; i++) { a.Add(bool(i & 4)); a.SetCtrl(i, 0, option.Add().SetLabel("Option " + AsString(i))); - option.Top() <<= THISBACK1(Do, i); + option.Top() << [=] { Do(i); }; } a.SetLineCy(Draw::GetStdFontCy() + 8); Add(a.SizePos()); diff --git a/reference/ArrayHideShowColumnMenu/init b/reference/ArrayHideShowColumnMenu/init new file mode 100644 index 000000000..071b4df27 --- /dev/null +++ b/reference/ArrayHideShowColumnMenu/init @@ -0,0 +1,4 @@ +#ifndef _ArrayHideShowColumnMenu_icpp_init_stub +#define _ArrayHideShowColumnMenu_icpp_init_stub +#include "CtrlLib/init" +#endif diff --git a/reference/ArrayHideShowColumnMenu/main.cpp b/reference/ArrayHideShowColumnMenu/main.cpp index ae809a361..ca6a1ef79 100644 --- a/reference/ArrayHideShowColumnMenu/main.cpp +++ b/reference/ArrayHideShowColumnMenu/main.cpp @@ -8,7 +8,6 @@ using namespace Upp; class MainWindow : public WithMainWindowLayout { public: - typedef MainWindow CLASSNAME; MainWindow(); void Serialize(Stream& s); protected: @@ -22,7 +21,7 @@ MainWindow::MainWindow() { CtrlLayout(*this, "Array Hide/Show Column Menu demonstration"); Sizeable(); - m_array.WhenBar = THISBACK(OnArrayBar); + m_array.WhenBar = [=](Bar& menu) { OnArrayBar(menu); }; m_array.AllSorting(); @@ -71,7 +70,7 @@ void MainWindow::OnArrayBar(Bar &menu) for(int i=0; i { void Set(void (*skin)()); Button::Style scolor, simage, sfn; - typedef MyApp CLASSNAME; MyApp(); }; @@ -106,16 +105,16 @@ void MyApp::Set(void (*skin)()) MyApp::MyApp() { CtrlLayout(*this, "Chameleon example"); - host <<= THISBACK1(Set, ChHostSkin); - std <<= THISBACK1(Set, ChStdSkin); - classic <<= THISBACK1(Set, ChClassicSkin); - color <<= THISBACK1(Set, ColorSkin); + host << [=] { Set(ChHostSkin); }; + std << [=] { Set(ChStdSkin); }; + classic << [=] { Set(ChClassicSkin); }; + color << [=] { Set(ColorSkin); }; scolor = ColorStyle(); color.SetStyle(scolor); - img <<= THISBACK1(Set, ImageSkin); - simage= ImageStyle(); + img << [=] { Set(ImageSkin); }; + simage = ImageStyle(); img.SetStyle(simage); - fn <<= THISBACK1(Set, FnSkin); + fn << [=] { Set(FnSkin); }; sfn = FnStyle(); fn.SetStyle(sfn); }