...

Import/GacUICompiler.h

@@ -798,9 +798,9 @@ Instance Binder
 		class IGuiInstanceDeserializer : public IDescriptable, public Description<IGuiInstanceDeserializer>
 		{
 		public:
-			virtual bool							CanDeserialize(description::ITypeInfo* typeInfo) = 0;
+			virtual bool							CanDeserialize(const IGuiInstanceLoader::PropertyInfo& propertyInfo, description::ITypeInfo* typeInfo) = 0;
-			virtual description::ITypeInfo*			DeserializeAs(description::ITypeInfo* typeInfo) = 0;
+			virtual description::ITypeInfo*			DeserializeAs(const IGuiInstanceLoader::PropertyInfo& propertyInfo, description::ITypeInfo* typeInfo) = 0;
-			virtual Ptr<workflow::WfExpression>		Deserialize(GuiResourcePrecompileContext& precompileContext, types::ResolvingResult& resolvingResult, description::ITypeInfo* typeInfo, Ptr<workflow::WfExpression> valueExpression, GuiResourceTextPos tagPosition, GuiResourceError::List& errors) = 0;
+			virtual Ptr<workflow::WfExpression>		Deserialize(GuiResourcePrecompileContext& precompileContext, types::ResolvingResult& resolvingResult, const IGuiInstanceLoader::PropertyInfo& propertyInfo, description::ITypeInfo* typeInfo, Ptr<workflow::WfExpression> valueExpression, GuiResourceTextPos tagPosition, GuiResourceError::List& errors) = 0;
 		};
 
 /***********************************************************************
@@ -810,24 +810,30 @@ Instance Loader Manager
 		class IGuiInstanceLoaderManager : public IDescriptable, public Description<IGuiInstanceLoaderManager>
 		{
 		public:
-			virtual bool								AddInstanceBinder(Ptr<IGuiInstanceBinder> binder) = 0;
+			virtual bool							AddInstanceBinder(Ptr<IGuiInstanceBinder> binder) = 0;
-			virtual IGuiInstanceBinder*					GetInstanceBinder(GlobalStringKey bindingName) = 0;
+			virtual IGuiInstanceBinder*				GetInstanceBinder(GlobalStringKey bindingName) = 0;
-			virtual bool								AddInstanceEventBinder(Ptr<IGuiInstanceEventBinder> binder) = 0;
+			virtual bool							AddInstanceEventBinder(Ptr<IGuiInstanceEventBinder> binder) = 0;
-			virtual IGuiInstanceEventBinder*			GetInstanceEventBinder(GlobalStringKey bindingName) = 0;
+			virtual IGuiInstanceEventBinder*		GetInstanceEventBinder(GlobalStringKey bindingName) = 0;
-			virtual bool								AddInstanceDeserializer(Ptr<IGuiInstanceDeserializer> deserializer) = 0;
+			virtual bool							AddInstanceDeserializer(Ptr<IGuiInstanceDeserializer> deserializer) = 0;
-			virtual IGuiInstanceDeserializer*			GetInstanceDeserializer(description::ITypeInfo* typeInfo) = 0;
+			virtual IGuiInstanceDeserializer*		GetInstanceDeserializer(const IGuiInstanceLoader::PropertyInfo& propertyInfo, description::ITypeInfo* typeInfo) = 0;
 
-			virtual bool								CreateVirtualType(GlobalStringKey parentType, Ptr<IGuiInstanceLoader> loader) = 0;
+			virtual bool							CreateVirtualType(GlobalStringKey parentType, Ptr<IGuiInstanceLoader> loader) = 0;
-			virtual bool								SetLoader(Ptr<IGuiInstanceLoader> loader) = 0;
+			virtual bool							SetLoader(Ptr<IGuiInstanceLoader> loader) = 0;
-			virtual IGuiInstanceLoader*					GetLoader(GlobalStringKey typeName) = 0;
+			virtual IGuiInstanceLoader*				GetLoader(GlobalStringKey typeName) = 0;
-			virtual IGuiInstanceLoader*					GetParentLoader(IGuiInstanceLoader* loader) = 0;
+			virtual IGuiInstanceLoader*				GetParentLoader(IGuiInstanceLoader* loader) = 0;
-			virtual Ptr<description::ITypeInfo>			GetTypeInfoForType(GlobalStringKey typeName) = 0;
+			virtual Ptr<description::ITypeInfo>		GetTypeInfoForType(GlobalStringKey typeName) = 0;
-			virtual void								GetVirtualTypes(collections::List<GlobalStringKey>& typeNames) = 0;
+			virtual void							GetVirtualTypes(collections::List<GlobalStringKey>& typeNames) = 0;
-			virtual GlobalStringKey						GetParentTypeForVirtualType(GlobalStringKey virtualType) = 0;
+			virtual GlobalStringKey					GetParentTypeForVirtualType(GlobalStringKey virtualType) = 0;
-			virtual void								ClearReflectionCache() = 0;
+			virtual void							ClearReflectionCache() = 0;
 		};
 
 		extern IGuiInstanceLoaderManager*			GetInstanceLoaderManager();
+
+/***********************************************************************
+Helper Functions
+***********************************************************************/
+
+		extern void									SplitBySemicolon(const WString& input, collections::List<WString>& fragments);
 	}
 }
 
@@ -1045,107 +1051,57 @@ namespace vl
 GuiVrtualTypeInstanceLoader
 ***********************************************************************/
 
