From ff82abb3182b871e522fc92028cf445b5966970e Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 28 Feb 2013 16:28:21 +0000 Subject: [PATCH] .uppdev git-svn-id: svn://ultimatepp.org/upp/trunk@5868 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppdev/ArrayCtrlMSel/main.cpp | 7 ++----- uppdev/RichEditTest/main.cpp | 7 ++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/uppdev/ArrayCtrlMSel/main.cpp b/uppdev/ArrayCtrlMSel/main.cpp index dfc5847dd..640f62c76 100644 --- a/uppdev/ArrayCtrlMSel/main.cpp +++ b/uppdev/ArrayCtrlMSel/main.cpp @@ -6,13 +6,10 @@ GUI_APP_MAIN { ArrayCtrl a; a.AddColumn("Alfa\rbeta"); - for(int i = 0; i < 100; i++) { + for(int i = 0; i < 10; i++) { a.Add(i); - if(i % 3 == 0) - a.Select(i); } - a.Select(70, 10); - a.MultiSelect(); + a.MultiSelect().Removing(); TopWindow app; app.Add(a.SizePos()); app.Run(); diff --git a/uppdev/RichEditTest/main.cpp b/uppdev/RichEditTest/main.cpp index 702706d46..144180eac 100644 --- a/uppdev/RichEditTest/main.cpp +++ b/uppdev/RichEditTest/main.cpp @@ -8,6 +8,11 @@ String FileName() return GetExeDirFile("test.qtf"); } +struct MyApp : TopWindow { + virtual void Activate() { Title("Active"); TopWindow::Activate(); } + virtual void Deactivate() { Title("Deactivated"); TopWindow::Deactivate(); } +}; + GUI_APP_MAIN { @@ -41,7 +46,7 @@ GUI_APP_MAIN LoadFromFile(f, ConfigFile("pos")); e.SetPosInfo(f); // e.Pick(ParseQTF(AsQTF(CreateImageObject(CtrlImg::exclamation)) + " hahahaha")); - TopWindow w; + MyApp w; w.ToolWindow(); w.SetRect(0, 0, 700, 500); w.Sizeable().Zoomable();