From 1c46ce8d7216633fccf0cdf6dbab89a4578b53d5 Mon Sep 17 00:00:00 2001
From: Zihan Chen <vczh@163.com>
Date: Sat, 21 Jul 2018 02:49:18 -0700
Subject: [PATCH] Update generated files

---
 .../Source/DemoPartialClasses.cpp             |   2 -
 .../Source/DocumentEditorBase.cpp             |  25 ++--
 .../Source/DocumentEditorBase.h               |   3 +
 .../Source/DocumentEditorRibbon.cpp           |   2 -
 .../Source/DocumentEditorToolstrip.cpp        |   2 -
 .../UI/FullControlTest/Source/MainWindow.cpp  |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   4 +-
 .../AddressBook/UI/Source/MainWindow.cpp      |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../DataGrid/UI/Source/DemoPartialClasses.cpp |   2 -
 .../UI/Source/DocumentEditorBase.cpp          |  25 ++--
 .../UI/Source/DocumentEditorBase.h            |   3 +
 .../UI/Source/EditorBasePartialClasses.cpp    |   2 -
 .../UI/Source/DocumentEditorRibbon.cpp        |   2 -
 .../UI/Source/EditorRibbonPartialClasses.cpp  |   2 -
 .../UI/Source/DocumentEditorToolstrip.cpp     |   2 -
 .../Source/EditorToolstripPartialClasses.cpp  |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../TextEditor/UI/Source/AboutWindow.cpp      |  10 +-
 .../TextEditor/UI/Source/AboutWindow.h        |   3 +
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../TextEditor/UI/Source/FindWindow.cpp       |  10 +-
 .../TextEditor/UI/Source/FindWindow.h         |   3 +
 .../TextEditor/UI/Source/MainWindow.cpp       | 125 +++++++-----------
 .../TextEditor/UI/Source/MainWindow.h         |   3 +
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/HelloWorldPartialClasses.cpp    |   2 -
 .../UI/Source/HelloWorldPartialClasses.cpp    |   2 -
 .../MVVM/UI/Source/MainWindow.cpp             |  10 +-
 .../MVVM/UI/Source/MainWindow.h               |   3 +
 Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x64  | Bin 24275 -> 24275 bytes
 Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86  | Bin 24275 -> 24275 bytes
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../Flow/UI/Source/DemoPartialClasses.cpp     |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../Stack/UI/Source/DemoPartialClasses.cpp    |   2 -
 .../Table/UI/Source/DemoPartialClasses.cpp    |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../Direct2DClock/UI/Source/MainWindow.cpp    |  10 +-
 .../Direct2DClock/UI/Source/MainWindow.h      |   3 +
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   7 +-
 .../UI/Source/DemoPartialClasses.h            |   3 +
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../Event_Cpp/UI/Source/MainWindow.cpp        |  10 +-
 .../Event_Cpp/UI/Source/MainWindow.h          |   3 +
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/MainWindow.cpp                  |  10 +-
 .../UI/Source/MainWindow.h                    |   3 +
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../Member_Field/UI/Source/MainWindow.cpp     |  10 +-
 .../Member_Field/UI/Source/MainWindow.h       |   3 +
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../UI/Source/DemoPartialClasses.cpp          |   2 -
 .../ResBase/Source/ResBasePartialClasses.cpp  |   2 -
 .../Source/ResDerivedPartialClasses.cpp       |   2 -
 73 files changed, 144 insertions(+), 241 deletions(-)

diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.cpp
index 503142d8..a05b6089 100644
--- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -21202,7 +21201,6 @@ Class (::demo::TreeViewTabPage)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorBase.cpp b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorBase.cpp
index 68d8bab1..d110ef9f 100644
--- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorBase.cpp
+++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorBase.cpp
@@ -29,7 +29,9 @@ https://github.com/vczh-libraries
 #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(...)
+
+/* USER_CONTENT_BEGIN(custom global declarations) */
+/* USER_CONTENT_END() */
 
 /***********************************************************************
 Class (::demo::DocumentEditorBase)
@@ -121,29 +123,25 @@ namespace demo
 		return static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->toolstripContainer);
 	}
 
-	USERIMPL(/* ::demo::DocumentEditorBase */)
 	void DocumentEditorBase::LoadAsPrivateFormat(const ::vl::WString& fileName)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::DocumentEditorBase) */
 		throw ::vl::Exception(L"You should implement this function.");
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::DocumentEditorBase */)
 	void DocumentEditorBase::SaveAsPrivateFormat(const ::vl::WString& fileName)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::DocumentEditorBase) */
 		throw ::vl::Exception(L"You should implement this function.");
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::DocumentEditorBase */)
 	void DocumentEditorBase::SaveAsRTF(const ::vl::WString& fileName)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::DocumentEditorBase) */
 		throw ::vl::Exception(L"You should implement this function.");
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::DocumentEditorBase */)
 	void DocumentEditorBase::SaveAsHTML(const ::vl::WString& fileName)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::DocumentEditorBase) */
 		throw ::vl::Exception(L"You should implement this function.");
-	}
+	}/* USER_CONTENT_END() */
 
 	void DocumentEditorBase::SaveDocument()
 	{
@@ -194,7 +192,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorBase.h b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorBase.h
index 571531aa..7d43dffc 100644
--- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorBase.h
+++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorBase.h
@@ -155,6 +155,9 @@ namespace demo
 		DocumentEditorBase();
 		void __vwsn_instance_ctor_();
 		~DocumentEditorBase();
+
+	/* USER_CONTENT_BEGIN(custom members of ::demo::DocumentEditorBase) */
+	/* USER_CONTENT_END() */
 	};
 
 }
diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorRibbon.cpp b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorRibbon.cpp
index fc49606c..5148db95 100644
--- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorRibbon.cpp
+++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorRibbon.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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::DocumentEditorRibbon)
@@ -193,7 +192,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorToolstrip.cpp b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorToolstrip.cpp
index 9b9bd227..57a9e503 100644
--- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorToolstrip.cpp
+++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DocumentEditorToolstrip.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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::DocumentEditorToolstrip)
@@ -54,7 +53,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/MainWindow.cpp b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/MainWindow.cpp
index 3e884b07..86ce10b5 100644
--- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/MainWindow.cpp
+++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/MainWindow.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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)
@@ -55,7 +54,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.cpp
index 8d8602e1..c7f90b0c 100644
--- a/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -2685,7 +2684,7 @@ Class (::demo::NewFolderWindow)
 	NewFolderWindow::NewFolderWindow()
 		: ::vl::presentation::controls::GuiWindow(::vl::presentation::theme::ThemeName::Window)
 		, __vwsn_prop_FolderName(::vl::WString(L"", false))