-			template<typename TControl, typename TControlStyle, typename TTemplate>
+			template<typename TControl>
 			class GuiTemplateControlInstanceLoader : public Object, public IGuiInstanceLoader
 			{
-				typedef Ptr<WfExpression>				ArgumentRawFunctionType(ArgumentMap&);
+				typedef Ptr<WfExpression>							ArgumentRawFunctionType(ArgumentMap&);
-				typedef void							InitRawFunctionType(const WString&, Ptr<WfBlockStatement>);
+				typedef void										InitRawFunctionType(const WString&, Ptr<WfBlockStatement>);
-				typedef Func<ArgumentRawFunctionType>	ArgumentFunctionType;
+				typedef Func<ArgumentRawFunctionType>				ArgumentFunctionType;
-				typedef Func<InitRawFunctionType>		InitFunctionType;
+				typedef Func<InitRawFunctionType>					InitFunctionType;
 
 			protected:
 				GlobalStringKey								typeName;
-				WString										styleMethod;
+				theme::ThemeName							themeName;
 				ArgumentFunctionType						argumentFunction;
 				InitFunctionType							initFunction;
 
 				virtual void AddAdditionalArguments(types::ResolvingResult& resolvingResult, const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, GuiResourceError::List& errors, Ptr<WfNewClassExpression> createControl)
 				{
 				}
-
-				virtual void PrepareAdditionalArgumentsAfterCreation(types::ResolvingResult& resolvingResult, const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, GuiResourceError::List& errors, Ptr<WfBlockStatement> block)
-				{
-				}
 			public:
-
+				static Ptr<WfExpression> CreateThemeName(theme::ThemeName themeName)
-				static Ptr<WfExpression> CreateIThemeCall(const WString& method)
 				{
-					auto refPresentation = MakePtr<WfTopQualifiedExpression>();
+					auto presentationExpr = MakePtr<WfTopQualifiedExpression>();
-					refPresentation->name.value = L"presentation";
+					presentationExpr->name.value = L"presentation";
 
-					auto refTheme = MakePtr<WfChildExpression>();
+					auto themeExpr = MakePtr<WfChildExpression>();
-					refTheme->parent = refPresentation;
+					themeExpr->parent = presentationExpr;
-					refTheme->name.value = L"theme";
+					themeExpr->name.value = L"theme";
 
-					auto refITheme = MakePtr<WfChildExpression>();
+					auto themeNameExpr = MakePtr<WfChildExpression>();
-					refITheme->parent = refTheme;
+					themeNameExpr->parent = themeExpr;
-					refITheme->name.value = L"ITheme";
+					themeNameExpr->name.value = L"ThemeName";
 
-					auto refGetCurrentTheme = MakePtr<WfChildExpression>();
+					auto refExpr = MakePtr<WfChildExpression>();
-					refGetCurrentTheme->parent = refITheme;
+					refExpr->parent = themeNameExpr;
-					refGetCurrentTheme->name.value = L"GetCurrentTheme";
+					switch (themeName)
-
-					auto call = MakePtr<WfCallExpression>();
-					call->function = refGetCurrentTheme;
-
-					auto refStyleMethod = MakePtr<WfMemberExpression>();
-					refStyleMethod->parent = call;
-					refStyleMethod->name.value = method;
-
-					auto createStyle = MakePtr<WfCallExpression>();
-					createStyle->function = refStyleMethod;
-					return createStyle;
-				}
-
-				static Ptr<WfExpression> CreateStyleMethodArgument(const WString& method, ArgumentMap& arguments)
-				{
-					vint indexControlTemplate = arguments.Keys().IndexOf(GlobalStringKey::_ControlTemplate);
-					if (indexControlTemplate != -1)
 					{
-						auto refControlStyle = MakePtr<WfReferenceExpression>();
+#define THEME_NAME_CASE(TEMPLATE, CONTROL) case theme::ThemeName::CONTROL: refExpr->name.value = L ## #CONTROL; break;
-						refControlStyle->name.value = L"<controlStyle>";
+						GUI_CONTROL_TEMPLATE_TYPES(THEME_NAME_CASE)
-
+#undef THEME_NAME_CASE
-						auto refCreateArgument = MakePtr<WfMemberExpression>();
+					default:
-						refCreateArgument->parent = refControlStyle;
+						CHECK_FAIL(L"GuiTemplateControlInstanceLoader::CreateThemeName()#Unknown theme name.");
-						refCreateArgument->name.value = L"CreateArgument";
-
-						auto call = MakePtr<WfCallExpression>();
-						call->function = refCreateArgument;
-
-						return call;
-					}
-					else
-					{
-						return CreateIThemeCall(method);
 					}
+					return refExpr;
 				}
 
 			public:
-				GuiTemplateControlInstanceLoader(const WString& _typeName, const WString& _styleMethod)
+				GuiTemplateControlInstanceLoader(const WString& _typeName, theme::ThemeName _themeName, ArgumentRawFunctionType* _argumentFunction = nullptr, InitRawFunctionType* _initFunction = nullptr)
 					:typeName(GlobalStringKey::Get(_typeName))
-					, styleMethod(_styleMethod)
+					, themeName(_themeName)
-				{
-				}
-
-				GuiTemplateControlInstanceLoader(const WString& _typeName, const WString& _styleMethod, WString argumentStyleMethod)
-					:typeName(GlobalStringKey::Get(_typeName))
-					, styleMethod(_styleMethod)
-					, argumentFunction([argumentStyleMethod](ArgumentMap& arguments){return CreateStyleMethodArgument(argumentStyleMethod, arguments);})
-				{
-				}
-
-				GuiTemplateControlInstanceLoader(const WString& _typeName, const WString& _styleMethod, ArgumentRawFunctionType* _argumentFunction)
-					:typeName(GlobalStringKey::Get(_typeName))
-					, styleMethod(_styleMethod)
-					, argumentFunction(_argumentFunction)
-				{
-				}
-
-				GuiTemplateControlInstanceLoader(const WString& _typeName, const WString& _styleMethod, InitRawFunctionType* _initFunction)
-					:typeName(GlobalStringKey::Get(_typeName))
-					, styleMethod(_styleMethod)
-					, initFunction(_initFunction)
 				{
+					if (_argumentFunction) argumentFunction = _argumentFunction;
+					if (_initFunction) initFunction = _initFunction;
 				}
 
 				GlobalStringKey GetTypeName()override
@@ -1153,91 +1109,30 @@ GuiVrtualTypeInstanceLoader
 					return typeName;
 				}
 
