diff --git a/TODO.md b/TODO.md index 78c6a1ea..8f14783c 100644 --- a/TODO.md +++ b/TODO.md @@ -68,7 +68,7 @@ https://zhuanlan.zhihu.com/p/33778843 - [x] Demo: Responsive1 - [x] Demo: Responsive2 - [ ] Demo: TextEditor - - [ ] Use toolstrip group instead of splitter + - [x] Use toolstrip group instead of splitter - [ ] Recently opened files in both menu and toolbar - [x] Prevent from crashing while binding to a.b.c if a.b is null with a.b.cChanged exists - [ ] **Update Release** diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/MainWindow.xml b/Tutorial/GacUI_Controls/TextEditor/UI/MainWindow.xml index 82549e08..994bd36a 100644 --- a/Tutorial/GacUI_Controls/TextEditor/UI/MainWindow.xml +++ b/Tutorial/GacUI_Controls/TextEditor/UI/MainWindow.xml @@ -140,33 +140,42 @@ - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp index fddbb39e..62d24c0d 100644 --- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp @@ -827,9 +827,9 @@ namespace demo void MainWindowConstructor::__vwsn_initialize_instance_(::demo::MainWindow* __vwsn_this_) { (this->self = __vwsn_this_); - (this->__vwsn_precompile_57 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_59 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_57)->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_59)->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->self)->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__; }()); @@ -1069,9 +1069,9 @@ namespace demo { (this->__vwsn_precompile_2 = new ::vl::presentation::controls::GuiToolstripMenuBar(::vl::presentation::theme::ThemeName::MenuBar)); } - (this->__vwsn_precompile_30 = ::vl::__vwsn::This(this->__vwsn_precompile_2)->GetBoundsComposition()); + (this->__vwsn_precompile_32 = ::vl::__vwsn::This(this->__vwsn_precompile_2)->GetBoundsComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_30)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_32)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }()); } { (this->__vwsn_precompile_3 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuBarButton)); @@ -1084,205 +1084,217 @@ namespace demo } (this->__vwsn_precompile_4 = ::vl::__vwsn::This(this->__vwsn_precompile_3)->EnsureToolstripSubMenu()); { - (this->__vwsn_precompile_5 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); + (this->__vwsn_precompile_5 = new ::vl::presentation::controls::GuiToolstripGroupContainer(::vl::presentation::theme::ThemeName::CustomControl)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_5)->SetAlt(::vl::WString(L"N", false)); + (this->__vwsn_precompile_6 = new ::vl::presentation::controls::GuiToolstripGroup(::vl::presentation::theme::ThemeName::CustomControl)); } - { - ::vl::__vwsn::This(this->__vwsn_precompile_5)->SetText(::vl::WString(L"New", false)); - } - (this->__vwsn_precompile_6 = ::vl::__vwsn::This(this->__vwsn_precompile_5)->EnsureToolstripSubMenu()); { (this->__vwsn_precompile_7 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_7)->SetAlt(::vl::WString(L"T", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_7)->SetAlt(::vl::WString(L"N", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_6)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_7)); - } - { - (this->__vwsn_precompile_8 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); - } - { - ::vl::__vwsn::This(this->__vwsn_precompile_8)->SetAlt(::vl::WString(L"X", false)); - } - { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_6)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_8)); - } - { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_4)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_5)); + ::vl::__vwsn::This(this->__vwsn_precompile_7)->SetText(::vl::WString(L"New", false)); } + (this->__vwsn_precompile_8 = ::vl::__vwsn::This(this->__vwsn_precompile_7)->EnsureToolstripSubMenu()); { (this->__vwsn_precompile_9 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_9)->SetAlt(::vl::WString(L"O", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_9)->SetAlt(::vl::WString(L"T", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_4)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_9)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_8)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_9)); } { (this->__vwsn_precompile_10 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_10)->SetAlt(::vl::WString(L"S", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_10)->SetAlt(::vl::WString(L"X", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_4)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_10)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_8)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_10)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_6)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_7)); } { (this->__vwsn_precompile_11 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_11)->SetAlt(::vl::WString(L"A", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_11)->SetAlt(::vl::WString(L"O", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_4)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_11)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_6)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_11)); } { - (this->__vwsn_precompile_12 = new ::vl::presentation::controls::GuiControl(::vl::presentation::theme::ThemeName::MenuSplitter)); + (this->__vwsn_precompile_12 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_4)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_12)); + ::vl::__vwsn::This(this->__vwsn_precompile_12)->SetAlt(::vl::WString(L"S", false)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_6)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_12)); } { (this->__vwsn_precompile_13 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_13)->SetAlt(::vl::WString(L"X", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_13)->SetAlt(::vl::WString(L"A", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_4)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_13)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_6)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_13)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_5)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_6)); + } + { + (this->__vwsn_precompile_14 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); + } + { + ::vl::__vwsn::This(this->__vwsn_precompile_14)->SetAlt(::vl::WString(L"X", false)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_5)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_14)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_4)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_5)); } { ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_2)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_3)); } { - (this->__vwsn_precompile_14 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuBarButton)); + (this->__vwsn_precompile_15 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuBarButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_14)->SetAlt(::vl::WString(L"E", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_15)->SetAlt(::vl::WString(L"E", false)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_14)->SetText(::vl::WString(L"Edit", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_15)->SetText(::vl::WString(L"Edit", false)); } - (this->__vwsn_precompile_15 = ::vl::__vwsn::This(this->__vwsn_precompile_14)->EnsureToolstripSubMenu()); + (this->__vwsn_precompile_16 = ::vl::__vwsn::This(this->__vwsn_precompile_15)->EnsureToolstripSubMenu()); { - (this->__vwsn_precompile_16 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); + (this->__vwsn_precompile_17 = new ::vl::presentation::controls::GuiToolstripGroupContainer(::vl::presentation::theme::ThemeName::CustomControl)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_16)->SetAlt(::vl::WString(L"U", false)); - } - { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_15)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_16)); - } - { - (this->__vwsn_precompile_17 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); - } - { - ::vl::__vwsn::This(this->__vwsn_precompile_17)->SetAlt(::vl::WString(L"R", false)); - } - { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_15)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_17)); - } - { - (this->__vwsn_precompile_18 = new ::vl::presentation::controls::GuiControl(::vl::presentation::theme::ThemeName::MenuSplitter)); - } - { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_15)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_18)); + (this->__vwsn_precompile_18 = new ::vl::presentation::controls::GuiToolstripGroup(::vl::presentation::theme::ThemeName::CustomControl)); } { (this->__vwsn_precompile_19 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_19)->SetAlt(::vl::WString(L"X", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_19)->SetAlt(::vl::WString(L"U", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_15)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_19)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_18)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_19)); } { (this->__vwsn_precompile_20 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_20)->SetAlt(::vl::WString(L"C", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_20)->SetAlt(::vl::WString(L"R", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_15)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_20)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_18)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_20)); } { - (this->__vwsn_precompile_21 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_17)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_18)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_21)->SetAlt(::vl::WString(L"V", false)); + (this->__vwsn_precompile_21 = new ::vl::presentation::controls::GuiToolstripGroup(::vl::presentation::theme::ThemeName::CustomControl)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_15)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_21)); + (this->__vwsn_precompile_22 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - (this->__vwsn_precompile_22 = new ::vl::presentation::controls::GuiControl(::vl::presentation::theme::ThemeName::MenuSplitter)); + ::vl::__vwsn::This(this->__vwsn_precompile_22)->SetAlt(::vl::WString(L"X", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_15)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_22)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_21)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_22)); } { (this->__vwsn_precompile_23 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_23)->SetAlt(::vl::WString(L"D", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_23)->SetAlt(::vl::WString(L"C", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_15)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_23)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_21)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_23)); } { (this->__vwsn_precompile_24 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_24)->SetAlt(::vl::WString(L"A", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_24)->SetAlt(::vl::WString(L"V", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_15)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_24)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_21)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_24)); } { - (this->__vwsn_precompile_25 = new ::vl::presentation::controls::GuiControl(::vl::presentation::theme::ThemeName::MenuSplitter)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_17)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_21)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_15)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_25)); + (this->__vwsn_precompile_25 = new ::vl::presentation::controls::GuiToolstripGroup(::vl::presentation::theme::ThemeName::CustomControl)); } { (this->__vwsn_precompile_26 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_26)->SetAlt(::vl::WString(L"F", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_26)->SetAlt(::vl::WString(L"D", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_15)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_26)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_25)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_26)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_2)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_14)); + (this->__vwsn_precompile_27 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - (this->__vwsn_precompile_27 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuBarButton)); + ::vl::__vwsn::This(this->__vwsn_precompile_27)->SetAlt(::vl::WString(L"A", false)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_27)->SetAlt(::vl::WString(L"H", false)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_25)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_27)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_27)->SetText(::vl::WString(L"Help", false)); - } - (this->__vwsn_precompile_28 = ::vl::__vwsn::This(this->__vwsn_precompile_27)->EnsureToolstripSubMenu()); - { - (this->__vwsn_precompile_29 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_17)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_25)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_29)->SetAlt(::vl::WString(L"A", false)); + (this->__vwsn_precompile_28 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_28)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_29)); + ::vl::__vwsn::This(this->__vwsn_precompile_28)->SetAlt(::vl::WString(L"F", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_2)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_27)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_17)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_28)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_16)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_17)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_2)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_15)); + } + { + (this->__vwsn_precompile_29 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuBarButton)); + } + { + ::vl::__vwsn::This(this->__vwsn_precompile_29)->SetAlt(::vl::WString(L"H", false)); + } + { + ::vl::__vwsn::This(this->__vwsn_precompile_29)->SetText(::vl::WString(L"Help", false)); + } + (this->__vwsn_precompile_30 = ::vl::__vwsn::This(this->__vwsn_precompile_29)->EnsureToolstripSubMenu()); + { + (this->__vwsn_precompile_31 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); + } + { + ::vl::__vwsn::This(this->__vwsn_precompile_31)->SetAlt(::vl::WString(L"A", false)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_30)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_31)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_2)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_29)); } { ::vl::__vwsn::This(this->__vwsn_precompile_1)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(::vl::__vwsn::This(this->__vwsn_precompile_2)->GetBoundsComposition())); @@ -1290,187 +1302,187 @@ namespace demo { ::vl::__vwsn::This(this->__vwsn_precompile_0)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_1)); } - (this->__vwsn_precompile_31 = new ::vl::presentation::compositions::GuiCellComposition()); + (this->__vwsn_precompile_33 = new ::vl::presentation::compositions::GuiCellComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_31)->SetSite(static_cast<::vl::vint>(1), static_cast<::vl::vint>(0), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1)); + ::vl::__vwsn::This(this->__vwsn_precompile_33)->SetSite(static_cast<::vl::vint>(1), static_cast<::vl::vint>(0), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1)); } { - (this->__vwsn_precompile_32 = new ::vl::presentation::controls::GuiToolstripToolBar(::vl::presentation::theme::ThemeName::ToolstripToolBar)); + (this->__vwsn_precompile_34 = new ::vl::presentation::controls::GuiToolstripToolBar(::vl::presentation::theme::ThemeName::ToolstripToolBar)); } - (this->__vwsn_precompile_54 = ::vl::__vwsn::This(this->__vwsn_precompile_32)->GetBoundsComposition()); + (this->__vwsn_precompile_56 = ::vl::__vwsn::This(this->__vwsn_precompile_34)->GetBoundsComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_54)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_56)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }()); } { - (this->__vwsn_precompile_33 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripDropdownButton)); + (this->__vwsn_precompile_35 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripDropdownButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_33)->SetAlt(::vl::WString(L"N", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_35)->SetAlt(::vl::WString(L"N", false)); } - (this->__vwsn_precompile_34 = ::vl::__vwsn::This(this->__vwsn_precompile_33)->EnsureToolstripSubMenu()); + (this->__vwsn_precompile_36 = ::vl::__vwsn::This(this->__vwsn_precompile_35)->EnsureToolstripSubMenu()); { - (this->__vwsn_precompile_35 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); + (this->__vwsn_precompile_37 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_35)->SetAlt(::vl::WString(L"T", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_37)->SetAlt(::vl::WString(L"T", false)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_36)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_37)); + } + { + (this->__vwsn_precompile_38 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); + } + { + ::vl::__vwsn::This(this->__vwsn_precompile_38)->SetAlt(::vl::WString(L"X", false)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_36)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_38)); } { ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_35)); } { - (this->__vwsn_precompile_36 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); + (this->__vwsn_precompile_39 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripSplitButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_36)->SetAlt(::vl::WString(L"X", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_39)->SetAlt(::vl::WString(L"O", false)); + } + (this->__vwsn_precompile_40 = ::vl::__vwsn::This(this->__vwsn_precompile_39)->EnsureToolstripSubMenu()); + { + (this->__vwsn_precompile_41 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_36)); + ::vl::__vwsn::This(this->__vwsn_precompile_41)->SetAlt(::vl::WString(L"T", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_33)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_40)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_41)); } { - (this->__vwsn_precompile_37 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripSplitButton)); + (this->__vwsn_precompile_42 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_37)->SetAlt(::vl::WString(L"O", false)); - } - (this->__vwsn_precompile_38 = ::vl::__vwsn::This(this->__vwsn_precompile_37)->EnsureToolstripSubMenu()); - { - (this->__vwsn_precompile_39 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); + ::vl::__vwsn::This(this->__vwsn_precompile_42)->SetAlt(::vl::WString(L"X", false)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_39)->SetAlt(::vl::WString(L"T", false)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_40)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_42)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_38)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_39)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_39)); } { - (this->__vwsn_precompile_40 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); + (this->__vwsn_precompile_43 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_40)->SetAlt(::vl::WString(L"X", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_43)->SetAlt(::vl::WString(L"S", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_38)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_40)); - } - { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_37)); - } - { - (this->__vwsn_precompile_41 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); - } - { - ::vl::__vwsn::This(this->__vwsn_precompile_41)->SetAlt(::vl::WString(L"S", false)); - } - { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_41)); - } - { - (this->__vwsn_precompile_42 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); - } - { - ::vl::__vwsn::This(this->__vwsn_precompile_42)->SetAlt(::vl::WString(L"A", false)); - } - { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_42)); - } - { - (this->__vwsn_precompile_43 = new ::vl::presentation::controls::GuiControl(::vl::presentation::theme::ThemeName::ToolstripSplitter)); - } - { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_43)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_43)); } { (this->__vwsn_precompile_44 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_44)->SetAlt(::vl::WString(L"U", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_44)->SetAlt(::vl::WString(L"A", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_44)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_44)); } { - (this->__vwsn_precompile_45 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); + (this->__vwsn_precompile_45 = new ::vl::presentation::controls::GuiControl(::vl::presentation::theme::ThemeName::ToolstripSplitter)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_45)->SetAlt(::vl::WString(L"R", false)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_45)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_45)); + (this->__vwsn_precompile_46 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); } { - (this->__vwsn_precompile_46 = new ::vl::presentation::controls::GuiControl(::vl::presentation::theme::ThemeName::ToolstripSplitter)); + ::vl::__vwsn::This(this->__vwsn_precompile_46)->SetAlt(::vl::WString(L"U", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_46)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_46)); } { (this->__vwsn_precompile_47 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_47)->SetAlt(::vl::WString(L"X", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_47)->SetAlt(::vl::WString(L"R", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_47)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_47)); } { - (this->__vwsn_precompile_48 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); + (this->__vwsn_precompile_48 = new ::vl::presentation::controls::GuiControl(::vl::presentation::theme::ThemeName::ToolstripSplitter)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_48)->SetAlt(::vl::WString(L"C", false)); - } - { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_48)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_48)); } { (this->__vwsn_precompile_49 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_49)->SetAlt(::vl::WString(L"V", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_49)->SetAlt(::vl::WString(L"X", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_49)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_49)); } { - (this->__vwsn_precompile_50 = new ::vl::presentation::controls::GuiControl(::vl::presentation::theme::ThemeName::ToolstripSplitter)); + (this->__vwsn_precompile_50 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_50)); + ::vl::__vwsn::This(this->__vwsn_precompile_50)->SetAlt(::vl::WString(L"C", false)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_50)); } { (this->__vwsn_precompile_51 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_51)->SetAlt(::vl::WString(L"D", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_51)->SetAlt(::vl::WString(L"V", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_51)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_51)); } { (this->__vwsn_precompile_52 = new ::vl::presentation::controls::GuiControl(::vl::presentation::theme::ThemeName::ToolstripSplitter)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_52)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_52)); } { (this->__vwsn_precompile_53 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_53)->SetAlt(::vl::WString(L"I", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_53)->SetAlt(::vl::WString(L"D", false)); } { - ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_53)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_53)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_31)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(::vl::__vwsn::This(this->__vwsn_precompile_32)->GetBoundsComposition())); + (this->__vwsn_precompile_54 = new ::vl::presentation::controls::GuiControl(::vl::presentation::theme::ThemeName::ToolstripSplitter)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_0)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_31)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_54)); } - (this->__vwsn_precompile_55 = new ::vl::presentation::compositions::GuiCellComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_55)->SetSite(static_cast<::vl::vint>(2), static_cast<::vl::vint>(0), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1)); + (this->__vwsn_precompile_55 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); + } + { + ::vl::__vwsn::This(this->__vwsn_precompile_55)->SetAlt(::vl::WString(L"I", false)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_55)); + } + { + ::vl::__vwsn::This(this->__vwsn_precompile_33)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetBoundsComposition())); + } + { + ::vl::__vwsn::This(this->__vwsn_precompile_0)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_33)); + } + (this->__vwsn_precompile_57 = new ::vl::presentation::compositions::GuiCellComposition()); + { + ::vl::__vwsn::This(this->__vwsn_precompile_57)->SetSite(static_cast<::vl::vint>(2), static_cast<::vl::vint>(0), static_cast<::vl::vint>(1), static_cast<::vl::vint>(1)); } { (this->textBox = new ::vl::presentation::controls::GuiMultilineTextBox(::vl::presentation::theme::ThemeName::MultilineTextBox)); @@ -1481,15 +1493,15 @@ namespace demo { ::vl::__vwsn::This(this->textBox)->SetHorizontalAlwaysVisible(::vl::__vwsn::Parse(::vl::WString(L"false", false))); } - (this->__vwsn_precompile_56 = ::vl::__vwsn::This(this->textBox)->GetBoundsComposition()); + (this->__vwsn_precompile_58 = ::vl::__vwsn::This(this->textBox)->GetBoundsComposition()); { - ::vl::__vwsn::This(this->__vwsn_precompile_56)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_58)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }()); } { - ::vl::__vwsn::This(this->__vwsn_precompile_55)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(::vl::__vwsn::This(this->textBox)->GetBoundsComposition())); + ::vl::__vwsn::This(this->__vwsn_precompile_57)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(::vl::__vwsn::This(this->textBox)->GetBoundsComposition())); } { - ::vl::__vwsn::This(this->__vwsn_precompile_0)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_55)); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_57)); } { ::vl::__vwsn::This(::vl::__vwsn::This(this->self)->GetContainerComposition())->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_0)); @@ -1633,97 +1645,97 @@ namespace demo ::vl::__vwsn::This(this->dialogSave)->SetTitle(::vl::__vwsn::This(this->self)->GetText()); } { - ::vl::__vwsn::This(this->__vwsn_precompile_7)->SetCommand(this->commandFileNewText); + ::vl::__vwsn::This(this->__vwsn_precompile_9)->SetCommand(this->commandFileNewText); } { - ::vl::__vwsn::This(this->__vwsn_precompile_8)->SetCommand(this->commandFileNewXml); + ::vl::__vwsn::This(this->__vwsn_precompile_10)->SetCommand(this->commandFileNewXml); } { - ::vl::__vwsn::This(this->__vwsn_precompile_5)->SetImage(::vl::__vwsn::Ensure(::vl::__vwsn::SharedPtrCast<::vl::presentation::GuiImageData>(::vl::__vwsn::This(__vwsn_this_)->ResolveResource(::vl::WString(L"res", false), ::vl::WString(L"Images/New.png", false), true).Obj()))); + ::vl::__vwsn::This(this->__vwsn_precompile_7)->SetImage(::vl::__vwsn::Ensure(::vl::__vwsn::SharedPtrCast<::vl::presentation::GuiImageData>(::vl::__vwsn::This(__vwsn_this_)->ResolveResource(::vl::WString(L"res", false), ::vl::WString(L"Images/New.png", false), true).Obj()))); } { - ::vl::__vwsn::This(this->__vwsn_precompile_9)->SetCommand(this->commandFileOpen); + ::vl::__vwsn::This(this->__vwsn_precompile_11)->SetCommand(this->commandFileOpen); } { - ::vl::__vwsn::This(this->__vwsn_precompile_10)->SetCommand(this->commandFileSave); + ::vl::__vwsn::This(this->__vwsn_precompile_12)->SetCommand(this->commandFileSave); } { - ::vl::__vwsn::This(this->__vwsn_precompile_11)->SetCommand(this->commandFileSaveAs); + ::vl::__vwsn::This(this->__vwsn_precompile_13)->SetCommand(this->commandFileSaveAs); } { - ::vl::__vwsn::This(this->__vwsn_precompile_13)->SetCommand(this->commandFileExit); + ::vl::__vwsn::This(this->__vwsn_precompile_14)->SetCommand(this->commandFileExit); } { - ::vl::__vwsn::This(this->__vwsn_precompile_16)->SetCommand(this->commandEditUndo); + ::vl::__vwsn::This(this->__vwsn_precompile_19)->SetCommand(this->commandEditUndo); } { - ::vl::__vwsn::This(this->__vwsn_precompile_17)->SetCommand(this->commandEditRedo); + ::vl::__vwsn::This(this->__vwsn_precompile_20)->SetCommand(this->commandEditRedo); } { - ::vl::__vwsn::This(this->__vwsn_precompile_19)->SetCommand(this->commandEditCut); + ::vl::__vwsn::This(this->__vwsn_precompile_22)->SetCommand(this->commandEditCut); } { - ::vl::__vwsn::This(this->__vwsn_precompile_20)->SetCommand(this->commandEditCopy); + ::vl::__vwsn::This(this->__vwsn_precompile_23)->SetCommand(this->commandEditCopy); } { - ::vl::__vwsn::This(this->__vwsn_precompile_21)->SetCommand(this->commandEditPaste); + ::vl::__vwsn::This(this->__vwsn_precompile_24)->SetCommand(this->commandEditPaste); } { - ::vl::__vwsn::This(this->__vwsn_precompile_23)->SetCommand(this->commandEditDelete); + ::vl::__vwsn::This(this->__vwsn_precompile_26)->SetCommand(this->commandEditDelete); } { - ::vl::__vwsn::This(this->__vwsn_precompile_24)->SetCommand(this->commandEditSelect); + ::vl::__vwsn::This(this->__vwsn_precompile_27)->SetCommand(this->commandEditSelect); } { - ::vl::__vwsn::This(this->__vwsn_precompile_26)->SetCommand(this->commandEditFind); + ::vl::__vwsn::This(this->__vwsn_precompile_28)->SetCommand(this->commandEditFind); } { - ::vl::__vwsn::This(this->__vwsn_precompile_29)->SetCommand(this->commandAbout); + ::vl::__vwsn::This(this->__vwsn_precompile_31)->SetCommand(this->commandAbout); } { - ::vl::__vwsn::This(this->__vwsn_precompile_35)->SetCommand(this->commandFileNewText); + ::vl::__vwsn::This(this->__vwsn_precompile_37)->SetCommand(this->commandFileNewText); } { - ::vl::__vwsn::This(this->__vwsn_precompile_36)->SetCommand(this->commandFileNewXml); + ::vl::__vwsn::This(this->__vwsn_precompile_38)->SetCommand(this->commandFileNewXml); } { - ::vl::__vwsn::This(this->__vwsn_precompile_33)->SetImage(::vl::__vwsn::Ensure(::vl::__vwsn::SharedPtrCast<::vl::presentation::GuiImageData>(::vl::__vwsn::This(__vwsn_this_)->ResolveResource(::vl::WString(L"res", false), ::vl::WString(L"Images/New.png", false), true).Obj()))); + ::vl::__vwsn::This(this->__vwsn_precompile_35)->SetImage(::vl::__vwsn::Ensure(::vl::__vwsn::SharedPtrCast<::vl::presentation::GuiImageData>(::vl::__vwsn::This(__vwsn_this_)->ResolveResource(::vl::WString(L"res", false), ::vl::WString(L"Images/New.png", false), true).Obj()))); } { - ::vl::__vwsn::This(this->__vwsn_precompile_39)->SetCommand(this->commandFileOpenText); + ::vl::__vwsn::This(this->__vwsn_precompile_41)->SetCommand(this->commandFileOpenText); } { - ::vl::__vwsn::This(this->__vwsn_precompile_40)->SetCommand(this->commandFileOpenXml); + ::vl::__vwsn::This(this->__vwsn_precompile_42)->SetCommand(this->commandFileOpenXml); } { - ::vl::__vwsn::This(this->__vwsn_precompile_37)->SetCommand(this->commandFileOpen); + ::vl::__vwsn::This(this->__vwsn_precompile_39)->SetCommand(this->commandFileOpen); } { - ::vl::__vwsn::This(this->__vwsn_precompile_41)->SetCommand(this->commandFileSave); + ::vl::__vwsn::This(this->__vwsn_precompile_43)->SetCommand(this->commandFileSave); } { - ::vl::__vwsn::This(this->__vwsn_precompile_42)->SetCommand(this->commandFileSaveAs); + ::vl::__vwsn::This(this->__vwsn_precompile_44)->SetCommand(this->commandFileSaveAs); } { - ::vl::__vwsn::This(this->__vwsn_precompile_44)->SetCommand(this->commandEditUndo); + ::vl::__vwsn::This(this->__vwsn_precompile_46)->SetCommand(this->commandEditUndo); } { - ::vl::__vwsn::This(this->__vwsn_precompile_45)->SetCommand(this->commandEditRedo); + ::vl::__vwsn::This(this->__vwsn_precompile_47)->SetCommand(this->commandEditRedo); } { - ::vl::__vwsn::This(this->__vwsn_precompile_47)->SetCommand(this->commandEditCut); + ::vl::__vwsn::This(this->__vwsn_precompile_49)->SetCommand(this->commandEditCut); } { - ::vl::__vwsn::This(this->__vwsn_precompile_48)->SetCommand(this->commandEditCopy); + ::vl::__vwsn::This(this->__vwsn_precompile_50)->SetCommand(this->commandEditCopy); } { - ::vl::__vwsn::This(this->__vwsn_precompile_49)->SetCommand(this->commandEditPaste); + ::vl::__vwsn::This(this->__vwsn_precompile_51)->SetCommand(this->commandEditPaste); } { - ::vl::__vwsn::This(this->__vwsn_precompile_51)->SetCommand(this->commandEditDelete); + ::vl::__vwsn::This(this->__vwsn_precompile_53)->SetCommand(this->commandEditDelete); } { - ::vl::__vwsn::This(this->__vwsn_precompile_53)->SetCommand(this->commandEditFind); + ::vl::__vwsn::This(this->__vwsn_precompile_55)->SetCommand(this->commandEditFind); } { ::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->self)->WindowClosing, LAMBDA(::vl_workflow_global::__vwsno24_Demo_demo_MainWindowConstructor___vwsn_initialize_instance__(__vwsn_this_, this))); @@ -1760,59 +1772,61 @@ namespace demo , __vwsn_precompile_2(static_cast<::vl::presentation::controls::GuiToolstripMenuBar*>(nullptr)) , __vwsn_precompile_3(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_4(static_cast<::vl::presentation::controls::GuiToolstripMenu*>(nullptr)) - , __vwsn_precompile_5(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_6(static_cast<::vl::presentation::controls::GuiToolstripMenu*>(nullptr)) + , __vwsn_precompile_5(static_cast<::vl::presentation::controls::GuiToolstripGroupContainer*>(nullptr)) + , __vwsn_precompile_6(static_cast<::vl::presentation::controls::GuiToolstripGroup*>(nullptr)) , __vwsn_precompile_7(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_8(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) + , __vwsn_precompile_8(static_cast<::vl::presentation::controls::GuiToolstripMenu*>(nullptr)) , __vwsn_precompile_9(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_10(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_11(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_12(static_cast<::vl::presentation::controls::GuiControl*>(nullptr)) + , __vwsn_precompile_12(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_13(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_14(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_15(static_cast<::vl::presentation::controls::GuiToolstripMenu*>(nullptr)) - , __vwsn_precompile_16(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_17(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_18(static_cast<::vl::presentation::controls::GuiControl*>(nullptr)) + , __vwsn_precompile_15(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) + , __vwsn_precompile_16(static_cast<::vl::presentation::controls::GuiToolstripMenu*>(nullptr)) + , __vwsn_precompile_17(static_cast<::vl::presentation::controls::GuiToolstripGroupContainer*>(nullptr)) + , __vwsn_precompile_18(static_cast<::vl::presentation::controls::GuiToolstripGroup*>(nullptr)) , __vwsn_precompile_19(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_20(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_21(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_22(static_cast<::vl::presentation::controls::GuiControl*>(nullptr)) + , __vwsn_precompile_21(static_cast<::vl::presentation::controls::GuiToolstripGroup*>(nullptr)) + , __vwsn_precompile_22(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_23(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_24(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_25(static_cast<::vl::presentation::controls::GuiControl*>(nullptr)) + , __vwsn_precompile_25(static_cast<::vl::presentation::controls::GuiToolstripGroup*>(nullptr)) , __vwsn_precompile_26(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_27(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_28(static_cast<::vl::presentation::controls::GuiToolstripMenu*>(nullptr)) + , __vwsn_precompile_28(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_29(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_30(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_31(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) - , __vwsn_precompile_32(static_cast<::vl::presentation::controls::GuiToolstripToolBar*>(nullptr)) - , __vwsn_precompile_33(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_34(static_cast<::vl::presentation::controls::GuiToolstripMenu*>(nullptr)) + , __vwsn_precompile_30(static_cast<::vl::presentation::controls::GuiToolstripMenu*>(nullptr)) + , __vwsn_precompile_31(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) + , __vwsn_precompile_32(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_33(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) + , __vwsn_precompile_34(static_cast<::vl::presentation::controls::GuiToolstripToolBar*>(nullptr)) , __vwsn_precompile_35(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_36(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) + , __vwsn_precompile_36(static_cast<::vl::presentation::controls::GuiToolstripMenu*>(nullptr)) , __vwsn_precompile_37(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_38(static_cast<::vl::presentation::controls::GuiToolstripMenu*>(nullptr)) + , __vwsn_precompile_38(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_39(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_40(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) + , __vwsn_precompile_40(static_cast<::vl::presentation::controls::GuiToolstripMenu*>(nullptr)) , __vwsn_precompile_41(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_42(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_43(static_cast<::vl::presentation::controls::GuiControl*>(nullptr)) + , __vwsn_precompile_43(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_44(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_45(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_46(static_cast<::vl::presentation::controls::GuiControl*>(nullptr)) + , __vwsn_precompile_45(static_cast<::vl::presentation::controls::GuiControl*>(nullptr)) + , __vwsn_precompile_46(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_47(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_48(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) + , __vwsn_precompile_48(static_cast<::vl::presentation::controls::GuiControl*>(nullptr)) , __vwsn_precompile_49(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_50(static_cast<::vl::presentation::controls::GuiControl*>(nullptr)) + , __vwsn_precompile_50(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_51(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_52(static_cast<::vl::presentation::controls::GuiControl*>(nullptr)) , __vwsn_precompile_53(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_54(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_55(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) + , __vwsn_precompile_54(static_cast<::vl::presentation::controls::GuiControl*>(nullptr)) + , __vwsn_precompile_55(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_56(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) - , __vwsn_precompile_57(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_57(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) + , __vwsn_precompile_58(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_59(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) { } diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.h b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.h index aae544ed..7c491c98 100644 --- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.h @@ -135,59 +135,61 @@ namespace demo ::vl::presentation::controls::GuiToolstripMenuBar* __vwsn_precompile_2; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_3; ::vl::presentation::controls::GuiToolstripMenu* __vwsn_precompile_4; - ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_5; - ::vl::presentation::controls::GuiToolstripMenu* __vwsn_precompile_6; + ::vl::presentation::controls::GuiToolstripGroupContainer* __vwsn_precompile_5; + ::vl::presentation::controls::GuiToolstripGroup* __vwsn_precompile_6; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_7; - ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_8; + ::vl::presentation::controls::GuiToolstripMenu* __vwsn_precompile_8; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_9; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_10; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_11; - ::vl::presentation::controls::GuiControl* __vwsn_precompile_12; + ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_12; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_13; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_14; - ::vl::presentation::controls::GuiToolstripMenu* __vwsn_precompile_15; - ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_16; - ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_17; - ::vl::presentation::controls::GuiControl* __vwsn_precompile_18; + ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_15; + ::vl::presentation::controls::GuiToolstripMenu* __vwsn_precompile_16; + ::vl::presentation::controls::GuiToolstripGroupContainer* __vwsn_precompile_17; + ::vl::presentation::controls::GuiToolstripGroup* __vwsn_precompile_18; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_19; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_20; - ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_21; - ::vl::presentation::controls::GuiControl* __vwsn_precompile_22; + ::vl::presentation::controls::GuiToolstripGroup* __vwsn_precompile_21; + ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_22; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_23; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_24; - ::vl::presentation::controls::GuiControl* __vwsn_precompile_25; + ::vl::presentation::controls::GuiToolstripGroup* __vwsn_precompile_25; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_26; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_27; - ::vl::presentation::controls::GuiToolstripMenu* __vwsn_precompile_28; + ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_28; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_29; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_30; - ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_31; - ::vl::presentation::controls::GuiToolstripToolBar* __vwsn_precompile_32; - ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_33; - ::vl::presentation::controls::GuiToolstripMenu* __vwsn_precompile_34; + ::vl::presentation::controls::GuiToolstripMenu* __vwsn_precompile_30; + ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_31; + ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_32; + ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_33; + ::vl::presentation::controls::GuiToolstripToolBar* __vwsn_precompile_34; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_35; - ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_36; + ::vl::presentation::controls::GuiToolstripMenu* __vwsn_precompile_36; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_37; - ::vl::presentation::controls::GuiToolstripMenu* __vwsn_precompile_38; + ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_38; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_39; - ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_40; + ::vl::presentation::controls::GuiToolstripMenu* __vwsn_precompile_40; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_41; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_42; - ::vl::presentation::controls::GuiControl* __vwsn_precompile_43; + ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_43; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_44; - ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_45; - ::vl::presentation::controls::GuiControl* __vwsn_precompile_46; + ::vl::presentation::controls::GuiControl* __vwsn_precompile_45; + ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_46; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_47; - ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_48; + ::vl::presentation::controls::GuiControl* __vwsn_precompile_48; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_49; - ::vl::presentation::controls::GuiControl* __vwsn_precompile_50; + ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_50; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_51; ::vl::presentation::controls::GuiControl* __vwsn_precompile_52; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_53; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_54; - ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_55; + ::vl::presentation::controls::GuiControl* __vwsn_precompile_54; + ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_55; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_56; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_57; + ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_57; + ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_58; + ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_59; void __vwsn_initialize_instance_(::demo::MainWindow* __vwsn_this_); public: MainWindowConstructor(); diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoReflection.cpp b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoReflection.cpp index b950ef8f..1c9d1b02 100644 --- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoReflection.cpp +++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoReflection.cpp @@ -187,6 +187,8 @@ namespace vl CLASS_MEMBER_FIELD(__vwsn_precompile_55) CLASS_MEMBER_FIELD(__vwsn_precompile_56) CLASS_MEMBER_FIELD(__vwsn_precompile_57) + CLASS_MEMBER_FIELD(__vwsn_precompile_58) + CLASS_MEMBER_FIELD(__vwsn_precompile_59) CLASS_MEMBER_FIELD(__vwsn_precompile_6) CLASS_MEMBER_FIELD(__vwsn_precompile_7) CLASS_MEMBER_FIELD(__vwsn_precompile_8)