-		, Ready(true)
+		, Ready(false)
 	{
 		auto __vwsn_resource_ = ::vl::__vwsn::This(::vl::presentation::GetResourceManager())->GetResourceFromClassName(::vl::WString(L"demo::NewFolderWindow", false));
 		auto __vwsn_resolver_ = ::vl::Ptr<::vl::presentation::GuiResourcePathResolver>(new ::vl::presentation::GuiResourcePathResolver(__vwsn_resource_, ::vl::__vwsn::This(__vwsn_resource_.Obj())->GetWorkingDirectory()));
@@ -2702,7 +2701,6 @@ Class (::demo::NewFolderWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/Source/MainWindow.cpp b/Tutorial/GacUI_Controls/AddressBook/UI/Source/MainWindow.cpp
index 204afb78..e1f2bc12 100644
--- a/Tutorial/GacUI_Controls/AddressBook/UI/Source/MainWindow.cpp
+++ b/Tutorial/GacUI_Controls/AddressBook/UI/Source/MainWindow.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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)
@@ -72,7 +71,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/Animation/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/Animation/UI/Source/DemoPartialClasses.cpp
index 316d6a40..4aae402f 100644
--- a/Tutorial/GacUI_Controls/Animation/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/Animation/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -1497,7 +1496,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/CalculatorAndStateMachine/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/CalculatorAndStateMachine/UI/Source/DemoPartialClasses.cpp
index c4f419aa..41f7a1b6 100644
--- a/Tutorial/GacUI_Controls/CalculatorAndStateMachine/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/CalculatorAndStateMachine/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -1423,7 +1422,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/ColorPicker/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/ColorPicker/UI/Source/DemoPartialClasses.cpp
index 6611d442..6c9dba22 100644
--- a/Tutorial/GacUI_Controls/ColorPicker/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/ColorPicker/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -673,7 +672,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/ContainersAndButtons/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/ContainersAndButtons/UI/Source/DemoPartialClasses.cpp
index 50108817..067b6cb7 100644
--- a/Tutorial/GacUI_Controls/ContainersAndButtons/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/ContainersAndButtons/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -704,7 +703,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/DataGrid/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/DataGrid/UI/Source/DemoPartialClasses.cpp
index d3eee174..a28a68ff 100644
--- a/Tutorial/GacUI_Controls/DataGrid/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/DataGrid/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -3588,7 +3587,6 @@ Class (::demo::TextEditor)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/DocumentEditorBase.cpp b/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/DocumentEditorBase.cpp
index 79462e28..b295a6df 100644
--- a/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/DocumentEditorBase.cpp
+++ b/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/DocumentEditorBase.cpp
@@ -29,7 +29,9 @@ https://github.com/vczh-libraries
 #define GLOBAL_SYMBOL ::vl_workflow_global::EditorBase::
 #define GLOBAL_NAME ::vl_workflow_global::EditorBase::Instance().
 #define GLOBAL_OBJ &::vl_workflow_global::EditorBase::Instance()
-#define USERIMPL(...)
+
+/* USER_CONTENT_BEGIN(custom global declarations) */
+/* USER_CONTENT_END() */
 
 /***********************************************************************
 Class (::demo::DocumentEditorBase)
@@ -121,28 +123,25 @@ namespace demo
 		return static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->toolstripContainer);
 	}
 
-	USERIMPL(/* ::demo::DocumentEditorBase */)
 	void DocumentEditorBase::LoadAsPrivateFormat(const ::vl::WString& fileName)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::DocumentEditorBase) */
 		vl::stream::FileStream fileStream(fileName, vl::stream::FileStream::ReadOnly);
 		auto model = vl::presentation::LoadDocumentFromClipboardStream(fileStream);
 		document->SetDocument(model);
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::DocumentEditorBase */)
 	void DocumentEditorBase::SaveAsPrivateFormat(const ::vl::WString& fileName)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::DocumentEditorBase) */
 		document->SelectAll();
 		auto model = document->GetSelectionModel();
 
 		vl::presentation::ModifyDocumentForClipboard(model);
 		vl::stream::FileStream fileStream(fileName, vl::stream::FileStream::WriteOnly);
 		vl::presentation::SaveDocumentToClipboardStream(model, fileStream);
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::DocumentEditorBase */)
 	void DocumentEditorBase::SaveAsRTF(const ::vl::WString& fileName)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::DocumentEditorBase) */
 		document->SelectAll();
 		auto model = document->GetSelectionModel();
 
@@ -150,11 +149,10 @@ namespace demo
 		vl::presentation::SaveDocumentToRtf(model, rtf);
 		vl::stream::FileStream fileStream(fileName, vl::stream::FileStream::WriteOnly);
 		fileStream.Write((void*)rtf.Buffer(), rtf.Length());
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::DocumentEditorBase */)
 	void DocumentEditorBase::SaveAsHTML(const ::vl::WString& fileName)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::DocumentEditorBase) */
 		document->SelectAll();
 		auto model = document->GetSelectionModel();
 
@@ -164,7 +162,7 @@ namespace demo
 		fileStream.Write((void*)header.Buffer(), header.Length());
 		fileStream.Write((void*)content.Buffer(), content.Length());
 		fileStream.Write((void*)footer.Buffer(), footer.Length());
-	}
+	}/* USER_CONTENT_END() */
 
 	void DocumentEditorBase::SaveDocument()
 	{
@@ -215,7 +213,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/DocumentEditorBase.h b/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/DocumentEditorBase.h
index 7cee1e9e..fa961cac 100644
--- a/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/DocumentEditorBase.h
+++ b/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/DocumentEditorBase.h
@@ -155,6 +155,9 @@ namespace demo
 		DocumentEditorBase();
 		void __vwsn_instance_ctor_();
 		~DocumentEditorBase();
+
+	/* USER_CONTENT_BEGIN(custom members of ::demo::DocumentEditorBase) */
+	/* USER_CONTENT_END() */
 	};
 
 }