-				void GetPropertyNames(const TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override
-				{
-					if (CanCreate(typeInfo))
-					{
-						propertyNames.Add(GlobalStringKey::_ControlTemplate);
-					}
-				}
-
-				Ptr<GuiInstancePropertyInfo> GetPropertyType(const PropertyInfo& propertyInfo)override
-				{
-					if (propertyInfo.propertyName == GlobalStringKey::_ControlTemplate)
-					{
-						auto info = GuiInstancePropertyInfo::Assign(TypeInfoRetriver<TemplateProperty<TTemplate>>::CreateTypeInfo());
-						info->usage = GuiInstancePropertyInfo::ConstructorArgument;
-						return info;
-					}
-					return 0;
-				}
-
 				bool CanCreate(const TypeInfo& typeInfo)override
 				{
 					return typeName == typeInfo.typeName;
 				}
 
-				Ptr<workflow::WfExpression> CreateInstance_ControlTemplate(types::ResolvingResult& resolvingResult, const TypeInfo& typeInfo, ArgumentMap& arguments, GuiResourceError::List& errors)
-				{
-					auto index = arguments.Keys().IndexOf(GlobalStringKey::_ControlTemplate);
-					if (index != -1)
-					{
-						auto argument = arguments.GetByIndex(index)[0];
-
-						auto createStyle = MakePtr<WfNewClassExpression>();
-						createStyle->type = GetTypeFromTypeInfo(TypeInfoRetriver<TControlStyle*>::CreateTypeInfo().Obj());
-						createStyle->arguments.Add(argument.expression);
-
-						return createStyle;
-					}
-					return CreateIThemeCall(styleMethod);
-				}
-
 				Ptr<workflow::WfBaseConstructorCall> CreateRootInstance(GuiResourcePrecompileContext& precompileContext, types::ResolvingResult& resolvingResult, const TypeInfo& typeInfo, ArgumentMap& arguments, GuiResourceError::List& errors)override
 				{
-					if (auto createStyleExpr = CreateInstance_ControlTemplate(resolvingResult, typeInfo, arguments, errors))
+					auto createControl = MakePtr<WfBaseConstructorCall>();
-					{
+					createControl->type = GetTypeFromTypeInfo(TypeInfoRetriver<TControl>::CreateTypeInfo().Obj());
-						auto createControl = MakePtr<WfBaseConstructorCall>();
+					createControl->arguments.Add(CreateThemeName(themeName));
-						createControl->type = GetTypeFromTypeInfo(TypeInfoRetriver<TControl>::CreateTypeInfo().Obj());
+					return createControl;
-						createControl->arguments.Add(createStyleExpr);
-						return createControl;
-					}
-					return nullptr;
 				}
 
 				Ptr<workflow::WfStatement> CreateInstance(GuiResourcePrecompileContext& precompileContext, types::ResolvingResult& resolvingResult, const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, GuiResourceTextPos tagPosition, GuiResourceError::List& errors)override
 				{
-					CHECK_ERROR(CanCreate(typeInfo), L"GuiTemplateControlInstanceLoader::CreateInstance# Wrong type info is provided.");
+					CHECK_ERROR(CanCreate(typeInfo), L"GuiTemplateControlInstanceLoader::CreateInstance()#Wrong type info is provided.");
-					vint indexControlTemplate = arguments.Keys().IndexOf(GlobalStringKey::_ControlTemplate);
-
-					auto createStyleExpr = CreateInstance_ControlTemplate(resolvingResult, typeInfo, arguments, errors);
-					if (!createStyleExpr)
-					{
-						return nullptr;
-					}
 
 					auto block = MakePtr<WfBlockStatement>();
-					{
-						auto varTemplate = MakePtr<WfVariableDeclaration>();
-						varTemplate->name.value = L"<controlStyle>";
-						varTemplate->expression = createStyleExpr;
-
-						auto varStat = MakePtr<WfVariableStatement>();
-						varStat->variable = varTemplate;
-						block->statements.Add(varStat);
-					}
-
 					{
 						auto controlType = TypeInfoRetriver<TControl*>::CreateTypeInfo();
 
 						auto createControl = MakePtr<WfNewClassExpression>();
 						createControl->type = GetTypeFromTypeInfo(controlType.Obj());
-						{
+						createControl->arguments.Add(CreateThemeName(themeName));
-							auto refControlStyle = MakePtr<WfReferenceExpression>();
-							refControlStyle->name.value = L"<controlStyle>";
-
-							createControl->arguments.Add(refControlStyle);
-						}
 
 						if (argumentFunction)
 						{
@@ -1258,7 +1153,6 @@ GuiVrtualTypeInstanceLoader
 						block->statements.Add(assignStat);
 					}
 
-					PrepareAdditionalArgumentsAfterCreation(resolvingResult, typeInfo, variableName, arguments, errors, block);
 					if (initFunction)
 					{
 						initFunction(variableName.ToString(), block);

Import/GacUIReflection.h

@@ -257,9 +257,12 @@ Type List (Templates)
 			F(presentation::controls::ButtonState)\
 			F(presentation::controls::ColumnSortingState)\
 			F(presentation::templates::BoolOption)\
+			F(presentation::controls::ITextBoxCommandExecutor)\
 			F(presentation::controls::IComboBoxCommandExecutor)\
 			F(presentation::controls::IScrollCommandExecutor)\
 			F(presentation::controls::ITabCommandExecutor)\
+			F(presentation::controls::IDatePickerCommandExecutor)\
+			F(presentation::controls::IScrollViewCommandExecutor)\
 			F(presentation::controls::GuiComponent)\
 			F(presentation::controls::GuiInstanceRootObject)\
 			F(presentation::templates::GuiTemplate)\
@@ -278,6 +281,7 @@ Type List (Templates)
 			F(presentation::templates::GuiComboBoxTemplate)\
 			F(presentation::templates::GuiScrollTemplate)\
 			F(presentation::templates::GuiScrollViewTemplate)\
+			F(presentation::templates::GuiListControlTemplate)\
 			F(presentation::templates::GuiTextListTemplate)\
 			F(presentation::templates::GuiListViewTemplate)\
 			F(presentation::templates::GuiTreeViewTemplate)\
@@ -290,27 +294,6 @@ Type List (Templates)
 			F(presentation::templates::GuiGridCellTemplate)\
 			F(presentation::templates::GuiGridVisualizerTemplate)\
 			F(presentation::templates::GuiGridEditorTemplate)\
-			F(presentation::templates::GuiControlTemplate_StyleProvider)\
-			F(presentation::templates::GuiLabelTemplate_StyleProvider)\
-			F(presentation::templates::GuiSinglelineTextBoxTemplate_StyleProvider)\
-			F(presentation::templates::GuiDocumentLabelTemplate_StyleProvider)\
-			F(presentation::templates::GuiMultilineTextBoxTemplate_StyleProvider)\
-			F(presentation::templates::GuiDocumentViewerTemplate_StyleProvider)\
-			F(presentation::templates::GuiMenuTemplate_StyleProvider)\
-			F(presentation::templates::GuiWindowTemplate_StyleProvider)\
-			F(presentation::templates::GuiButtonTemplate_StyleProvider)\
-			F(presentation::templates::GuiSelectableButtonTemplate_StyleProvider)\
-			F(presentation::templates::GuiToolstripButtonTemplate_StyleProvider)\
-			F(presentation::templates::GuiListViewColumnHeaderTemplate_StyleProvider)\
-			F(presentation::templates::GuiComboBoxTemplate_StyleProvider)\
-			F(presentation::templates::GuiDatePickerTemplate_StyleProvider)\
-			F(presentation::templates::GuiDateComboBoxTemplate_StyleProvider)\
-			F(presentation::templates::GuiScrollTemplate_StyleProvider)\
-			F(presentation::templates::GuiScrollViewTemplate_StyleProvider)\
-			F(presentation::templates::GuiTextListTemplate_StyleProvider)\
-			F(presentation::templates::GuiListViewTemplate_StyleProvider)\
-			F(presentation::templates::GuiTreeViewTemplate_StyleProvider)\
-			F(presentation::templates::GuiTabTemplate_StyleProvider)\
 
 /***********************************************************************
 Type List (Controls)
@@ -318,6 +301,7 @@ Type List (Controls)
 
 #define GUIREFLECTIONCONTROLS_TYPELIST(F)\
 			F(presentation::controls::GuiApplication)\
+			F(presentation::theme::ThemeName)\
 			F(presentation::theme::ITheme)\
 			F(presentation::theme::ThemeTemplates)\
 			F(presentation::controls::GuiDialogBase)\
@@ -328,32 +312,22 @@ Type List (Controls)
 			F(presentation::controls::GuiOpenFileDialog)\
 			F(presentation::controls::GuiSaveFileDialog)\
 			F(presentation::controls::GuiControl)\
-			F(presentation::controls::GuiControl::IStyleController)\
-			F(presentation::controls::GuiControl::IStyleProvider)\
 			F(presentation::controls::GuiCustomControl)\
 			F(presentation::controls::GuiLabel)\
-			F(presentation::controls::GuiLabel::IStyleController)\
 			F(presentation::controls::GuiButton)\
-			F(presentation::controls::GuiButton::IStyleController)\
 			F(presentation::controls::GuiSelectableButton)\
-			F(presentation::controls::GuiSelectableButton::IStyleController)\
 			F(presentation::controls::GuiSelectableButton::GroupController)\
 			F(presentation::controls::GuiSelectableButton::MutexGroupController)\
 			F(presentation::controls::GuiScroll)\
-			F(presentation::controls::GuiScroll::IStyleController)\
 			F(presentation::controls::GuiTabPage)\
 			F(presentation::controls::GuiTab)\
-			F(presentation::controls::GuiTab::IStyleController)\
 			F(presentation::controls::GuiScrollView)\
-			F(presentation::controls::GuiScrollView::IStyleProvider)\
 			F(presentation::controls::GuiScrollContainer)\
 			F(presentation::controls::GuiControlHost)\
 			F(presentation::controls::GuiWindow)\
-			F(presentation::controls::GuiWindow::IStyleController)\
 			F(presentation::controls::GuiPopup)\
 			F(presentation::controls::GuiTooltip)\
 			F(presentation::controls::GuiListControl)\
-			F(presentation::controls::GuiListControl::IStyleProvider)\
 			F(presentation::controls::GuiListControl::IItemProviderCallback)\
 			F(presentation::controls::GuiListControl::IItemArrangerCallback)\
 			F(presentation::controls::GuiListControl::IItemProvider)\
@@ -368,12 +342,9 @@ Type List (Controls)
 			F(presentation::controls::list::TextItem)\
 			F(presentation::controls::TextListView)\
 			F(presentation::controls::GuiVirtualTextList)\
-			F(presentation::controls::GuiVirtualTextList::IStyleProvider)\
 			F(presentation::controls::GuiTextList)\
 			F(presentation::controls::GuiListViewColumnHeader)\
-			F(presentation::controls::GuiListViewColumnHeader::IStyleController)\
 			F(presentation::controls::GuiListViewBase)\
-			F(presentation::controls::GuiListViewBase::IStyleProvider)\
 			F(presentation::controls::list::IListViewItemView)\
 			F(presentation::controls::list::ListViewColumnItemArranger)\
 			F(presentation::controls::list::ListViewColumnItemArranger::IColumnItemViewCallback)\
@@ -388,7 +359,6 @@ Type List (Controls)
 			F(presentation::controls::GuiMenu)\
 			F(presentation::controls::GuiMenuBar)\
 			F(presentation::controls::GuiMenuButton)\
-			F(presentation::controls::GuiMenuButton::IStyleController)\
 			F(presentation::controls::tree::INodeProviderCallback)\
 			F(presentation::controls::tree::INodeProvider)\
 			F(presentation::controls::tree::INodeRootProvider)\
@@ -401,12 +371,9 @@ Type List (Controls)
 			F(presentation::controls::tree::TreeViewItem)\
 			F(presentation::controls::tree::TreeViewItemRootProvider)\
 			F(presentation::controls::GuiVirtualTreeView)\
-			F(presentation::controls::GuiVirtualTreeView::IStyleProvider)\
 			F(presentation::controls::GuiTreeView)\
 			F(presentation::controls::GuiComboBoxBase)\
-			F(presentation::controls::GuiComboBoxBase::IStyleController)\
 			F(presentation::controls::GuiComboBoxListControl)\
-			F(presentation::controls::GuiComboBoxListControl::IStyleController)\
 			F(presentation::controls::GuiToolstripCommand)\
 			F(presentation::controls::GuiToolstripMenu)\
 			F(presentation::controls::GuiToolstripMenuBar)\
@@ -416,13 +383,10 @@ Type List (Controls)
 			F(presentation::controls::GuiDocumentCommonInterface)\
 			F(presentation::controls::GuiDocumentCommonInterface::EditMode)\
 			F(presentation::controls::GuiDocumentViewer)\
-			F(presentation::controls::GuiDocumentViewer::IStyleProvider)\
 			F(presentation::controls::GuiDocumentLabel)\
-			F(presentation::controls::GuiDocumentLabel::IStyleController)\
 			F(presentation::controls::GuiTextBoxCommonInterface)\
 			F(presentation::controls::GuiMultilineTextBox)\
 			F(presentation::controls::GuiSinglelineTextBox)\
-			F(presentation::controls::GuiSinglelineTextBox::IStyleProvider)\
 			F(presentation::controls::list::IDataGridContext)\
 			F(presentation::controls::list::IDataVisualizerFactory)\
 			F(presentation::controls::list::IDataVisualizer)\
@@ -439,7 +403,6 @@ Type List (Controls)
 			F(presentation::controls::list::HyperlinkVisualizerTemplate)\
 			F(presentation::controls::list::CellBorderVisualizerTemplate)\
 			F(presentation::controls::GuiDatePicker)\
-			F(presentation::controls::GuiDatePicker::IStyleProvider)\
 			F(presentation::controls::GuiDateComboBox)\
 			F(presentation::controls::GuiBindableTextList)\
 			F(presentation::controls::GuiBindableListView)\
@@ -1050,9 +1013,9 @@ Interface Proxy (Controls)
 					INVOKEGET_INTERFACE_PROXY_NOPARAMS(GetItemProvider);
 				}
 
-				presentation::controls::GuiListViewBase::IStyleProvider* GetListViewStyleProvider()override
+				presentation::templates::GuiListViewTemplate* GetListViewControlTemplate()override
 				{
-					INVOKEGET_INTERFACE_PROXY_NOPARAMS(GetListViewStyleProvider);
+					INVOKEGET_INTERFACE_PROXY_NOPARAMS(GetListViewControlTemplate);
 				}
 
 				presentation::description::Value GetViewModelContext()override

Import/Import.bat

@@ -1,11 +0,0 @@
-pushd %~dp0
-mkdir Skins
-mkdir Skins\DarkSkin
-copy ..\..\Vlpp\Release\*.h .
-copy ..\..\Vlpp\Release\*.cpp .
-copy ..\..\Workflow\Release\*.h .
-copy ..\..\Workflow\Release\*.cpp .
-copy ..\..\GacUI\Release\Gac*.h .
-copy ..\..\GacUI\Release\Gac*.cpp .
-copy ..\..\GacUI\Release\DarkSkin* .\Skins\DarkSkin\
-popd

Tools/Deploy.bat

@@ -1,10 +0,0 @@
-pushd %~dp0
-copy ..\..\Tools\Tools\ParserGen.exe .
-copy ..\..\Tools\Tools\GacGen32.exe .
-copy ..\..\Tools\Tools\GacGen64.exe .
-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 .
-popd

Tools/GacGen.bat

@@ -1,16 +0,0 @@
-del *.wait.tmp
-start %~dp0RunAndLock %RANDOM% "%~dp0GacGen32.exe /P %1"
-start %~dp0RunAndLock %RANDOM% "%~dp0GacGen64.exe /P %1"
-call %~dp0WaitForLock
-
-@if exist %1.log\x32\Error.txt (
-	@echo "Error occurs: %1.log\x32\Error.txt"
-	@exit
-)
-
-@if exist %1.log\x64\Error.txt (
-	@echo "Error occurs: %1.log\x64\Error.txt"
-	@exit
-)
-
-call %~dp0GacMerge %1

Tools/GacGen.ps1

@@ -0,0 +1,27 @@
+param (
+    [String]$FileName
+)
+Write-Host "Compiling GacUI Resource: $FileName ..."
+$gacgen_32 = Start-Process "$PSScriptRoot\GacGen32.exe" -ArgumentList "/P $FileName" -PassThru
+$gacgen_64 = Start-Process "$PSScriptRoot\GacGen64.exe" -ArgumentList "/P $FileName" -PassThru
+$gacgen_32.WaitForExit()
+$gacgen_64.WaitForExit()
+
+if (Test-Path -Path "$($FileName).log\x32\Error.txt") {
+    throw "Failed to compile GacUI Resource (x86): $FileName"
+}
+if (Test-Path -Path "$($FileName).log\x64\Error.txt") {
+    throw "Failed to compile GacUI Resource (x64): $FileName"
+}
+    
+$output_folder = Get-Content "$($FileName).log\x32\CppOutput.txt"
+$x32_folder = "$($FileName).log\x32\Source"
+$x64_folder = "$($FileName).log\x64\Source"
+if (!(Test-Path -Path $output_folder)) {
+    New-Item $output_folder -ItemType directory | Out-Null
+}
+Get-ChildItem -Path $output_folder -ErrorAction SilentlyContinue | %{
+    Write-Host "    Merging C++ Source File: $($_.Name) ..."
+    $cppmerge = Start-Process "$PSScriptRoot\CppMerge.exe" -ArgumentList "/P `"$x32_folder\$($_.Name)`" `"$x64_folder\$($_.Name)`" `"$output_folder\$($_.Name)`"" -PassThru
+    $cppmerge.WaitForExit();
+}

Tools/GacMerge.bat

@@ -1,8 +0,0 @@
-@set /P CppOutput=< %1.log\x32\CppOutput.txt
-@for %%i in (%1.log\x32\Source\*.*) do @(
-	echo Processing %%~nxi ...
-	%~dp0CppMerge.exe %1.log\x32\Source\%%~nxi %1.log\x64\Source\%%~nxi %CppOutput%\%%~nxi
-)
-@if exist %1.log\x32\Deploy.bat @ (
-	call %1.log\x32\Deploy.bat
-)

Tools/RunAndLock.bat

@@ -1,4 +0,0 @@
-echo > %1.wait.tmp
-call %~2
-del %1.wait.tmp
-exit

Tools/WaitForLock.bat

@@ -1,6 +0,0 @@
-@timeout 1 > nul
-:wait_for_lock
-@if not exist *.wait.tmp goto :finish_lock
-	@timeout 1 > nul
-@goto wait_for_lock
-:finish_lock

Tutorial/GacUI_ControlTemplate/BlackSkin/UI/Codegen.bat

@@ -1,6 +0,0 @@
-pushd %~dp0
-rmdir /S /Q FullControlTest
-robocopy ..\..\..\..\..\GacUI\Test\GacUISrc\Host\Resources\FullControlTest FullControlTest /E
-mkdir FullControlTest\Source
-call ..\..\..\..\Tools\GacGen FullControlTest\Resource.xml
-popd

Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/RepeatTabPage.xml

@@ -85,22 +85,28 @@
           <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
           <att.Pages>
             <TabPage Text="RepeatStack" Alt="S">
-              <RepeatStack ref.Name="repeatStack" AlignmentToParent="left:0 top:0 right:0 bottom:0">
+              <ScrollContainer ExtendToFullWidth="true" HorizontalAlwaysVisible="false">
-                <att.Direction>Vertical</att.Direction>
+                <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
-                <att.Padding>5</att.Padding>
+                <RepeatStack ref.Name="repeatStack" AlignmentToParent="left:0 top:0 right:0 bottom:0" MinSizeLimitation="LimitToElementAndChildren">
-                <att.ExtraMargin>left:5 top:5 right:5 bottom:5</att.ExtraMargin>
+                  <att.Direction>Vertical</att.Direction>
-                <att.ItemTemplate>demo::RepeatItemTemplate</att.ItemTemplate>
+                  <att.Padding>5</att.Padding>
-                <att.ItemSource-eval>self.itemsToBind</att.ItemSource-eval>
+                  <att.ExtraMargin>left:5 top:5 right:5 bottom:5</att.ExtraMargin>
-              </RepeatStack>
+                  <att.ItemTemplate>demo::RepeatItemTemplate</att.ItemTemplate>
+                  <att.ItemSource-eval>self.itemsToBind</att.ItemSource-eval>
+                </RepeatStack>
+              </ScrollContainer>
             </TabPage>
             <TabPage Text="RepeatFlow" Alt="F">
-              <RepeatFlow ref.Name="repeatFlow" AlignmentToParent="left:0 top:0 right:0 bottom:0">
+              <ScrollContainer ExtendToFullWidth="true" HorizontalAlwaysVisible="false">
-                <att.RowPadding>5</att.RowPadding>
+                <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
-                <att.ColumnPadding>5</att.ColumnPadding>
+                <RepeatFlow ref.Name="repeatFlow" AlignmentToParent="left:0 top:0 right:0 bottom:0" MinSizeLimitation="LimitToElementAndChildren">
-                <att.ExtraMargin>left:5 top:5 right:5 bottom:5</att.ExtraMargin>
+                  <att.RowPadding>5</att.RowPadding>
-                <att.ItemTemplate>demo::RepeatItemTemplate</att.ItemTemplate>
+                  <att.ColumnPadding>5</att.ColumnPadding>
-                <att.ItemSource-eval>self.itemsToBind</att.ItemSource-eval>
+                  <att.ExtraMargin>left:5 top:5 right:5 bottom:5</att.ExtraMargin>
-              </RepeatFlow>
+                  <att.ItemTemplate>demo::RepeatItemTemplate</att.ItemTemplate>
+                  <att.ItemSource-eval>self.itemsToBind</att.ItemSource-eval>
+                </RepeatFlow>
+              </ScrollContainer>
             </TabPage>
           </att.Pages>
         </Tab>

Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/Demo.h

@@ -1,16 +0,0 @@
-/***********************************************************************
-!!!!!! DO NOT MODIFY !!!!!!
-
-GacGen.exe Resource.xml
-
-This file is generated by Workflow compiler
-https://github.com/vczh-libraries
-***********************************************************************/
-
-#ifndef VCZH_WORKFLOW_COMPILER_GENERATED_DEMO
-#define VCZH_WORKFLOW_COMPILER_GENERATED_DEMO
-
-#include "DemoPartialClasses.h"
-#include "MainWindow.h"
-
-#endif

Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoReflection.h

@@ -1,98 +0,0 @@
-/***********************************************************************
-!!!!!! DO NOT MODIFY !!!!!!
-
-GacGen.exe Resource.xml
-
-This file is generated by Workflow compiler
-https://github.com/vczh-libraries
-***********************************************************************/
-
-#ifndef VCZH_WORKFLOW_COMPILER_GENERATED_DEMOREFLECTION
-#define VCZH_WORKFLOW_COMPILER_GENERATED_DEMOREFLECTION
-
-#include "Demo.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(::demo::CategoryDisplayer)
-			DECL_TYPE_INFO(::demo::CategoryDisplayerConstructor)
-			DECL_TYPE_INFO(::demo::CategoryEditor)
-			DECL_TYPE_INFO(::demo::CategoryEditorConstructor)
-			DECL_TYPE_INFO(::demo::CategoryItemTemplate)
-			DECL_TYPE_INFO(::demo::CategoryItemTemplateConstructor)
-			DECL_TYPE_INFO(::demo::CategoryVisualizer)
-			DECL_TYPE_INFO(::demo::CategoryVisualizerConstructor)
-			DECL_TYPE_INFO(::demo::DataGridTabPage)
-			DECL_TYPE_INFO(::demo::DataGridTabPageConstructor)
-			DECL_TYPE_INFO(::demo::DateEditor)
-			DECL_TYPE_INFO(::demo::DateEditorConstructor)
-			DECL_TYPE_INFO(::demo::DateFilter)
-			DECL_TYPE_INFO(::demo::DateFilterConstructor)
-			DECL_TYPE_INFO(::demo::DocumentTabPage)
-			DECL_TYPE_INFO(::demo::DocumentTabPageConstructor)
-			DECL_TYPE_INFO(::demo::GenderDisplayer)
-			DECL_TYPE_INFO(::demo::GenderDisplayerConstructor)
-			DECL_TYPE_INFO(::demo::GenderEditor)
-			DECL_TYPE_INFO(::demo::GenderEditorConstructor)
-			DECL_TYPE_INFO(::demo::GenderItemTemplate)
-			DECL_TYPE_INFO(::demo::GenderItemTemplateConstructor)
-			DECL_TYPE_INFO(::demo::GenderVisualizer)
-			DECL_TYPE_INFO(::demo::GenderVisualizerConstructor)
-			DECL_TYPE_INFO(::demo::HyperlinkWindow)
-			DECL_TYPE_INFO(::demo::HyperlinkWindowConstructor)
-			DECL_TYPE_INFO(::demo::ListViewTabPage)
-			DECL_TYPE_INFO(::demo::ListViewTabPageConstructor)
-			DECL_TYPE_INFO(::demo::MainWindow)
-			DECL_TYPE_INFO(::demo::MainWindowConstructor)
-			DECL_TYPE_INFO(::demo::MyCategory)
-			DECL_TYPE_INFO(::demo::MyDataItem)
-			DECL_TYPE_INFO(::demo::MyGender)
-			DECL_TYPE_INFO(::demo::MyTextItem)
-			DECL_TYPE_INFO(::demo::RepeatItemTemplate)
-			DECL_TYPE_INFO(::demo::RepeatItemTemplateConstructor)
-			DECL_TYPE_INFO(::demo::RepeatTabPage)
-			DECL_TYPE_INFO(::demo::RepeatTabPageConstructor)
-			DECL_TYPE_INFO(::demo::TextBoxTabPage)
-			DECL_TYPE_INFO(::demo::TextBoxTabPageConstructor)
-			DECL_TYPE_INFO(::demo::TextEditor)
-			DECL_TYPE_INFO(::demo::TextEditorConstructor)
-			DECL_TYPE_INFO(::demo::TextListTabPage)
-			DECL_TYPE_INFO(::demo::TextListTabPageConstructor)
-			DECL_TYPE_INFO(::demo::TreeViewTabPage)
-			DECL_TYPE_INFO(::demo::TreeViewTabPageConstructor)
-#endif
-
-			extern bool LoadDemoTypes();
-		}
-	}
-}
-
-#if defined( _MSC_VER)
-#pragma warning(pop)
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-#endif

Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/MainWindow.cpp

@@ -1,66 +0,0 @@
-/***********************************************************************
-!!!!!! DO NOT MODIFY !!!!!!
-
-GacGen.exe Resource.xml
-
-This file is generated by Workflow compiler
-https://github.com/vczh-libraries
-***********************************************************************/
-
-#include "Demo.h"
-/* CodePack:BeginIgnore() */
-#ifndef VCZH_DEBUG_NO_REFLECTION
-/* CodePack:ConditionOff(VCZH_DEBUG_NO_REFLECTION, DemoReflection.h) */
-#include "DemoReflection.h"
-#endif
-/* CodePack:EndIgnore() */
-
-#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
-
-#define GLOBAL_SYMBOL ::vl_workflow_global::Demo::
-#define GLOBAL_NAME ::vl_workflow_global::Demo::Instance().
-#define GLOBAL_OBJ &::vl_workflow_global::Demo::Instance()
-#define USERIMPL(...)
-
-/***********************************************************************
-Class (::demo::MainWindow)
-***********************************************************************/
-
-namespace demo
-{
-	MainWindow::MainWindow()
-		: ::vl::presentation::controls::GuiWindow(::vl::__vwsn::This(::vl::presentation::theme::GetCurrentTheme())->CreateWindowStyle())
-	{
-		auto __vwsn_resource_ = ::vl::__vwsn::This(::vl::presentation::GetResourceManager())->GetResourceFromClassName(::vl::WString(L"demo::MainWindow", false));
-		auto __vwsn_resolver_ = ::vl::Ptr<::vl::presentation::GuiResourcePathResolver>(new ::vl::presentation::GuiResourcePathResolver(__vwsn_resource_, ::vl::__vwsn::This(__vwsn_resource_.Obj())->GetWorkingDirectory()));
-		::vl::__vwsn::This(this)->SetResourceResolver(__vwsn_resolver_);
-		::vl::__vwsn::This(this)->__vwsn_initialize_instance_(this);
-	}
-
-	MainWindow::~MainWindow()
-	{
-		this->FinalizeInstanceRecursively(static_cast<::vl::presentation::controls::GuiControlHost*>(this));
-	}
-
-}
-#undef GLOBAL_SYMBOL
-#undef GLOBAL_NAME
-#undef GLOBAL_OBJ
-#undef USERIMPL
-
-#if defined( _MSC_VER)
-#pragma warning(pop)
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#endif

Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/MainWindow.h

@@ -1,48 +0,0 @@
-/***********************************************************************
-!!!!!! DO NOT MODIFY !!!!!!
-
-GacGen.exe Resource.xml
-
-This file is generated by Workflow compiler
-https://github.com/vczh-libraries
-***********************************************************************/
-
-#ifndef VCZH_WORKFLOW_COMPILER_GENERATED_MAINWINDOW
-#define VCZH_WORKFLOW_COMPILER_GENERATED_MAINWINDOW
-
-#include "DemoPartialClasses.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
-
-namespace demo
-{
-	class MainWindow : public ::vl::presentation::controls::GuiWindow, public ::demo::MainWindowConstructor, public ::vl::reflection::Description<MainWindow>
-	{
-		friend class ::demo::MainWindowConstructor;
-#ifndef VCZH_DEBUG_NO_REFLECTION
-		friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<MainWindow>;
-#endif
-	public:
-		MainWindow();
-		~MainWindow();
-	};
-
-}
-#if defined( _MSC_VER)
-#pragma warning(pop)
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-#endif

Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/TextBoxTabPage.xml

@@ -142,7 +142,7 @@ So as I pray, unlimited blade works.]]>
                     </Cell>
 
                     <Cell Site="row:1 column:0">
