Update import

Import/GacUI.UnitTest.cpp

@@ -87,6 +87,11 @@ IGuiRemoteProtocolMessages (Rendering)
 #undef ERROR_MESSAGE_PREFIX
 	}
 
+	void UnitTestRemoteProtocol_Rendering::Impl_RendererIdle()
+	{
+		rendererIdleCount++;
+	}
+
 /***********************************************************************
 IGuiRemoteProtocolMessages (Rendering - Element)
 ***********************************************************************/
@@ -1806,7 +1811,7 @@ File GacUIUnitTest_PrepareSnapshotFile(const WString& appName, const WString& ex
 
 	File snapshotFile = snapshotFolder.GetFilePath() / (appName + extension);
 	{
-		auto pathPrefix = snapshotFolder.GetFilePath().GetFullPath() + WString::FromChar(FilePath::Delimiter);
+		auto pathPrefix = snapshotFolder.GetFilePath().GetFullPath() + WString::FromChar(FilePath::GetPathDelimiter());
 		auto snapshotPath = snapshotFile.GetFilePath().GetFullPath();
 		CHECK_ERROR(
 			snapshotPath.Length() > pathPrefix.Length() && snapshotPath.Left(pathPrefix.Length()) == pathPrefix,

Import/GacUI.UnitTest.h

@@ -791,6 +791,7 @@ UnitTestRemoteProtocol
 		remoteprotocol::DomIndex						receivedDomIndex;
 		bool											receivedDomDiffMessage = false;
 		bool											receivedElementMessage = false;
+		vint											rendererIdleCount = 0;
 
 		ElementDescMap									lastElementDescs;
 		IdSet											removedElementIds;
@@ -828,6 +829,7 @@ IGuiRemoteProtocolMessages (Rendering)
 		Ptr<UnitTestLoggedFrame>			TryGetLastRenderingFrameAndReset();
 		void								Impl_RendererBeginRendering(const remoteprotocol::ElementBeginRendering& arguments);
 		void								Impl_RendererEndRendering(vint id);
+		void								Impl_RendererIdle();
 
 /***********************************************************************
 IGuiRemoteProtocolMessages (Rendering - Element)
@@ -1105,6 +1107,17 @@ IGuiRemoteProtocol
 						auto&& lastFrame = (*loggedTrace.frames.Obj())[loggedTrace.frames->Count() - 1];
 						lastFrame.frameName = name;
 					}
+					if (nextEventIndex == 0)
+					{
+						CHECK_ERROR(rendererIdleCount <= 1, ERROR_MESSAGE_PREFIX L"Expected at most one RendererIdle before the first frame boundary.");
+					}
+					else
+					{
+						CHECK_ERROR(rendererIdleCount == 1, ERROR_MESSAGE_PREFIX L"Expected exactly one RendererIdle between two frame boundaries.");
+					}
+					rendererIdleCount = 0;
+					// Note: do not reset rendererIdleCount when LogRenderingResult() is false;
+					// it must accumulate across non-boundary ticks to detect duplicate/out-of-order RendererIdle.
 					frameExecuting = true;
 					func();
 					frameExecuting = false;
@@ -1123,6 +1136,7 @@ IGuiRemoteProtocol
 
 #endif
 
+
 /***********************************************************************
 .\GUIUNITTESTUTILITIES.H
 ***********************************************************************/

Import/GacUIReflection.cpp

@@ -2526,7 +2526,7 @@ Type Declaration (Class)
 
 				CLASS_MEMBER_PROPERTY_READONLY_FAST(ViewSize)
 				CLASS_MEMBER_PROPERTY_READONLY_FAST(ViewBounds)
-				CLASS_MEMBER_PROPERTY_READONLY_FAST(ViewPosition)
+				CLASS_MEMBER_PROPERTY_FAST(ViewPosition)
 				CLASS_MEMBER_PROPERTY_READONLY_FAST(HorizontalScroll)
 				CLASS_MEMBER_PROPERTY_READONLY_FAST(VerticalScroll)
 				CLASS_MEMBER_PROPERTY_FAST(HorizontalAlwaysVisible)

Import/Metadata/RemoteProtocol.json

@@ -3027,6 +3027,12 @@
                 "name": "ElementMeasurings"
             }
         }
+    }, {
+        "$ast": "MessageDecl",
+        "attributes": [],
+        "name": "RendererIdle",
+        "request": null,
+        "response": null
     }, {
         "$ast": "StructDecl",
         "attributes": [],

Import/Metadata/RemoteProtocol/Protocol_Renderer.txt

@@ -91,3 +91,4 @@ message RendererBeginBoundary                       { request: ElementBoundary;
 message RendererRenderElement                       { request: ElementRendering; }
 message RendererEndBoundary                         {}
 message RendererEndRendering                        { response: ElementMeasurings; }
+message RendererIdle                                {}

Import/VlppOS.Linux.cpp

@@ -41,6 +41,27 @@ LinuxFileSystemImpl
 		{
 		public:
 			// FilePath operations implementation
+			wchar_t GetPathDelimiter() const override
+			{
+				return L'/';
+			}
+
+			const wchar_t* GetCompatibleDelimiters() const override
+			{
+				return L"";
+			}
+
+			WString ConcatPath(const WString& fullPath, const WString& relativePath) const override
+			{
+				auto delimiter = WString::FromChar(GetPathDelimiter());
+				if (IsRoot(fullPath))
+				{
+					return delimiter + relativePath;
+				}
+
+				return fullPath + delimiter + relativePath;
+			}
+
 			void Initialize(WString& fullPath) const override
 			{
 				{
@@ -51,13 +72,13 @@ LinuxFileSystemImpl
 				}
 
 				if (fullPath.Length() == 0)
-					fullPath = WString::Unmanaged(L"/");
+					fullPath = WString::FromChar(GetPathDelimiter());
 
-				if (fullPath[0] != FilePath::Delimiter)
+				if (fullPath[0] != GetPathDelimiter())
 				{
 					char buffer[PATH_MAX] = { 0 };
 					getcwd(buffer, PATH_MAX);
-					fullPath = atow(AString(buffer)) + WString::FromChar(FilePath::Delimiter) + fullPath;
+					fullPath = atow(AString(buffer)) + WString::FromChar(GetPathDelimiter()) + fullPath;
 				}
 
 				{
@@ -111,7 +132,7 @@ LinuxFileSystemImpl
 
 			bool IsRoot(const WString& fullPath) const override
 			{
-				return fullPath == L"/";
+				return fullPath == WString::FromChar(GetPathDelimiter());
 			}
 
 			WString GetRelativePathFor(const WString& fromPath, const WString& toPath) const override

Import/VlppOS.Windows.cpp

@@ -41,6 +41,26 @@ WindowsFileSystemImpl
 		class WindowsFileSystemImpl : public feature_injection::FeatureImpl<IFileSystemImpl>
 		{
 		public:
+			wchar_t GetPathDelimiter() const override
+			{
+				return L'\\';
+			}
+
+			const wchar_t* GetCompatibleDelimiters() const override
+			{
+				return L"/";
+			}
+
+			WString ConcatPath(const WString& fullPath, const WString& relativePath) const override
+			{
+				if (IsRoot(fullPath))
+				{
+					return relativePath;
+				}
+
+				return fullPath + WString::FromChar(GetPathDelimiter()) + relativePath;
+			}
+
 			void Initialize(WString& fullPath) const override
 			{
 				{

Import/VlppOS.cpp

@@ -20,6 +20,18 @@ namespace vl
 		using namespace collections;
 		using namespace stream;
 
+		extern IFileSystemImpl* GetFileSystemImpl();
+
+		static wchar_t GetInjectedDelimiter()
+		{
+			return GetFileSystemImpl()->GetPathDelimiter();
+		}
+
+		static WString GetInjectedDelimiterString()
+		{
+			return WString::FromChar(GetInjectedDelimiter());
+		}
+
 		// ReadDirectoryChangesW
 
 /***********************************************************************
@@ -28,18 +40,25 @@ FilePath
 
 		void FilePath::NormalizeDelimiters(collections::Array<wchar_t>& buffer)
 		{
+			auto delimiter = GetInjectedDelimiter();
+			auto compatibleDelimiters = GetFileSystemImpl()->GetCompatibleDelimiters();
 			for (vint i = 0; i < buffer.Count(); i++)
 			{
-				if (buffer[i] == L'\\' || buffer[i] == L'/')
+				for (auto reading = compatibleDelimiters; *reading; reading++)
 				{
-					buffer[i] = Delimiter;
+					if (*reading == buffer[i])
+					{
+						buffer[i] = delimiter;
+						break;
+					}
 				}
 			}
 		}
 
 		void FilePath::TrimLastDelimiter(WString& fullPath)
 		{
-			if (fullPath != L"/" && fullPath.Length() > 0 && fullPath[fullPath.Length() - 1] == Delimiter)
+			auto delimiter = GetInjectedDelimiter();
+			if (!GetFileSystemImpl()->IsRoot(fullPath) && fullPath.Length() > 0 && fullPath[fullPath.Length() - 1] == delimiter)
 			{
 				fullPath = fullPath.Left(fullPath.Length() - 1);
 			}
@@ -67,21 +86,9 @@ FilePath
 		{
 		}
 
-		FilePath FilePath::operator/(const WString& relativePath)const
-		{
-			if (IsRoot())
-			{
-				return relativePath;
-			}
-			else
-			{
-				return fullPath + L"/" + relativePath;
-			}
-		}
-
 		WString FilePath::GetName()const
 		{
-			auto delimiter = WString::FromChar(Delimiter);
+			auto delimiter = GetInjectedDelimiterString();
 			auto index = INVLOC.FindLast(fullPath, delimiter, Locale::None);
 			if (index.key == -1) return fullPath;
 			return fullPath.Right(fullPath.Length() - index.key - 1);
@@ -89,7 +96,7 @@ FilePath
 
 		FilePath FilePath::GetFolder()const
 		{
-			auto delimiter = WString::FromChar(Delimiter);
+			auto delimiter = GetInjectedDelimiterString();
 			auto index = INVLOC.FindLast(fullPath, delimiter, Locale::None);
 			if (index.key == -1) return FilePath();
 			return fullPath.Left(index.key);
@@ -103,13 +110,15 @@ FilePath
 		void FilePath::GetPathComponents(WString path, collections::List<WString>& components)
 		{
 			WString pathRemaining = path;
-			auto delimiter = WString::FromChar(Delimiter);
+			auto delimiter = GetInjectedDelimiter();
+			auto delimiterString = WString::FromChar(delimiter);
+			auto doubleDelimiter = delimiterString + delimiterString;
 
 			components.Clear();
 
 			while (true)
 			{
-				auto index = INVLOC.FindFirst(pathRemaining, delimiter, Locale::None);
+				auto index = INVLOC.FindFirst(pathRemaining, delimiterString, Locale::None);
 				if (index.key == -1)
 					break;
 
@@ -117,19 +126,15 @@ FilePath
 					components.Add(pathRemaining.Left(index.key));
 				else
 				{
-#if defined VCZH_MSVC
+					if (pathRemaining.Length() >= 2 && pathRemaining[1] == delimiter)
-					if (pathRemaining.Length() >= 2 && pathRemaining[1] == Delimiter)
 					{
-						// Windows UNC Path starting with "\\"
+						components.Add(doubleDelimiter);
-						// components[0] will be L"\\"
-						components.Add(L"\\");
 						index.value++;
 					}
-#elif defined VCZH_GCC
+					else if (GetFileSystemImpl()->IsRoot(delimiterString))
-					// Unix absolute path starting with "/"
+					{
-					// components[0] will be L"/"
+						components.Add(delimiterString);
-					components.Add(delimiter);
+					}
-#endif
 				}
 
 				pathRemaining = pathRemaining.Right(pathRemaining.Length() - (index.key + index.value));
@@ -144,31 +149,32 @@ FilePath
 		WString FilePath::ComponentsToPath(const collections::List<WString>& components)
 		{
 			WString result;
-			auto delimiter = WString::FromChar(Delimiter);
+			auto delimiter = GetInjectedDelimiterString();
+			auto doubleDelimiter = delimiter + delimiter;
 
-			int i = 0;
+			vint i = 0;
 
-#if defined VCZH_MSVC
+			if (components.Count() > 0)
-			// For Windows, if first component is "\\" then it is an UNC path
-			if(components.Count() > 0 && components[0] == L"\\")
 			{
-				result += delimiter;
+				if (components[0] == doubleDelimiter)
-				i++;
+				{
-			}
+					result += doubleDelimiter;
-#elif defined VCZH_GCC
+					i++;
-			// For Unix-like OSes, if first component is "/" then take it as absolute path
+				}
-			if(components.Count() > 0 && components[0] == delimiter)
+				else if (components[0] == delimiter)
-			{
+				{
-				result += delimiter;
-				i++;
-			}
-#endif
-
-			for(; i < components.Count(); i++)
-			{
-				result += components[i];
-				if(i + 1 < components.Count())
 					result += delimiter;
+					i++;
+				}
+			}
+
+			for (; i < components.Count(); i++)
+			{
+				if (result.Length() > 0 && result[result.Length() - 1] != GetInjectedDelimiter())
+				{
+					result += delimiter;
+				}
+				result += components[i];
 			}
 
 			return result;
@@ -475,11 +481,21 @@ namespace vl
 FilePath
 ***********************************************************************/
 
+		wchar_t FilePath::GetPathDelimiter()
+		{
+			return GetFileSystemImpl()->GetPathDelimiter();
+		}
+
 		void FilePath::Initialize()
 		{
 			GetFileSystemImpl()->Initialize(fullPath);
 		}
 
+		FilePath FilePath::operator/(const WString& relativePath) const
+		{
+			return GetFileSystemImpl()->ConcatPath(fullPath, relativePath);
+		}
+
 		bool FilePath::IsFile() const
 		{
 			return GetFileSystemImpl()->IsFile(fullPath);

Import/VlppOS.h

@@ -2488,17 +2488,8 @@ namespace vl
 			static void					GetPathComponents(WString path, collections::List<WString>& components);
 			static WString				ComponentsToPath(const collections::List<WString>& components);
 		public:
-#if defined VCZH_MSVC
+			/// <summary>Get the delimiter character used in a file path.</summary>
-			/// <summary>The delimiter character used in a file path</summary>
+			static wchar_t				GetPathDelimiter();
-			/// <remarks>
-			/// In Windows, it is "\".
-			/// In Linux and macOS, it is "/".
-			/// But you can always use "/", it is also supported in Windows.
-			/// </remarks>
-			static constexpr wchar_t	Delimiter = L'\\';
-#elif defined VCZH_GCC
-			static constexpr wchar_t	Delimiter = L'/';
-#endif
 
 			/// <summary>Create a root path.</summary>
 			/// <remarks><see cref="GetFullPath"/> returns different values for root path on different platforms. Do not rely on the value.</remarks>
@@ -2675,6 +2666,9 @@ namespace vl
 		{
 		public:
 			// FilePath operations
+			virtual wchar_t GetPathDelimiter() const = 0;
+			virtual const wchar_t* GetCompatibleDelimiters() const = 0;
+			virtual WString ConcatPath(const WString& fullPath, const WString& relativePath) const = 0;
 			virtual void Initialize(WString& fullPath) const = 0;
 			virtual bool IsFile(const WString& fullPath) const = 0;
 			virtual bool IsFolder(const WString& fullPath) const = 0;

Tools/Executables/CodePack/Codepack_Combine.cpp

@@ -9,7 +9,7 @@ FilePath GetCommonFolder(
 	{
 		if (From(paths).All([&](const FilePath& path)
 		{
-			return INVLOC.StartsWith(path.GetFullPath(), folder.GetFullPath() + WString::FromChar(folder.Delimiter), Locale::IgnoreCase);
+			return INVLOC.StartsWith(path.GetFullPath(), folder.GetFullPath() + WString::FromChar(FilePath::GetPathDelimiter()), Locale::IgnoreCase);
 		}))
 		{
 			return folder;

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

@@ -76,6 +76,24 @@
         var openedSubWindows: GuiWindow^[] = {};
       ]]></ref.Members>
       <Window ref.Name="self" Text="Complete Control Showcase" ClientSize="x:640 y:480">
+        <MessageDialog ref.Name="dialogLocalShortcut"
+                       Title-eval="self.Text"
+                       Text="You pressed Ctrl+Q!"
+          />
+        <MessageDialog ref.Name="dialogGlobalShortcut"
+                       Title-eval="self.Text"
+                       Text="You pressed Ctrl+Shift+Alt+Q!"
+          />
+        <ToolstripCommand ShortcutBuilder="Ctrl+Q">
+          <ev.Executed-eval><![CDATA[{
+            dialogLocalShortcut.ShowDialog();
+          }]]></ev.Executed-eval>
+        </ToolstripCommand>
+        <ToolstripCommand ShortcutBuilder="global:Ctrl+Shift+Alt+Q">
+          <ev.Executed-eval><![CDATA[{
+            dialogGlobalShortcut.ShowDialog();
+          }]]></ev.Executed-eval>
+        </ToolstripCommand>
         <att.BoundsComposition-set PreferredMinSize="x:640 y:480"/>
         <Tab>
           <att.BoundsComposition-set AlignmentToParent="left:5 top:5 right:5 bottom:5"/>
@@ -145,7 +163,14 @@
               </Tab>
             </TabPage>
             <TabPage Alt="W" Text="Window Manager">
-              <Stack ref.Style="windowManagerContent"/>
+              <Stack ref.Style="windowManagerContent">
+                <StackItem>
+                  <Label Text="Local shortcut key: Ctrl+Q"/>
+                </StackItem>
+                <StackItem>
+                  <Label Text="Global shortcut key: Ctrl+Shift+Alt+Q"/>
+                </StackItem>
+              </Stack>
             </TabPage>
             <TabPage Alt="X" Text="Exit">
               <Stack Direction="Vertical" AlignmentToParent="left:5 top:5 right:5 bottom:5" Padding="5" MinSizeLimitation="LimitToElementAndChildren">

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

@@ -27,7 +27,7 @@ namespace demo
 {
 	class DocumentEditorRibbon : public ::demo::DocumentEditorBase, public ::demo::DocumentEditorRibbonConstructor, public ::vl::reflection::Description<DocumentEditorRibbon>
 	{
-		friend struct ::vl_workflow_global::__vwsnf223_Demo_demo_DocumentEditorRibbon___vwsn_instance_ctor__;
+		friend struct ::vl_workflow_global::__vwsnf225_Demo_demo_DocumentEditorRibbon___vwsn_instance_ctor__;
 		friend class ::demo::DocumentEditorRibbonConstructor;
 		friend class ::vl_workflow_global::__vwsnc100_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
 		friend class ::vl_workflow_global::__vwsnc101_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
@@ -38,8 +38,6 @@ namespace demo
 		friend class ::vl_workflow_global::__vwsnc106_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
 		friend class ::vl_workflow_global::__vwsnc98_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
 		friend class ::vl_workflow_global::__vwsnc99_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
-		friend struct ::vl_workflow_global::__vwsnf208_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
-		friend struct ::vl_workflow_global::__vwsnf209_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf210_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf211_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf212_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
@@ -53,6 +51,8 @@ namespace demo
 		friend struct ::vl_workflow_global::__vwsnf220_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf221_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf222_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
+		friend struct ::vl_workflow_global::__vwsnf223_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
+		friend struct ::vl_workflow_global::__vwsnf224_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
 #ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
 		friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<DocumentEditorRibbon>;
 #endif
@@ -86,8 +86,8 @@ namespace demo
 		friend class ::demo::DocumentEditorToolstripConstructor;
 		friend class ::vl_workflow_global::__vwsnc110_Demo_demo_DocumentEditorToolstripConstructor___vwsn_demo_DocumentEditorToolstrip_Initialize__vl_reflection_description_IValueSubscription;
 		friend class ::vl_workflow_global::__vwsnc111_Demo_demo_DocumentEditorToolstripConstructor___vwsn_demo_DocumentEditorToolstrip_Initialize__vl_reflection_description_IValueSubscription;
-		friend struct ::vl_workflow_global::__vwsnf227_Demo_demo_DocumentEditorToolstripConstructor___vwsn_demo_DocumentEditorToolstrip_Initialize_;
+		friend struct ::vl_workflow_global::__vwsnf229_Demo_demo_DocumentEditorToolstripConstructor___vwsn_demo_DocumentEditorToolstrip_Initialize_;
-		friend struct ::vl_workflow_global::__vwsnf228_Demo_demo_DocumentEditorToolstripConstructor___vwsn_demo_DocumentEditorToolstrip_Initialize_;
+		friend struct ::vl_workflow_global::__vwsnf230_Demo_demo_DocumentEditorToolstripConstructor___vwsn_demo_DocumentEditorToolstrip_Initialize_;
 #ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
 		friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<DocumentEditorToolstrip>;
 #endif

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

@@ -1430,6 +1430,12 @@ namespace vl
 				CLASS_MEMBER_FIELD(__vwsn_precompile_6)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_60)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_61)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_62)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_63)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_64)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_65)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_66)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_67)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_7)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_8)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_9)
@@ -1440,6 +1446,8 @@ namespace vl
 				CLASS_MEMBER_FIELD(checkMin)
 				CLASS_MEMBER_FIELD(checkSizeBox)
 				CLASS_MEMBER_FIELD(checkTitle)
+				CLASS_MEMBER_FIELD(dialogGlobalShortcut)
+				CLASS_MEMBER_FIELD(dialogLocalShortcut)
 				CLASS_MEMBER_FIELD(editorRibbon)
 				CLASS_MEMBER_FIELD(editorToolstrip)
 				CLASS_MEMBER_FIELD(self)

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

@@ -57,8 +57,6 @@ namespace demo
 		friend class ::vl_workflow_global::__vwsnc95_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
 		friend class ::vl_workflow_global::__vwsnc96_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
 		friend class ::vl_workflow_global::__vwsnc97_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
-		friend struct ::vl_workflow_global::__vwsnf149_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
-		friend struct ::vl_workflow_global::__vwsnf150_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf151_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf152_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf153_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
@@ -80,9 +78,9 @@ namespace demo
 		friend struct ::vl_workflow_global::__vwsnf169_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf170_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf171_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
-		friend struct ::vl_workflow_global::__vwsnf172_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__;
+		friend struct ::vl_workflow_global::__vwsnf172_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf173_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
-		friend struct ::vl_workflow_global::__vwsnf174_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
+		friend struct ::vl_workflow_global::__vwsnf174_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__;
 		friend struct ::vl_workflow_global::__vwsnf175_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf176_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf177_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
@@ -116,6 +114,8 @@ namespace demo
 		friend struct ::vl_workflow_global::__vwsnf205_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf206_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf207_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
+		friend struct ::vl_workflow_global::__vwsnf208_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
+		friend struct ::vl_workflow_global::__vwsnf209_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
 #ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
 		friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<DocumentEditorBase>;
 #endif

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

@@ -54,17 +54,19 @@ namespace demo
 		friend struct ::vl_workflow_global::__vwsnf53_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf54_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf55_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
-		friend struct ::vl_workflow_global::__vwsnf56_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__;
+		friend struct ::vl_workflow_global::__vwsnf56_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf57_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
-		friend struct ::vl_workflow_global::__vwsnf58_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
+		friend struct ::vl_workflow_global::__vwsnf58_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__;
-		friend struct ::vl_workflow_global::__vwsnf59_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__;
+		friend struct ::vl_workflow_global::__vwsnf59_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf60_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
-		friend struct ::vl_workflow_global::__vwsnf61_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
+		friend struct ::vl_workflow_global::__vwsnf61_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__;
 		friend struct ::vl_workflow_global::__vwsnf62_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf63_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf64_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf65_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
 		friend struct ::vl_workflow_global::__vwsnf66_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
+		friend struct ::vl_workflow_global::__vwsnf67_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
+		friend struct ::vl_workflow_global::__vwsnf68_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
 #ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
 		friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<MainWindow>;
 #endif