diff --git a/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/EditorBasePartialClasses.cpp b/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/EditorBasePartialClasses.cpp
index ad413a36..a42788de 100644
--- a/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/EditorBasePartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/EditorBasePartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #define GLOBAL_SYMBOL ::vl_workflow_global::EditorBase::
 #define GLOBAL_NAME ::vl_workflow_global::EditorBase::Instance().
 #define GLOBAL_OBJ &::vl_workflow_global::EditorBase::Instance()
-#define USERIMPL(...)
 
 /***********************************************************************
 Global Variables
@@ -3913,7 +3912,6 @@ Class (::demo::HyperlinkWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/DocumentEditorRibbon/UI/Source/DocumentEditorRibbon.cpp b/Tutorial/GacUI_Controls/DocumentEditorRibbon/UI/Source/DocumentEditorRibbon.cpp
index b6acb104..dfe05b8c 100644
--- a/Tutorial/GacUI_Controls/DocumentEditorRibbon/UI/Source/DocumentEditorRibbon.cpp
+++ b/Tutorial/GacUI_Controls/DocumentEditorRibbon/UI/Source/DocumentEditorRibbon.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #define GLOBAL_SYMBOL ::vl_workflow_global::EditorRibbon::
 #define GLOBAL_NAME ::vl_workflow_global::EditorRibbon::Instance().
 #define GLOBAL_OBJ &::vl_workflow_global::EditorRibbon::Instance()
-#define USERIMPL(...)
 
 /***********************************************************************
 Class (::demo::DocumentEditorRibbon)
@@ -193,7 +192,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/DocumentEditorRibbon/UI/Source/EditorRibbonPartialClasses.cpp b/Tutorial/GacUI_Controls/DocumentEditorRibbon/UI/Source/EditorRibbonPartialClasses.cpp
index 8612621f..2653eb5d 100644
--- a/Tutorial/GacUI_Controls/DocumentEditorRibbon/UI/Source/EditorRibbonPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/DocumentEditorRibbon/UI/Source/EditorRibbonPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #define GLOBAL_SYMBOL ::vl_workflow_global::EditorRibbon::
 #define GLOBAL_NAME ::vl_workflow_global::EditorRibbon::Instance().
 #define GLOBAL_OBJ &::vl_workflow_global::EditorRibbon::Instance()
-#define USERIMPL(...)
 
 /***********************************************************************
 Global Variables
@@ -2522,7 +2521,6 @@ Class (::demo::StyleItemTemplate)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/DocumentEditorToolstrip/UI/Source/DocumentEditorToolstrip.cpp b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/UI/Source/DocumentEditorToolstrip.cpp
index 3029865c..caaf929a 100644
--- a/Tutorial/GacUI_Controls/DocumentEditorToolstrip/UI/Source/DocumentEditorToolstrip.cpp
+++ b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/UI/Source/DocumentEditorToolstrip.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #define GLOBAL_SYMBOL ::vl_workflow_global::EditorToolstrip::
 #define GLOBAL_NAME ::vl_workflow_global::EditorToolstrip::Instance().
 #define GLOBAL_OBJ &::vl_workflow_global::EditorToolstrip::Instance()
-#define USERIMPL(...)
 
 /***********************************************************************
 Class (::demo::DocumentEditorToolstrip)
@@ -54,7 +53,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/DocumentEditorToolstrip/UI/Source/EditorToolstripPartialClasses.cpp b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/UI/Source/EditorToolstripPartialClasses.cpp
index c208a3cf..db65b41c 100644
--- a/Tutorial/GacUI_Controls/DocumentEditorToolstrip/UI/Source/EditorToolstripPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/DocumentEditorToolstrip/UI/Source/EditorToolstripPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #define GLOBAL_SYMBOL ::vl_workflow_global::EditorToolstrip::
 #define GLOBAL_NAME ::vl_workflow_global::EditorToolstrip::Instance().
 #define GLOBAL_OBJ &::vl_workflow_global::EditorToolstrip::Instance()
-#define USERIMPL(...)
 
 /***********************************************************************
 Global Variables
@@ -1196,7 +1195,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/ListControls/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/ListControls/UI/Source/DemoPartialClasses.cpp
index 72ad7ea4..812d267b 100644
--- a/Tutorial/GacUI_Controls/ListControls/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/ListControls/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -1828,7 +1827,6 @@ Class (::demo::TreeViewTabPage)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/Localization/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/Localization/UI/Source/DemoPartialClasses.cpp
index 95b5838b..10425832 100644
--- a/Tutorial/GacUI_Controls/Localization/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/Localization/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -1973,7 +1972,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/MenuVisibility/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/MenuVisibility/UI/Source/DemoPartialClasses.cpp
index 9fa32dc8..18f2520a 100644
--- a/Tutorial/GacUI_Controls/MenuVisibility/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/MenuVisibility/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -413,7 +412,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.cpp
index 174cdd94..be666695 100644
--- a/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -471,7 +470,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/AboutWindow.cpp b/Tutorial/GacUI_Controls/TextEditor/UI/Source/AboutWindow.cpp
index a50bbc81..a7000f67 100644
--- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/AboutWindow.cpp
+++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/AboutWindow.cpp
@@ -29,7 +29,9 @@ https://github.com/vczh-libraries
 #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(...)
+
+/* USER_CONTENT_BEGIN(custom global declarations) */
+/* USER_CONTENT_END() */
 
 /***********************************************************************
 Class (::demo::AboutWindow)
@@ -37,11 +39,10 @@ Class (::demo::AboutWindow)
 
 namespace demo
 {
-	USERIMPL(/* ::demo::AboutWindow */)
 	void AboutWindow::documentLabel_ActiveHyperlinkExecuted(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::AboutWindow) */
 		OpenUrl(documentLabel->GetActiveHyperlinkReference());
-	}
+	}/* USER_CONTENT_END() */
 
 	AboutWindow::AboutWindow()
 		: ::vl::presentation::controls::GuiWindow(::vl::presentation::theme::ThemeName::Window)
@@ -61,7 +62,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/AboutWindow.h b/Tutorial/GacUI_Controls/TextEditor/UI/Source/AboutWindow.h
index e4dbca4c..ac608a26 100644
--- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/AboutWindow.h
+++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/AboutWindow.h
@@ -38,6 +38,9 @@ namespace demo
 	public:
 		AboutWindow();
 		~AboutWindow();
+
+	/* USER_CONTENT_BEGIN(custom members of ::demo::AboutWindow) */
+	/* USER_CONTENT_END() */
 	};
 
 }
diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp
index 139e656f..d43cf0d6 100644
--- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -2567,7 +2566,6 @@ Class (::demo::RecentFileItemTemplate)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/FindWindow.cpp b/Tutorial/GacUI_Controls/TextEditor/UI/Source/FindWindow.cpp
index 60812bde..a74b2408 100644
--- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/FindWindow.cpp
+++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/FindWindow.cpp
@@ -29,7 +29,9 @@ https://github.com/vczh-libraries
 #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(...)
+
+/* USER_CONTENT_BEGIN(custom global declarations) */
+/* USER_CONTENT_END() */
 
 /***********************************************************************
 Class (::demo::FindWindow)
@@ -37,9 +39,8 @@ Class (::demo::FindWindow)
 
 namespace demo
 {
-	USERIMPL(/* ::demo::FindWindow */)
 	bool FindWindow::FindNext(const ::vl::WString& toFind, bool caseSensitive, bool down)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::FindWindow) */
 		auto position = textBox->GetCaretEnd();
 		auto rowCount = textBox->GetRowCount();
 		auto normalization = caseSensitive ? Locale::None : Locale::IgnoreCase;
@@ -94,7 +95,7 @@ namespace demo
 		}
 
 		return false;
-	}
+	}/* USER_CONTENT_END() */
 
 	FindWindow::FindWindow()
 		: ::vl::presentation::controls::GuiWindow(::vl::presentation::theme::ThemeName::Window)
@@ -115,7 +116,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/FindWindow.h b/Tutorial/GacUI_Controls/TextEditor/UI/Source/FindWindow.h
index 938fe5ce..dcbd109b 100644
--- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/FindWindow.h
+++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/FindWindow.h
@@ -39,6 +39,9 @@ namespace demo
 		::vl::presentation::controls::GuiMultilineTextBox* textBox;
 		FindWindow();
 		~FindWindow();
+
+	/* USER_CONTENT_BEGIN(custom members of ::demo::FindWindow) */
+	/* USER_CONTENT_END() */
 	};
 
 }
diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp b/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp
index 24a66725..fd185f66 100644
--- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp
+++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp
@@ -29,7 +29,9 @@ https://github.com/vczh-libraries
 #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(...)
+
+/* USER_CONTENT_BEGIN(custom global declarations) */
+/* USER_CONTENT_END() */
 
 /***********************************************************************
 Class (::demo::MainWindow)
@@ -37,9 +39,8 @@ Class (::demo::MainWindow)
 
 namespace demo
 {
-	USERIMPL(/* ::demo::MainWindow */)
 	bool MainWindow::CanCloseFile()
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		if (textBox->GetModified())
 		{
 			switch (dialogQueryClose->ShowDialog())
@@ -56,11 +57,10 @@ namespace demo
 		{
 			return true;
 		}
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	bool MainWindow::LoadFile(const ::vl::WString& path)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		stream::FileStream fileStream(path, stream::FileStream::ReadOnly);
 		if (fileStream.IsAvailable())
 		{
@@ -92,11 +92,10 @@ namespace demo
 		{
 			return false;
 		}
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	bool MainWindow::OpenFile(::vl::vint filterIndex)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		if (CanCloseFile())
 		{
 			dialogOpen->SetFilterIndex(filterIndex);
@@ -113,11 +112,10 @@ namespace demo
 			}
 		}
 		return false;
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	bool MainWindow::SaveFile(bool saveAs)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		WString targetFileName = fileName;
 		if (saveAs || targetFileName == L"")
 		{
@@ -162,27 +160,25 @@ namespace demo
 			dialogCannotSave->ShowDialog();
 		}
 		return false;
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::SetupTextConfig()
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		if (isXml == true)
 		{
 			isXml = false;
 			SetColorizer(textBox, false);
 		}
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::SetupXmlConfig()
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		if (isXml == false)
 		{
 			isXml = true;
 			SetColorizer(textBox, true);
 		}
-	}
+	}/* USER_CONTENT_END() */
 
 	void MainWindow::AddRecentFile(const ::vl::WString& path)
 	{
@@ -214,109 +210,93 @@ namespace demo
 		::vl::__vwsn::This(this->recentFiles.Obj())->Insert(static_cast<::vl::vint>(0), ::vl::__vwsn::Box(command));
 	}
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandFileNewText_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		if (CanCloseFile())
 		{
 			textBox->SetText(L"");
 			textBox->ClearUndoRedo();
 			SetupTextConfig();
 		}
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandFileNewXml_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		if (CanCloseFile())
 		{
 			textBox->SetText(L"");
 			textBox->ClearUndoRedo();
 			SetupXmlConfig();
 		}
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandFileOpen_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		OpenFile(dialogOpen->GetFilterIndex());
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandFileOpenText_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		OpenFile(0);
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandFileOpenXml_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		OpenFile(1);
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandFileSave_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		SaveFile(false);
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandFileSaveAs_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		SaveFile(true);
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandFileExit_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		Close();
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandEditUndo_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		textBox->Undo();
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandEditRedo_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		textBox->Redo();
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandEditCut_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		textBox->Cut();
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandEditCopy_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		textBox->Copy();
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandEditPaste_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		textBox->Paste();
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandEditDelete_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		textBox->SetSelectionText(L"");
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandEditSelect_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		textBox->SelectAll();
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandEditFind_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		if (!findWindow)
 		{
 			auto window = MakePtr<FindWindow>();
@@ -326,21 +306,19 @@ namespace demo
 			findWindow = window;
 		}
 		findWindow->Show();
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::commandAbout_Executed(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		auto window = new AboutWindow;
 		window->MoveToScreenCenter();
 		window->ShowModalAndDelete(this, []() {});
-	}
+	}/* USER_CONTENT_END() */
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::window_Closing(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiRequestEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		arguments->cancel = !CanCloseFile();
-	}
+	}/* USER_CONTENT_END() */
 
 	MainWindow::MainWindow()
 		: ::vl::presentation::controls::GuiWindow(::vl::presentation::theme::ThemeName::Window)
@@ -364,7 +342,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.h b/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.h
index 24587dde..cf7eb179 100644
--- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.h
+++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.h
@@ -101,6 +101,9 @@ namespace demo
 	public:
 		MainWindow();
 		~MainWindow();
+
+	/* USER_CONTENT_BEGIN(custom members of ::demo::MainWindow) */
+	/* USER_CONTENT_END() */
 	};
 
 }