-                      <MultilineTextBox ref.Name="textBoxM" Text-uri="res://TextBoxComponents/Text" Alt="M">
+                      <MultilineTextBox ref.Name="textBoxM" Text-uri="res://TextBoxComponents/Text" Alt="M" HorizontalAlwaysVisible="false" VerticalAlwaysVisible="false">
                         <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
                       </MultilineTextBox>
                     </Cell>

Tutorial/GacUI_Controls/AddressBook/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_Controls/ColorPicker/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_Controls/ContainersAndButtons/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_Controls/DataGrid/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_Controls/DocumentEditor/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_Controls/ListControls/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_Controls/ProgressAndAsync/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_Controls/TextEditor/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_HelloWorlds/CppXml/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.cpp

@@ -64,20 +64,19 @@ 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::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }());
+			::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_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)->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)->SetText(::vl::WString(L"Hello, world!", false));
 		}
 		{
-			auto __vwsn_controlStyle_ = ::vl::__vwsn::This(::vl::presentation::theme::GetCurrentTheme())->CreateLabelStyle();
+			(this->__vwsn_precompile_1 = new ::vl::presentation::controls::GuiLabel(::vl::presentation::theme::ThemeName::Label));
-			(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::vint>(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::vint32_t>(32); __vwsn_temp__.antialias = true; return __vwsn_temp__; }());
 		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_1)->SetText(::vl::WString(L"Welcome to GacUI Library!", false));
