diff --git a/Import/Import.bat b/Import/Import.bat index 574d4353..66e1396b 100644 --- a/Import/Import.bat +++ b/Import/Import.bat @@ -1,3 +1,4 @@ +pushd %~dp0 mkdir Skins mkdir Skins\DarkSkin copy ..\..\Vlpp\Release\*.h . @@ -6,4 +7,5 @@ copy ..\..\Workflow\Release\*.h . copy ..\..\Workflow\Release\*.cpp . copy ..\..\GacUI\Release\Gac*.h . copy ..\..\GacUI\Release\Gac*.cpp . -copy ..\..\GacUI\Release\DarkSkin* .\Skins\DarkSkin\ \ No newline at end of file +copy ..\..\GacUI\Release\DarkSkin* .\Skins\DarkSkin\ +popd \ No newline at end of file diff --git a/Tools/Deploy.bat b/Tools/Deploy.bat index d6f76e5b..020b1321 100644 --- a/Tools/Deploy.bat +++ b/Tools/Deploy.bat @@ -1,3 +1,4 @@ +pushd %~dp0 copy ..\..\Tools\Tools\ParserGen.exe . copy ..\..\Tools\Tools\GacGen32.exe . copy ..\..\Tools\Tools\GacGen64.exe . @@ -5,4 +6,5 @@ copy ..\..\Tools\Tools\CppMerge.exe . copy ..\..\Tools\Tools\RunAndLock.bat . copy ..\..\Tools\Tools\WaitForLock.bat . copy ..\..\Tools\Tools\GacGen.bat . -copy ..\..\Tools\Tools\GacMerge.bat . \ No newline at end of file +copy ..\..\Tools\Tools\GacMerge.bat . +popd \ No newline at end of file diff --git a/Tutorial/GacUI_HelloWorlds/Cpp/Main.cpp b/Tutorial/GacUI_HelloWorlds/Cpp/Main.cpp index ca1ae251..f78e6839 100644 --- a/Tutorial/GacUI_HelloWorlds/Cpp/Main.cpp +++ b/Tutorial/GacUI_HelloWorlds/Cpp/Main.cpp @@ -1,11 +1,5 @@ #define GAC_HEADER_USE_NAMESPACE #include -#include - -int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int CmdShow) -{ - return SetupWindowsDirect2DRenderer(); -} void GuiMain() { diff --git a/Tutorial/GacUI_HelloWorlds/CppXml/Main.cpp b/Tutorial/GacUI_HelloWorlds/CppXml/Main.cpp index d2d1c09e..4fca1111 100644 --- a/Tutorial/GacUI_HelloWorlds/CppXml/Main.cpp +++ b/Tutorial/GacUI_HelloWorlds/CppXml/Main.cpp @@ -1,15 +1,9 @@ #define GAC_HEADER_USE_NAMESPACE #include "UI/Source/HelloWorld.h" -#include using namespace vl::collections; using namespace vl::stream; -int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int CmdShow) -{ - return SetupWindowsDirect2DRenderer(); -} - void GuiMain() { { diff --git a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Codegen.bat b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Codegen.bat index 27f6654b..5c9662ad 100644 --- a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Codegen.bat +++ b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Codegen.bat @@ -1 +1 @@ -..\..\..\..\Tools\GacGen.exe Resource.xml \ No newline at end of file +%~dp0..\..\..\..\Tools\GacGen Resource.xml \ No newline at end of file diff --git a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorld.h b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorld.h index 93e959dc..5e55620a 100644 --- a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorld.h +++ b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorld.h @@ -1,4 +1,4 @@ -/*********************************************************************** +/*********************************************************************** !!!!!! DO NOT MODIFY !!!!!! GacGen.exe Resource.xml @@ -12,24 +12,4 @@ https://github.com/vczh-libraries #include "HelloWorldPartialClasses.h" -/*********************************************************************** -Reflection -***********************************************************************/ - -namespace vl -{ - namespace reflection - { - namespace description - { -#ifndef VCZH_DEBUG_NO_REFLECTION - DECL_TYPE_INFO(::helloworld::MainWindow) - DECL_TYPE_INFO(::helloworld::MainWindowConstructor) -#endif - - extern bool LoadHelloWorldTypes(); - } - } -} - #endif diff --git a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.cpp b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.cpp index 8e84f8bb..1b8c93ed 100644 --- a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.cpp +++ b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.cpp @@ -8,6 +8,12 @@ https://github.com/vczh-libraries ***********************************************************************/ #include "HelloWorld.h" +/* CodePack:BeginIgnore() */ +#ifndef VCZH_DEBUG_NO_REFLECTION +/* CodePack:ConditionOff(VCZH_DEBUG_NO_REFLECTION, HelloWorldReflection.h) */ +#include "HelloWorldReflection.h" +#endif +/* CodePack:EndIgnore() */ #if defined( _MSC_VER) #pragma warning(push) @@ -58,10 +64,10 @@ namespace helloworld (this->__vwsn_precompile_0 = __vwsn_this_); (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_2)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint32_t>(480); __vwsn_temp__.y = static_cast<::vl::vint32_t>(320); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_2)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } { - ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetClientSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint32_t>(480); __vwsn_temp__.y = static_cast<::vl::vint32_t>(320); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetClientSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } { ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetText(::vl::WString(L"Hello, world!", false)); @@ -71,7 +77,7 @@ namespace helloworld (this->__vwsn_precompile_1 = new ::vl::presentation::controls::GuiLabel(__vwsn_controlStyle_)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_1)->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Segoe UI", false); __vwsn_temp__.size = static_cast<::vl::vint32_t>(32); __vwsn_temp__.antialias = true; return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_1)->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Segoe UI", false); __vwsn_temp__.size = static_cast<::vl::vint>(32); __vwsn_temp__.antialias = true; return __vwsn_temp__; }()); } { ::vl::__vwsn::This(this->__vwsn_precompile_1)->SetText(::vl::WString(L"Welcome to GacUI Library!", false)); @@ -100,7 +106,7 @@ Class (::helloworld::MainWindow) MainWindow::~MainWindow() { - this->FinalizeInstanceRecursively(static_cast<::vl::presentation::controls::GuiControl*>(this)); + this->FinalizeInstanceRecursively(static_cast<::vl::presentation::controls::GuiControlHost*>(this)); } } @@ -109,63 +115,6 @@ Class (::helloworld::MainWindow) #undef GLOBAL_OBJ #undef USERIMPL -/*********************************************************************** -Reflection -***********************************************************************/ - -namespace vl -{ - namespace reflection - { - namespace description - { -#ifndef VCZH_DEBUG_NO_REFLECTION - IMPL_CPP_TYPE_INFO(helloworld::MainWindow) - IMPL_CPP_TYPE_INFO(helloworld::MainWindowConstructor) - -#define _ , - BEGIN_CLASS_MEMBER(::helloworld::MainWindow) - CLASS_MEMBER_CONSTRUCTOR(::helloworld::MainWindow*(), NO_PARAMETER) - END_CLASS_MEMBER(::helloworld::MainWindow) - - BEGIN_CLASS_MEMBER(::helloworld::MainWindowConstructor) - CLASS_MEMBER_CONSTRUCTOR(::vl::Ptr<::helloworld::MainWindowConstructor>(), NO_PARAMETER) - CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" }) - CLASS_MEMBER_FIELD(__vwsn_precompile_0) - CLASS_MEMBER_FIELD(__vwsn_precompile_1) - CLASS_MEMBER_FIELD(__vwsn_precompile_2) - END_CLASS_MEMBER(::helloworld::MainWindowConstructor) - -#undef _ - class HelloWorldTypeLoader : public Object, public ITypeLoader - { - public: - void Load(ITypeManager* manager) - { - ADD_TYPE_INFO(::helloworld::MainWindow) - ADD_TYPE_INFO(::helloworld::MainWindowConstructor) - } - - void Unload(ITypeManager* manager) - { - } - }; -#endif - - bool LoadHelloWorldTypes() - { -#ifndef VCZH_DEBUG_NO_REFLECTION - if (auto manager = GetGlobalTypeManager()) - { - return manager->AddTypeLoader(MakePtr()); - } -#endif - return false; - } - } - } -} - #if defined( _MSC_VER) #pragma warning(pop) #elif defined(__GNUC__) diff --git a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldReflection.cpp b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldReflection.cpp new file mode 100644 index 00000000..af1883ff --- /dev/null +++ b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldReflection.cpp @@ -0,0 +1,86 @@ +/*********************************************************************** +!!!!!! DO NOT MODIFY !!!!!! + +GacGen.exe Resource.xml + +This file is generated by Workflow compiler +https://github.com/vczh-libraries +***********************************************************************/ + +#include "HelloWorldReflection.h" + +#if defined( _MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#elif defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wparentheses-equality" +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wparentheses-equality" +#endif + +/*********************************************************************** +Reflection +***********************************************************************/ + +namespace vl +{ + namespace reflection + { + namespace description + { +#ifndef VCZH_DEBUG_NO_REFLECTION + IMPL_CPP_TYPE_INFO(helloworld::MainWindow) + IMPL_CPP_TYPE_INFO(helloworld::MainWindowConstructor) + +#define _ , + BEGIN_CLASS_MEMBER(::helloworld::MainWindow) + CLASS_MEMBER_CONSTRUCTOR(::helloworld::MainWindow*(), NO_PARAMETER) + END_CLASS_MEMBER(::helloworld::MainWindow) + + BEGIN_CLASS_MEMBER(::helloworld::MainWindowConstructor) + CLASS_MEMBER_CONSTRUCTOR(::vl::Ptr<::helloworld::MainWindowConstructor>(), NO_PARAMETER) + CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" }) + CLASS_MEMBER_FIELD(__vwsn_precompile_0) + CLASS_MEMBER_FIELD(__vwsn_precompile_1) + CLASS_MEMBER_FIELD(__vwsn_precompile_2) + END_CLASS_MEMBER(::helloworld::MainWindowConstructor) + +#undef _ + class HelloWorldTypeLoader : public Object, public ITypeLoader + { + public: + void Load(ITypeManager* manager) + { + ADD_TYPE_INFO(::helloworld::MainWindow) + ADD_TYPE_INFO(::helloworld::MainWindowConstructor) + } + + void Unload(ITypeManager* manager) + { + } + }; +#endif + + bool LoadHelloWorldTypes() + { +#ifndef VCZH_DEBUG_NO_REFLECTION + if (auto manager = GetGlobalTypeManager()) + { + return manager->AddTypeLoader(MakePtr()); + } +#endif + return false; + } + } + } +} + +#if defined( _MSC_VER) +#pragma warning(pop) +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#elif defined(__clang__) +#pragma clang diagnostic pop +#endif diff --git a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldReflection.h b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldReflection.h new file mode 100644 index 00000000..a474f40b --- /dev/null +++ b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldReflection.h @@ -0,0 +1,54 @@ +/*********************************************************************** +!!!!!! DO NOT MODIFY !!!!!! + +GacGen.exe Resource.xml + +This file is generated by Workflow compiler +https://github.com/vczh-libraries +***********************************************************************/ + +#ifndef VCZH_WORKFLOW_COMPILER_GENERATED_HELLOWORLDREFLECTION +#define VCZH_WORKFLOW_COMPILER_GENERATED_HELLOWORLDREFLECTION + +#include "HelloWorld.h" + +#if defined( _MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#elif defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wparentheses-equality" +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wparentheses-equality" +#endif + +/*********************************************************************** +Reflection +***********************************************************************/ + +namespace vl +{ + namespace reflection + { + namespace description + { +#ifndef VCZH_DEBUG_NO_REFLECTION + DECL_TYPE_INFO(::helloworld::MainWindow) + DECL_TYPE_INFO(::helloworld::MainWindowConstructor) +#endif + + extern bool LoadHelloWorldTypes(); + } + } +} + +#if defined( _MSC_VER) +#pragma warning(pop) +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#elif defined(__clang__) +#pragma clang diagnostic pop +#endif + +#endif diff --git a/Tutorial/GacUI_HelloWorlds/CppXml/WinMain.cpp b/Tutorial/GacUI_HelloWorlds/CppXml/WinMain.cpp deleted file mode 100644 index c5d2996a..00000000 --- a/Tutorial/GacUI_HelloWorlds/CppXml/WinMain.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include - -int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int CmdShow) -{ - return SetupWindowsDirect2DRenderer(); -} \ No newline at end of file diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/MVVM.vcxproj b/Tutorial/GacUI_HelloWorlds/MVVM/MVVM.vcxproj index 6e06f525..d1dd5cdf 100644 --- a/Tutorial/GacUI_HelloWorlds/MVVM/MVVM.vcxproj +++ b/Tutorial/GacUI_HelloWorlds/MVVM/MVVM.vcxproj @@ -80,7 +80,6 @@ - diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/MVVM.vcxproj.filters b/Tutorial/GacUI_HelloWorlds/MVVM/MVVM.vcxproj.filters index 9c6864e2..0c8736fc 100644 --- a/Tutorial/GacUI_HelloWorlds/MVVM/MVVM.vcxproj.filters +++ b/Tutorial/GacUI_HelloWorlds/MVVM/MVVM.vcxproj.filters @@ -27,9 +27,6 @@ UI - - Source Files - diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Codegen.bat b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Codegen.bat index 27f6654b..5c9662ad 100644 --- a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Codegen.bat +++ b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Codegen.bat @@ -1 +1 @@ -..\..\..\..\Tools\GacGen.exe Resource.xml \ No newline at end of file +%~dp0..\..\..\..\Tools\GacGen Resource.xml \ No newline at end of file diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/UI/MainWindow.xml b/Tutorial/GacUI_HelloWorlds/MVVM/UI/MainWindow.xml index c4375932..d71c6347 100644 --- a/Tutorial/GacUI_HelloWorlds/MVVM/UI/MainWindow.xml +++ b/Tutorial/GacUI_HelloWorlds/MVVM/UI/MainWindow.xml @@ -6,8 +6,8 @@ prop HasLoggedIn : bool = false {} ]]> - - + + diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorld.h b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorld.h index 84e8b59c..5395ddbd 100644 --- a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorld.h +++ b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorld.h @@ -1,4 +1,4 @@ -/*********************************************************************** +/*********************************************************************** !!!!!! DO NOT MODIFY !!!!!! GacGen.exe Resource.xml @@ -13,56 +13,4 @@ https://github.com/vczh-libraries #include "HelloWorldPartialClasses.h" #include "MainWindow.h" -/*********************************************************************** -Reflection -***********************************************************************/ - -namespace vl -{ - namespace reflection - { - namespace description - { -#ifndef VCZH_DEBUG_NO_REFLECTION - DECL_TYPE_INFO(::helloworld::MainWindow) - DECL_TYPE_INFO(::helloworld::MainWindowConstructor) - DECL_TYPE_INFO(::vm::IViewModel) - - BEGIN_INTERFACE_PROXY_NOPARENT_SHAREDPTR(::vm::IViewModel) - ::vl::WString GetPassword() override - { - INVOKEGET_INTERFACE_PROXY_NOPARAMS(GetPassword); - } - ::vl::WString GetPasswordError() override - { - INVOKEGET_INTERFACE_PROXY_NOPARAMS(GetPasswordError); - } - ::vl::WString GetUserName() override - { - INVOKEGET_INTERFACE_PROXY_NOPARAMS(GetUserName); - } - ::vl::WString GetUserNameError() override - { - INVOKEGET_INTERFACE_PROXY_NOPARAMS(GetUserNameError); - } - void SetPassword(const ::vl::WString& value) override - { - INVOKE_INTERFACE_PROXY(SetPassword, value); - } - void SetUserName(const ::vl::WString& value) override - { - INVOKE_INTERFACE_PROXY(SetUserName, value); - } - bool SignUp() override - { - INVOKEGET_INTERFACE_PROXY_NOPARAMS(SignUp); - } - END_INTERFACE_PROXY(::vm::IViewModel) -#endif - - extern bool LoadHelloWorldTypes(); - } - } -} - #endif diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.cpp b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.cpp index 6f7e72a9..a137c945 100644 --- a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.cpp +++ b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.cpp @@ -8,6 +8,12 @@ https://github.com/vczh-libraries ***********************************************************************/ #include "HelloWorld.h" +/* CodePack:BeginIgnore() */ +#ifndef VCZH_DEBUG_NO_REFLECTION +/* CodePack:ConditionOff(VCZH_DEBUG_NO_REFLECTION, HelloWorldReflection.h) */ +#include "HelloWorldReflection.h" +#endif +/* CodePack:EndIgnore() */ #if defined( _MSC_VER) #pragma warning(push) @@ -488,10 +494,10 @@ namespace helloworld (this->ViewModel = ::vl::__vwsn::This(__vwsn_this_)->GetViewModel()); (this->__vwsn_precompile_19 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_19)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint32_t>(320); __vwsn_temp__.y = static_cast<::vl::vint32_t>(280); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_19)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(320); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } { - ::vl::__vwsn::This(this->self)->SetClientSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint32_t>(320); __vwsn_temp__.y = static_cast<::vl::vint32_t>(280); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->self)->SetClientSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(320); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } (this->__vwsn_precompile_18 = ::vl::__vwsn::This(this->self)->GetViewModel()); { @@ -499,31 +505,31 @@ namespace helloworld } (this->__vwsn_precompile_0 = new ::vl::presentation::compositions::GuiTableComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint32_t>(0); __vwsn_temp__.top = static_cast<::vl::vint32_t>(0); __vwsn_temp__.right = static_cast<::vl::vint32_t>(0); __vwsn_temp__.bottom = static_cast<::vl::vint32_t>(0); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }()); } { - ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetCellPadding(::vl::__vwsn::Parse<::vl::vint32_t>(::vl::WString(L"5", false))); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetCellPadding(::vl::__vwsn::Parse<::vl::vint>(::vl::WString(L"5", false))); } { - ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowsAndColumns(static_cast<::vl::vint32_t>(8), static_cast<::vl::vint32_t>(2)); - ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint32_t>(0), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::Absolute; __vwsn_temp__.absolute = static_cast<::vl::vint32_t>(90); return __vwsn_temp__; }()); - ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint32_t>(1), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::MinSize; return __vwsn_temp__; }()); - ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint32_t>(2), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::MinSize; return __vwsn_temp__; }()); - ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint32_t>(3), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::MinSize; return __vwsn_temp__; }()); - ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint32_t>(4), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::MinSize; return __vwsn_temp__; }()); - ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint32_t>(5), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::Absolute; __vwsn_temp__.absolute = static_cast<::vl::vint32_t>(12); return __vwsn_temp__; }()); - ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint32_t>(6), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::Percentage; __vwsn_temp__.percentage = static_cast(1.0); return __vwsn_temp__; }()); - ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint32_t>(7), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::MinSize; return __vwsn_temp__; }()); - ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetColumnOption(static_cast<::vl::vint32_t>(0), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::MinSize; return __vwsn_temp__; }()); - ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetColumnOption(static_cast<::vl::vint32_t>(1), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::Percentage; __vwsn_temp__.percentage = static_cast(1.0); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowsAndColumns(static_cast<::vl::vint>(8), static_cast<::vl::vint>(2)); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint>(0), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::Absolute; __vwsn_temp__.absolute = static_cast<::vl::vint>(90); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint>(1), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::MinSize; return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint>(2), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::MinSize; return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint>(3), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::MinSize; return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint>(4), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::MinSize; return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint>(5), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::Absolute; __vwsn_temp__.absolute = static_cast<::vl::vint>(12); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint>(6), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::Percentage; __vwsn_temp__.percentage = static_cast(1.0); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint>(7), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::MinSize; return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetColumnOption(static_cast<::vl::vint>(0), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::MinSize; return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetColumnOption(static_cast<::vl::vint>(1), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::Percentage; __vwsn_temp__.percentage = static_cast(1.0); return __vwsn_temp__; }()); } (this->__vwsn_precompile_1 = new ::vl::presentation::compositions::GuiCellComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_1)->SetSite(static_cast<::vl::vint32_t>(0), static_cast<::vl::vint32_t>(0), static_cast<::vl::vint32_t>(1), static_cast<::vl::vint32_t>(2)); + ::vl::__vwsn::This(this->__vwsn_precompile_1)->SetSite(static_cast<::vl::vint>(0), static_cast<::vl::vint>(0), static_cast<::vl::vint>(1), static_cast<::vl::vint>(2)); } (this->__vwsn_precompile_2 = ::vl::Ptr<::vl::presentation::elements::GuiSolidLabelElement>(::vl::reflection::description::Element_Constructor<::vl::presentation::elements::GuiSolidLabelElement>())); { - ::vl::__vwsn::This(this->__vwsn_precompile_2.Obj())->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Segoe UI", false); __vwsn_temp__.size = static_cast<::vl::vint32_t>(40); __vwsn_temp__.antialias = true; return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_2.Obj())->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Segoe UI", false); __vwsn_temp__.size = static_cast<::vl::vint>(40); __vwsn_temp__.antialias = true; return __vwsn_temp__; }()); } { ::vl::__vwsn::This(this->__vwsn_precompile_2.Obj())->SetVerticalAlignment(::vl::presentation::Alignment::Center); @@ -542,11 +548,11 @@ namespace helloworld } (this->__vwsn_precompile_3 = new ::vl::presentation::compositions::GuiCellComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_3)->SetSite(static_cast<::vl::vint32_t>(1), static_cast<::vl::vint32_t>(0), static_cast<::vl::vint32_t>(1), static_cast<::vl::vint32_t>(1)); + ::vl::__vwsn::This(this->__vwsn_precompile_3)->SetSite(static_cast<::vl::vint>(1), static_cast<::vl::vint>(0), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1)); } (this->__vwsn_precompile_4 = ::vl::Ptr<::vl::presentation::elements::GuiSolidLabelElement>(::vl::reflection::description::Element_Constructor<::vl::presentation::elements::GuiSolidLabelElement>())); { - ::vl::__vwsn::This(this->__vwsn_precompile_4.Obj())->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Segoe UI", false); __vwsn_temp__.size = static_cast<::vl::vint32_t>(12); __vwsn_temp__.antialias = true; return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_4.Obj())->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Segoe UI", false); __vwsn_temp__.size = static_cast<::vl::vint>(12); __vwsn_temp__.antialias = true; return __vwsn_temp__; }()); } { ::vl::__vwsn::This(this->__vwsn_precompile_4.Obj())->SetVerticalAlignment(::vl::presentation::Alignment::Center); @@ -562,7 +568,7 @@ namespace helloworld } (this->__vwsn_precompile_5 = new ::vl::presentation::compositions::GuiCellComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_5)->SetSite(static_cast<::vl::vint32_t>(1), static_cast<::vl::vint32_t>(1), static_cast<::vl::vint32_t>(1), static_cast<::vl::vint32_t>(1)); + ::vl::__vwsn::This(this->__vwsn_precompile_5)->SetSite(static_cast<::vl::vint>(1), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1)); } { auto __vwsn_controlStyle_ = ::vl::__vwsn::This(::vl::presentation::theme::GetCurrentTheme())->CreateTextBoxStyle(); @@ -570,10 +576,10 @@ namespace helloworld } (this->__vwsn_precompile_6 = ::vl::__vwsn::This(this->textBoxUserName)->GetBoundsComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_6)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint32_t>(0); __vwsn_temp__.y = static_cast<::vl::vint32_t>(24); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_6)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(0); __vwsn_temp__.y = static_cast<::vl::vint>(24); return __vwsn_temp__; }()); } { - ::vl::__vwsn::This(this->__vwsn_precompile_6)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint32_t>(0); __vwsn_temp__.top = static_cast<::vl::vint32_t>(0); __vwsn_temp__.right = static_cast<::vl::vint32_t>(0); __vwsn_temp__.bottom = static_cast<::vl::vint32_t>(0); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_6)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }()); } { ::vl::__vwsn::This(this->__vwsn_precompile_5)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(::vl::__vwsn::This(this->textBoxUserName)->GetBoundsComposition())); @@ -583,7 +589,7 @@ namespace helloworld } (this->__vwsn_precompile_7 = new ::vl::presentation::compositions::GuiCellComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_7)->SetSite(static_cast<::vl::vint32_t>(2), static_cast<::vl::vint32_t>(1), static_cast<::vl::vint32_t>(1), static_cast<::vl::vint32_t>(1)); + ::vl::__vwsn::This(this->__vwsn_precompile_7)->SetSite(static_cast<::vl::vint>(2), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1)); } (this->__vwsn_precompile_8 = ::vl::Ptr<::vl::presentation::elements::GuiSolidLabelElement>(::vl::reflection::description::Element_Constructor<::vl::presentation::elements::GuiSolidLabelElement>())); { @@ -596,7 +602,7 @@ namespace helloworld ::vl::__vwsn::This(this->__vwsn_precompile_8.Obj())->SetColor(::vl::__vwsn::Parse<::vl::presentation::Color>(::vl::WString(L"#FF0000", false))); } { - ::vl::__vwsn::This(this->__vwsn_precompile_8.Obj())->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Segoe UI", false); __vwsn_temp__.size = static_cast<::vl::vint32_t>(12); __vwsn_temp__.antialias = true; return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_8.Obj())->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Segoe UI", false); __vwsn_temp__.size = static_cast<::vl::vint>(12); __vwsn_temp__.antialias = true; return __vwsn_temp__; }()); } { ::vl::__vwsn::This(this->__vwsn_precompile_7)->SetOwnedElement(::vl::Ptr<::vl::presentation::elements::IGuiGraphicsElement>(this->__vwsn_precompile_8)); @@ -606,11 +612,11 @@ namespace helloworld } (this->__vwsn_precompile_9 = new ::vl::presentation::compositions::GuiCellComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_9)->SetSite(static_cast<::vl::vint32_t>(3), static_cast<::vl::vint32_t>(0), static_cast<::vl::vint32_t>(1), static_cast<::vl::vint32_t>(1)); + ::vl::__vwsn::This(this->__vwsn_precompile_9)->SetSite(static_cast<::vl::vint>(3), static_cast<::vl::vint>(0), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1)); } (this->__vwsn_precompile_10 = ::vl::Ptr<::vl::presentation::elements::GuiSolidLabelElement>(::vl::reflection::description::Element_Constructor<::vl::presentation::elements::GuiSolidLabelElement>())); { - ::vl::__vwsn::This(this->__vwsn_precompile_10.Obj())->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Segoe UI", false); __vwsn_temp__.size = static_cast<::vl::vint32_t>(12); __vwsn_temp__.antialias = true; return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_10.Obj())->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Segoe UI", false); __vwsn_temp__.size = static_cast<::vl::vint>(12); __vwsn_temp__.antialias = true; return __vwsn_temp__; }()); } { ::vl::__vwsn::This(this->__vwsn_precompile_10.Obj())->SetVerticalAlignment(::vl::presentation::Alignment::Center); @@ -626,7 +632,7 @@ namespace helloworld } (this->__vwsn_precompile_11 = new ::vl::presentation::compositions::GuiCellComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_11)->SetSite(static_cast<::vl::vint32_t>(3), static_cast<::vl::vint32_t>(1), static_cast<::vl::vint32_t>(1), static_cast<::vl::vint32_t>(1)); + ::vl::__vwsn::This(this->__vwsn_precompile_11)->SetSite(static_cast<::vl::vint>(3), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1)); } { auto __vwsn_controlStyle_ = ::vl::__vwsn::This(::vl::presentation::theme::GetCurrentTheme())->CreateTextBoxStyle(); @@ -637,10 +643,10 @@ namespace helloworld } (this->__vwsn_precompile_12 = ::vl::__vwsn::This(this->textBoxPassword)->GetBoundsComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_12)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint32_t>(0); __vwsn_temp__.y = static_cast<::vl::vint32_t>(24); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_12)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(0); __vwsn_temp__.y = static_cast<::vl::vint>(24); return __vwsn_temp__; }()); } { - ::vl::__vwsn::This(this->__vwsn_precompile_12)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint32_t>(0); __vwsn_temp__.top = static_cast<::vl::vint32_t>(0); __vwsn_temp__.right = static_cast<::vl::vint32_t>(0); __vwsn_temp__.bottom = static_cast<::vl::vint32_t>(0); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_12)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }()); } { ::vl::__vwsn::This(this->__vwsn_precompile_11)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(::vl::__vwsn::This(this->textBoxPassword)->GetBoundsComposition())); @@ -650,7 +656,7 @@ namespace helloworld } (this->__vwsn_precompile_13 = new ::vl::presentation::compositions::GuiCellComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_13)->SetSite(static_cast<::vl::vint32_t>(4), static_cast<::vl::vint32_t>(1), static_cast<::vl::vint32_t>(1), static_cast<::vl::vint32_t>(1)); + ::vl::__vwsn::This(this->__vwsn_precompile_13)->SetSite(static_cast<::vl::vint>(4), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1)); } (this->__vwsn_precompile_14 = ::vl::Ptr<::vl::presentation::elements::GuiSolidLabelElement>(::vl::reflection::description::Element_Constructor<::vl::presentation::elements::GuiSolidLabelElement>())); { @@ -663,7 +669,7 @@ namespace helloworld ::vl::__vwsn::This(this->__vwsn_precompile_14.Obj())->SetColor(::vl::__vwsn::Parse<::vl::presentation::Color>(::vl::WString(L"#FF0000", false))); } { - ::vl::__vwsn::This(this->__vwsn_precompile_14.Obj())->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Segoe UI", false); __vwsn_temp__.size = static_cast<::vl::vint32_t>(12); __vwsn_temp__.antialias = true; return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_14.Obj())->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Segoe UI", false); __vwsn_temp__.size = static_cast<::vl::vint>(12); __vwsn_temp__.antialias = true; return __vwsn_temp__; }()); } { ::vl::__vwsn::This(this->__vwsn_precompile_13)->SetOwnedElement(::vl::Ptr<::vl::presentation::elements::IGuiGraphicsElement>(this->__vwsn_precompile_14)); @@ -673,7 +679,7 @@ namespace helloworld } (this->__vwsn_precompile_15 = new ::vl::presentation::compositions::GuiCellComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_15)->SetSite(static_cast<::vl::vint32_t>(7), static_cast<::vl::vint32_t>(0), static_cast<::vl::vint32_t>(1), static_cast<::vl::vint32_t>(2)); + ::vl::__vwsn::This(this->__vwsn_precompile_15)->SetSite(static_cast<::vl::vint>(7), static_cast<::vl::vint>(0), static_cast<::vl::vint>(1), static_cast<::vl::vint>(2)); } { auto __vwsn_controlStyle_ = ::vl::__vwsn::This(::vl::presentation::theme::GetCurrentTheme())->CreateButtonStyle(); @@ -681,10 +687,10 @@ namespace helloworld } (this->__vwsn_precompile_16 = ::vl::__vwsn::This(this->buttonSignUp)->GetBoundsComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_16)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint32_t>(100); __vwsn_temp__.y = static_cast<::vl::vint32_t>(24); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_16)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(100); __vwsn_temp__.y = static_cast<::vl::vint>(24); return __vwsn_temp__; }()); } { - ::vl::__vwsn::This(this->__vwsn_precompile_16)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint32_t>(0); __vwsn_temp__.top = static_cast<::vl::vint32_t>(0); __vwsn_temp__.right = (- static_cast<::vl::vint32_t>(1)); __vwsn_temp__.bottom = static_cast<::vl::vint32_t>(0); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_16)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = (- static_cast<::vl::vint>(1)); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }()); } { ::vl::__vwsn::This(this->buttonSignUp)->SetText(::vl::WString(L"Sign Up!", false)); @@ -698,10 +704,10 @@ namespace helloworld } (this->__vwsn_precompile_17 = ::vl::__vwsn::This(this->buttonCancel)->GetBoundsComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_17)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint32_t>(100); __vwsn_temp__.y = static_cast<::vl::vint32_t>(24); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_17)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(100); __vwsn_temp__.y = static_cast<::vl::vint>(24); return __vwsn_temp__; }()); } { - ::vl::__vwsn::This(this->__vwsn_precompile_17)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = (- static_cast<::vl::vint32_t>(1)); __vwsn_temp__.top = static_cast<::vl::vint32_t>(0); __vwsn_temp__.right = static_cast<::vl::vint32_t>(0); __vwsn_temp__.bottom = static_cast<::vl::vint32_t>(0); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_17)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = (- static_cast<::vl::vint>(1)); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }()); } { ::vl::__vwsn::This(this->buttonCancel)->SetText(::vl::WString(L"Close", false)); @@ -766,113 +772,6 @@ namespace vm #undef GLOBAL_OBJ #undef USERIMPL -/*********************************************************************** -Reflection -***********************************************************************/ - -namespace vl -{ - namespace reflection - { - namespace description - { -#ifndef VCZH_DEBUG_NO_REFLECTION - IMPL_CPP_TYPE_INFO(helloworld::MainWindow) - IMPL_CPP_TYPE_INFO(helloworld::MainWindowConstructor) - IMPL_CPP_TYPE_INFO(vm::IViewModel) - -#define _ , - BEGIN_CLASS_MEMBER(::helloworld::MainWindow) - CLASS_MEMBER_CONSTRUCTOR(::helloworld::MainWindow*(::vl::Ptr<::vm::IViewModel>), { L"__vwsn_ctor_parameter_ViewModel" }) - CLASS_MEMBER_METHOD(GetHasLoggedIn, NO_PARAMETER) - CLASS_MEMBER_METHOD(GetViewModel, NO_PARAMETER) - CLASS_MEMBER_METHOD(SetHasLoggedIn, { L"__vwsn_value_" }) - CLASS_MEMBER_METHOD(buttonSignUp_Clicked, { L"sender" _ L"arguments" }) - CLASS_MEMBER_EVENT(HasLoggedInChanged) - CLASS_MEMBER_FIELD(__vwsn_parameter_ViewModel) - CLASS_MEMBER_FIELD(__vwsn_prop_HasLoggedIn) - CLASS_MEMBER_PROPERTY_EVENT(HasLoggedIn, GetHasLoggedIn, SetHasLoggedIn, HasLoggedInChanged) - CLASS_MEMBER_PROPERTY_READONLY(ViewModel, GetViewModel) - END_CLASS_MEMBER(::helloworld::MainWindow) - - BEGIN_CLASS_MEMBER(::helloworld::MainWindowConstructor) - CLASS_MEMBER_CONSTRUCTOR(::vl::Ptr<::helloworld::MainWindowConstructor>(), NO_PARAMETER) - CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" }) - CLASS_MEMBER_FIELD(__vwsn_precompile_0) - CLASS_MEMBER_FIELD(__vwsn_precompile_1) - CLASS_MEMBER_FIELD(__vwsn_precompile_10) - CLASS_MEMBER_FIELD(__vwsn_precompile_11) - CLASS_MEMBER_FIELD(__vwsn_precompile_12) - CLASS_MEMBER_FIELD(__vwsn_precompile_13) - CLASS_MEMBER_FIELD(__vwsn_precompile_14) - CLASS_MEMBER_FIELD(__vwsn_precompile_15) - CLASS_MEMBER_FIELD(__vwsn_precompile_16) - CLASS_MEMBER_FIELD(__vwsn_precompile_17) - CLASS_MEMBER_FIELD(__vwsn_precompile_18) - CLASS_MEMBER_FIELD(__vwsn_precompile_19) - CLASS_MEMBER_FIELD(__vwsn_precompile_2) - CLASS_MEMBER_FIELD(__vwsn_precompile_3) - CLASS_MEMBER_FIELD(__vwsn_precompile_4) - CLASS_MEMBER_FIELD(__vwsn_precompile_5) - CLASS_MEMBER_FIELD(__vwsn_precompile_6) - CLASS_MEMBER_FIELD(__vwsn_precompile_7) - CLASS_MEMBER_FIELD(__vwsn_precompile_8) - CLASS_MEMBER_FIELD(__vwsn_precompile_9) - CLASS_MEMBER_FIELD(ViewModel) - CLASS_MEMBER_FIELD(buttonCancel) - CLASS_MEMBER_FIELD(buttonSignUp) - CLASS_MEMBER_FIELD(self) - CLASS_MEMBER_FIELD(textBoxPassword) - CLASS_MEMBER_FIELD(textBoxUserName) - END_CLASS_MEMBER(::helloworld::MainWindowConstructor) - - BEGIN_INTERFACE_MEMBER(::vm::IViewModel) - CLASS_MEMBER_METHOD(GetPassword, NO_PARAMETER) - CLASS_MEMBER_METHOD(GetPasswordError, NO_PARAMETER) - CLASS_MEMBER_METHOD(GetUserName, NO_PARAMETER) - CLASS_MEMBER_METHOD(GetUserNameError, NO_PARAMETER) - CLASS_MEMBER_METHOD(SetPassword, { L"value" }) - CLASS_MEMBER_METHOD(SetUserName, { L"value" }) - CLASS_MEMBER_METHOD(SignUp, NO_PARAMETER) - CLASS_MEMBER_EVENT(PasswordErrorChanged) - CLASS_MEMBER_EVENT(UserNameErrorChanged) - CLASS_MEMBER_PROPERTY(Password, GetPassword, SetPassword) - CLASS_MEMBER_PROPERTY_EVENT_READONLY(PasswordError, GetPasswordError, PasswordErrorChanged) - CLASS_MEMBER_PROPERTY(UserName, GetUserName, SetUserName) - CLASS_MEMBER_PROPERTY_EVENT_READONLY(UserNameError, GetUserNameError, UserNameErrorChanged) - END_INTERFACE_MEMBER(::vm::IViewModel) - -#undef _ - class HelloWorldTypeLoader : public Object, public ITypeLoader - { - public: - void Load(ITypeManager* manager) - { - ADD_TYPE_INFO(::helloworld::MainWindow) - ADD_TYPE_INFO(::helloworld::MainWindowConstructor) - ADD_TYPE_INFO(::vm::IViewModel) - } - - void Unload(ITypeManager* manager) - { - } - }; -#endif - - bool LoadHelloWorldTypes() - { -#ifndef VCZH_DEBUG_NO_REFLECTION - if (auto manager = GetGlobalTypeManager()) - { - return manager->AddTypeLoader(MakePtr()); - } -#endif - return false; - } - } - } -} - #if defined( _MSC_VER) #pragma warning(pop) #elif defined(__GNUC__) diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldReflection.cpp b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldReflection.cpp new file mode 100644 index 00000000..ddc13803 --- /dev/null +++ b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldReflection.cpp @@ -0,0 +1,136 @@ +/*********************************************************************** +!!!!!! DO NOT MODIFY !!!!!! + +GacGen.exe Resource.xml + +This file is generated by Workflow compiler +https://github.com/vczh-libraries +***********************************************************************/ + +#include "HelloWorldReflection.h" + +#if defined( _MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#elif defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wparentheses-equality" +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wparentheses-equality" +#endif + +/*********************************************************************** +Reflection +***********************************************************************/ + +namespace vl +{ + namespace reflection + { + namespace description + { +#ifndef VCZH_DEBUG_NO_REFLECTION + IMPL_CPP_TYPE_INFO(helloworld::MainWindow) + IMPL_CPP_TYPE_INFO(helloworld::MainWindowConstructor) + IMPL_CPP_TYPE_INFO(vm::IViewModel) + +#define _ , + BEGIN_CLASS_MEMBER(::helloworld::MainWindow) + CLASS_MEMBER_CONSTRUCTOR(::helloworld::MainWindow*(::vl::Ptr<::vm::IViewModel>), { L"__vwsn_ctor_parameter_ViewModel" }) + CLASS_MEMBER_METHOD(GetHasLoggedIn, NO_PARAMETER) + CLASS_MEMBER_METHOD(GetViewModel, NO_PARAMETER) + CLASS_MEMBER_METHOD(SetHasLoggedIn, { L"__vwsn_value_" }) + CLASS_MEMBER_METHOD(buttonSignUp_Clicked, { L"sender" _ L"arguments" }) + CLASS_MEMBER_EVENT(HasLoggedInChanged) + CLASS_MEMBER_FIELD(__vwsn_parameter_ViewModel) + CLASS_MEMBER_FIELD(__vwsn_prop_HasLoggedIn) + CLASS_MEMBER_PROPERTY_EVENT(HasLoggedIn, GetHasLoggedIn, SetHasLoggedIn, HasLoggedInChanged) + CLASS_MEMBER_PROPERTY_READONLY(ViewModel, GetViewModel) + END_CLASS_MEMBER(::helloworld::MainWindow) + + BEGIN_CLASS_MEMBER(::helloworld::MainWindowConstructor) + CLASS_MEMBER_CONSTRUCTOR(::vl::Ptr<::helloworld::MainWindowConstructor>(), NO_PARAMETER) + CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" }) + CLASS_MEMBER_FIELD(__vwsn_precompile_0) + CLASS_MEMBER_FIELD(__vwsn_precompile_1) + CLASS_MEMBER_FIELD(__vwsn_precompile_10) + CLASS_MEMBER_FIELD(__vwsn_precompile_11) + CLASS_MEMBER_FIELD(__vwsn_precompile_12) + CLASS_MEMBER_FIELD(__vwsn_precompile_13) + CLASS_MEMBER_FIELD(__vwsn_precompile_14) + CLASS_MEMBER_FIELD(__vwsn_precompile_15) + CLASS_MEMBER_FIELD(__vwsn_precompile_16) + CLASS_MEMBER_FIELD(__vwsn_precompile_17) + CLASS_MEMBER_FIELD(__vwsn_precompile_18) + CLASS_MEMBER_FIELD(__vwsn_precompile_19) + CLASS_MEMBER_FIELD(__vwsn_precompile_2) + CLASS_MEMBER_FIELD(__vwsn_precompile_3) + CLASS_MEMBER_FIELD(__vwsn_precompile_4) + CLASS_MEMBER_FIELD(__vwsn_precompile_5) + CLASS_MEMBER_FIELD(__vwsn_precompile_6) + CLASS_MEMBER_FIELD(__vwsn_precompile_7) + CLASS_MEMBER_FIELD(__vwsn_precompile_8) + CLASS_MEMBER_FIELD(__vwsn_precompile_9) + CLASS_MEMBER_FIELD(ViewModel) + CLASS_MEMBER_FIELD(buttonCancel) + CLASS_MEMBER_FIELD(buttonSignUp) + CLASS_MEMBER_FIELD(self) + CLASS_MEMBER_FIELD(textBoxPassword) + CLASS_MEMBER_FIELD(textBoxUserName) + END_CLASS_MEMBER(::helloworld::MainWindowConstructor) + + BEGIN_INTERFACE_MEMBER(::vm::IViewModel) + CLASS_MEMBER_METHOD(GetPassword, NO_PARAMETER) + CLASS_MEMBER_METHOD(GetPasswordError, NO_PARAMETER) + CLASS_MEMBER_METHOD(GetUserName, NO_PARAMETER) + CLASS_MEMBER_METHOD(GetUserNameError, NO_PARAMETER) + CLASS_MEMBER_METHOD(SetPassword, { L"value" }) + CLASS_MEMBER_METHOD(SetUserName, { L"value" }) + CLASS_MEMBER_METHOD(SignUp, NO_PARAMETER) + CLASS_MEMBER_EVENT(PasswordErrorChanged) + CLASS_MEMBER_EVENT(UserNameErrorChanged) + CLASS_MEMBER_PROPERTY(Password, GetPassword, SetPassword) + CLASS_MEMBER_PROPERTY_EVENT_READONLY(PasswordError, GetPasswordError, PasswordErrorChanged) + CLASS_MEMBER_PROPERTY(UserName, GetUserName, SetUserName) + CLASS_MEMBER_PROPERTY_EVENT_READONLY(UserNameError, GetUserNameError, UserNameErrorChanged) + END_INTERFACE_MEMBER(::vm::IViewModel) + +#undef _ + class HelloWorldTypeLoader : public Object, public ITypeLoader + { + public: + void Load(ITypeManager* manager) + { + ADD_TYPE_INFO(::helloworld::MainWindow) + ADD_TYPE_INFO(::helloworld::MainWindowConstructor) + ADD_TYPE_INFO(::vm::IViewModel) + } + + void Unload(ITypeManager* manager) + { + } + }; +#endif + + bool LoadHelloWorldTypes() + { +#ifndef VCZH_DEBUG_NO_REFLECTION + if (auto manager = GetGlobalTypeManager()) + { + return manager->AddTypeLoader(MakePtr()); + } +#endif + return false; + } + } + } +} + +#if defined( _MSC_VER) +#pragma warning(pop) +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#elif defined(__clang__) +#pragma clang diagnostic pop +#endif diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldReflection.h b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldReflection.h new file mode 100644 index 00000000..178dd806 --- /dev/null +++ b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldReflection.h @@ -0,0 +1,86 @@ +/*********************************************************************** +!!!!!! DO NOT MODIFY !!!!!! + +GacGen.exe Resource.xml + +This file is generated by Workflow compiler +https://github.com/vczh-libraries +***********************************************************************/ + +#ifndef VCZH_WORKFLOW_COMPILER_GENERATED_HELLOWORLDREFLECTION +#define VCZH_WORKFLOW_COMPILER_GENERATED_HELLOWORLDREFLECTION + +#include "HelloWorld.h" + +#if defined( _MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#elif defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wparentheses-equality" +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wparentheses-equality" +#endif + +/*********************************************************************** +Reflection +***********************************************************************/ + +namespace vl +{ + namespace reflection + { + namespace description + { +#ifndef VCZH_DEBUG_NO_REFLECTION + DECL_TYPE_INFO(::helloworld::MainWindow) + DECL_TYPE_INFO(::helloworld::MainWindowConstructor) + DECL_TYPE_INFO(::vm::IViewModel) + + BEGIN_INTERFACE_PROXY_NOPARENT_SHAREDPTR(::vm::IViewModel) + ::vl::WString GetPassword() override + { + INVOKEGET_INTERFACE_PROXY_NOPARAMS(GetPassword); + } + ::vl::WString GetPasswordError() override + { + INVOKEGET_INTERFACE_PROXY_NOPARAMS(GetPasswordError); + } + ::vl::WString GetUserName() override + { + INVOKEGET_INTERFACE_PROXY_NOPARAMS(GetUserName); + } + ::vl::WString GetUserNameError() override + { + INVOKEGET_INTERFACE_PROXY_NOPARAMS(GetUserNameError); + } + void SetPassword(const ::vl::WString& value) override + { + INVOKE_INTERFACE_PROXY(SetPassword, value); + } + void SetUserName(const ::vl::WString& value) override + { + INVOKE_INTERFACE_PROXY(SetUserName, value); + } + bool SignUp() override + { + INVOKEGET_INTERFACE_PROXY_NOPARAMS(SignUp); + } + END_INTERFACE_PROXY(::vm::IViewModel) +#endif + + extern bool LoadHelloWorldTypes(); + } + } +} + +#if defined( _MSC_VER) +#pragma warning(pop) +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#elif defined(__clang__) +#pragma clang diagnostic pop +#endif + +#endif diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/MainWindow.cpp b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/MainWindow.cpp index d74b9194..5ee9d9ab 100644 --- a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/MainWindow.cpp +++ b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/MainWindow.cpp @@ -8,6 +8,12 @@ https://github.com/vczh-libraries ***********************************************************************/ #include "HelloWorld.h" +/* CodePack:BeginIgnore() */ +#ifndef VCZH_DEBUG_NO_REFLECTION +/* CodePack:ConditionOff(VCZH_DEBUG_NO_REFLECTION, HelloWorldReflection.h) */ +#include "HelloWorldReflection.h" +#endif +/* CodePack:EndIgnore() */ #if defined( _MSC_VER) #pragma warning(push) @@ -71,7 +77,7 @@ namespace helloworld MainWindow::~MainWindow() { - this->FinalizeInstanceRecursively(static_cast<::vl::presentation::controls::GuiControl*>(this)); + this->FinalizeInstanceRecursively(static_cast<::vl::presentation::controls::GuiControlHost*>(this)); } } diff --git a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin index 9897e2fc..e66d61fd 100644 Binary files a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin and b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin differ diff --git a/Tutorial/GacUI_HelloWorlds/WorkflowScript/Main.cpp b/Tutorial/GacUI_HelloWorlds/WorkflowScript/Main.cpp index 72efcedf..649b4be9 100644 --- a/Tutorial/GacUI_HelloWorlds/WorkflowScript/Main.cpp +++ b/Tutorial/GacUI_HelloWorlds/WorkflowScript/Main.cpp @@ -1,6 +1,5 @@ #define GAC_HEADER_USE_NAMESPACE #include -#include using namespace vl::parsing; using namespace vl::collections; @@ -8,11 +7,6 @@ using namespace vl::workflow; using namespace vl::workflow::emitter; using namespace vl::workflow::runtime; -int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int CmdShow) -{ - return SetupWindowsDirect2DRenderer(); -} - const wchar_t* WorkflowScript = LR"workflow( module helloworld; diff --git a/Tutorial/GacUI_HelloWorlds/Xml/Main.cpp b/Tutorial/GacUI_HelloWorlds/Xml/Main.cpp index cd0b8500..514c2375 100644 --- a/Tutorial/GacUI_HelloWorlds/Xml/Main.cpp +++ b/Tutorial/GacUI_HelloWorlds/Xml/Main.cpp @@ -1,16 +1,10 @@ #define GAC_HEADER_USE_NAMESPACE #include -#include using namespace vl::collections; using namespace vl::stream; using namespace vl::reflection::description; -int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int CmdShow) -{ - return SetupWindowsDirect2DRenderer(); -} - void GuiMain() { { diff --git a/Tutorial/GacUI_HelloWorlds/Xml/UI/Codegen.bat b/Tutorial/GacUI_HelloWorlds/Xml/UI/Codegen.bat index 27f6654b..e13ce68e 100644 --- a/Tutorial/GacUI_HelloWorlds/Xml/UI/Codegen.bat +++ b/Tutorial/GacUI_HelloWorlds/Xml/UI/Codegen.bat @@ -1 +1 @@ -..\..\..\..\Tools\GacGen.exe Resource.xml \ No newline at end of file +%~dp0..\..\..\..\Tools\GacGen32.exe Resource.xml \ No newline at end of file diff --git a/Tutorial/Lib/GacUI/GacUI.vcxproj b/Tutorial/Lib/GacUI/GacUI.vcxproj index 265cb16d..93665dac 100644 --- a/Tutorial/Lib/GacUI/GacUI.vcxproj +++ b/Tutorial/Lib/GacUI/GacUI.vcxproj @@ -48,6 +48,7 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true + $(ProjectDir)\..\..\..\Import;%(AdditionalIncludeDirectories) Windows @@ -64,6 +65,7 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true + $(ProjectDir)\..\..\..\Import;%(AdditionalIncludeDirectories) Windows @@ -85,6 +87,8 @@ /bigobj %(AdditionalOptions) /bigobj %(AdditionalOptions) + + /bigobj %(AdditionalOptions) /bigobj %(AdditionalOptions) @@ -93,11 +97,14 @@ /bigobj %(AdditionalOptions) /bigobj %(AdditionalOptions) + + + diff --git a/Tutorial/Lib/GacUI/GacUI.vcxproj.filters b/Tutorial/Lib/GacUI/GacUI.vcxproj.filters index ef718e84..70f55a35 100644 --- a/Tutorial/Lib/GacUI/GacUI.vcxproj.filters +++ b/Tutorial/Lib/GacUI/GacUI.vcxproj.filters @@ -13,39 +13,63 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {734768e1-c731-4563-ba14-c7bbb5c7f618} + + + {c5fafe3e-a864-4ba7-aff3-fbe8ed6bb5bf} + + + {5734f06c-6ba0-4560-87c1-cf76e113fb9e} + - - Source Files - - Source Files + Import - Source Files + Import + + + Import - Source Files + Import + Import + + + Import\Skins\DarkSkin + + + Import\Skins\DarkSkin + + Source Files - - Header Files - - - Header Files - - Header Files + Import + + + Import - Header Files + Import - Header Files + Import + + + Import + + + Import\Skins\DarkSkin + + + Import\Skins\DarkSkin \ No newline at end of file diff --git a/Tutorial/Lib/GacUI/WinMain.cpp b/Tutorial/Lib/GacUI/WinMain.cpp new file mode 100644 index 00000000..79625b1d --- /dev/null +++ b/Tutorial/Lib/GacUI/WinMain.cpp @@ -0,0 +1,29 @@ +#define GAC_HEADER_USE_NAMESPACE +#include +#include +#include + +class DefaultSkinPlugin : public Object, public IGuiPlugin +{ +public: + + GUI_PLUGIN_NAME(Custom_DefaultSkinPlugin) + { + GUI_PLUGIN_DEPEND(GacGen_DarkSkinResourceLoader); + } + + void Load()override + { + RegisterTheme(L"DarkSkin", MakePtr()); + } + + void Unload()override + { + } +}; +GUI_REGISTER_PLUGIN(DefaultSkinPlugin) + +int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int CmdShow) +{ + return SetupWindowsDirect2DRenderer(); +} \ No newline at end of file diff --git a/Tutorial/Lib/GacUIComplete/GacUIComplete.vcxproj b/Tutorial/Lib/GacUIComplete/GacUIComplete.vcxproj index 23c76e83..7cc13cd4 100644 --- a/Tutorial/Lib/GacUIComplete/GacUIComplete.vcxproj +++ b/Tutorial/Lib/GacUIComplete/GacUIComplete.vcxproj @@ -48,6 +48,7 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true + $(ProjectDir)\..\..\..\Import;%(AdditionalIncludeDirectories) Windows @@ -64,6 +65,7 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true + $(ProjectDir)\..\..\..\Import;%(AdditionalIncludeDirectories) Windows diff --git a/Tutorial/Lib/GacUIComplete/GacUIComplete.vcxproj.filters b/Tutorial/Lib/GacUIComplete/GacUIComplete.vcxproj.filters index 15fbed41..c3cc0970 100644 --- a/Tutorial/Lib/GacUIComplete/GacUIComplete.vcxproj.filters +++ b/Tutorial/Lib/GacUIComplete/GacUIComplete.vcxproj.filters @@ -13,21 +13,24 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {ea79debf-3d39-4992-8c43-1eab2f841a12} + - Source Files + Import - Source Files + Import - Header Files + Import - Header Files + Import \ No newline at end of file diff --git a/Tutorial/Lib/GacUILite/GacUILite.vcxproj b/Tutorial/Lib/GacUILite/GacUILite.vcxproj index 6bde6607..fd3ddb65 100644 --- a/Tutorial/Lib/GacUILite/GacUILite.vcxproj +++ b/Tutorial/Lib/GacUILite/GacUILite.vcxproj @@ -48,6 +48,7 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);VCZH_DEBUG_NO_REFLECTION true + $(ProjectDir)\..\..\..\Import;%(AdditionalIncludeDirectories) Windows @@ -64,6 +65,7 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);VCZH_DEBUG_NO_REFLECTION true + $(ProjectDir)\..\..\..\Import;%(AdditionalIncludeDirectories) Windows @@ -81,14 +83,17 @@ /bigobj %(AdditionalOptions) /bigobj %(AdditionalOptions) + /bigobj %(AdditionalOptions) /bigobj %(AdditionalOptions) + + diff --git a/Tutorial/Lib/GacUILite/GacUILite.vcxproj.filters b/Tutorial/Lib/GacUILite/GacUILite.vcxproj.filters index 0152aabf..5a4603e6 100644 --- a/Tutorial/Lib/GacUILite/GacUILite.vcxproj.filters +++ b/Tutorial/Lib/GacUILite/GacUILite.vcxproj.filters @@ -13,27 +13,45 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {2aa0ec25-70cf-43d4-acd1-aa7b2cd15dd3} + + + {46a18e0a-a3f5-4b24-9dc3-085b70672874} + + + {db52dfa7-2aae-4d3d-a9a3-9441cdf9ba4d} + - - Source Files - - Source Files + Import + + + Import + Import + + + Import\Skins\DarkSkin + + Source Files - - Header Files - - Header Files + Import + + + Import - Header Files + Import + + + Import\Skins\DarkSkin \ No newline at end of file diff --git a/Tutorial/Lib/GacUILite/WinMain.cpp b/Tutorial/Lib/GacUILite/WinMain.cpp new file mode 100644 index 00000000..79625b1d --- /dev/null +++ b/Tutorial/Lib/GacUILite/WinMain.cpp @@ -0,0 +1,29 @@ +#define GAC_HEADER_USE_NAMESPACE +#include +#include +#include + +class DefaultSkinPlugin : public Object, public IGuiPlugin +{ +public: + + GUI_PLUGIN_NAME(Custom_DefaultSkinPlugin) + { + GUI_PLUGIN_DEPEND(GacGen_DarkSkinResourceLoader); + } + + void Load()override + { + RegisterTheme(L"DarkSkin", MakePtr()); + } + + void Unload()override + { + } +}; +GUI_REGISTER_PLUGIN(DefaultSkinPlugin) + +int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int CmdShow) +{ + return SetupWindowsDirect2DRenderer(); +} \ No newline at end of file