diff --git a/Tutorial/GacUI_Controls/TriplePhaseImageButton/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/TriplePhaseImageButton/UI/Source/DemoPartialClasses.cpp
index 31a53ff3..a75d808a 100644
--- a/Tutorial/GacUI_Controls/TriplePhaseImageButton/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Controls/TriplePhaseImageButton/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -1484,7 +1483,6 @@ Class (::demo::TriplePhaseImageButtonTemplate)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.cpp b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.cpp
index 95d1bf55..810bab96 100644
--- a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.cpp
+++ b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #define GLOBAL_SYMBOL ::vl_workflow_global::HelloWorld::
 #define GLOBAL_NAME ::vl_workflow_global::HelloWorld::Instance().
 #define GLOBAL_OBJ &::vl_workflow_global::HelloWorld::Instance()
-#define USERIMPL(...)
 
 /***********************************************************************
 Global Variables
@@ -115,7 +114,6 @@ Class (::helloworld::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.cpp b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.cpp
index 03c78af6..f796be9d 100644
--- a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.cpp
+++ b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #define GLOBAL_SYMBOL ::vl_workflow_global::HelloWorld::
 #define GLOBAL_NAME ::vl_workflow_global::HelloWorld::Instance().
 #define GLOBAL_OBJ &::vl_workflow_global::HelloWorld::Instance()
-#define USERIMPL(...)
 
 /***********************************************************************
 Global Variables
@@ -820,7 +819,6 @@ namespace vm
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/MainWindow.cpp b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/MainWindow.cpp
index b342c07c..5cfbd808 100644
--- a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/MainWindow.cpp
+++ b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/MainWindow.cpp
@@ -29,7 +29,9 @@ https://github.com/vczh-libraries
 #define GLOBAL_SYMBOL ::vl_workflow_global::HelloWorld::
 #define GLOBAL_NAME ::vl_workflow_global::HelloWorld::Instance().
 #define GLOBAL_OBJ &::vl_workflow_global::HelloWorld::Instance()
-#define USERIMPL(...)
+
+/* USER_CONTENT_BEGIN(custom global declarations) */
+/* USER_CONTENT_END() */
 
 /***********************************************************************
 Class (::helloworld::MainWindow)
@@ -55,15 +57,14 @@ namespace helloworld
 		return this->__vwsn_parameter_ViewModel;
 	}
 
-	USERIMPL(/* ::helloworld::MainWindow */)
 	void MainWindow::buttonSignUp_Clicked(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::helloworld::MainWindow) */
 		if (this->GetViewModel()->SignUp())
 		{
 			this->SetHasLoggedIn(true);
 			this->buttonSignUp->SetText(L"Success!");
 		}
-	}
+	}/* USER_CONTENT_END() */
 
 	MainWindow::MainWindow(::vl::Ptr<::vm::IViewModel> __vwsn_ctor_parameter_ViewModel)
 		: ::vl::presentation::controls::GuiWindow(::vl::presentation::theme::ThemeName::Window)
@@ -86,7 +87,6 @@ namespace helloworld
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/MainWindow.h b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/MainWindow.h
index c4aa5495..d341e839 100644
--- a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/MainWindow.h
+++ b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/MainWindow.h
@@ -55,6 +55,9 @@ namespace helloworld
 	public:
 		MainWindow(::vl::Ptr<::vm::IViewModel> __vwsn_ctor_parameter_ViewModel);
 		~MainWindow();
+
+	/* USER_CONTENT_BEGIN(custom members of ::helloworld::MainWindow) */
+	/* USER_CONTENT_END() */
 	};
 
 }