@@ -96,7 +95,7 @@ Class (::helloworld::MainWindow)
 ***********************************************************************/
 
 	MainWindow::MainWindow()
-		: ::vl::presentation::controls::GuiWindow(::vl::__vwsn::This(::vl::presentation::theme::GetCurrentTheme())->CreateWindowStyle())
+		: ::vl::presentation::controls::GuiWindow(::vl::presentation::theme::ThemeName::Window)
 	{
 		auto __vwsn_resource_ = ::vl::__vwsn::This(::vl::presentation::GetResourceManager())->GetResourceFromClassName(::vl::WString(L"helloworld::MainWindow", false));
 		auto __vwsn_resolver_ = ::vl::Ptr<::vl::presentation::GuiResourcePathResolver>(new ::vl::presentation::GuiResourcePathResolver(__vwsn_resource_, ::vl::__vwsn::This(__vwsn_resource_.Obj())->GetWorkingDirectory()));

Tutorial/GacUI_HelloWorlds/MVVM/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.cpp

@@ -494,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::vint>(320); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }());
+			::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>(320); 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__; }());
+			::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>(320); return __vwsn_temp__; }());
 		}
 		(this->__vwsn_precompile_18 = ::vl::__vwsn::This(this->self)->GetViewModel());
 		{
@@ -505,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::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)->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)->SetCellPadding(::vl::__vwsn::Parse<::vl::vint>(::vl::WString(L"5", false)));
+			::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)->SetRowsAndColumns(static_cast<::vl::vint>(8), static_cast<::vl::vint>(2));
+			::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::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::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::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::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::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::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::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::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::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::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::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::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::vint>(6), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::Percentage; __vwsn_temp__.percentage = static_cast<double>(1.0); 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<double>(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)->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::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::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::vint>(1), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::Percentage; __vwsn_temp__.percentage = static_cast<double>(1.0); 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<double>(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::vint>(0), static_cast<::vl::vint>(0), static_cast<::vl::vint>(1), static_cast<::vl::vint>(2));
+			::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));
 		}
 		(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::vint>(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::vint32_t>(40); __vwsn_temp__.antialias = true; return __vwsn_temp__; }());
 		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_2.Obj())->SetVerticalAlignment(::vl::presentation::Alignment::Center);
