From c6af358d0e2e3da7201813774d3fe2ca62514d5e Mon Sep 17 00:00:00 2001 From: koldo Date: Wed, 11 Mar 2020 08:00:21 +0000 Subject: [PATCH] *SysInfo_demo_gui: Updated and fixed git-svn-id: svn://ultimatepp.org/upp/trunk@14153 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- bazaar/SysInfo_demo_gui/SysInfo_demo_gui.h | 18 ++++++------------ bazaar/SysInfo_demo_gui/main.cpp | 13 ++++++------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/bazaar/SysInfo_demo_gui/SysInfo_demo_gui.h b/bazaar/SysInfo_demo_gui/SysInfo_demo_gui.h index 627f6d71c..f8ab12c31 100644 --- a/bazaar/SysInfo_demo_gui/SysInfo_demo_gui.h +++ b/bazaar/SysInfo_demo_gui/SysInfo_demo_gui.h @@ -8,8 +8,7 @@ struct SpecialFolders : WithSpecialFolders { typedef SpecialFolders CLASSNAME; - SpecialFolders() - { + SpecialFolders() { CtrlLayout(*this); } void Fill(); @@ -19,8 +18,7 @@ struct SystemInfo : WithSystemInfo { typedef SystemInfo CLASSNAME; - SystemInfo() - { + SystemInfo() { CtrlLayout(*this); } void Fill(); @@ -30,8 +28,7 @@ struct WindowsList_ : WithWindowsList { typedef WindowsList_ CLASSNAME; - WindowsList_() - { + WindowsList_() { CtrlLayout(*this); } void Fill(); @@ -46,8 +43,7 @@ struct ProcessList : WithProcessList { typedef ProcessList CLASSNAME; - ProcessList() - { + ProcessList() { CtrlLayout(*this); } void Fill(); @@ -57,8 +53,7 @@ struct ScreenGrabTab : WithScreenGrabTab { typedef ScreenGrabTab CLASSNAME; - ScreenGrabTab() - { + ScreenGrabTab() { CtrlLayout(*this); } void Fill(); @@ -70,8 +65,7 @@ struct MouseKeyboard : WithMouseKeyboard { typedef MouseKeyboard CLASSNAME; - MouseKeyboard() - { + MouseKeyboard() { CtrlLayout(*this); } void Fill(); diff --git a/bazaar/SysInfo_demo_gui/main.cpp b/bazaar/SysInfo_demo_gui/main.cpp index bf5793aa3..7628a3552 100644 --- a/bazaar/SysInfo_demo_gui/main.cpp +++ b/bazaar/SysInfo_demo_gui/main.cpp @@ -1,20 +1,19 @@ #include -#include "SysInfo/SysInfo.h" -#include "SysInfo_demo_gui.h" +#include #include +using namespace Upp; + +#include "SysInfo_demo_gui.h" + #define IMAGEFILE #define IMAGECLASS Images #include #define LAYOUTFILE - -using namespace Upp; - + GUI_APP_MAIN { - String pepe = "frefre fproforwejifpoijrfoijrwopjwoerhghgihfdiuhiuwrgi rtgwiuhgiuh iwurhgiuhgiuwhreigu wuireh giwu ghowituhiuwthuiuohoi uhre"; - SysInfoDemo program; SetLanguage(LNGC_('E','N','U','S', CHARSET_UTF8));