diff --git a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x64 b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x64
index 0c389411184e137a4ee8c3502e35db42fe9c2825..ba984f64eeadce56531e43f50236a01d180c60b3 100644
GIT binary patch
delta 559
zcmZ{h%}Z2K7{)u!+?jLl)jXv*2ZH%PlOd2MA*|?Ymu+N-@ZK|@Q3TZ{h#*RYK%o{<
zIln~{MAAP{6Runc?%D<-K}1=b{skjLUu~dOXLWeq=RD6jzq7WY)>c$!J;9$umi0uD
zL&-V5Bv11?c^2y(VaBWYWBdNDF-$7UP4A#T+Eqq(m8C83l~Vh8nLeok7UB%6v8EFl
zo~Jd9w9kN^U@D=x;d*(hEq#8IOS-7~Sk*)P(t~`^!{n-(xB7tU=c_-&jDJ;yva7Ki
zT;pC);8bvic2H0$u7^3=QE$(EkA-M}snBO6%rYMy=W|$KIV>#w4mU5dEs2?GUU__%
zTXiD6cZ+Y4CGRwgGA+51=!3kQ4pk5D_gpzP<021Z%dx1$Y`>=L%zs^4d9C=dR18<n
zakQrS80VRErsXD?o3>nWBeY}FWul3NLB|EmJImda;fE{Byd*x&txBEoN?u4<wkx(J
z($C2HUYGV^W?hDyz-?B~%i}D@<!MUihG<3t7e%{W-7Par)XIF4Pk2$gBOrtN1-4FT
mo{9U3<Zi@9KtHHI!mpcdrj<5BTFz%LYh1$$<bSg_jqx3X!MeWy

delta 613
zcmZ`$&ubGw6n0E@^JZ7Oqm5*Wm>;FBrI*BtRD;zX6zfGQN_VH(BvuI$4~^6!SS<(^
z6g=7QU=P*Szra9G9xDC=N}+h^K}8U+f)}Am`&JX^#etbO?|a{S-<vlZYhq(fG(X1h
zGuEFzxaZ%B?Ct5=o!ZpQ<V?LWRV-eq&(?4_{s^1#Gk6(44Q&lz$vP#wTPfX8b{ci-
zxa?~oeG#(y+gcK6ln5({LHzLu^CpY;2NWs^iB1|49r!?bJ||5lDx?u}yV%Rg0rX1`
zNtwi5s^S~p@5}4L!6zBwtuu@lP7YhVi_Q&Uq3ZVHvU{jQw8SHO&%zNmgL(G^Hr*WF
zxVhCW_t!;ib2m3bjfVkAyT$LtGcScpF~VnGBWnoD%qo}yntl?m$6cJW72XBJen#xY
zx_=hO`~pUe{x2gh?1kXTE{QplLMF%}9}?EtF8XT0jAD+b@^oC`n(4uXQd@-(n0;s(
zhbN}7;u9X&gs)}{i$Q_8gj*A3jwvpw&<IuZ9&Ar&_Nndf5+AlBaYD5;!V}O?{0~)b
z<O^ep6_y!m{8d*N3deBXQ+OUu<0x0}DxVY{MoKAWE3qH5<;RfaNI9yf@!eNQaBli4
P!BjMUa85h+sxr6(waUCb

diff --git a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86
index 02e72826dcae156adfcf8e7f19e40db0b966cc0a..a447f225ca6229cf76fbd46fd70ff01d3d026448 100644
GIT binary patch
delta 573
zcmZuu&rcIk5axB4xAV45x){x_2G|B-&=_bnM9`pMOi)OSC+u5x0S`6eFA4&tCYpHk
zsC+TuWZJ*LH9c@5dL!z^gbVQ?e*-rTNFD5w^xzz3-b`k`@0)qsn__!Y#9JwBL_OF_
z_2Yfks}C590>8}b_-KyQz4lHa41Cru;-Z6h7NH~^oFPXXqC4wjP!=$2DLj)OL<5Eu
zvY)e-@h3}|q|1mYYmS!}R&Yf<#19(6e2}3VrP9s$M^8(r(gjqgfU0^TY-H>KEZBKm
zwFd>ErgF^j#U5dQVCU$t(KOVo)0jwi;aj>Jo$3Cr_O_;pmRM=&_Ee!YGcGn#yr^40
zmH9m(B<@E(-e~HO$@tkMN{kvVc8eZz0f{!84}84lt?q_|ubTKCC-LcC8n;3x$$eqs
zXED#cJ;fLQsmnF}mI;T$KE%2rEQSoRu8+qFI>;an?Bw88CV3@EnJj4K`RapS?CJcG
zRAn7Y#Wm@|*XQtf`VQkYkqPC<IqDPES~$dnz0-Y|3&(If;Ibk(froYe&E(B`mz0b0
lzdaoI5n(j?j)P%B$IKX}PB_@n9$wDuvsjOjJk(|{{RKBYzK{R_

delta 573
zcmZut&ui3B5Z;$$lX=O)My+l@OG0hw_ONXg(IT~as|xj0%!}E&rPzbNXpvQ-Q0P&i
zh~4iZ2-5xm;>w<jy%ju2r63lHdhjB6^U_0Mon-gmp#$%I^X7ds^UdsRh@B15+|uw{
zt6)p(!>;gJ!}_AYo-vNM#zf1@pAxd&HGx&<7&grwe6}PWnihVUFY)du;h8m^;aBT{
zv~wNP@j;c)4BZA%_PJsb>ZXf3d@4m3*XcYGSw=#o{PcWM&*3jkV3|&0NcQ6m)vzY-
z3kL;z7<cV+xM+_E!nzDZ8z1d)z7OmGiBrKPr<Y&7j<1b&;7kf-%sD6U%IVRQwuaSW
zsdc>Y{hH7*TlKN5Na|gs1Ng#9Z|H;{p@$$Mk;hQvW2s133;Xf@rX#HGG(PrKIn8EH
zU-;yZxZY6D|0}%|mEfxYfkxO?N*G)^#?{E<)euxvKr^yME-Swh5&oET#9(3dM~~-E
zcLi$L4o5h1EFMHtd6;G1y<1Z<<)t=&P8SyoRW}o7G~x?9=?gW8T6~4QbV8S#PR1^N
xD$4xVVaH$K*rsyfR|%J^pLpf=%p?xR2vfX)Z`|<d%sxwI24~h{59_zj{sZ`gwuArx

diff --git a/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoPartialClasses.cpp
index a0cfaf60..6126f82f 100644
--- a/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -161,7 +160,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Layout/Flow/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/Flow/UI/Source/DemoPartialClasses.cpp
index 06bb46c9..15d9d916 100644
--- a/Tutorial/GacUI_Layout/Flow/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Layout/Flow/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -1383,7 +1382,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Layout/Responsive1/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/Responsive1/UI/Source/DemoPartialClasses.cpp
index 4b49472c..ffa83717 100644
--- a/Tutorial/GacUI_Layout/Responsive1/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Layout/Responsive1/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -2284,7 +2283,6 @@ Class (::demo::ResponsiveViewControl)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Layout/Responsive2/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/Responsive2/UI/Source/DemoPartialClasses.cpp
index cd210035..2b627515 100644
--- a/Tutorial/GacUI_Layout/Responsive2/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Layout/Responsive2/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -2211,7 +2210,6 @@ Class (::demo::VideoItemTemplate)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.cpp
index f9c1edbf..42ef361c 100644
--- a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -615,7 +614,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Layout/SharedSize/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/SharedSize/UI/Source/DemoPartialClasses.cpp
index 955e0854..47c56ac0 100644
--- a/Tutorial/GacUI_Layout/SharedSize/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Layout/SharedSize/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -1386,7 +1385,6 @@ Class (::demo::SharedSizeTextItemTemplate)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Layout/Stack/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/Stack/UI/Source/DemoPartialClasses.cpp
index c4e44e4f..ff2a5812 100644
--- a/Tutorial/GacUI_Layout/Stack/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Layout/Stack/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -495,7 +494,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Layout/Table/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/Table/UI/Source/DemoPartialClasses.cpp
index bd642ef8..97e5e2a7 100644
--- a/Tutorial/GacUI_Layout/Table/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Layout/Table/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -377,7 +376,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Layout/TableSplitter/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/TableSplitter/UI/Source/DemoPartialClasses.cpp
index a89ba202..c2b1db29 100644
--- a/Tutorial/GacUI_Layout/TableSplitter/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Layout/TableSplitter/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -1672,7 +1671,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Windows/Direct2DClock/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Windows/Direct2DClock/UI/Source/DemoPartialClasses.cpp
index 76aabbc6..d9076cd5 100644
--- a/Tutorial/GacUI_Windows/Direct2DClock/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Windows/Direct2DClock/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -90,7 +89,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Windows/Direct2DClock/UI/Source/MainWindow.cpp b/Tutorial/GacUI_Windows/Direct2DClock/UI/Source/MainWindow.cpp
index 326d2df3..6dfe0342 100644
--- a/Tutorial/GacUI_Windows/Direct2DClock/UI/Source/MainWindow.cpp
+++ b/Tutorial/GacUI_Windows/Direct2DClock/UI/Source/MainWindow.cpp
@@ -29,7 +29,9 @@ https://github.com/vczh-libraries
 #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(...)