@@ -548,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::vint>(1), static_cast<::vl::vint>(0), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1));
+			::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));
 		}
 		(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::vint>(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::vint32_t>(12); __vwsn_temp__.antialias = true; return __vwsn_temp__; }());
 		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_4.Obj())->SetVerticalAlignment(::vl::presentation::Alignment::Center);
@@ -568,18 +568,17 @@ namespace helloworld
 		}
 		(this->__vwsn_precompile_5 = new ::vl::presentation::compositions::GuiCellComposition());
 		{
-			::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));
+			::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));
 		}
 		{
-			auto __vwsn_controlStyle_ = ::vl::__vwsn::This(::vl::presentation::theme::GetCurrentTheme())->CreateTextBoxStyle();
+			(this->textBoxUserName = new ::vl::presentation::controls::GuiSinglelineTextBox(::vl::presentation::theme::ThemeName::SinglelineTextBox));
-			(this->textBoxUserName = new ::vl::presentation::controls::GuiSinglelineTextBox(__vwsn_controlStyle_));
 		}
 		(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::vint>(0); __vwsn_temp__.y = static_cast<::vl::vint>(24); return __vwsn_temp__; }());
+			::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)->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_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_5)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(::vl::__vwsn::This(this->textBoxUserName)->GetBoundsComposition()));
@@ -589,7 +588,7 @@ namespace helloworld
 		}
 		(this->__vwsn_precompile_7 = new ::vl::presentation::compositions::GuiCellComposition());
 		{
-			::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));
+			::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));
 		}
 		(this->__vwsn_precompile_8 = ::vl::Ptr<::vl::presentation::elements::GuiSolidLabelElement>(::vl::reflection::description::Element_Constructor<::vl::presentation::elements::GuiSolidLabelElement>()));
 		{
@@ -602,7 +601,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::vint>(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::vint32_t>(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));
@@ -612,11 +611,11 @@ namespace helloworld
 		}
 		(this->__vwsn_precompile_9 = new ::vl::presentation::compositions::GuiCellComposition());
 		{
-			::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));
+			::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));
 		}
 		(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::vint>(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::vint32_t>(12); __vwsn_temp__.antialias = true; return __vwsn_temp__; }());
 		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_10.Obj())->SetVerticalAlignment(::vl::presentation::Alignment::Center);
