From 33aeee9e23944c44244a77e199f90c38d0742919 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 20 Dec 2018 16:29:11 +0000 Subject: [PATCH] .upptst git-svn-id: svn://ultimatepp.org/upp/trunk@12631 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- upptst/EnableCase/EnableCase.h | 17 +++++++++++++++++ upptst/EnableCase/EnableCase.lay | 4 ++++ upptst/EnableCase/EnableCase.upp | 11 +++++++++++ upptst/EnableCase/main.cpp | 12 ++++++++++++ upptst/GLDrawTest/main.cpp | 4 +--- 5 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 upptst/EnableCase/EnableCase.h create mode 100644 upptst/EnableCase/EnableCase.lay create mode 100644 upptst/EnableCase/EnableCase.upp create mode 100644 upptst/EnableCase/main.cpp diff --git a/upptst/EnableCase/EnableCase.h b/upptst/EnableCase/EnableCase.h new file mode 100644 index 000000000..9daa8f021 --- /dev/null +++ b/upptst/EnableCase/EnableCase.h @@ -0,0 +1,17 @@ +#ifndef _EnableCase_EnableCase_h +#define _EnableCase_EnableCase_h + +#include + +using namespace Upp; + +#define LAYOUTFILE +#include + +class EnableCase : public WithEnableCaseLayout { +public: + typedef EnableCase CLASSNAME; + EnableCase(); +}; + +#endif diff --git a/upptst/EnableCase/EnableCase.lay b/upptst/EnableCase/EnableCase.lay new file mode 100644 index 000000000..b9e23a479 --- /dev/null +++ b/upptst/EnableCase/EnableCase.lay @@ -0,0 +1,4 @@ +LAYOUT(EnableCaseLayout, 200, 100) + ITEM(Switch, sw, SetLabel(t_("One\nTwo\nThree")).LeftPosZ(28, 56).TopPosZ(8, 88)) +END_LAYOUT + diff --git a/upptst/EnableCase/EnableCase.upp b/upptst/EnableCase/EnableCase.upp new file mode 100644 index 000000000..54f7e9444 --- /dev/null +++ b/upptst/EnableCase/EnableCase.upp @@ -0,0 +1,11 @@ +uses + CtrlLib; + +file + EnableCase.h, + main.cpp, + EnableCase.lay; + +mainconfig + "" = "GUI"; + diff --git a/upptst/EnableCase/main.cpp b/upptst/EnableCase/main.cpp new file mode 100644 index 000000000..ca9b84f16 --- /dev/null +++ b/upptst/EnableCase/main.cpp @@ -0,0 +1,12 @@ +#include "EnableCase.h" + +EnableCase::EnableCase() +{ + CtrlLayout(*this, "Window title"); + sw.DisableCase(1); +} + +GUI_APP_MAIN +{ + EnableCase().Run(); +} diff --git a/upptst/GLDrawTest/main.cpp b/upptst/GLDrawTest/main.cpp index abffdcec2..8c2d6111e 100644 --- a/upptst/GLDrawTest/main.cpp +++ b/upptst/GLDrawTest/main.cpp @@ -11,12 +11,10 @@ struct OpenGLExample : GLCtrl { DLOG("GLPaint"); Size sz = GetSize(); - GLDraw w; + DrawGL w(sz); Rect r = Rect(GetSize()).Deflated(20, 20); - w.InitGL(GetSize()); - w.DrawRect(sz, LtRed()); DrawFatFrame(w, r, LtBlue(), 2);