+
+/* USER_CONTENT_BEGIN(custom global declarations) */
+/* USER_CONTENT_END() */
 
 /***********************************************************************
 Class (::demo::MainWindow)
@@ -37,13 +39,12 @@ Class (::demo::MainWindow)
 
 namespace demo
 {
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::InstallAnimationControl()
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		auto animationControl = new AnimationControl;
 		animationControl->GetBoundsComposition()->SetAlignmentToParent(vl::presentation::Margin(0, 0, 0, 0));
 		animationBounds->AddChild(animationControl->GetBoundsComposition());
-	}
+	}/* USER_CONTENT_END() */
 
 	MainWindow::MainWindow()
 		: ::vl::presentation::controls::GuiWindow(::vl::presentation::theme::ThemeName::Window)
@@ -69,7 +70,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Windows/Direct2DClock/UI/Source/MainWindow.h b/Tutorial/GacUI_Windows/Direct2DClock/UI/Source/MainWindow.h
index 0be29bb8..b521902b 100644
--- a/Tutorial/GacUI_Windows/Direct2DClock/UI/Source/MainWindow.h
+++ b/Tutorial/GacUI_Windows/Direct2DClock/UI/Source/MainWindow.h
@@ -37,6 +37,9 @@ namespace demo
 		MainWindow();
 		void __vwsn_instance_ctor_();
 		~MainWindow();
+
+	/* USER_CONTENT_BEGIN(custom members of ::demo::MainWindow) */
+	/* USER_CONTENT_END() */
 	};
 
 }
diff --git a/Tutorial/GacUI_Xml/Binding_Bind/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Binding_Bind/UI/Source/DemoPartialClasses.cpp
index 7f1a4d6c..fea67fbb 100644
--- a/Tutorial/GacUI_Xml/Binding_Bind/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Binding_Bind/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -363,7 +362,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Binding_Eval/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Binding_Eval/UI/Source/DemoPartialClasses.cpp
index 1b109e74..d151baaa 100644
--- a/Tutorial/GacUI_Xml/Binding_Eval/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Binding_Eval/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -115,7 +114,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Binding_Format/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Binding_Format/UI/Source/DemoPartialClasses.cpp
index 1f972ac5..87f9446b 100644
--- a/Tutorial/GacUI_Xml/Binding_Format/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Binding_Format/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -276,7 +275,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.cpp
index 5b8bb150..3ad5ece4 100644
--- a/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -169,11 +168,10 @@ namespace demo
 Class (::demo::MainWindow)
 ***********************************************************************/
 
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::documentLabel_ActiveHyperlinkExecuted(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		throw ::vl::Exception(L"You should implement this function.");
-	}
+	}/* USER_CONTENT_END() */
 
 	MainWindow::MainWindow()
 		: ::vl::presentation::controls::GuiWindow(::vl::presentation::theme::ThemeName::Window)
@@ -193,7 +191,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.h
index 9fd23ff8..2e265b77 100644
--- a/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.h
+++ b/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.h
@@ -67,6 +67,9 @@ namespace demo
 	public:
 		MainWindow();
 		~MainWindow();
+
+	/* USER_CONTENT_BEGIN(custom members of ::demo::MainWindow) */
+	/* USER_CONTENT_END() */
 	};
 
 }
diff --git a/Tutorial/GacUI_Xml/Binding_ViewModel/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Binding_ViewModel/UI/Source/DemoPartialClasses.cpp
index cd0de107..f9326060 100644
--- a/Tutorial/GacUI_Xml/Binding_ViewModel/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Binding_ViewModel/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -289,7 +288,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/DemoPartialClasses.cpp
index cee2f40e..79749f8e 100644
--- a/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -284,7 +283,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/MainWindow.cpp b/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/MainWindow.cpp
index 097c55d1..1e9e3014 100644
--- a/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/MainWindow.cpp
+++ b/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/MainWindow.cpp
@@ -29,7 +29,9 @@ https://github.com/vczh-libraries
 #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(...)
+
+/* USER_CONTENT_BEGIN(custom global declarations) */
+/* USER_CONTENT_END() */
 
 /***********************************************************************
 Class (::demo::MainWindow)
@@ -37,9 +39,8 @@ Class (::demo::MainWindow)
 
 namespace demo
 {
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::buttonCalculate_Clicked(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		bool successA = false;
 		bool successB = false;
 		auto a = vl::wtoi_test(textBoxA->GetText(), successA);
@@ -49,7 +50,7 @@ namespace demo
 			: L"<ERROR>"
 			;
 		textBoxC->SetText(c);
-	}
+	}/* USER_CONTENT_END() */
 
 	MainWindow::MainWindow()
 		: ::vl::presentation::controls::GuiWindow(::vl::presentation::theme::ThemeName::Window)
@@ -69,7 +70,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/MainWindow.h b/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/MainWindow.h
index dd042ca7..ad15e1e0 100644
--- a/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/MainWindow.h
+++ b/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/MainWindow.h
@@ -37,6 +37,9 @@ namespace demo
 	public:
 		MainWindow();
 		~MainWindow();
+
+	/* USER_CONTENT_BEGIN(custom members of ::demo::MainWindow) */
+	/* USER_CONTENT_END() */
 	};
 
 }