@@ -632,21 +631,20 @@ namespace helloworld
 		}
 		(this->__vwsn_precompile_11 = new ::vl::presentation::compositions::GuiCellComposition());
 		{
-			::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));
+			::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));
 		}
 		{
-			auto __vwsn_controlStyle_ = ::vl::__vwsn::This(::vl::presentation::theme::GetCurrentTheme())->CreateTextBoxStyle();
+			(this->textBoxPassword = new ::vl::presentation::controls::GuiSinglelineTextBox(::vl::presentation::theme::ThemeName::SinglelineTextBox));
-			(this->textBoxPassword = new ::vl::presentation::controls::GuiSinglelineTextBox(__vwsn_controlStyle_));
 		}
 		{
 			::vl::__vwsn::This(this->textBoxPassword)->SetPasswordChar(::vl::__vwsn::Parse<wchar_t>(::vl::WString(L"*", false)));
 		}
 		(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::vint>(0); __vwsn_temp__.y = static_cast<::vl::vint>(24); return __vwsn_temp__; }());
+			::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)->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_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_11)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(::vl::__vwsn::This(this->textBoxPassword)->GetBoundsComposition()));
@@ -656,7 +654,7 @@ namespace helloworld
 		}
 		(this->__vwsn_precompile_13 = new ::vl::presentation::compositions::GuiCellComposition());
 		{
-			::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));
+			::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));
 		}
 		(this->__vwsn_precompile_14 = ::vl::Ptr<::vl::presentation::elements::GuiSolidLabelElement>(::vl::reflection::description::Element_Constructor<::vl::presentation::elements::GuiSolidLabelElement>()));
 		{
@@ -669,7 +667,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::vint>(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::vint32_t>(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));
@@ -679,18 +677,17 @@ namespace helloworld
 		}
 		(this->__vwsn_precompile_15 = new ::vl::presentation::compositions::GuiCellComposition());
 		{
-			::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));
+			::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));
 		}
 		{
-			auto __vwsn_controlStyle_ = ::vl::__vwsn::This(::vl::presentation::theme::GetCurrentTheme())->CreateButtonStyle();
+			(this->buttonSignUp = new ::vl::presentation::controls::GuiButton(::vl::presentation::theme::ThemeName::Button));
-			(this->buttonSignUp = new ::vl::presentation::controls::GuiButton(__vwsn_controlStyle_));
 		}
 		(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::vint>(100); __vwsn_temp__.y = static_cast<::vl::vint>(24); return __vwsn_temp__; }());
