diff --git a/Tutorial/GacUI_Controls/GacUI_Controls.sln b/Tutorial/GacUI_Controls/GacUI_Controls.sln index 548c6e13..1c60bfdf 100644 --- a/Tutorial/GacUI_Controls/GacUI_Controls.sln +++ b/Tutorial/GacUI_Controls/GacUI_Controls.sln @@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{739DADD1-5B9 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GacUILite", "..\Lib\GacUILite\GacUILite.vcxproj", "{96C559CA-9718-4BEC-A053-28A0AB6A8CA2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextEditor", "TextEditor\TextEditor.vcxproj", "{66069A5E-F697-42E2-8D9E-7D6E82019838}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ColorPicker", "ColorPicker\ColorPicker.vcxproj", "{FBBBA8BF-96A4-4096-8204-A92571100F0E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AddressBook", "AddressBook\AddressBook.vcxproj", "{7F92FCD2-8A1E-4C73-9949-91555BEF3832}" @@ -71,14 +69,6 @@ Global {96C559CA-9718-4BEC-A053-28A0AB6A8CA2}.Release|Win32.Build.0 = Release|Win32 {96C559CA-9718-4BEC-A053-28A0AB6A8CA2}.Release|x64.ActiveCfg = Release|x64 {96C559CA-9718-4BEC-A053-28A0AB6A8CA2}.Release|x64.Build.0 = Release|x64 - {66069A5E-F697-42E2-8D9E-7D6E82019838}.Debug|Win32.ActiveCfg = Debug|Win32 - {66069A5E-F697-42E2-8D9E-7D6E82019838}.Debug|Win32.Build.0 = Debug|Win32 - {66069A5E-F697-42E2-8D9E-7D6E82019838}.Debug|x64.ActiveCfg = Debug|x64 - {66069A5E-F697-42E2-8D9E-7D6E82019838}.Debug|x64.Build.0 = Debug|x64 - {66069A5E-F697-42E2-8D9E-7D6E82019838}.Release|Win32.ActiveCfg = Release|Win32 - {66069A5E-F697-42E2-8D9E-7D6E82019838}.Release|Win32.Build.0 = Release|Win32 - {66069A5E-F697-42E2-8D9E-7D6E82019838}.Release|x64.ActiveCfg = Release|x64 - {66069A5E-F697-42E2-8D9E-7D6E82019838}.Release|x64.Build.0 = Release|x64 {FBBBA8BF-96A4-4096-8204-A92571100F0E}.Debug|Win32.ActiveCfg = Debug|Win32 {FBBBA8BF-96A4-4096-8204-A92571100F0E}.Debug|Win32.Build.0 = Debug|Win32 {FBBBA8BF-96A4-4096-8204-A92571100F0E}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/Tutorial/GacUI_Controls/TextEditor.zip b/Tutorial/GacUI_Controls/TextEditor.zip new file mode 100644 index 00000000..32164878 Binary files /dev/null and b/Tutorial/GacUI_Controls/TextEditor.zip differ diff --git a/Tutorial/GacUI_Controls/TextEditor/Main.cpp b/Tutorial/GacUI_Controls/TextEditor/Main.cpp deleted file mode 100644 index 13cdd678..00000000 --- a/Tutorial/GacUI_Controls/TextEditor/Main.cpp +++ /dev/null @@ -1,116 +0,0 @@ -#define GAC_HEADER_USE_NAMESPACE -#include "UI/Source/Demo.h" -#ifdef VCZH_MSVC -#include -#endif - -using namespace vl::collections; -using namespace vl::stream; - -#pragma comment(linker,"\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") - -void GuiMain() -{ - { - FileStream fileStream(L"../UIRes/TextEditor.bin", FileStream::ReadOnly); - GetResourceManager()->LoadResourceOrPending(fileStream); - } - demo::MainWindow window; - window.MoveToScreenCenter(); - GetApplication()->Run(&window); -} - -/*********************************************************************** -OpenUrl -***********************************************************************/ - -void OpenUrl(const WString& url) -{ -#ifdef VCZH_MSVC - ShellExecute(NULL, L"OPEN", url.Buffer(), NULL, NULL, SW_MAXIMIZE); -#endif -} - -/*********************************************************************** -SetTokenizer -***********************************************************************/ - -class XmlColorizer : public GuiTextBoxRegexColorizer -{ -public: - XmlColorizer() - { - text::ColorEntry entry; - entry.normal.text = Color(255, 255, 255); - entry.normal.background = Color(0, 0, 0, 0); - entry.selectedFocused.text = Color(255, 255, 255); - entry.selectedFocused.background = Color(0, 122, 204); - entry.selectedUnfocused.text = Color(255, 255, 255); - entry.selectedUnfocused.background = Color(0, 122, 204); - SetDefaultColor(entry); - - entry.normal.text = Color(0, 128, 0); - AddToken(L"/