From 4d7ef798bfd94acdba05c873ef8e09aca7de36d6 Mon Sep 17 00:00:00 2001 From: micio Date: Sat, 22 Jan 2011 17:45:19 +0000 Subject: [PATCH] Bazaar/SysExecTest : Fixed for windows git-svn-id: svn://ultimatepp.org/upp/trunk@3061 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- bazaar/SysExecTest/main.cpp | 185 +++++++++++++++++++----------------- 1 file changed, 97 insertions(+), 88 deletions(-) diff --git a/bazaar/SysExecTest/main.cpp b/bazaar/SysExecTest/main.cpp index b42aa26cd..6b072934b 100644 --- a/bazaar/SysExecTest/main.cpp +++ b/bazaar/SysExecTest/main.cpp @@ -1,88 +1,97 @@ -#include "SysExecTest.h" -#include - -void SysExecTest::btnCb(int n) -{ -#ifdef PLATFORM_POSIX - String term = "xterm"; -#else - String term = "notepad.exe"; -#endif - bool res; - - status.Set("RUNNING......."); - Ctrl::ProcessEvents(); - switch(n) - { - case 1: - res = SysExec(term, ""); - break; - - case 2: - res = SysStart(term, ""); - break; - - case 3: - res = SysExecAdmin(pass, term, ""); - break; - - case 4: - res = SysStartAdmin(pass, term, ""); - break; - - case 5: - res = SysExecUser(user, pass, term, ""); - break; - - case 6: - res = SysStartUser(user, pass, term, ""); - break; - - case 7: - res = SysExecAdmin(term, ""); - break; - - case 8: - res = SysStartAdmin(term, ""); - break; - - case 9: - res = SysExecUser(user, term, ""); - break; - - case 10: - res = SysStartUser(user, term, ""); - break; - - default: - NEVER(); - } - - String resStr; - resStr = res ? "TRUE" : "FALSE"; - status.Set("Last command returned '" + resStr + "' status"); -} - -SysExecTest::SysExecTest() -{ - CtrlLayout(*this, "Test SysExec package"); - AddFrame(status); - pass.Password(); - - btn1 <<= THISBACK1(btnCb, 1); - btn2 <<= THISBACK1(btnCb, 2); - btn3 <<= THISBACK1(btnCb, 3); - btn4 <<= THISBACK1(btnCb, 4); - btn5 <<= THISBACK1(btnCb, 5); - btn6 <<= THISBACK1(btnCb, 6); - btn3G <<= THISBACK1(btnCb, 7); - btn4G <<= THISBACK1(btnCb, 8); - btn5G <<= THISBACK1(btnCb, 9); - btn6G <<= THISBACK1(btnCb, 10); -} - -GUI_APP_MAIN -{ - SysExecTest().Run(); -} - +#include "SysExecTest.h" +#include + +void SysExecTest::btnCb(int n) +{ +#ifdef PLATFORM_POSIX + String term = "xterm"; +#else + String term = "notepad.exe"; +#endif + bool res; + + status.Set("RUNNING......."); + Ctrl::ProcessEvents(); + switch(n) + { + case 1: + res = SysExec(term, ""); + break; + + case 2: + res = SysStart(term, ""); + break; + + case 3: + res = SysExecAdmin(pass, term, ""); + break; + + case 4: + res = SysStartAdmin(pass, term, ""); + break; + + case 5: + res = SysExecUser(user, pass, term, ""); + break; + + case 6: + res = SysStartUser(user, pass, term, ""); + break; + +#ifdef PLATFORM_POSIX + case 7: + res = SysExecAdmin(term, ""); + break; + + case 8: + res = SysStartAdmin(term, ""); + break; + + case 9: + res = SysExecUser(user, term, ""); + break; + + case 10: + res = SysStartUser(user, term, ""); + break; +#endif + default: + NEVER(); + } + + String resStr; + resStr = res ? "TRUE" : "FALSE"; + status.Set("Last command returned '" + resStr + "' status"); +} + +SysExecTest::SysExecTest() +{ + CtrlLayout(*this, "Test SysExec package"); + AddFrame(status); + pass.Password(); + + btn1 <<= THISBACK1(btnCb, 1); + btn2 <<= THISBACK1(btnCb, 2); + btn3 <<= THISBACK1(btnCb, 3); + btn4 <<= THISBACK1(btnCb, 4); + btn5 <<= THISBACK1(btnCb, 5); + btn6 <<= THISBACK1(btnCb, 6); + +#ifdef PLATFORM_POSIX + btn3G <<= THISBACK1(btnCb, 7); + btn4G <<= THISBACK1(btnCb, 8); + btn5G <<= THISBACK1(btnCb, 9); + btn6G <<= THISBACK1(btnCb, 10); +#else + btn3G.Hide(); + btn4G.Hide(); + btn5G.Hide(); + btn6G.Hide(); +#endif +} + +GUI_APP_MAIN +{ + SysExecTest().Run(); +} +