+			::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)->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->__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->buttonSignUp)->SetText(::vl::WString(L"Sign Up!", false));
@@ -699,15 +696,14 @@ namespace helloworld
 			::vl::__vwsn::This(this->__vwsn_precompile_15)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(::vl::__vwsn::This(this->buttonSignUp)->GetBoundsComposition()));
 		}
 		{
-			auto __vwsn_controlStyle_ = ::vl::__vwsn::This(::vl::presentation::theme::GetCurrentTheme())->CreateButtonStyle();
+			(this->buttonCancel = new ::vl::presentation::controls::GuiButton(::vl::presentation::theme::ThemeName::Button));
-			(this->buttonCancel = new ::vl::presentation::controls::GuiButton(__vwsn_controlStyle_));
 		}
 		(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::vint>(100); __vwsn_temp__.y = static_cast<::vl::vint>(24); return __vwsn_temp__; }());
+			::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)->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->__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->buttonCancel)->SetText(::vl::WString(L"Close", false));

Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/MainWindow.cpp

@@ -66,7 +66,7 @@ namespace helloworld
 	}
 
 	MainWindow::MainWindow(::vl::Ptr<::vm::IViewModel> __vwsn_ctor_parameter_ViewModel)
-		: ::vl::presentation::controls::GuiWindow(::vl::__vwsn::This(::vl::presentation::theme::GetCurrentTheme())->CreateWindowStyle())
+		: ::vl::presentation::controls::GuiWindow(::vl::presentation::theme::ThemeName::Window)
 	{
 		(this->__vwsn_parameter_ViewModel = __vwsn_ctor_parameter_ViewModel);
 		auto __vwsn_resource_ = ::vl::__vwsn::This(::vl::presentation::GetResourceManager())->GetResourceFromClassName(::vl::WString(L"helloworld::MainWindow", false));

Tutorial/GacUI_HelloWorlds/Xml/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen32.exe %~dp0Resource.xml

Tutorial/GacUI_Layout/Alignment/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_Layout/Flow/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_Layout/RichTextEmbedding/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_Layout/Stack/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_Layout/Table/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml

Tutorial/GacUI_Layout/TableSplitter/UI/Codegen.bat

@@ -1 +0,0 @@
-%~dp0..\..\..\..\Tools\GacGen %~dp0Resource.xml