diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/MainWindow.xml b/Tutorial/GacUI_Controls/TextEditor/UI/MainWindow.xml index 994bd36a..b855c341 100644 --- a/Tutorial/GacUI_Controls/TextEditor/UI/MainWindow.xml +++ b/Tutorial/GacUI_Controls/TextEditor/UI/MainWindow.xml @@ -175,7 +175,7 @@ - + @@ -188,31 +188,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.cpp index 62d24c0d..2ef14552 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_59 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); + (this->__vwsn_precompile_60 = ::vl::__vwsn::This(this->self)->GetBoundsComposition()); { - ::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->__vwsn_precompile_60)->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__; }()); @@ -1309,170 +1309,176 @@ namespace demo { (this->__vwsn_precompile_34 = new ::vl::presentation::controls::GuiToolstripToolBar(::vl::presentation::theme::ThemeName::ToolstripToolBar)); } - (this->__vwsn_precompile_56 = ::vl::__vwsn::This(this->__vwsn_precompile_34)->GetBoundsComposition()); + (this->__vwsn_precompile_57 = ::vl::__vwsn::This(this->__vwsn_precompile_34)->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_57)->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_35 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripDropdownButton)); + (this->__vwsn_precompile_35 = new ::vl::presentation::controls::GuiToolstripGroupContainer(::vl::presentation::theme::ThemeName::CustomControl)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_35)->SetAlt(::vl::WString(L"N", false)); - } - (this->__vwsn_precompile_36 = ::vl::__vwsn::This(this->__vwsn_precompile_35)->EnsureToolstripSubMenu()); - { - (this->__vwsn_precompile_37 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); + (this->__vwsn_precompile_36 = new ::vl::presentation::controls::GuiToolstripGroup(::vl::presentation::theme::ThemeName::CustomControl)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_37)->SetAlt(::vl::WString(L"T", false)); + (this->__vwsn_precompile_37 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripDropdownButton)); + } + { + ::vl::__vwsn::This(this->__vwsn_precompile_37)->SetAlt(::vl::WString(L"N", 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_39)->SetAlt(::vl::WString(L"T", 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_39)); + } + { + (this->__vwsn_precompile_40 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); + } + { + ::vl::__vwsn::This(this->__vwsn_precompile_40)->SetAlt(::vl::WString(L"X", 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_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)); + (this->__vwsn_precompile_41 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripSplitButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_38)->SetAlt(::vl::WString(L"X", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_41)->SetAlt(::vl::WString(L"O", false)); + } + (this->__vwsn_precompile_42 = ::vl::__vwsn::This(this->__vwsn_precompile_41)->EnsureToolstripSubMenu()); + { + (this->__vwsn_precompile_43 = 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_36)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_38)); + ::vl::__vwsn::This(this->__vwsn_precompile_43)->SetAlt(::vl::WString(L"T", 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_35)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_42)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_43)); } { - (this->__vwsn_precompile_39 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripSplitButton)); + (this->__vwsn_precompile_44 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::MenuItemButton)); } { - ::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(this->__vwsn_precompile_44)->SetAlt(::vl::WString(L"X", false)); } { - ::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_42)->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_40)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_41)); + ::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_41)); } { - (this->__vwsn_precompile_42 = 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_35)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_36)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_42)->SetAlt(::vl::WString(L"X", 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_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_39)); - } - { - (this->__vwsn_precompile_43 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); - } - { - ::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_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"A", 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_44)); - } - { - (this->__vwsn_precompile_45 = 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_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_45)); + (this->__vwsn_precompile_45 = new ::vl::presentation::controls::GuiToolstripGroup(::vl::presentation::theme::ThemeName::CustomControl)); } { (this->__vwsn_precompile_46 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_46)->SetAlt(::vl::WString(L"U", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_46)->SetAlt(::vl::WString(L"S", 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_46)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_45)->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"R", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_47)->SetAlt(::vl::WString(L"A", 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_47)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_45)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_47)); } { - (this->__vwsn_precompile_48 = 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_35)->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_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_48)); + (this->__vwsn_precompile_48 = new ::vl::presentation::controls::GuiToolstripGroup(::vl::presentation::theme::ThemeName::CustomControl)); } { (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"X", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_49)->SetAlt(::vl::WString(L"U", 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_49)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_48)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_49)); } { (this->__vwsn_precompile_50 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_50)->SetAlt(::vl::WString(L"C", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_50)->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_50)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_48)->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(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_35)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_48)); } { - ::vl::__vwsn::This(this->__vwsn_precompile_51)->SetAlt(::vl::WString(L"V", false)); + (this->__vwsn_precompile_51 = 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_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_51)); + (this->__vwsn_precompile_52 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); } { - (this->__vwsn_precompile_52 = new ::vl::presentation::controls::GuiControl(::vl::presentation::theme::ThemeName::ToolstripSplitter)); + ::vl::__vwsn::This(this->__vwsn_precompile_52)->SetAlt(::vl::WString(L"X", 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_52)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_51)->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"D", false)); + ::vl::__vwsn::This(this->__vwsn_precompile_53)->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_53)); + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_51)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_53)); } { - (this->__vwsn_precompile_54 = new ::vl::presentation::controls::GuiControl(::vl::presentation::theme::ThemeName::ToolstripSplitter)); + (this->__vwsn_precompile_54 = 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_34)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_54)); + ::vl::__vwsn::This(this->__vwsn_precompile_54)->SetAlt(::vl::WString(L"V", false)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_51)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_54)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_35)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_51)); } { (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(this->__vwsn_precompile_55)->SetAlt(::vl::WString(L"D", 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(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_35)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_55)); + } + { + (this->__vwsn_precompile_56 = new ::vl::presentation::controls::GuiToolstripButton(::vl::presentation::theme::ThemeName::ToolstripButton)); + } + { + ::vl::__vwsn::This(this->__vwsn_precompile_56)->SetAlt(::vl::WString(L"I", false)); + } + { + ::vl::__vwsn::This(::vl::__vwsn::UnboxCollection<::vl::reflection::description::IValueList>(::vl::__vwsn::This(this->__vwsn_precompile_35)->GetToolstripItems()).Obj())->Add(::vl::__vwsn::Box(this->__vwsn_precompile_56)); + } + { + ::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)); } { ::vl::__vwsn::This(this->__vwsn_precompile_33)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(::vl::__vwsn::This(this->__vwsn_precompile_34)->GetBoundsComposition())); @@ -1480,9 +1486,9 @@ namespace demo { ::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()); + (this->__vwsn_precompile_58 = 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)); + ::vl::__vwsn::This(this->__vwsn_precompile_58)->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)); @@ -1493,15 +1499,15 @@ namespace demo { ::vl::__vwsn::This(this->textBox)->SetHorizontalAlwaysVisible(::vl::__vwsn::Parse(::vl::WString(L"false", false))); } - (this->__vwsn_precompile_58 = ::vl::__vwsn::This(this->textBox)->GetBoundsComposition()); + (this->__vwsn_precompile_59 = ::vl::__vwsn::This(this->textBox)->GetBoundsComposition()); { - ::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_59)->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_57)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(::vl::__vwsn::This(this->textBox)->GetBoundsComposition())); + ::vl::__vwsn::This(this->__vwsn_precompile_58)->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_57)); + ::vl::__vwsn::This(this->__vwsn_precompile_0)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_58)); } { ::vl::__vwsn::This(::vl::__vwsn::This(this->self)->GetContainerComposition())->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_0)); @@ -1693,49 +1699,49 @@ namespace demo ::vl::__vwsn::This(this->__vwsn_precompile_31)->SetCommand(this->commandAbout); } { - ::vl::__vwsn::This(this->__vwsn_precompile_37)->SetCommand(this->commandFileNewText); + ::vl::__vwsn::This(this->__vwsn_precompile_39)->SetCommand(this->commandFileNewText); } { - ::vl::__vwsn::This(this->__vwsn_precompile_38)->SetCommand(this->commandFileNewXml); + ::vl::__vwsn::This(this->__vwsn_precompile_40)->SetCommand(this->commandFileNewXml); } { - ::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_37)->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_41)->SetCommand(this->commandFileOpenText); + ::vl::__vwsn::This(this->__vwsn_precompile_43)->SetCommand(this->commandFileOpenText); } { - ::vl::__vwsn::This(this->__vwsn_precompile_42)->SetCommand(this->commandFileOpenXml); + ::vl::__vwsn::This(this->__vwsn_precompile_44)->SetCommand(this->commandFileOpenXml); } { - ::vl::__vwsn::This(this->__vwsn_precompile_39)->SetCommand(this->commandFileOpen); + ::vl::__vwsn::This(this->__vwsn_precompile_41)->SetCommand(this->commandFileOpen); } { - ::vl::__vwsn::This(this->__vwsn_precompile_43)->SetCommand(this->commandFileSave); + ::vl::__vwsn::This(this->__vwsn_precompile_46)->SetCommand(this->commandFileSave); } { - ::vl::__vwsn::This(this->__vwsn_precompile_44)->SetCommand(this->commandFileSaveAs); + ::vl::__vwsn::This(this->__vwsn_precompile_47)->SetCommand(this->commandFileSaveAs); } { - ::vl::__vwsn::This(this->__vwsn_precompile_46)->SetCommand(this->commandEditUndo); + ::vl::__vwsn::This(this->__vwsn_precompile_49)->SetCommand(this->commandEditUndo); } { - ::vl::__vwsn::This(this->__vwsn_precompile_47)->SetCommand(this->commandEditRedo); + ::vl::__vwsn::This(this->__vwsn_precompile_50)->SetCommand(this->commandEditRedo); } { - ::vl::__vwsn::This(this->__vwsn_precompile_49)->SetCommand(this->commandEditCut); + ::vl::__vwsn::This(this->__vwsn_precompile_52)->SetCommand(this->commandEditCut); } { - ::vl::__vwsn::This(this->__vwsn_precompile_50)->SetCommand(this->commandEditCopy); + ::vl::__vwsn::This(this->__vwsn_precompile_53)->SetCommand(this->commandEditCopy); } { - ::vl::__vwsn::This(this->__vwsn_precompile_51)->SetCommand(this->commandEditPaste); + ::vl::__vwsn::This(this->__vwsn_precompile_54)->SetCommand(this->commandEditPaste); } { - ::vl::__vwsn::This(this->__vwsn_precompile_53)->SetCommand(this->commandEditDelete); + ::vl::__vwsn::This(this->__vwsn_precompile_55)->SetCommand(this->commandEditDelete); } { - ::vl::__vwsn::This(this->__vwsn_precompile_55)->SetCommand(this->commandEditFind); + ::vl::__vwsn::This(this->__vwsn_precompile_56)->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))); @@ -1802,31 +1808,32 @@ namespace demo , __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::GuiToolstripMenu*>(nullptr)) + , __vwsn_precompile_35(static_cast<::vl::presentation::controls::GuiToolstripGroupContainer*>(nullptr)) + , __vwsn_precompile_36(static_cast<::vl::presentation::controls::GuiToolstripGroup*>(nullptr)) , __vwsn_precompile_37(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_38(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) + , __vwsn_precompile_38(static_cast<::vl::presentation::controls::GuiToolstripMenu*>(nullptr)) , __vwsn_precompile_39(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_40(static_cast<::vl::presentation::controls::GuiToolstripMenu*>(nullptr)) + , __vwsn_precompile_40(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_41(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_42(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) + , __vwsn_precompile_42(static_cast<::vl::presentation::controls::GuiToolstripMenu*>(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::GuiControl*>(nullptr)) + , __vwsn_precompile_45(static_cast<::vl::presentation::controls::GuiToolstripGroup*>(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::GuiControl*>(nullptr)) + , __vwsn_precompile_48(static_cast<::vl::presentation::controls::GuiToolstripGroup*>(nullptr)) , __vwsn_precompile_49(static_cast<::vl::presentation::controls::GuiToolstripButton*>(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_51(static_cast<::vl::presentation::controls::GuiToolstripGroup*>(nullptr)) + , __vwsn_precompile_52(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) , __vwsn_precompile_53(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) - , __vwsn_precompile_54(static_cast<::vl::presentation::controls::GuiControl*>(nullptr)) + , __vwsn_precompile_54(static_cast<::vl::presentation::controls::GuiToolstripButton*>(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::GuiCellComposition*>(nullptr)) - , __vwsn_precompile_58(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_56(static_cast<::vl::presentation::controls::GuiToolstripButton*>(nullptr)) + , __vwsn_precompile_57(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_58(static_cast<::vl::presentation::compositions::GuiCellComposition*>(nullptr)) , __vwsn_precompile_59(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr)) + , __vwsn_precompile_60(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 7c491c98..2b95102e 100644 --- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoPartialClasses.h @@ -165,31 +165,32 @@ namespace demo ::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::GuiToolstripMenu* __vwsn_precompile_36; + ::vl::presentation::controls::GuiToolstripGroupContainer* __vwsn_precompile_35; + ::vl::presentation::controls::GuiToolstripGroup* __vwsn_precompile_36; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_37; - ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_38; + ::vl::presentation::controls::GuiToolstripMenu* __vwsn_precompile_38; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_39; - ::vl::presentation::controls::GuiToolstripMenu* __vwsn_precompile_40; + ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_40; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_41; - ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_42; + ::vl::presentation::controls::GuiToolstripMenu* __vwsn_precompile_42; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_43; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_44; - ::vl::presentation::controls::GuiControl* __vwsn_precompile_45; + ::vl::presentation::controls::GuiToolstripGroup* __vwsn_precompile_45; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_46; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_47; - ::vl::presentation::controls::GuiControl* __vwsn_precompile_48; + ::vl::presentation::controls::GuiToolstripGroup* __vwsn_precompile_48; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_49; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_50; - ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_51; - ::vl::presentation::controls::GuiControl* __vwsn_precompile_52; + ::vl::presentation::controls::GuiToolstripGroup* __vwsn_precompile_51; + ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_52; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_53; - ::vl::presentation::controls::GuiControl* __vwsn_precompile_54; + ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_54; ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_55; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_56; - ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_57; - ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_58; + ::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_56; + ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_57; + ::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_58; ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_59; + ::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_60; 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 1c9d1b02..b1494a9f 100644 --- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoReflection.cpp +++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/DemoReflection.cpp @@ -190,6 +190,7 @@ namespace vl CLASS_MEMBER_FIELD(__vwsn_precompile_58) CLASS_MEMBER_FIELD(__vwsn_precompile_59) CLASS_MEMBER_FIELD(__vwsn_precompile_6) + CLASS_MEMBER_FIELD(__vwsn_precompile_60) CLASS_MEMBER_FIELD(__vwsn_precompile_7) CLASS_MEMBER_FIELD(__vwsn_precompile_8) CLASS_MEMBER_FIELD(__vwsn_precompile_9)