diff --git a/Tutorial/GacUI_Xml/Binding_Bind/Main.cpp b/Tutorial/GacUI_Xml/Binding_Bind/Main.cpp index f6d0e3aa..bdd930ee 100644 --- a/Tutorial/GacUI_Xml/Binding_Bind/Main.cpp +++ b/Tutorial/GacUI_Xml/Binding_Bind/Main.cpp @@ -13,9 +13,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Binding_Bind.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window; diff --git a/Tutorial/GacUI_Xml/Binding_Eval/Main.cpp b/Tutorial/GacUI_Xml/Binding_Eval/Main.cpp index bb927ae1..8a2d102f 100644 --- a/Tutorial/GacUI_Xml/Binding_Eval/Main.cpp +++ b/Tutorial/GacUI_Xml/Binding_Eval/Main.cpp @@ -13,9 +13,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Binding_Eval.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window; diff --git a/Tutorial/GacUI_Xml/Binding_Format/Main.cpp b/Tutorial/GacUI_Xml/Binding_Format/Main.cpp index db7b6192..58988f77 100644 --- a/Tutorial/GacUI_Xml/Binding_Format/Main.cpp +++ b/Tutorial/GacUI_Xml/Binding_Format/Main.cpp @@ -13,9 +13,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Binding_Format.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window; diff --git a/Tutorial/GacUI_Xml/Binding_Uri/Main.cpp b/Tutorial/GacUI_Xml/Binding_Uri/Main.cpp index b6609658..7c43559a 100644 --- a/Tutorial/GacUI_Xml/Binding_Uri/Main.cpp +++ b/Tutorial/GacUI_Xml/Binding_Uri/Main.cpp @@ -13,9 +13,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Binding_Uri.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window; diff --git a/Tutorial/GacUI_Xml/Binding_ViewModel/Main.cpp b/Tutorial/GacUI_Xml/Binding_ViewModel/Main.cpp index 2a4f8a9e..5ca79404 100644 --- a/Tutorial/GacUI_Xml/Binding_ViewModel/Main.cpp +++ b/Tutorial/GacUI_Xml/Binding_ViewModel/Main.cpp @@ -22,9 +22,8 @@ public: void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Binding_ViewModel.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window(new ViewModelImpl); diff --git a/Tutorial/GacUI_Xml/Event_Cpp/Main.cpp b/Tutorial/GacUI_Xml/Event_Cpp/Main.cpp index b980f45f..0aaf21f5 100644 --- a/Tutorial/GacUI_Xml/Event_Cpp/Main.cpp +++ b/Tutorial/GacUI_Xml/Event_Cpp/Main.cpp @@ -13,9 +13,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Event_Cpp.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window; diff --git a/Tutorial/GacUI_Xml/Event_Script/Main.cpp b/Tutorial/GacUI_Xml/Event_Script/Main.cpp index aa5e0509..9181218d 100644 --- a/Tutorial/GacUI_Xml/Event_Script/Main.cpp +++ b/Tutorial/GacUI_Xml/Event_Script/Main.cpp @@ -13,9 +13,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Event_Script.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window; diff --git a/Tutorial/GacUI_Xml/Event_ViewModel/Main.cpp b/Tutorial/GacUI_Xml/Event_ViewModel/Main.cpp index 96a3ffb7..bf5567c5 100644 --- a/Tutorial/GacUI_Xml/Event_ViewModel/Main.cpp +++ b/Tutorial/GacUI_Xml/Event_ViewModel/Main.cpp @@ -27,9 +27,8 @@ public: void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Event_ViewModel.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window(new ViewModelImpl); diff --git a/Tutorial/GacUI_Xml/Instance_Control/Main.cpp b/Tutorial/GacUI_Xml/Instance_Control/Main.cpp index 237d08ca..cd26118e 100644 --- a/Tutorial/GacUI_Xml/Instance_Control/Main.cpp +++ b/Tutorial/GacUI_Xml/Instance_Control/Main.cpp @@ -13,9 +13,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Instance_Control.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window; diff --git a/Tutorial/GacUI_Xml/Instance_MultipleWindows/Main.cpp b/Tutorial/GacUI_Xml/Instance_MultipleWindows/Main.cpp index ca900087..d47b62f1 100644 --- a/Tutorial/GacUI_Xml/Instance_MultipleWindows/Main.cpp +++ b/Tutorial/GacUI_Xml/Instance_MultipleWindows/Main.cpp @@ -13,9 +13,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Instance_MultipleWindows.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window; diff --git a/Tutorial/GacUI_Xml/Instance_Window/Main.cpp b/Tutorial/GacUI_Xml/Instance_Window/Main.cpp index 4d15685e..8c61dd5c 100644 --- a/Tutorial/GacUI_Xml/Instance_Window/Main.cpp +++ b/Tutorial/GacUI_Xml/Instance_Window/Main.cpp @@ -13,9 +13,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Instance_Window.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window; diff --git a/Tutorial/GacUI_Xml/Member_Field/Main.cpp b/Tutorial/GacUI_Xml/Member_Field/Main.cpp index ac3fdb73..80317676 100644 --- a/Tutorial/GacUI_Xml/Member_Field/Main.cpp +++ b/Tutorial/GacUI_Xml/Member_Field/Main.cpp @@ -13,9 +13,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Member_Field.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window; diff --git a/Tutorial/GacUI_Xml/Member_Field/UI/Resource.xml b/Tutorial/GacUI_Xml/Member_Field/UI/Resource.xml index bb85aa4e..a7127144 100644 --- a/Tutorial/GacUI_Xml/Member_Field/UI/Resource.xml +++ b/Tutorial/GacUI_Xml/Member_Field/UI/Resource.xml @@ -11,7 +11,6 @@ - errors; FileStream fileStream(L"../UIRes/Member_Parameter.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window(new ViewModelImpl); diff --git a/Tutorial/GacUI_Xml/Member_Property/Main.cpp b/Tutorial/GacUI_Xml/Member_Property/Main.cpp index f5d58199..504a44a9 100644 --- a/Tutorial/GacUI_Xml/Member_Property/Main.cpp +++ b/Tutorial/GacUI_Xml/Member_Property/Main.cpp @@ -13,9 +13,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Member_Property.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window; diff --git a/Tutorial/GacUI_Xml/Member_Property/UI/Resource.xml b/Tutorial/GacUI_Xml/Member_Property/UI/Resource.xml index 694be8e2..d82d0df0 100644 --- a/Tutorial/GacUI_Xml/Member_Property/UI/Resource.xml +++ b/Tutorial/GacUI_Xml/Member_Property/UI/Resource.xml @@ -24,25 +24,7 @@ diff --git a/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.cpp index 5ba2c18e..39d622fd 100644 --- a/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.cpp @@ -475,14 +475,13 @@ Class (::demo::MyControl) ::vl::WString MyControl::GetSelectedOption() { - return ::vl::__vwsn::This(this)->selectedOption; + return ::vl::__vwsn::This(this)->__vwsn_prop_SelectedOption; } - - void MyControl::SetSelectedOption(const ::vl::WString& value) + void MyControl::SetSelectedOption(const ::vl::WString& __vwsn_value_) { - if ((::vl::__vwsn::This(this)->selectedOption != value)) + if ((::vl::__vwsn::This(this)->__vwsn_prop_SelectedOption != __vwsn_value_)) { - (::vl::__vwsn::This(this)->selectedOption = value); + (::vl::__vwsn::This(this)->__vwsn_prop_SelectedOption = __vwsn_value_); ::vl::__vwsn::EventInvoke(::vl::__vwsn::This(this)->SelectedOptionChanged)(); } } @@ -539,10 +538,10 @@ namespace vl BEGIN_CLASS_MEMBER(::demo::MyControl) CLASS_MEMBER_CONSTRUCTOR(::demo::MyControl*(), NO_PARAMETER) CLASS_MEMBER_METHOD(GetSelectedOption, NO_PARAMETER) - CLASS_MEMBER_METHOD(SetSelectedOption, { L"value" }) + CLASS_MEMBER_METHOD(SetSelectedOption, { L"__vwsn_value_" }) CLASS_MEMBER_EVENT(SelectedOptionChanged) + CLASS_MEMBER_FIELD(__vwsn_prop_SelectedOption) CLASS_MEMBER_PROPERTY_EVENT(SelectedOption, GetSelectedOption, SetSelectedOption, SelectedOptionChanged) - CLASS_MEMBER_FIELD(selectedOption) END_CLASS_MEMBER(::demo::MyControl) BEGIN_CLASS_MEMBER(::demo::MyControlConstructor) diff --git a/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.h index b2c98147..56aff6a5 100644 --- a/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.h @@ -111,12 +111,11 @@ namespace demo #ifndef VCZH_DEBUG_NO_REFLECTION friend struct ::vl::reflection::description::CustomTypeDescriptorSelector; #endif - protected: - ::vl::WString selectedOption = ::vl::WString(L"A", false); public: - ::vl::Event SelectedOptionChanged; + ::vl::WString __vwsn_prop_SelectedOption = ::vl::WString(L"A", false); ::vl::WString GetSelectedOption(); - void SetSelectedOption(const ::vl::WString& value); + void SetSelectedOption(const ::vl::WString& __vwsn_value_); + ::vl::Event SelectedOptionChanged; MyControl(); ~MyControl(); };