diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.cpp index df5dcf72..d76161fd 100644 --- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.cpp @@ -18586,7 +18586,7 @@ Class (::demo::HyperlinkWindowConstructor) { ::vl::__vwsn::This(this->self)->SetSizeBox(false); } - (this->__vwsn_precompile_13 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_13 = ::vl::__vwsn::This(this->self)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_13)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(320); __vwsn_temp__.y = static_cast<::vl::vint>(80); return __vwsn_temp__; }()); } @@ -18742,7 +18742,7 @@ Class (::demo::HyperlinkWindowConstructor) , __vwsn_precompile_10(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_11(static_cast<::vl::presentation::controls::GuiButton*>(nullptr)) , __vwsn_precompile_12(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_13(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_13(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } @@ -19487,7 +19487,7 @@ Class (::demo::MainWindowConstructor) void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->self = __vwsn_this_); - (this->__vwsn_precompile_29 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_29 = ::vl::__vwsn::This(this->self)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_29)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(640); __vwsn_temp__.y = static_cast<::vl::vint>(480); return __vwsn_temp__; }()); } @@ -19768,7 +19768,7 @@ Class (::demo::MainWindowConstructor) , __vwsn_precompile_26(static_cast<::demo::AnimationTabPage*>(nullptr)) , __vwsn_precompile_27(static_cast<::demo::LocalizedStringsTabPage*>(nullptr)) , __vwsn_precompile_28(static_cast<::demo::DatePickerTabPage*>(nullptr)) - , __vwsn_precompile_29(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_29(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.h b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.h index a00a6501..7ab14d09 100644 --- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.h @@ -1857,7 +1857,7 @@ namespace demo ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_10; ::vl::presentation::controls::GuiButton* __vwsn_precompile_11; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_12; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_13; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_13; void __vwsn_demo_HyperlinkWindow_Initialize(::demo::HyperlinkWindow* __vwsn_this_); public: HyperlinkWindowConstructor(); @@ -2138,7 +2138,7 @@ namespace demo ::demo::AnimationTabPage* __vwsn_precompile_26; ::demo::LocalizedStringsTabPage* __vwsn_precompile_27; ::demo::DatePickerTabPage* __vwsn_precompile_28; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_29; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_29; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/EditorBasePartialClasses.cpp b/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/EditorBasePartialClasses.cpp index 7a5e468a..2cf642c5 100644 --- a/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/EditorBasePartialClasses.cpp +++ b/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/EditorBasePartialClasses.cpp @@ -3734,7 +3734,7 @@ Class (::demo::HyperlinkWindowConstructor) void HyperlinkWindowConstructor::__vwsn_demo_HyperlinkWindow_Initialize(::demo::HyperlinkWindow* __vwsn_this_) { (this->self = __vwsn_this_); - (this->__vwsn_precompile_13 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_13 = ::vl::__vwsn::This(this->self)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_13)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(320); __vwsn_temp__.y = static_cast<::vl::vint>(80); return __vwsn_temp__; }()); } @@ -3902,7 +3902,7 @@ Class (::demo::HyperlinkWindowConstructor) , __vwsn_precompile_10(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_11(static_cast<::vl::presentation::controls::GuiButton*>(nullptr)) , __vwsn_precompile_12(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_13(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_13(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/EditorBasePartialClasses.h b/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/EditorBasePartialClasses.h index 2c17b798..6a91794c 100644 --- a/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/EditorBasePartialClasses.h +++ b/Tutorial/GacUI_Controls/DocumentEditor/UI/Source/EditorBasePartialClasses.h @@ -291,7 +291,7 @@ namespace demo ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_10; ::vl::presentation::controls::GuiButton* __vwsn_precompile_11; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_12; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_13; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_13; void __vwsn_demo_HyperlinkWindow_Initialize(::demo::HyperlinkWindow* __vwsn_this_); public: HyperlinkWindowConstructor(); diff --git a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.cpp b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.cpp index 37be5fa1..a52a65f9 100644 --- a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.cpp +++ b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.cpp @@ -60,7 +60,7 @@ namespace helloworld void MainWindowConstructor::__vwsn_helloworld_MainWindow_Initialize(::helloworld::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_2)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -87,7 +87,7 @@ namespace helloworld MainWindowConstructor::MainWindowConstructor() : __vwsn_precompile_0(static_cast<::helloworld::MainWindow*>(nullptr)) , __vwsn_precompile_1(static_cast<::vl::presentation::controls::GuiLabel*>(nullptr)) - , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.h b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.h index 1bc05529..d70715d9 100644 --- a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.h +++ b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Source/HelloWorldPartialClasses.h @@ -35,7 +35,7 @@ namespace helloworld protected: ::helloworld::MainWindow* __vwsn_precompile_0; ::vl::presentation::controls::GuiLabel* __vwsn_precompile_1; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_2; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_2; void __vwsn_helloworld_MainWindow_Initialize(::helloworld::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.cpp b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.cpp index 7da8f1e3..bbf8c87b 100644 --- a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.cpp +++ b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.cpp @@ -518,7 +518,7 @@ namespace helloworld { (this->self = __vwsn_this_); (this->ViewModel = ::vl::__vwsn::This(__vwsn_this_)->GetViewModel()); - (this->__vwsn_precompile_19 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_19 = ::vl::__vwsn::This(this->self)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_19)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(320); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -803,7 +803,7 @@ namespace helloworld , __vwsn_precompile_16(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) , __vwsn_precompile_17(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) , __vwsn_precompile_18(::vl::Ptr<::vm::IViewModel>()) - , __vwsn_precompile_19(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_19(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.h b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.h index e60ac562..88841ece 100644 --- a/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.h +++ b/Tutorial/GacUI_HelloWorlds/MVVM/UI/Source/HelloWorldPartialClasses.h @@ -93,7 +93,7 @@ namespace helloworld ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_16; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_17; ::vl::Ptr<::vm::IViewModel> __vwsn_precompile_18; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_19; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_19; void __vwsn_helloworld_MainWindow_Initialize(::helloworld::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x64 b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x64 index 25a250bd..96bb0104 100644 Binary files a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x64 and b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x64 differ diff --git a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 index 6260daa4..f151f0b7 100644 Binary files a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 and b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 differ diff --git a/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoPartialClasses.cpp index 81738bfe..c6e7b352 100644 --- a/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoPartialClasses.cpp @@ -60,11 +60,10 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_8 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); + (this->__vwsn_precompile_7 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_8)->SetInternalMargin([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(5); __vwsn_temp__.top = static_cast<::vl::vint>(5); __vwsn_temp__.right = static_cast<::vl::vint>(5); __vwsn_temp__.bottom = static_cast<::vl::vint>(5); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_7)->SetInternalMargin([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(5); __vwsn_temp__.top = static_cast<::vl::vint>(5); __vwsn_temp__.right = static_cast<::vl::vint>(5); __vwsn_temp__.bottom = static_cast<::vl::vint>(5); return __vwsn_temp__; }()); } - (this->__vwsn_precompile_7 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_7)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -132,8 +131,7 @@ namespace demo , __vwsn_precompile_4(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) , __vwsn_precompile_5(static_cast<::vl::presentation::controls::GuiButton*>(nullptr)) , __vwsn_precompile_6(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_7(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_8(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) + , __vwsn_precompile_7(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoPartialClasses.h index 904eeba8..aec17cac 100644 --- a/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoPartialClasses.h @@ -40,8 +40,7 @@ namespace demo ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_4; ::vl::presentation::controls::GuiButton* __vwsn_precompile_5; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_6; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_7; - ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_8; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_7; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoReflection.cpp b/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoReflection.cpp index f380d258..4edd5157 100644 --- a/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoReflection.cpp +++ b/Tutorial/GacUI_Layout/Alignment/UI/Source/DemoReflection.cpp @@ -53,7 +53,6 @@ namespace vl CLASS_MEMBER_FIELD(__vwsn_precompile_5) CLASS_MEMBER_FIELD(__vwsn_precompile_6) CLASS_MEMBER_FIELD(__vwsn_precompile_7) - CLASS_MEMBER_FIELD(__vwsn_precompile_8) END_CLASS_MEMBER(::demo::MainWindowConstructor) #undef _ diff --git a/Tutorial/GacUI_Layout/Flow/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/Flow/UI/Source/DemoPartialClasses.cpp index f2709f84..3148c454 100644 --- a/Tutorial/GacUI_Layout/Flow/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Layout/Flow/UI/Source/DemoPartialClasses.cpp @@ -556,14 +556,13 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_72 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); - { - ::vl::__vwsn::This(this->__vwsn_precompile_72)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren); - } - (this->__vwsn_precompile_71 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_71 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_71)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } + { + ::vl::__vwsn::This(this->__vwsn_precompile_71)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren); + } { ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetClientSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -1354,8 +1353,7 @@ namespace demo , __vwsn_precompile_68(static_cast<::vl::presentation::compositions::GuiFlowItemComposition*>(nullptr)) , __vwsn_precompile_69(static_cast<::vl::presentation::controls::GuiButton*>(nullptr)) , __vwsn_precompile_70(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_71(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_72(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) + , __vwsn_precompile_71(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Layout/Flow/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Layout/Flow/UI/Source/DemoPartialClasses.h index 956251ac..96581722 100644 --- a/Tutorial/GacUI_Layout/Flow/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Layout/Flow/UI/Source/DemoPartialClasses.h @@ -159,8 +159,7 @@ namespace demo ::vl::presentation::compositions::GuiFlowItemComposition* __vwsn_precompile_68; ::vl::presentation::controls::GuiButton* __vwsn_precompile_69; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_70; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_71; - ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_72; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_71; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Layout/Flow/UI/Source/DemoReflection.cpp b/Tutorial/GacUI_Layout/Flow/UI/Source/DemoReflection.cpp index 47f11533..52b2733b 100644 --- a/Tutorial/GacUI_Layout/Flow/UI/Source/DemoReflection.cpp +++ b/Tutorial/GacUI_Layout/Flow/UI/Source/DemoReflection.cpp @@ -115,7 +115,6 @@ namespace vl CLASS_MEMBER_FIELD(__vwsn_precompile_7) CLASS_MEMBER_FIELD(__vwsn_precompile_70) CLASS_MEMBER_FIELD(__vwsn_precompile_71) - CLASS_MEMBER_FIELD(__vwsn_precompile_72) CLASS_MEMBER_FIELD(__vwsn_precompile_8) CLASS_MEMBER_FIELD(__vwsn_precompile_9) CLASS_MEMBER_FIELD(flowLayout) diff --git a/Tutorial/GacUI_Layout/Responsive1/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/Responsive1/UI/Source/DemoPartialClasses.cpp index 018f68e6..e67b7175 100644 --- a/Tutorial/GacUI_Layout/Responsive1/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Layout/Responsive1/UI/Source/DemoPartialClasses.cpp @@ -927,7 +927,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->self = __vwsn_this_); - (this->__vwsn_precompile_16 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_16 = ::vl::__vwsn::This(this->self)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_16)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(640); __vwsn_temp__.y = static_cast<::vl::vint>(480); return __vwsn_temp__; }()); } @@ -1059,7 +1059,7 @@ namespace demo , __vwsn_precompile_13(static_cast<::demo::ResponsiveGroupControl*>(nullptr)) , __vwsn_precompile_14(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) , __vwsn_precompile_15(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_16(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_16(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Layout/Responsive1/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Layout/Responsive1/UI/Source/DemoPartialClasses.h index 97e43d0e..8f3013d5 100644 --- a/Tutorial/GacUI_Layout/Responsive1/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Layout/Responsive1/UI/Source/DemoPartialClasses.h @@ -86,7 +86,7 @@ namespace demo ::demo::ResponsiveGroupControl* __vwsn_precompile_13; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_14; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_15; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_16; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_16; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.cpp index a5accd94..c7a0d1f1 100644 --- a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.cpp @@ -81,11 +81,10 @@ Class (::demo::MainWindowConstructor) { (this->__vwsn_precompile_0 = __vwsn_this_); (this->ViewModel = ::vl::__vwsn::This(__vwsn_this_)->GetViewModel()); - (this->__vwsn_precompile_52 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); + (this->__vwsn_precompile_51 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_52)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren); + ::vl::__vwsn::This(this->__vwsn_precompile_51)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren); } - (this->__vwsn_precompile_51 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_51)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(640); return __vwsn_temp__; }()); } @@ -579,8 +578,7 @@ Class (::demo::MainWindowConstructor) , __vwsn_precompile_48(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_49(static_cast<::vl::presentation::controls::GuiLabel*>(nullptr)) , __vwsn_precompile_50(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_51(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_52(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) + , __vwsn_precompile_51(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.h index 59f9e749..a5cabc28 100644 --- a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoPartialClasses.h @@ -102,8 +102,7 @@ namespace demo ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_48; ::vl::presentation::controls::GuiLabel* __vwsn_precompile_49; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_50; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_51; - ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_52; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_51; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoReflection.cpp b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoReflection.cpp index e6b33906..f09fe788 100644 --- a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoReflection.cpp +++ b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/Source/DemoReflection.cpp @@ -102,7 +102,6 @@ namespace vl CLASS_MEMBER_FIELD(__vwsn_precompile_5) CLASS_MEMBER_FIELD(__vwsn_precompile_50) CLASS_MEMBER_FIELD(__vwsn_precompile_51) - CLASS_MEMBER_FIELD(__vwsn_precompile_52) CLASS_MEMBER_FIELD(__vwsn_precompile_6) CLASS_MEMBER_FIELD(__vwsn_precompile_7) CLASS_MEMBER_FIELD(__vwsn_precompile_8) diff --git a/Tutorial/GacUI_Layout/Stack/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/Stack/UI/Source/DemoPartialClasses.cpp index c10383a4..8b503c24 100644 --- a/Tutorial/GacUI_Layout/Stack/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Layout/Stack/UI/Source/DemoPartialClasses.cpp @@ -203,7 +203,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_22 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_22 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_22)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -467,7 +467,7 @@ namespace demo , __vwsn_precompile_19(static_cast<::vl::presentation::compositions::GuiStackItemComposition*>(nullptr)) , __vwsn_precompile_20(static_cast<::vl::presentation::controls::GuiButton*>(nullptr)) , __vwsn_precompile_21(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_22(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_22(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Layout/Stack/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Layout/Stack/UI/Source/DemoPartialClasses.h index 4654ab4b..f042b405 100644 --- a/Tutorial/GacUI_Layout/Stack/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Layout/Stack/UI/Source/DemoPartialClasses.h @@ -75,7 +75,7 @@ namespace demo ::vl::presentation::compositions::GuiStackItemComposition* __vwsn_precompile_19; ::vl::presentation::controls::GuiButton* __vwsn_precompile_20; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_21; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_22; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_22; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Layout/Table/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/Table/UI/Source/DemoPartialClasses.cpp index 2d4c9380..46a9b9a5 100644 --- a/Tutorial/GacUI_Layout/Table/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Layout/Table/UI/Source/DemoPartialClasses.cpp @@ -60,7 +60,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_31 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_31 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_31)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -349,7 +349,7 @@ namespace demo , __vwsn_precompile_28(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_29(static_cast<::vl::presentation::controls::GuiButton*>(nullptr)) , __vwsn_precompile_30(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_31(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_31(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Layout/Table/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Layout/Table/UI/Source/DemoPartialClasses.h index 444f49ec..1ac075b6 100644 --- a/Tutorial/GacUI_Layout/Table/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Layout/Table/UI/Source/DemoPartialClasses.h @@ -64,7 +64,7 @@ namespace demo ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_28; ::vl::presentation::controls::GuiButton* __vwsn_precompile_29; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_30; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_31; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_31; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Layout/TableSplitter/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Layout/TableSplitter/UI/Source/DemoPartialClasses.cpp index 0c05157d..2499a9b1 100644 --- a/Tutorial/GacUI_Layout/TableSplitter/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Layout/TableSplitter/UI/Source/DemoPartialClasses.cpp @@ -776,7 +776,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_96 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_96 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_96)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(640); __vwsn_temp__.y = static_cast<::vl::vint>(480); return __vwsn_temp__; }()); } @@ -1644,7 +1644,7 @@ namespace demo , __vwsn_precompile_93(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_94(::vl::Ptr<::vl::presentation::elements::GuiSolidBorderElement>()) , __vwsn_precompile_95(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_96(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_96(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Layout/TableSplitter/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Layout/TableSplitter/UI/Source/DemoPartialClasses.h index aca527c2..8bb58d75 100644 --- a/Tutorial/GacUI_Layout/TableSplitter/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Layout/TableSplitter/UI/Source/DemoPartialClasses.h @@ -171,7 +171,7 @@ namespace demo ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_93; ::vl::Ptr<::vl::presentation::elements::GuiSolidBorderElement> __vwsn_precompile_94; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_95; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_96; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_96; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Xml/Binding_Bind/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Binding_Bind/UI/Source/DemoPartialClasses.cpp index caed98b4..0a161884 100644 --- a/Tutorial/GacUI_Xml/Binding_Bind/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Binding_Bind/UI/Source/DemoPartialClasses.cpp @@ -160,7 +160,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_14 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_14 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_14)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -335,7 +335,7 @@ namespace demo , __vwsn_precompile_11(static_cast<::vl::presentation::controls::GuiLabel*>(nullptr)) , __vwsn_precompile_12(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_13(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_14(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_14(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Xml/Binding_Bind/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Binding_Bind/UI/Source/DemoPartialClasses.h index ad481f3f..6ad7082e 100644 --- a/Tutorial/GacUI_Xml/Binding_Bind/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Binding_Bind/UI/Source/DemoPartialClasses.h @@ -58,7 +58,7 @@ namespace demo ::vl::presentation::controls::GuiLabel* __vwsn_precompile_11; ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_12; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_13; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_14; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_14; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Xml/Binding_Eval/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Binding_Eval/UI/Source/DemoPartialClasses.cpp index da60a9d4..937988f5 100644 --- a/Tutorial/GacUI_Xml/Binding_Eval/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Binding_Eval/UI/Source/DemoPartialClasses.cpp @@ -60,7 +60,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_2)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -87,7 +87,7 @@ namespace demo MainWindowConstructor::MainWindowConstructor() : __vwsn_precompile_0(static_cast<::demo::MainWindow*>(nullptr)) , __vwsn_precompile_1(static_cast<::vl::presentation::controls::GuiLabel*>(nullptr)) - , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Xml/Binding_Eval/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Binding_Eval/UI/Source/DemoPartialClasses.h index 6a0bf2f3..70a3cc18 100644 --- a/Tutorial/GacUI_Xml/Binding_Eval/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Binding_Eval/UI/Source/DemoPartialClasses.h @@ -35,7 +35,7 @@ namespace demo protected: ::demo::MainWindow* __vwsn_precompile_0; ::vl::presentation::controls::GuiLabel* __vwsn_precompile_1; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_2; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_2; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Xml/Binding_Format/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Binding_Format/UI/Source/DemoPartialClasses.cpp index ddbef162..ae62c02b 100644 --- a/Tutorial/GacUI_Xml/Binding_Format/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Binding_Format/UI/Source/DemoPartialClasses.cpp @@ -144,7 +144,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_8 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_8 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_8)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -248,7 +248,7 @@ namespace demo , __vwsn_precompile_5(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) , __vwsn_precompile_6(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_7(static_cast<::vl::presentation::controls::GuiLabel*>(nullptr)) - , __vwsn_precompile_8(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_8(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Xml/Binding_Format/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Binding_Format/UI/Source/DemoPartialClasses.h index 40d70a3d..54d5f5d3 100644 --- a/Tutorial/GacUI_Xml/Binding_Format/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Binding_Format/UI/Source/DemoPartialClasses.h @@ -50,7 +50,7 @@ namespace demo ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_5; ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_6; ::vl::presentation::controls::GuiLabel* __vwsn_precompile_7; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_8; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_8; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.cpp index 0b333ed0..03a8ad0a 100644 --- a/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.cpp @@ -77,7 +77,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_8 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_8 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_8)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -159,7 +159,7 @@ namespace demo , __vwsn_precompile_5(::vl::Ptr<::vl::presentation::elements::GuiImageFrameElement>()) , __vwsn_precompile_6(static_cast<::vl::presentation::controls::GuiTabPage*>(nullptr)) , __vwsn_precompile_7(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_8(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_8(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.h index c271799a..c623a2c0 100644 --- a/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Binding_Uri/UI/Source/DemoPartialClasses.h @@ -48,7 +48,7 @@ namespace demo ::vl::Ptr<::vl::presentation::elements::GuiImageFrameElement> __vwsn_precompile_5; ::vl::presentation::controls::GuiTabPage* __vwsn_precompile_6; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_7; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_8; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_8; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Xml/Binding_ViewModel/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Binding_ViewModel/UI/Source/DemoPartialClasses.cpp index e85b6ff6..dbdddc20 100644 --- a/Tutorial/GacUI_Xml/Binding_ViewModel/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Binding_ViewModel/UI/Source/DemoPartialClasses.cpp @@ -149,7 +149,7 @@ Class (::demo::MainWindowConstructor) { (this->__vwsn_precompile_0 = __vwsn_this_); (this->ViewModel = ::vl::__vwsn::This(__vwsn_this_)->GetViewModel()); - (this->__vwsn_precompile_8 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_8 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_8)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -254,7 +254,7 @@ Class (::demo::MainWindowConstructor) , __vwsn_precompile_5(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) , __vwsn_precompile_6(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_7(static_cast<::vl::presentation::controls::GuiLabel*>(nullptr)) - , __vwsn_precompile_8(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_8(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Xml/Binding_ViewModel/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Binding_ViewModel/UI/Source/DemoPartialClasses.h index 269aa2dd..25c70734 100644 --- a/Tutorial/GacUI_Xml/Binding_ViewModel/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Binding_ViewModel/UI/Source/DemoPartialClasses.h @@ -61,7 +61,7 @@ namespace demo ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_5; ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_6; ::vl::presentation::controls::GuiLabel* __vwsn_precompile_7; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_8; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_8; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/DemoPartialClasses.cpp index b7dda549..f3288591 100644 --- a/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/DemoPartialClasses.cpp @@ -77,7 +77,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_17 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_17 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_17)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -274,7 +274,7 @@ namespace demo , __vwsn_precompile_14(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_15(static_cast<::vl::presentation::controls::GuiButton*>(nullptr)) , __vwsn_precompile_16(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_17(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_17(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/DemoPartialClasses.h index 77f27ffe..2963daa3 100644 --- a/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Event_Cpp/UI/Source/DemoPartialClasses.h @@ -59,7 +59,7 @@ namespace demo ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_14; ::vl::presentation::controls::GuiButton* __vwsn_precompile_15; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_16; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_17; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_17; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Xml/Event_Script/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Event_Script/UI/Source/DemoPartialClasses.cpp index beed4f97..0fab4231 100644 --- a/Tutorial/GacUI_Xml/Event_Script/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Event_Script/UI/Source/DemoPartialClasses.cpp @@ -79,7 +79,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_17 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_17 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_17)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -277,7 +277,7 @@ namespace demo , __vwsn_precompile_14(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_15(static_cast<::vl::presentation::controls::GuiButton*>(nullptr)) , __vwsn_precompile_16(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_17(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_17(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Xml/Event_Script/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Event_Script/UI/Source/DemoPartialClasses.h index 8976cc28..2fd3d0b3 100644 --- a/Tutorial/GacUI_Xml/Event_Script/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Event_Script/UI/Source/DemoPartialClasses.h @@ -59,7 +59,7 @@ namespace demo ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_14; ::vl::presentation::controls::GuiButton* __vwsn_precompile_15; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_16; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_17; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_17; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Xml/Event_ViewModel/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Event_ViewModel/UI/Source/DemoPartialClasses.cpp index 7e87c24c..817f215a 100644 --- a/Tutorial/GacUI_Xml/Event_ViewModel/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Event_ViewModel/UI/Source/DemoPartialClasses.cpp @@ -81,7 +81,7 @@ Class (::demo::MainWindowConstructor) { (this->__vwsn_precompile_0 = __vwsn_this_); (this->ViewModel = ::vl::__vwsn::This(__vwsn_this_)->GetViewModel()); - (this->__vwsn_precompile_17 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_17 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_17)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -280,7 +280,7 @@ Class (::demo::MainWindowConstructor) , __vwsn_precompile_14(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_15(static_cast<::vl::presentation::controls::GuiButton*>(nullptr)) , __vwsn_precompile_16(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_17(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_17(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Xml/Event_ViewModel/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Event_ViewModel/UI/Source/DemoPartialClasses.h index 0574da17..bc946c35 100644 --- a/Tutorial/GacUI_Xml/Event_ViewModel/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Event_ViewModel/UI/Source/DemoPartialClasses.h @@ -71,7 +71,7 @@ namespace demo ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_14; ::vl::presentation::controls::GuiButton* __vwsn_precompile_15; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_16; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_17; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_17; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Xml/Instance_Control/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Instance_Control/UI/Source/DemoPartialClasses.cpp index 778e3983..9c88e30f 100644 --- a/Tutorial/GacUI_Xml/Instance_Control/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Instance_Control/UI/Source/DemoPartialClasses.cpp @@ -223,7 +223,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_2)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -248,7 +248,7 @@ namespace demo MainWindowConstructor::MainWindowConstructor() : __vwsn_precompile_0(static_cast<::demo::MainWindow*>(nullptr)) , __vwsn_precompile_1(static_cast<::demo::MyControl*>(nullptr)) - , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Xml/Instance_Control/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Instance_Control/UI/Source/DemoPartialClasses.h index b645f305..8cef5ac7 100644 --- a/Tutorial/GacUI_Xml/Instance_Control/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Instance_Control/UI/Source/DemoPartialClasses.h @@ -45,7 +45,7 @@ namespace demo protected: ::demo::MainWindow* __vwsn_precompile_0; ::demo::MyControl* __vwsn_precompile_1; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_2; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_2; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/DemoPartialClasses.cpp index 8e423f66..a492593a 100644 --- a/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/DemoPartialClasses.cpp @@ -77,7 +77,7 @@ namespace demo void AnotherWindowConstructor::__vwsn_demo_AnotherWindow_Initialize(::demo::AnotherWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_2)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(320); __vwsn_temp__.y = static_cast<::vl::vint>(280); return __vwsn_temp__; }()); } @@ -104,7 +104,7 @@ namespace demo AnotherWindowConstructor::AnotherWindowConstructor() : __vwsn_precompile_0(static_cast<::demo::AnotherWindow*>(nullptr)) , __vwsn_precompile_1(static_cast<::vl::presentation::controls::GuiLabel*>(nullptr)) - , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } @@ -133,7 +133,7 @@ Class (::demo::MainWindowConstructor) void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_3 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_3 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_3)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -165,7 +165,7 @@ Class (::demo::MainWindowConstructor) : __vwsn_precompile_0(static_cast<::demo::MainWindow*>(nullptr)) , __vwsn_precompile_1(static_cast<::vl::presentation::controls::GuiButton*>(nullptr)) , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_3(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_3(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/DemoPartialClasses.h index 6bc7373a..e98c2f1a 100644 --- a/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Instance_MultipleWindows/UI/Source/DemoPartialClasses.h @@ -42,7 +42,7 @@ namespace demo protected: ::demo::AnotherWindow* __vwsn_precompile_0; ::vl::presentation::controls::GuiLabel* __vwsn_precompile_1; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_2; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_2; void __vwsn_demo_AnotherWindow_Initialize(::demo::AnotherWindow* __vwsn_this_); public: AnotherWindowConstructor(); @@ -69,7 +69,7 @@ namespace demo ::demo::MainWindow* __vwsn_precompile_0; ::vl::presentation::controls::GuiButton* __vwsn_precompile_1; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_2; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_3; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_3; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Xml/Instance_Window/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Instance_Window/UI/Source/DemoPartialClasses.cpp index 2d2d2d84..9e96aa14 100644 --- a/Tutorial/GacUI_Xml/Instance_Window/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Instance_Window/UI/Source/DemoPartialClasses.cpp @@ -60,7 +60,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_2)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -87,7 +87,7 @@ namespace demo MainWindowConstructor::MainWindowConstructor() : __vwsn_precompile_0(static_cast<::demo::MainWindow*>(nullptr)) , __vwsn_precompile_1(static_cast<::vl::presentation::controls::GuiLabel*>(nullptr)) - , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Xml/Instance_Window/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Instance_Window/UI/Source/DemoPartialClasses.h index 6a0bf2f3..70a3cc18 100644 --- a/Tutorial/GacUI_Xml/Instance_Window/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Instance_Window/UI/Source/DemoPartialClasses.h @@ -35,7 +35,7 @@ namespace demo protected: ::demo::MainWindow* __vwsn_precompile_0; ::vl::presentation::controls::GuiLabel* __vwsn_precompile_1; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_2; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_2; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Xml/Member_Field/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Member_Field/UI/Source/DemoPartialClasses.cpp index 1290456d..bee7b485 100644 --- a/Tutorial/GacUI_Xml/Member_Field/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Member_Field/UI/Source/DemoPartialClasses.cpp @@ -169,7 +169,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->self = __vwsn_this_); - (this->__vwsn_precompile_11 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_11 = ::vl::__vwsn::This(this->self)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_11)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -310,7 +310,7 @@ namespace demo , __vwsn_precompile_8(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_9(static_cast<::vl::presentation::controls::GuiButton*>(nullptr)) , __vwsn_precompile_10(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_11(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_11(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Xml/Member_Field/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Member_Field/UI/Source/DemoPartialClasses.h index 261c8f33..7d386a30 100644 --- a/Tutorial/GacUI_Xml/Member_Field/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Member_Field/UI/Source/DemoPartialClasses.h @@ -59,7 +59,7 @@ namespace demo ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_8; ::vl::presentation::controls::GuiButton* __vwsn_precompile_9; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_10; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_11; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_11; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Xml/Member_Parameter/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Member_Parameter/UI/Source/DemoPartialClasses.cpp index 87caa21b..ad523167 100644 --- a/Tutorial/GacUI_Xml/Member_Parameter/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Member_Parameter/UI/Source/DemoPartialClasses.cpp @@ -65,7 +65,7 @@ Class (::demo::MainWindowConstructor) { (this->__vwsn_precompile_0 = __vwsn_this_); (this->ViewModel = ::vl::__vwsn::This(__vwsn_this_)->GetViewModel()); - (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_2)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -93,7 +93,7 @@ Class (::demo::MainWindowConstructor) : ViewModel(::vl::Ptr<::demo::IViewModel>()) , __vwsn_precompile_0(static_cast<::demo::MainWindow*>(nullptr)) , __vwsn_precompile_1(static_cast<::vl::presentation::controls::GuiLabel*>(nullptr)) - , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Xml/Member_Parameter/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Member_Parameter/UI/Source/DemoPartialClasses.h index 1ba080fd..c33d70fb 100644 --- a/Tutorial/GacUI_Xml/Member_Parameter/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Member_Parameter/UI/Source/DemoPartialClasses.h @@ -46,7 +46,7 @@ namespace demo ::vl::Ptr<::demo::IViewModel> ViewModel; ::demo::MainWindow* __vwsn_precompile_0; ::vl::presentation::controls::GuiLabel* __vwsn_precompile_1; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_2; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_2; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.cpp index 67702c39..27dc17bc 100644 --- a/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.cpp @@ -247,7 +247,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->__vwsn_precompile_0 = __vwsn_this_); - (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_2 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_2)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }()); } @@ -276,7 +276,7 @@ namespace demo : myControl(static_cast<::demo::MyControl*>(nullptr)) , __vwsn_precompile_0(static_cast<::demo::MainWindow*>(nullptr)) , __vwsn_precompile_1(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.h index 07e97523..40d3e6b4 100644 --- a/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Xml/Member_Property/UI/Source/DemoPartialClasses.h @@ -50,7 +50,7 @@ namespace demo ::demo::MyControl* myControl; ::demo::MainWindow* __vwsn_precompile_0; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_1; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_2; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_2; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor();