...

Import/VlppWorkflowCompiler.cpp

@@ -20579,7 +20579,12 @@ namespace vl
 				FOREACH(ITypeDescriptor*, td, tds)
 				{
 					writer.WriteString(L"\t\t\tIMPL_CPP_TYPE_INFO(");
-					writer.WriteString(ConvertType(td));
+					WString type = ConvertType(td);
+					if (type.Length() > 2 && type.Sub(0, 2) == L"::")
+					{
+						type = type.Sub(2, type.Length() - 2);
+					}
+					writer.WriteString(type);
 					writer.WriteLine(L")");
 				}
 				writer.WriteLine(L"");
@@ -20648,6 +20653,50 @@ namespace vl
 							writer.WriteString(ConvertType(td));
 							writer.WriteLine(L")");
 
+							if (td->GetTypeDescriptorFlags() == TypeDescriptorFlags::Class)
+							{
+								auto methodGroup = td->GetConstructorGroup();
+								vint methodCount = methodGroup->GetMethodCount();
+								for (vint j = 0; j < methodCount; j++)
+								{
+									auto methodInfo = methodGroup->GetMethod(j);
+									vint parameterCount = methodInfo->GetParameterCount();
+
+									writer.WriteString(L"\t\t\t\tCLASS_MEMBER_CONSTRUCTOR(");
+									writer.WriteString(ConvertType(methodInfo->GetReturn()));
+									writer.WriteString(L"(");
+									for (vint k = 0; k < parameterCount; k++)
+									{
+										if (k > 0)
+										{
+											writer.WriteString(L", ");
+										}
+										writer.WriteString(ConvertArgumentType(methodInfo->GetParameter(k)->GetType()));
+									}
+									writer.WriteString(L")");
+
+									if (parameterCount > 0)
+									{
+										writer.WriteString(L", {");
+										for (vint k = 0; k < parameterCount; k++)
+										{
+											if (k > 0)
+											{
+												writer.WriteString(L" _");
+											}
+											writer.WriteString(L" L\"");
+											writer.WriteString(ConvertName(methodInfo->GetParameter(k)->GetName()));
+											writer.WriteString(L"\"");
+										}
+										writer.WriteLine(L" })");
+									}
+									else
+									{
+										writer.WriteLine(L", NO_PARAMETER)");
+									}
+								}
+							}
+
 							vint methodGroupCount = td->GetMethodGroupCount();
 							for (vint i = 0; i < methodGroupCount; i++)
 							{

Tutorial/GacUI_ControlTemplate/BlackSkin/BlackSkin.vcxproj

@@ -53,7 +53,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);VCZH_DEBUG_NO_REFLECTION</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
     </ClCompile>
     <Link>
@@ -69,7 +69,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);VCZH_DEBUG_NO_REFLECTION</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
     </ClCompile>
     <Link>
@@ -81,12 +81,17 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="Main.cpp" />
-    <ClCompile Include="UI\Source\DemoPartialClasses.cpp" />
+    <ClCompile Include="UI\Source\DemoPartialClasses.cpp">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Xml Include="UI\Images\Folder.xml" />
     <Xml Include="UI\MainWindow.xml" />
-    <Xml Include="UI\Resource.xml" />
+    <Xml Include="UI\Resource.xml">
+      <SubType>Designer</SubType>
+    </Xml>
     <Xml Include="UI\Skin.xml" />
     <Xml Include="UI\XmlDocDemo.xml" />
   </ItemGroup>
@@ -113,8 +118,8 @@
     <ClInclude Include="UI\Source\DemoPartialClasses.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Lib\GacUILite\GacUILite.vcxproj">
+    <ProjectReference Include="..\..\Lib\GacUI\GacUI.vcxproj">
-      <Project>{96c559ca-9718-4bec-a053-28a0ab6a8ca2}</Project>
+      <Project>{8018d622-66ba-4e65-9d03-bdac37ea9a54}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Tutorial/GacUI_ControlTemplate/BlackSkin/Main.cpp

@@ -1,9 +1,12 @@
-#define GAC_HEADER_USE_NAMESPACE
 #include "UI/Source/Demo.h"
 #include <Windows.h>
 
+using namespace vl;
 using namespace vl::collections;
 using namespace vl::stream;
+using namespace vl::reflection::description;
+using namespace vl::presentation;
+using namespace vl::presentation::controls;
 
 #pragma comment(linker,"\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
 
@@ -14,6 +17,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 
 void GuiMain()
 {
+	LoadDemoTypes();
 	{
 		List<WString> errors;
 		FileStream fileStream(L"../UIRes/BlackSkin.bin", FileStream::ReadOnly);

Tutorial/GacUI_ControlTemplate/BlackSkin/UI/Resource.xml

@@ -4,7 +4,7 @@
     <Folder name="Cpp">
       <Text name="SourceFolder">Source</Text>
       <Text name="Resource">..\..\UIRes\BlackSkin.bin</Text>
-      <Text name="NormalInclude">GacUI.h</Text>
+      <Text name="NormalInclude">GacUIReflection.h</Text>
       <Text name="Name">Demo</Text>
     </Folder>
   </Folder>

Tutorial/GacUI_ControlTemplate/BlackSkin/UI/Source/DemoPartialClasses.h

@@ -10,7 +10,7 @@ https://github.com/vczh-libraries
 #ifndef VCZH_WORKFLOW_COMPILER_GENERATED_DEMOPARTIALCLASSES
 #define VCZH_WORKFLOW_COMPILER_GENERATED_DEMOPARTIALCLASSES
 
-#include "GacUI.h"
+#include "GacUIReflection.h"
 
 #if defined( _MSC_VER)
 #pragma warning(push)

Tutorial/GacUI_ControlTemplate/GacUI_ControlTemplate.sln

@@ -9,6 +9,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{A7FA6C2B-37E
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GacUILite", "..\Lib\GacUILite\GacUILite.vcxproj", "{96C559CA-9718-4BEC-A053-28A0AB6A8CA2}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GacUI", "..\Lib\GacUI\GacUI.vcxproj", "{8018D622-66BA-4E65-9D03-BDAC37EA9A54}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -23,11 +25,16 @@ Global
 		{96C559CA-9718-4BEC-A053-28A0AB6A8CA2}.Debug|Win32.Build.0 = Debug|Win32
 		{96C559CA-9718-4BEC-A053-28A0AB6A8CA2}.Release|Win32.ActiveCfg = Release|Win32
 		{96C559CA-9718-4BEC-A053-28A0AB6A8CA2}.Release|Win32.Build.0 = Release|Win32
+		{8018D622-66BA-4E65-9D03-BDAC37EA9A54}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8018D622-66BA-4E65-9D03-BDAC37EA9A54}.Debug|Win32.Build.0 = Debug|Win32
+		{8018D622-66BA-4E65-9D03-BDAC37EA9A54}.Release|Win32.ActiveCfg = Release|Win32
+		{8018D622-66BA-4E65-9D03-BDAC37EA9A54}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{96C559CA-9718-4BEC-A053-28A0AB6A8CA2} = {A7FA6C2B-37E0-4C2B-AC76-6E577A987492}
+		{8018D622-66BA-4E65-9D03-BDAC37EA9A54} = {A7FA6C2B-37E0-4C2B-AC76-6E577A987492}
 	EndGlobalSection
 EndGlobal