diff --git a/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.cpp index 9d93e194..a0db65bc 100644 --- a/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.cpp @@ -1555,7 +1555,7 @@ Class (::demo::MainWindowConstructor) { (this->self = __vwsn_this_); (this->ViewModel = ::vl::__vwsn::This(__vwsn_this_)->GetViewModel()); - (this->__vwsn_precompile_39 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_39 = ::vl::__vwsn::This(this->self)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_39)->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__; }()); } @@ -2169,7 +2169,7 @@ Class (::demo::MainWindowConstructor) , __vwsn_precompile_36(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) , __vwsn_precompile_37(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) , __vwsn_precompile_38(::vl::Ptr<::demo::IViewModel>()) - , __vwsn_precompile_39(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_39(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } @@ -2525,7 +2525,7 @@ Class (::demo::NewFolderWindowConstructor) { ::vl::__vwsn::This(this->self)->SetMaximizedBox(false); } - (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>(240); __vwsn_temp__.y = static_cast<::vl::vint>(120); return __vwsn_temp__; }()); } @@ -2672,7 +2672,7 @@ Class (::demo::NewFolderWindowConstructor) , __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_Controls/AddressBook/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.h index d4b31129..83621966 100644 --- a/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.h @@ -239,7 +239,7 @@ namespace demo ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_36; ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_37; ::vl::Ptr<::demo::IViewModel> __vwsn_precompile_38; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_39; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_39; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); @@ -334,7 +334,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_NewFolderWindow_Initialize(::demo::NewFolderWindow* __vwsn_this_); public: NewFolderWindowConstructor(); diff --git a/Tutorial/GacUI_Controls/Animation/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/Animation/UI/Source/DemoPartialClasses.cpp index da0c0115..28866205 100644 --- a/Tutorial/GacUI_Controls/Animation/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Controls/Animation/UI/Source/DemoPartialClasses.cpp @@ -1212,7 +1212,7 @@ Class (::demo::MainWindowConstructor) void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->self = __vwsn_this_); - (this->__vwsn_precompile_20 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_20 = ::vl::__vwsn::This(this->self)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_20)->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__; }()); } @@ -1438,7 +1438,7 @@ Class (::demo::MainWindowConstructor) , __vwsn_precompile_17(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) , __vwsn_precompile_18(static_cast<::vl::presentation::controls::GuiTabPage*>(nullptr)) , __vwsn_precompile_19(::vl::Ptr<::vl::presentation::elements::GuiSolidBackgroundElement>()) - , __vwsn_precompile_20(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_20(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Controls/Animation/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Controls/Animation/UI/Source/DemoPartialClasses.h index b057761c..5b3fd48c 100644 --- a/Tutorial/GacUI_Controls/Animation/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Controls/Animation/UI/Source/DemoPartialClasses.h @@ -156,7 +156,7 @@ namespace demo ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_17; ::vl::presentation::controls::GuiTabPage* __vwsn_precompile_18; ::vl::Ptr<::vl::presentation::elements::GuiSolidBackgroundElement> __vwsn_precompile_19; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_20; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_20; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Controls/CalculatorAndStateMachine/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/CalculatorAndStateMachine/UI/Source/DemoPartialClasses.cpp index 5ecdce69..106ea2dd 100644 --- a/Tutorial/GacUI_Controls/CalculatorAndStateMachine/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Controls/CalculatorAndStateMachine/UI/Source/DemoPartialClasses.cpp @@ -870,13 +870,13 @@ Class (::demo::MainWindowConstructor) { (this->__vwsn_precompile_0 = __vwsn_this_); (this->calculator = ::vl::__vwsn::This(__vwsn_this_)->Getcalculator()); - { - ::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__; }()); - } - (this->__vwsn_precompile_49 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_49 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_49)->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_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__; }()); + } { ::vl::__vwsn::This(this->__vwsn_precompile_0)->SetText(::vl::WString::Unmanaged(L"CalculatorAndStateMachine")); } @@ -1388,7 +1388,7 @@ Class (::demo::MainWindowConstructor) , __vwsn_precompile_46(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_47(static_cast<::vl::presentation::controls::GuiButton*>(nullptr)) , __vwsn_precompile_48(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_49(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_49(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Controls/CalculatorAndStateMachine/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Controls/CalculatorAndStateMachine/UI/Source/DemoPartialClasses.h index 773c67c8..53f7000d 100644 --- a/Tutorial/GacUI_Controls/CalculatorAndStateMachine/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Controls/CalculatorAndStateMachine/UI/Source/DemoPartialClasses.h @@ -156,7 +156,7 @@ namespace demo ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_46; ::vl::presentation::controls::GuiButton* __vwsn_precompile_47; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_48; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_49; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_49; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Controls/ColorPicker/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/ColorPicker/UI/Source/DemoPartialClasses.cpp index 3c3d2c31..d1c1160c 100644 --- a/Tutorial/GacUI_Controls/ColorPicker/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Controls/ColorPicker/UI/Source/DemoPartialClasses.cpp @@ -541,7 +541,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__; }()); } @@ -638,7 +638,7 @@ Class (::demo::MainWindowConstructor) , __vwsn_precompile_5(static_cast<::vl::presentation::controls::GuiComboBoxListControl*>(nullptr)) , __vwsn_precompile_6(static_cast<::vl::presentation::controls::GuiBindableTextList*>(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_Controls/ColorPicker/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Controls/ColorPicker/UI/Source/DemoPartialClasses.h index 20fb38ac..25098e07 100644 --- a/Tutorial/GacUI_Controls/ColorPicker/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Controls/ColorPicker/UI/Source/DemoPartialClasses.h @@ -157,7 +157,7 @@ namespace demo ::vl::presentation::controls::GuiComboBoxListControl* __vwsn_precompile_5; ::vl::presentation::controls::GuiBindableTextList* __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_Controls/ContainersAndButtons/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/ContainersAndButtons/UI/Source/DemoPartialClasses.cpp index 4d7517ac..3f3fca97 100644 --- a/Tutorial/GacUI_Controls/ContainersAndButtons/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Controls/ContainersAndButtons/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_75 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetBoundsComposition()); + (this->__vwsn_precompile_75 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_75)->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__; }()); } @@ -676,7 +676,7 @@ namespace demo , __vwsn_precompile_72(static_cast<::vl::presentation::controls::GuiButton*>(nullptr)) , __vwsn_precompile_73(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) , __vwsn_precompile_74(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_75(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_75(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Controls/ContainersAndButtons/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Controls/ContainersAndButtons/UI/Source/DemoPartialClasses.h index 0fc5204e..a5aa880b 100644 --- a/Tutorial/GacUI_Controls/ContainersAndButtons/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Controls/ContainersAndButtons/UI/Source/DemoPartialClasses.h @@ -109,7 +109,7 @@ namespace demo ::vl::presentation::controls::GuiButton* __vwsn_precompile_72; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_73; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_74; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_75; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_75; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Controls/ListControls/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/ListControls/UI/Source/DemoPartialClasses.cpp index 3d910e36..4f54b07a 100644 --- a/Tutorial/GacUI_Controls/ListControls/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Controls/ListControls/UI/Source/DemoPartialClasses.cpp @@ -1043,7 +1043,7 @@ Class (::demo::MainWindowConstructor) void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->self = __vwsn_this_); - (this->__vwsn_precompile_5 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_5 = ::vl::__vwsn::This(this->self)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_5)->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__; }()); } @@ -1096,7 +1096,7 @@ Class (::demo::MainWindowConstructor) , __vwsn_precompile_2(static_cast<::demo::TextListTabPage*>(nullptr)) , __vwsn_precompile_3(static_cast<::demo::ListViewTabPage*>(nullptr)) , __vwsn_precompile_4(static_cast<::demo::TreeViewTabPage*>(nullptr)) - , __vwsn_precompile_5(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_5(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Controls/ListControls/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Controls/ListControls/UI/Source/DemoPartialClasses.h index e0ccf20a..470c9da6 100644 --- a/Tutorial/GacUI_Controls/ListControls/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Controls/ListControls/UI/Source/DemoPartialClasses.h @@ -134,7 +134,7 @@ namespace demo ::demo::TextListTabPage* __vwsn_precompile_2; ::demo::ListViewTabPage* __vwsn_precompile_3; ::demo::TreeViewTabPage* __vwsn_precompile_4; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_5; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_5; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Controls/MenuVisibility/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/MenuVisibility/UI/Source/DemoPartialClasses.cpp index f40ef163..ab394922 100644 --- a/Tutorial/GacUI_Controls/MenuVisibility/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Controls/MenuVisibility/UI/Source/DemoPartialClasses.cpp @@ -78,7 +78,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->self = __vwsn_this_); - (this->__vwsn_precompile_27 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_27 = ::vl::__vwsn::This(this->self)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_27)->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__; }()); } @@ -385,7 +385,7 @@ namespace demo , __vwsn_precompile_24(::vl::Ptr<::vl::presentation::controls::list::TextItem>()) , __vwsn_precompile_25(::vl::Ptr<::vl::presentation::controls::list::TextItem>()) , __vwsn_precompile_26(::vl::Ptr<::vl::presentation::controls::list::TextItem>()) - , __vwsn_precompile_27(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_27(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Controls/MenuVisibility/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Controls/MenuVisibility/UI/Source/DemoPartialClasses.h index 1a908969..6362e955 100644 --- a/Tutorial/GacUI_Controls/MenuVisibility/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Controls/MenuVisibility/UI/Source/DemoPartialClasses.h @@ -69,7 +69,7 @@ namespace demo ::vl::Ptr<::vl::presentation::controls::list::TextItem> __vwsn_precompile_24; ::vl::Ptr<::vl::presentation::controls::list::TextItem> __vwsn_precompile_25; ::vl::Ptr<::vl::presentation::controls::list::TextItem> __vwsn_precompile_26; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_27; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_27; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.cpp index 3c028fd3..2687e357 100644 --- a/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.cpp @@ -328,7 +328,7 @@ Class (::demo::MainWindowConstructor) { (this->self = __vwsn_this_); (this->ViewModel = ::vl::__vwsn::This(__vwsn_this_)->GetViewModel()); - (this->__vwsn_precompile_6 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_6 = ::vl::__vwsn::This(this->self)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_6)->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__; }()); } @@ -436,7 +436,7 @@ Class (::demo::MainWindowConstructor) , __vwsn_precompile_3(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_4(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_5(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_6(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_6(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.h index 12aed19c..5f10ca23 100644 --- a/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Controls/ProgressAndAsync/UI/Source/DemoPartialClasses.h @@ -92,7 +92,7 @@ namespace demo ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_3; ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_4; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_5; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_6; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_6; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp index 957d7110..50f9c929 100644 --- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp @@ -1141,7 +1141,7 @@ Class (::demo::FindWindowConstructor) void FindWindowConstructor::__vwsn_demo_FindWindow_Initialize(::demo::FindWindow* __vwsn_this_) { (this->self = __vwsn_this_); - (this->__vwsn_precompile_22 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_22 = ::vl::__vwsn::This(this->self)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_22)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(360); __vwsn_temp__.y = static_cast<::vl::vint>(150); return __vwsn_temp__; }()); } @@ -1420,7 +1420,7 @@ Class (::demo::FindWindowConstructor) , __vwsn_precompile_19(static_cast<::vl::presentation::compositions::GuiCellComposition*>(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)) { } @@ -1431,7 +1431,7 @@ Class (::demo::MainWindowConstructor) void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->self = __vwsn_this_); - (this->__vwsn_precompile_65 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_65 = ::vl::__vwsn::This(this->self)->GetContainerComposition()); { ::vl::__vwsn::This(this->__vwsn_precompile_65)->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__; }()); } @@ -2499,7 +2499,7 @@ Class (::demo::MainWindowConstructor) , __vwsn_precompile_62(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) , __vwsn_precompile_63(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_64(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_65(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_65(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.h index 66c566ef..9fae7fdd 100644 --- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.h @@ -137,7 +137,7 @@ namespace demo ::vl::presentation::compositions::GuiCellComposition* __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_FindWindow_Initialize(::demo::FindWindow* __vwsn_this_); public: FindWindowConstructor(); @@ -273,7 +273,7 @@ namespace demo ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_62; ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_63; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_64; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_65; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_65; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Controls/Win11ToolstripMenu/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/Win11ToolstripMenu/UI/Source/DemoPartialClasses.cpp index da73020b..13c100b1 100644 --- a/Tutorial/GacUI_Controls/Win11ToolstripMenu/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Controls/Win11ToolstripMenu/UI/Source/DemoPartialClasses.cpp @@ -92,8 +92,7 @@ namespace demo void MainWindowConstructor::__vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_) { (this->self = __vwsn_this_); - (this->__vwsn_precompile_17 = ::vl::__vwsn::This(this->self)->GetContainerComposition()); - (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>(320); __vwsn_temp__.y = static_cast<::vl::vint>(240); return __vwsn_temp__; }()); } @@ -346,7 +345,7 @@ namespace demo } { auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf2_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_(this)); - ::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_17)->GetEventReceiver()->rightButtonDown, __vwsn_event_handler_); + ::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_16)->GetEventReceiver()->rightButtonDown, __vwsn_event_handler_); } } @@ -378,8 +377,7 @@ namespace demo , __vwsn_precompile_13(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_14(static_cast<::vl::presentation::controls::GuiLabel*>(nullptr)) , __vwsn_precompile_15(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_16(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_17(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) + , __vwsn_precompile_16(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Controls/Win11ToolstripMenu/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Controls/Win11ToolstripMenu/UI/Source/DemoPartialClasses.h index 6ed0f546..7de2052f 100644 --- a/Tutorial/GacUI_Controls/Win11ToolstripMenu/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Controls/Win11ToolstripMenu/UI/Source/DemoPartialClasses.h @@ -70,8 +70,7 @@ namespace demo ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_13; ::vl::presentation::controls::GuiLabel* __vwsn_precompile_14; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_15; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_16; - ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_17; + ::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_16; void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Controls/Win11ToolstripMenu/UI/Source/DemoReflection.cpp b/Tutorial/GacUI_Controls/Win11ToolstripMenu/UI/Source/DemoReflection.cpp index 2fc14122..e6ce2830 100644 --- a/Tutorial/GacUI_Controls/Win11ToolstripMenu/UI/Source/DemoReflection.cpp +++ b/Tutorial/GacUI_Controls/Win11ToolstripMenu/UI/Source/DemoReflection.cpp @@ -56,7 +56,6 @@ namespace vl CLASS_MEMBER_FIELD(__vwsn_precompile_14) CLASS_MEMBER_FIELD(__vwsn_precompile_15) CLASS_MEMBER_FIELD(__vwsn_precompile_16) - CLASS_MEMBER_FIELD(__vwsn_precompile_17) CLASS_MEMBER_FIELD(__vwsn_precompile_2) CLASS_MEMBER_FIELD(__vwsn_precompile_3) CLASS_MEMBER_FIELD(__vwsn_precompile_4)