diff --git a/Tutorial/GacUI_Xml/Event_Script/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Event_Script/UI/Source/DemoPartialClasses.cpp
index 1a345c00..57bdb91e 100644
--- a/Tutorial/GacUI_Xml/Event_Script/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Event_Script/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -305,7 +304,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Event_ViewModel/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Event_ViewModel/UI/Source/DemoPartialClasses.cpp
index 5db70b16..bb458a80 100644
--- a/Tutorial/GacUI_Xml/Event_ViewModel/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Event_ViewModel/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -315,7 +314,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Instance_Control/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Instance_Control/UI/Source/DemoPartialClasses.cpp
index ce485aa0..7432752c 100644
--- a/Tutorial/GacUI_Xml/Instance_Control/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Instance_Control/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -335,7 +334,6 @@ Class (::demo::MyControl)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/DemoPartialClasses.cpp
index e94dfc78..bc7b98d5 100644
--- a/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -175,7 +174,6 @@ Class (::demo::AnotherWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/MainWindow.cpp b/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/MainWindow.cpp
index f2878c81..9ea7beca 100644
--- a/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/MainWindow.cpp
+++ b/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/MainWindow.cpp
@@ -29,7 +29,9 @@ https://github.com/vczh-libraries
 #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(...)
+
+/* USER_CONTENT_BEGIN(custom global declarations) */
+/* USER_CONTENT_END() */
 
 /***********************************************************************
 Class (::demo::MainWindow)
@@ -37,13 +39,12 @@ Class (::demo::MainWindow)
 
 namespace demo
 {
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::buttonShowWindow_Clicked(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		auto window = new AnotherWindow;
 		window->MoveToScreenCenter();
 		window->ShowModalAndDelete(this, []() {});
-	}
+	}/* USER_CONTENT_END() */
 
 	MainWindow::MainWindow()
 		: ::vl::presentation::controls::GuiWindow(::vl::presentation::theme::ThemeName::Window)
@@ -63,7 +64,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/MainWindow.h b/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/MainWindow.h
index 9d98459c..cd28fe5d 100644
--- a/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/MainWindow.h
+++ b/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/MainWindow.h
@@ -37,6 +37,9 @@ namespace demo
 	public:
 		MainWindow();
 		~MainWindow();
+
+	/* USER_CONTENT_BEGIN(custom members of ::demo::MainWindow) */
+	/* USER_CONTENT_END() */
 	};
 
 }
diff --git a/Tutorial/GacUI_Xml/Instance_Window/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Instance_Window/UI/Source/DemoPartialClasses.cpp
index b8df9908..760f56db 100644
--- a/Tutorial/GacUI_Xml/Instance_Window/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Instance_Window/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -115,7 +114,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Member_Field/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Member_Field/UI/Source/DemoPartialClasses.cpp
index 5fda54ac..4e0dfbb8 100644
--- a/Tutorial/GacUI_Xml/Member_Field/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Member_Field/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -320,7 +319,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Member_Field/UI/Source/MainWindow.cpp b/Tutorial/GacUI_Xml/Member_Field/UI/Source/MainWindow.cpp
index 74261e9e..55af7de6 100644
--- a/Tutorial/GacUI_Xml/Member_Field/UI/Source/MainWindow.cpp
+++ b/Tutorial/GacUI_Xml/Member_Field/UI/Source/MainWindow.cpp
@@ -29,7 +29,9 @@ https://github.com/vczh-libraries
 #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(...)
+
+/* USER_CONTENT_BEGIN(custom global declarations) */
+/* USER_CONTENT_END() */
 
 /***********************************************************************
 Class (::demo::MainWindow)
@@ -37,11 +39,10 @@ Class (::demo::MainWindow)
 
 namespace demo
 {
-	USERIMPL(/* ::demo::MainWindow */)
 	void MainWindow::buttonPaste_Clicked(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments)
-	{
+	{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
 		textBoxB->SetText(vl::itow(this->integerState));
-	}
+	}/* USER_CONTENT_END() */
 
 	MainWindow::MainWindow()
 		: ::vl::presentation::controls::GuiWindow(::vl::presentation::theme::ThemeName::Window)
@@ -62,7 +63,6 @@ namespace demo
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Member_Field/UI/Source/MainWindow.h b/Tutorial/GacUI_Xml/Member_Field/UI/Source/MainWindow.h
index a2cd9d85..0d110a45 100644
--- a/Tutorial/GacUI_Xml/Member_Field/UI/Source/MainWindow.h
+++ b/Tutorial/GacUI_Xml/Member_Field/UI/Source/MainWindow.h
@@ -41,6 +41,9 @@ namespace demo
 	public:
 		MainWindow();
 		~MainWindow();
+
+	/* USER_CONTENT_BEGIN(custom members of ::demo::MainWindow) */
+	/* USER_CONTENT_END() */
 	};
 
 }
diff --git a/Tutorial/GacUI_Xml/Member_Parameter/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Member_Parameter/UI/Source/DemoPartialClasses.cpp
index 9e3bcc5d..89a7249b 100644
--- a/Tutorial/GacUI_Xml/Member_Parameter/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Member_Parameter/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -128,7 +127,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.cpp
index d518a952..3a0e1a13 100644
--- a/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #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(...)
 
 /***********************************************************************
 Global Variables
@@ -441,7 +440,6 @@ Class (::demo::MyControl)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Misc_ImportFolder/ResBase/Source/ResBasePartialClasses.cpp b/Tutorial/GacUI_Xml/Misc_ImportFolder/ResBase/Source/ResBasePartialClasses.cpp
index fd12d939..1faaccce 100644
--- a/Tutorial/GacUI_Xml/Misc_ImportFolder/ResBase/Source/ResBasePartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Misc_ImportFolder/ResBase/Source/ResBasePartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #define GLOBAL_SYMBOL ::vl_workflow_global::ResBase::
 #define GLOBAL_NAME ::vl_workflow_global::ResBase::Instance().
 #define GLOBAL_OBJ &::vl_workflow_global::ResBase::Instance()
-#define USERIMPL(...)
 
 /***********************************************************************
 Global Variables
@@ -56,7 +55,6 @@ Global Functions
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)
diff --git a/Tutorial/GacUI_Xml/Misc_ImportFolder/ResDerived/Source/ResDerivedPartialClasses.cpp b/Tutorial/GacUI_Xml/Misc_ImportFolder/ResDerived/Source/ResDerivedPartialClasses.cpp
index 5343e293..b4116c63 100644
--- a/Tutorial/GacUI_Xml/Misc_ImportFolder/ResDerived/Source/ResDerivedPartialClasses.cpp
+++ b/Tutorial/GacUI_Xml/Misc_ImportFolder/ResDerived/Source/ResDerivedPartialClasses.cpp
@@ -29,7 +29,6 @@ https://github.com/vczh-libraries
 #define GLOBAL_SYMBOL ::vl_workflow_global::ResDerived::
 #define GLOBAL_NAME ::vl_workflow_global::ResDerived::Instance().
 #define GLOBAL_OBJ &::vl_workflow_global::ResDerived::Instance()
-#define USERIMPL(...)
 
 /***********************************************************************
 Global Variables
@@ -152,7 +151,6 @@ Class (::demo::MainWindow)
 #undef GLOBAL_SYMBOL
 #undef GLOBAL_NAME
 #undef GLOBAL_OBJ
-#undef USERIMPL
 
 #if defined( _MSC_VER)
 #pragma warning(pop)