From e3c7e3554a9102807fc76166492e9a10e87bdd27 Mon Sep 17 00:00:00 2001 From: vczh Date: Sun, 3 Jul 2022 13:34:58 -0700 Subject: [PATCH] ... --- .../Source/DemoPartialClasses.cpp | 8 ++++---- .../Source/DemoPartialClasses.h | 4 ++-- .../UI/Source/EditorBasePartialClasses.cpp | 4 ++-- .../UI/Source/EditorBasePartialClasses.h | 2 +- .../UI/Source/HelloWorldPartialClasses.cpp | 4 ++-- .../UI/Source/HelloWorldPartialClasses.h | 2 +- .../UI/Source/HelloWorldPartialClasses.cpp | 4 ++-- .../MVVM/UI/Source/HelloWorldPartialClasses.h | 2 +- Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x64 | Bin 25226 -> 25176 bytes Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 | Bin 25226 -> 25176 bytes .../UI/Source/DemoPartialClasses.cpp | 8 +++----- .../Alignment/UI/Source/DemoPartialClasses.h | 3 +-- .../Alignment/UI/Source/DemoReflection.cpp | 1 - .../Flow/UI/Source/DemoPartialClasses.cpp | 12 +++++------- .../Flow/UI/Source/DemoPartialClasses.h | 3 +-- .../Flow/UI/Source/DemoReflection.cpp | 1 - .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 8 +++----- .../UI/Source/DemoPartialClasses.h | 3 +-- .../UI/Source/DemoReflection.cpp | 1 - .../Stack/UI/Source/DemoPartialClasses.cpp | 4 ++-- .../Stack/UI/Source/DemoPartialClasses.h | 2 +- .../Table/UI/Source/DemoPartialClasses.cpp | 4 ++-- .../Table/UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../Event_Cpp/UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 8 ++++---- .../UI/Source/DemoPartialClasses.h | 4 ++-- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../UI/Source/DemoPartialClasses.h | 2 +- .../UI/Source/DemoPartialClasses.cpp | 4 ++-- .../UI/Source/DemoPartialClasses.h | 2 +- 55 files changed, 86 insertions(+), 98 deletions(-) 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 25a250bdd55716b19574ef004531b17f6b6c7c2d..96bb0104ad51cfde011e60ad0cce0b162beeb6b6 100644 GIT binary patch delta 2137 zcmb`IZA@EL7{@u#cK1?{+n_tGrrfe%=oVVpiwd;mbsH}O#Kn!xw$LIqG^6c8!Ixz$ z)lbF*Gxy)V4aYwC$q{F&aXM?3$mX`#L=$z}2TY7_TaYa#ep8H3=_&Sw%n#b+_W!@n z`JLx^&h5E9uU}?27uflai`f`17Dt%@kCmvX)b!y^jSW7{R-D#)@O{ZP94!e@>|xy7 zURu*R6&wtPMb*vaiBwL*#^71V0 z3`}-J!jt}BI55!>2_23^gOkBXxQJH8;gBC>3S#o6)$fh?NG@YKT#>Czf>OF))`>(C zBBgd};ht<^TJjrFDI2Lny2q!b$Kcg(!jRrlysZecdb3H)D$)p((rEBVpa?O2%>ztC zQ~Hu7ep_EC?$zKYZ6(HS_Emky_Jh2(g7``MZJF)CbOUDtIMtxCCM=VG z8p(h4dok6hvI!&`IXi~=^?Wt7={_D6JvIx?h##&dUVSo;YRL=>{og71RHh=PJ2|@r zvxBoGJnm2p--(f0QTs_G92`d-N;YNsC68(q^c^fZ)NGP{h(#wa*6GmitYQ}sa&oqS zgj3D&IZ)vZ?UaB^#n&!Ht`mix$E-_b2a#}b=EgVcj*h_A%;izB>9)Yz#MjBufZ1lw zUV*noWsN9r;cOR{n{$0OQ|MnslIC8+GR?gKZL7-SNValz6E5=a!%O}W=JR|uQ|NDD zUz=*$wIRLSda>#~LJwi4O=XW@zKyeStmOGpnAg1mu59{F<~IVi|Gu{|T4`!gut&FTLrxm#s( zm?nP?-aMbp6nX<(ohmy3FTE-gm?GZ}R~Khd%#-gxlHyOn+?DIInLIb2n#K zv2q{(HfD%<4~yL@EAa9)Dg7{M=h7}qk6%Y$k4kS@sE4y3k@&~Q6Fm{O*(d%+Rq-=C zBlNkv_#kF_YYk`eqDV!n3!)-NMt(ziA7^D)?p0ZqkMHdJT#q+~CD?ruVt$2ACkf{o zB+SwMRi6Tl$A>vOkS-oPjPMX~bdC9q=qGi0tYR#NCx$FIPls3Qhy;hbdo9OVuNA-Q zBrLe=VHru~v!aUX)f4CRC?_Okb;_uxhLvFJ2&aTbyhhiT9s?akD{g**su{f26Ox2B z?*RUIR-q%Tn#fcOnUY_5_oYT~)@xZ^##=)QUZBf9C_$pK*~_}%QK-BXcZcd}=@v8( z8>yuO7@(H!QqEMnSB9^{;+IlI=X^07r>9}{x8iqqYHI39#i$83qC)RBiY9vg26)an AW&i*H literal 25226 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 E18AypbpQYW diff --git a/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 b/Tutorial/GacUI_HelloWorlds/UIRes/Xml.bin.x86 index 6260daa497282cb7cd60f639fb4da8e18851b130..f151f0b762d1d768bba582a6bfc9ddd8f34b0c1f 100644 GIT binary patch delta 2114 zcmb`IZD?C%6vunoB)vCX=#67OjWfN?WHb|#b!~@f()4xfd#lrG*EVUBxX6l4B26Z4 zSXuq3c8vWu7)aejd;twA@ntw86*pLAnGBrWK2!unEu&&V@Kezz?b9wVWq#1Wz2|?= z`90^Hhur&|moL-JOZ4IAg>)Df3!`Mj?jjY>71@v~+Pj{d{JP_WM* z3K~QtZKFq{v0%vQ>S%khTRj)=Az-)e&(&Er&r z4@Mb!bXEM45Wh#lt2!U50t!xgBxs7;NI{4gQbq;WiX|K?K7qJVhEduhOQO0C-BJY= z<1e{}-{<7LsMc53>P3`g*!EzoH4={b$HKvh)=22tNOUYV76}WYK#%MC9hAP`YiQ%# z9siL20V=_tdMg<)F4<|zYDoiLlb*y%DR0&pbXSiCh1#tcx7kc?=TPNfN?>KMI<_-5Jy(eh5waf7hy#t*lXSx)Crjq71y z|9470vtALC?Tl{0>|%5qdtIvW2N9_hwI4>(#qfel$)rrb=1@(7Uc`b+%_QkFEY!0? zoeq8V<#Yj|dPbL!tXH#i7L@3{aC7}J zyj;&Bo})9Fe0>W~G^?il#cRD+iCuRK`wXU=RoaetGox{=|1`F#%AF35Q#bI4zE$N@nv!nQ9fr|6^{B`Z0ZjK)8qei;k@i~hyduZCS%#sP@e_WjN2Ls%*w_1a39k4Q zEPB!hzJk6{2`Bhf>nX##+}{+CaGp=Ci-X7cTwC@t^o>ZU=X7TDm7(J}>6376R64~M zq>)*k%r!j7C&l`rSw2s`993|2*b3K>0*$8wlcf?Id@vsJ+*sAkULXG8iAJ&$UH1kz z5;^dWtU%#qULPq#1y5=XRK5B82=VPL`zy(cm0`49#TNXry~v=3{?LEcs4DD literal 25226 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 pcv2~__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();