diff --git a/Import/GacUI.cpp b/Import/GacUI.cpp index de54b4a0..eea2dd4b 100644 --- a/Import/GacUI.cpp +++ b/Import/GacUI.cpp @@ -718,10 +718,42 @@ namespace vl using namespace collections; using namespace reflection::description; +/*********************************************************************** +GuiDisposedFlag +***********************************************************************/ + + void GuiDisposedFlag::SetDisposed() + { + disposed = true; + } + + GuiDisposedFlag::GuiDisposedFlag(GuiControl* _owner) + :owner(_owner) + { + } + + GuiDisposedFlag::~GuiDisposedFlag() + { + } + + bool GuiDisposedFlag::IsDisposed() + { + return disposed; + } + /*********************************************************************** GuiControl ***********************************************************************/ + Ptr GuiControl::GetDisposedFlag() + { + if (!disposedFlag) + { + disposedFlag = new GuiDisposedFlag(this); + } + return disposedFlag; + } + void GuiControl::BeforeControlTemplateUninstalled() { } @@ -729,7 +761,7 @@ GuiControl void GuiControl::AfterControlTemplateInstalled(bool initialize) { controlTemplateObject->SetText(text); - controlTemplateObject->SetFont(font); + controlTemplateObject->SetFont(displayFont); controlTemplateObject->SetContext(context); controlTemplateObject->SetVisuallyEnabled(isVisuallyEnabled); controlTemplateObject->SetFocusableComposition(focusableComposition); @@ -788,6 +820,7 @@ GuiControl control->parent=this; control->OnParentChanged(oldParent, control->parent); control->UpdateVisuallyEnabled(); + control->UpdateDisplayFont(); if (auto host = boundsComposition->GetRelatedGraphicsHost()) { @@ -873,6 +906,29 @@ GuiControl } } + void GuiControl::UpdateDisplayFont() + { + auto newValue = + font ? font.Value() : + parent ? parent->GetDisplayFont() : + GetCurrentController()->ResourceService()->GetDefaultFont(); + + if (displayFont != newValue) + { + displayFont = newValue; + if (controlTemplateObject) + { + controlTemplateObject->SetFont(displayFont); + } + DisplayFontChanged.Execute(GetNotifyEventArguments()); + + for (vint i = 0; i < children.Count(); i++) + { + children[i]->UpdateDisplayFont(); + } + } + } + void GuiControl::OnGotFocus(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments) { if (!isFocused) @@ -993,7 +1049,7 @@ GuiControl GuiControl::GuiControl(theme::ThemeName themeName) :controlThemeName(themeName) - , flagDisposed(new bool(false)) + , displayFont(GetCurrentController()->ResourceService()->GetDefaultFont()) { { boundsComposition = new GuiBoundsComposition; @@ -1015,18 +1071,21 @@ GuiControl EnabledChanged.SetAssociatedComposition(boundsComposition); FocusedChanged.SetAssociatedComposition(boundsComposition); VisuallyEnabledChanged.SetAssociatedComposition(boundsComposition); + DisplayFontChanged.SetAssociatedComposition(boundsComposition); AltChanged.SetAssociatedComposition(boundsComposition); TextChanged.SetAssociatedComposition(boundsComposition); FontChanged.SetAssociatedComposition(boundsComposition); ContextChanged.SetAssociatedComposition(boundsComposition); } - font = GetCurrentController()->ResourceService()->GetDefaultFont(); sharedPtrDestructorProc = &GuiControl::SharedPtrDestructorProc; } GuiControl::~GuiControl() { - *flagDisposed.Obj() = true; + if (disposedFlag) + { + disposedFlag->SetDisposed(); + } // prevent a root bounds composition from notifying its dead controls if (!parent) { @@ -1061,10 +1120,10 @@ GuiControl auto controlHost = GetRelatedControlHost(); if (controlHost && boundsComposition->IsRendering()) { - auto flag = flagDisposed; + auto flag = GetDisposedFlag(); GetApplication()->InvokeInMainThread(controlHost, [=]() { - if (!*flag.Obj()) + if (!flag->IsDisposed()) { proc(); } @@ -1283,23 +1342,25 @@ GuiControl } } - const FontProperties& GuiControl::GetFont() + const Nullable& GuiControl::GetFont() { return font; } - void GuiControl::SetFont(const FontProperties& value) + void GuiControl::SetFont(const Nullable& value) { if (font != value) { font = value; - if (controlTemplateObject) - { - controlTemplateObject->SetFont(font); - } FontChanged.Execute(GetNotifyEventArguments()); + UpdateDisplayFont(); } } + + const FontProperties& GuiControl::GetDisplayFont() + { + return displayFont; + } description::Value GuiControl::GetContext() { @@ -2117,6 +2178,12 @@ GuiScrollView CalculateView(); } + void GuiScrollView::UpdateDisplayFont() + { + GuiControl::UpdateDisplayFont(); + CalculateView(); + } + void GuiScrollView::OnContainerBoundsChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments) { InvokeOrDelayIfRendering([=]() @@ -2238,7 +2305,7 @@ GuiScrollView vint GuiScrollView::GetSmallMove() { - return GetFont().size * 2; + return GetDisplayFont().size * 2; } Size GuiScrollView::GetBigMove() @@ -2250,12 +2317,6 @@ GuiScrollView { } - void GuiScrollView::SetFont(const FontProperties& value) - { - GuiControl::SetFont(value); - CalculateView(); - } - void GuiScrollView::CalculateView() { auto ct = GetControlTemplateObject(true); @@ -2681,7 +2742,7 @@ GuiDateComboBox { } - void GuiDateComboBox::SetFont(const FontProperties& value) + void GuiDateComboBox::SetFont(const Nullable& value) { GuiComboBoxBase::SetFont(value); datePicker->SetFont(value); @@ -6670,6 +6731,16 @@ GuiComboBoxBase GuiComboBoxListControl ***********************************************************************/ + void GuiComboBoxListControl::UpdateDisplayFont() + { + GuiControl::UpdateDisplayFont(); + if (itemStyleController) + { + itemStyleController->SetFont(GetDisplayFont()); + } + AdoptSubMenuSize(); + } + void GuiComboBoxListControl::BeforeControlTemplateUninstalled() { GuiComboBoxBase::BeforeControlTemplateUninstalled(); @@ -6703,7 +6774,7 @@ GuiComboBoxListControl { itemStyleController = style; itemStyleController->SetText(GetText()); - itemStyleController->SetFont(GetFont()); + itemStyleController->SetFont(GetDisplayFont()); itemStyleController->SetContext(GetContext()); itemStyleController->SetVisuallyEnabled(GetVisuallyEnabled()); itemStyleController->SetAlignmentToParent(Margin(0, 0, 0, 0)); @@ -6737,7 +6808,7 @@ GuiComboBoxListControl void GuiComboBoxListControl::AdoptSubMenuSize() { - Size expectedSize(0, GetFont().size * 20); + Size expectedSize(0, GetDisplayFont().size * 20); Size adoptedSize = containedListControl->GetAdoptedSize(expectedSize); Size clientSize = GetPreferredMenuClientSize(); @@ -6758,15 +6829,6 @@ GuiComboBoxListControl } } - void GuiComboBoxListControl::OnFontChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments) - { - if (itemStyleController) - { - itemStyleController->SetFont(GetFont()); - } - AdoptSubMenuSize(); - } - void GuiComboBoxListControl::OnContextChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments) { if (itemStyleController) @@ -6798,10 +6860,10 @@ GuiComboBoxListControl void GuiComboBoxListControl::OnListControlBoundsChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments) { - auto flag = flagDisposed; + auto flag = GetDisposedFlag(); GetApplication()->InvokeLambdaInMainThread(GetRelatedControlHost(), [=]() { - if (!*flag.Obj()) + if (!flag->IsDisposed()) { AdoptSubMenuSize(); } @@ -6856,7 +6918,6 @@ GuiComboBoxListControl , containedListControl(_containedListControl) { TextChanged.AttachMethod(this, &GuiComboBoxListControl::OnTextChanged); - FontChanged.AttachMethod(this, &GuiComboBoxListControl::OnFontChanged); ContextChanged.AttachMethod(this, &GuiComboBoxListControl::OnContextChanged); VisuallyEnabledChanged.AttachMethod(this, &GuiComboBoxListControl::OnVisuallyEnabledChanged); AfterSubMenuOpening.AttachMethod(this, &GuiComboBoxListControl::OnAfterSubMenuOpening); @@ -8250,16 +8311,13 @@ RangedItemArrangerBase StyleList newVisibleStyles; for (vint i = newStartIndex; i < itemCount; i++) { - auto style - = startIndex <= i && i <= endIndex - ? visibleStyles[i - startIndex] - : CreateStyle(i) - ; + bool reuseOldStyle = startIndex <= i && i <= endIndex; + auto style = reuseOldStyle ? visibleStyles[i - startIndex] : CreateStyle(i); newVisibleStyles.Add(style); Rect bounds; Margin alignmentToParent; - PlaceItem(true, i, style, newBounds, bounds, alignmentToParent); + PlaceItem(true, !reuseOldStyle, i, style, newBounds, bounds, alignmentToParent); if (IsItemOutOfViewBounds(i, style, bounds, newBounds)) { break; @@ -8299,7 +8357,7 @@ RangedItemArrangerBase auto style = visibleStyles[i]; Rect bounds; Margin alignmentToParent(-1, -1, -1, -1); - PlaceItem(false, startIndex + i, style, viewBounds, bounds, alignmentToParent); + PlaceItem(false, false, startIndex + i, style, viewBounds, bounds, alignmentToParent); bounds.x1 -= viewBounds.x1; bounds.x2 -= viewBounds.x1; @@ -8443,7 +8501,7 @@ RangedItemArrangerBase } else { - return 0; + return nullptr; } } @@ -8517,15 +8575,20 @@ FreeHeightItemArranger } } - void FreeHeightItemArranger::PlaceItem(bool forMoving, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent) + void FreeHeightItemArranger::PlaceItem(bool forMoving, bool newCreatedStyle, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent) { - vint styleHeight = 0; + vint styleHeight = heights[index]; { auto composition = GetStyleBounds(style); auto currentBounds = callback->GetStyleBounds(composition); callback->SetStyleBounds(composition, Rect(bounds.LeftTop(), Size(viewBounds.Width(), bounds.Height()))); - styleHeight = callback->GetStylePreferredSize(GetStyleBounds(style)).y; + vint newStyleHeight = callback->GetStylePreferredSize(composition).y; callback->SetStyleBounds(composition, currentBounds); + + if (!newCreatedStyle || styleHeight < newStyleHeight) + { + styleHeight = newStyleHeight; + } } if (heights[index] != styleHeight) @@ -8608,12 +8671,30 @@ FreeHeightItemArranger { availableOffsetCount = start; vint itemCount = heights.Count() + newCount - count; - heights.Resize(itemCount); - offsets.Resize(itemCount); + + if (count < newCount) + { + heights.Resize(itemCount); + if (start + newCount < itemCount) + { + memmove(&heights[start + newCount], &heights[start + count], sizeof(vint) * (itemCount - start - newCount)); + } + } + else if (count > newCount) + { + if (start + newCount < itemCount) + { + memmove(&heights[start + newCount], &heights[start + count], sizeof(vint) * (itemCount - start - newCount)); + } + heights.Resize(itemCount); + } + for (vint i = 0; i < newCount; i++) { heights[start + i] = 1; } + offsets.Resize(itemCount); + RangedItemArrangerBase::OnItemModified(start, count, newCount); } @@ -8636,22 +8717,10 @@ FreeHeightItemArranger itemIndex = count; break; case KeyDirection::PageUp: - EnsureOffsetForItem(itemIndex); - while (true) - { - --itemIndex; - if (itemIndex < 0) break; - if (offsets[itemIndex] + heights[itemIndex] <= viewBounds.Top()) break; - } + itemIndex -= visibleStyles.Count(); break; case KeyDirection::PageDown: - while (true) - { - ++itemIndex; - if (itemIndex > offsets.Count()) break; - EnsureOffsetForItem(itemIndex); - if (offsets[itemIndex] > -viewBounds.Bottom()) break; - } + itemIndex += visibleStyles.Count(); break; default: return -1; @@ -8662,13 +8731,46 @@ FreeHeightItemArranger else return itemIndex; } - bool FreeHeightItemArranger::EnsureItemVisible(vint itemIndex) + GuiListControl::EnsureItemVisibleResult FreeHeightItemArranger::EnsureItemVisible(vint itemIndex) { if (callback) { - return true; + bool moved = false; + while (true) + { + if (itemIndex < 0 || itemIndex >= itemProvider->Count()) + { + return GuiListControl::EnsureItemVisibleResult::ItemNotExists; + } + + EnsureOffsetForItem(itemIndex); + vint offset = viewBounds.y1; + vint top = offsets[itemIndex]; + vint bottom = top + heights[itemIndex]; + vint height = viewBounds.Height(); + + Point location = viewBounds.LeftTop(); + if (offset > top) + { + location.y = top; + } + else if (offset < bottom - height) + { + location.y = bottom - height; + } + else + { + break; + } + + auto oldLeftTop = viewBounds.LeftTop(); + callback->SetViewLocation(location); + moved |= viewBounds.LeftTop() != oldLeftTop; + if (viewBounds.LeftTop() != location) break; + } + return moved ? GuiListControl::EnsureItemVisibleResult::Moved : GuiListControl::EnsureItemVisibleResult::NotMoved; } - return false; + return GuiListControl::EnsureItemVisibleResult::NotMoved; } Size FreeHeightItemArranger::GetAdoptedSize(Size expectedSize) @@ -8702,7 +8804,7 @@ FixedHeightItemArranger } } - void FixedHeightItemArranger::PlaceItem(bool forMoving, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent) + void FixedHeightItemArranger::PlaceItem(bool forMoving, bool newCreatedStyle, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent) { vint top = GetYOffset() + index * rowHeight; if (pi_width == -1) @@ -8800,14 +8902,15 @@ FixedHeightItemArranger else return itemIndex; } - bool FixedHeightItemArranger::EnsureItemVisible(vint itemIndex) + GuiListControl::EnsureItemVisibleResult FixedHeightItemArranger::EnsureItemVisible(vint itemIndex) { if (callback) { if (itemIndex < 0 || itemIndex >= itemProvider->Count()) { - return false; + return GuiListControl::EnsureItemVisibleResult::ItemNotExists; } + bool moved = false; while (true) { vint yOffset = GetYOffset(); @@ -8835,11 +8938,15 @@ FixedHeightItemArranger { break; } + + auto oldLeftTop = viewBounds.LeftTop(); callback->SetViewLocation(location); + moved |= viewBounds.LeftTop() != oldLeftTop; + if (viewBounds.LeftTop() != location) break; } - return true; + return moved ? GuiListControl::EnsureItemVisibleResult::Moved : GuiListControl::EnsureItemVisibleResult::NotMoved; } - return false; + return GuiListControl::EnsureItemVisibleResult::NotMoved; } Size FixedHeightItemArranger::GetAdoptedSize(Size expectedSize) @@ -8871,7 +8978,7 @@ FixedSizeMultiColumnItemArranger } } - void FixedSizeMultiColumnItemArranger::PlaceItem(bool forMoving, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent) + void FixedSizeMultiColumnItemArranger::PlaceItem(bool forMoving, bool newCreatedStyle, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent) { vint rowItems = viewBounds.Width() / itemSize.x; if (rowItems < 1) rowItems = 1; @@ -8990,14 +9097,15 @@ FixedSizeMultiColumnItemArranger else return itemIndex; } - bool FixedSizeMultiColumnItemArranger::EnsureItemVisible(vint itemIndex) + GuiListControl::EnsureItemVisibleResult FixedSizeMultiColumnItemArranger::EnsureItemVisible(vint itemIndex) { if (callback) { if (itemIndex < 0 || itemIndex >= itemProvider->Count()) { - return false; + return GuiListControl::EnsureItemVisibleResult::ItemNotExists; } + bool moved = false; while (true) { vint rowHeight = itemSize.y; @@ -9029,11 +9137,15 @@ FixedSizeMultiColumnItemArranger { break; } + + auto oldLeftTop = viewBounds.LeftTop(); callback->SetViewLocation(location); + moved |= viewBounds.LeftTop() != oldLeftTop; + if (viewBounds.LeftTop() != location) break; } - return true; + return moved ? GuiListControl::EnsureItemVisibleResult::Moved : GuiListControl::EnsureItemVisibleResult::NotMoved; } - return false; + return GuiListControl::EnsureItemVisibleResult::NotMoved; } Size FixedSizeMultiColumnItemArranger::GetAdoptedSize(Size expectedSize) @@ -9076,7 +9188,7 @@ FixedHeightMultiColumnItemArranger } } - void FixedHeightMultiColumnItemArranger::PlaceItem(bool forMoving, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent) + void FixedHeightMultiColumnItemArranger::PlaceItem(bool forMoving, bool newCreatedStyle, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent) { vint rows = viewBounds.Height() / itemHeight; if (rows < 1) rows = 1; @@ -9178,14 +9290,15 @@ FixedHeightMultiColumnItemArranger else return itemIndex; } - bool FixedHeightMultiColumnItemArranger::EnsureItemVisible(vint itemIndex) + GuiListControl::EnsureItemVisibleResult FixedHeightMultiColumnItemArranger::EnsureItemVisible(vint itemIndex) { if (callback) { if (itemIndex < 0 || itemIndex >= itemProvider->Count()) { - return false; + return GuiListControl::EnsureItemVisibleResult::ItemNotExists; } + bool moved = false; while (true) { vint rowCount = viewBounds.Height() / itemHeight; @@ -9227,11 +9340,15 @@ FixedHeightMultiColumnItemArranger { break; } + + auto oldLeftTop = viewBounds.LeftTop(); callback->SetViewLocation(location); + moved |= viewBounds.LeftTop() != oldLeftTop; + if (viewBounds.LeftTop() != location) break; } - return true; + return moved ? GuiListControl::EnsureItemVisibleResult::Moved : GuiListControl::EnsureItemVisibleResult::NotMoved; } - return false; + return GuiListControl::EnsureItemVisibleResult::NotMoved; } Size FixedHeightMultiColumnItemArranger::GetAdoptedSize(Size expectedSize) @@ -9408,7 +9525,7 @@ GuiListControl void GuiListControl::OnStyleInstalled(vint itemIndex, ItemStyle* style) { - style->SetFont(GetFont()); + style->SetFont(GetDisplayFont()); style->SetContext(GetContext()); style->SetText(itemProvider->GetTextValue(itemIndex)); style->SetVisuallyEnabled(GetVisuallyEnabled()); @@ -9490,6 +9607,15 @@ GuiListControl CalculateView(); } + void GuiListControl::UpdateDisplayFont() + { + GuiControl::UpdateDisplayFont(); + FOREACH(ItemStyle*, style, visibleStyles.Keys()) + { + style->SetFont(GetDisplayFont()); + } + } + void GuiListControl::OnClientBoundsChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments) { auto args = GetNotifyEventArguments(); @@ -9504,14 +9630,6 @@ GuiListControl } } - void GuiListControl::OnFontChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments) - { - FOREACH(ItemStyle*, style, visibleStyles.Keys()) - { - style->SetFont(GetFont()); - } - } - void GuiListControl::OnContextChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments) { FOREACH(ItemStyle*, style, visibleStyles.Keys()) @@ -9629,7 +9747,6 @@ GuiListControl :GuiScrollView(themeName) , itemProvider(_itemProvider) { - FontChanged.AttachMethod(this, &GuiListControl::OnFontChanged); ContextChanged.AttachMethod(this, &GuiListControl::OnContextChanged); VisuallyEnabledChanged.AttachMethod(this, &GuiListControl::OnVisuallyEnabledChanged); containerComposition->BoundsChanged.AttachMethod(this, &GuiListControl::OnClientBoundsChanged); @@ -9722,7 +9839,24 @@ GuiListControl { return false; } - return itemArranger ? itemArranger->EnsureItemVisible(itemIndex) : false; + + if (!itemArranger) return false; + auto result = itemArranger->EnsureItemVisible(itemIndex); + if (result == EnsureItemVisibleResult::Moved) + { + if (auto host = GetBoundsComposition()->GetRelatedGraphicsHost()) + { + auto flag = GetDisposedFlag(); + host->InvokeAfterRendering([=]() + { + if (!flag->IsDisposed()) + { + EnsureItemVisible(itemIndex); + } + }, { this,0 }); + } + } + return result != EnsureItemVisibleResult::ItemNotExists; } Size GuiListControl::GetAdoptedSize(Size expectedSize) @@ -15188,7 +15322,7 @@ GuiDocumentCommonInterface void GuiDocumentCommonInterface::MergeBaselineAndDefaultFont(Ptr document) { - document->MergeDefaultFont(documentControl->GetFont()); + document->MergeDefaultFont(documentControl->GetDisplayFont()); if (baselineDocument) { document->MergeBaselineStyles(baselineDocument); @@ -17146,6 +17280,36 @@ GuiMultilineTextBox ct->SetCommands(commandExecutor.Obj()); } + void GuiMultilineTextBox::UpdateVisuallyEnabled() + { + GuiControl::UpdateVisuallyEnabled(); + textElement->SetVisuallyEnabled(GetVisuallyEnabled()); + } + + void GuiMultilineTextBox::UpdateDisplayFont() + { + GuiControl::UpdateDisplayFont(); + textElement->SetFont(GetDisplayFont()); + CalculateViewAndSetScroll(); + } + + void GuiMultilineTextBox::OnRenderTargetChanged(elements::IGuiGraphicsRenderTarget* renderTarget) + { + CalculateViewAndSetScroll(); + GuiScrollView::OnRenderTargetChanged(renderTarget); + } + + Size GuiMultilineTextBox::QueryFullSize() + { + text::TextLines& lines = textElement->GetLines(); + return Size(lines.GetMaxWidth() + TextMargin * 2, lines.GetMaxHeight() + TextMargin * 2); + } + + void GuiMultilineTextBox::UpdateView(Rect viewBounds) + { + textElement->SetViewPosition(viewBounds.LeftTop() - Size(TextMargin, TextMargin)); + } + void GuiMultilineTextBox::CalculateViewAndSetScroll() { auto ct = GetControlTemplateObject(true); @@ -17166,28 +17330,6 @@ GuiMultilineTextBox } } - void GuiMultilineTextBox::OnVisuallyEnabledChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments) - { - textElement->SetVisuallyEnabled(GetVisuallyEnabled()); - } - - Size GuiMultilineTextBox::QueryFullSize() - { - text::TextLines& lines = textElement->GetLines(); - return Size(lines.GetMaxWidth() + TextMargin * 2, lines.GetMaxHeight() + TextMargin * 2); - } - - void GuiMultilineTextBox::UpdateView(Rect viewBounds) - { - textElement->SetViewPosition(viewBounds.LeftTop() - Size(TextMargin, TextMargin)); - } - - void GuiMultilineTextBox::OnRenderTargetChanged(elements::IGuiGraphicsRenderTarget* renderTarget) - { - CalculateViewAndSetScroll(); - GuiScrollView::OnRenderTargetChanged(renderTarget); - } - void GuiMultilineTextBox::OnBoundsMouseButtonDown(compositions::GuiGraphicsComposition* sender, compositions::GuiMouseEventArgs& arguments) { if(GetVisuallyEnabled()) @@ -17200,7 +17342,7 @@ GuiMultilineTextBox :GuiScrollView(themeName) { textElement = GuiColorizedTextElement::Create(); - textElement->SetFont(GetFont()); + textElement->SetFont(GetDisplayFont()); textComposition = new GuiBoundsComposition; textComposition->SetAlignmentToParent(Margin(0, 0, 0, 0)); @@ -17215,7 +17357,6 @@ GuiMultilineTextBox Install(textElement, textComposition, this, boundsComposition, focusableComposition); SetCallback(callback.Obj()); - VisuallyEnabledChanged.AttachMethod(this, &GuiMultilineTextBox::OnVisuallyEnabledChanged); boundsComposition->GetEventReceiver()->leftButtonDown.AttachMethod(this, &GuiMultilineTextBox::OnBoundsMouseButtonDown); boundsComposition->GetEventReceiver()->middleButtonDown.AttachMethod(this, &GuiMultilineTextBox::OnBoundsMouseButtonDown); boundsComposition->GetEventReceiver()->rightButtonDown.AttachMethod(this, &GuiMultilineTextBox::OnBoundsMouseButtonDown); @@ -17239,13 +17380,6 @@ GuiMultilineTextBox CalculateView(); } - void GuiMultilineTextBox::SetFont(const FontProperties& value) - { - GuiControl::SetFont(value); - textElement->SetFont(value); - CalculateViewAndSetScroll(); - } - /*********************************************************************** GuiSinglelineTextBox::DefaultTextElementOperatorCallback ***********************************************************************/ @@ -17331,6 +17465,19 @@ GuiSinglelineTextBox textElement->SetCaretColor(ct->GetCaretColor()); } + void GuiSinglelineTextBox::UpdateVisuallyEnabled() + { + GuiControl::UpdateVisuallyEnabled(); + textElement->SetVisuallyEnabled(GetVisuallyEnabled()); + } + + void GuiSinglelineTextBox::UpdateDisplayFont() + { + GuiControl::UpdateDisplayFont(); + textElement->SetFont(GetDisplayFont()); + RearrangeTextElement(); + } + void GuiSinglelineTextBox::RearrangeTextElement() { textCompositionTable->SetRowOption( @@ -17346,11 +17493,6 @@ GuiSinglelineTextBox RearrangeTextElement(); } - void GuiSinglelineTextBox::OnVisuallyEnabledChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments) - { - textElement->SetVisuallyEnabled(GetVisuallyEnabled()); - } - void GuiSinglelineTextBox::OnBoundsMouseButtonDown(compositions::GuiGraphicsComposition* sender, compositions::GuiMouseEventArgs& arguments) { if(GetVisuallyEnabled()) @@ -17363,7 +17505,7 @@ GuiSinglelineTextBox :GuiControl(themeName) { textElement = GuiColorizedTextElement::Create(); - textElement->SetFont(GetFont()); + textElement->SetFont(GetDisplayFont()); textElement->SetViewPosition(Point(-GuiSinglelineTextBox::TextMargin, -GuiSinglelineTextBox::TextMargin)); textCompositionTable = new GuiTableComposition; @@ -17387,7 +17529,6 @@ GuiSinglelineTextBox Install(textElement, textComposition, this, boundsComposition, focusableComposition); SetCallback(callback.Obj()); - VisuallyEnabledChanged.AttachMethod(this, &GuiSinglelineTextBox::OnVisuallyEnabledChanged); boundsComposition->GetEventReceiver()->leftButtonDown.AttachMethod(this, &GuiSinglelineTextBox::OnBoundsMouseButtonDown); boundsComposition->GetEventReceiver()->middleButtonDown.AttachMethod(this, &GuiSinglelineTextBox::OnBoundsMouseButtonDown); boundsComposition->GetEventReceiver()->rightButtonDown.AttachMethod(this, &GuiSinglelineTextBox::OnBoundsMouseButtonDown); @@ -17410,13 +17551,6 @@ GuiSinglelineTextBox textElement->SetCaretEnd(TextPos(0, 0)); } - void GuiSinglelineTextBox::SetFont(const FontProperties& value) - { - GuiControl::SetFont(value); - textElement->SetFont(value); - RearrangeTextElement(); - } - wchar_t GuiSinglelineTextBox::GetPasswordChar() { return textElement->GetPasswordChar(); @@ -22593,7 +22727,7 @@ GalleryItemArranger } } - void GalleryItemArranger::PlaceItem(bool forMoving, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent) + void GalleryItemArranger::PlaceItem(bool forMoving, bool newCreatedStyle, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent) { alignmentToParent = Margin(-1, 0, -1, 0); bounds = Rect(Point((index - firstIndex) * itemWidth, 0), Size(itemWidth, 0)); @@ -22686,24 +22820,31 @@ GalleryItemArranger else return itemIndex; } - bool GalleryItemArranger::EnsureItemVisible(vint itemIndex) + GuiListControl::EnsureItemVisibleResult GalleryItemArranger::EnsureItemVisible(vint itemIndex) { - if (callback && 0 <= itemIndex && itemIndex < itemProvider->Count()) + if (callback) { - vint groupCount = viewBounds.Width() / itemWidth; - if (itemIndex < firstIndex) + if (0 <= itemIndex && itemIndex < itemProvider->Count()) { - firstIndex = itemIndex; - callback->OnTotalSizeChanged(); + vint groupCount = viewBounds.Width() / itemWidth; + if (itemIndex < firstIndex) + { + firstIndex = itemIndex; + callback->OnTotalSizeChanged(); + } + else if (itemIndex >= firstIndex + groupCount) + { + firstIndex = itemIndex - groupCount + 1; + callback->OnTotalSizeChanged(); + } + return GuiListControl::EnsureItemVisibleResult::NotMoved; } - else if (itemIndex >= firstIndex + groupCount) + else { - firstIndex = itemIndex - groupCount + 1; - callback->OnTotalSizeChanged(); + return GuiListControl::EnsureItemVisibleResult::ItemNotExists; } - return true; } - return false; + return GuiListControl::EnsureItemVisibleResult::NotMoved; } Size GalleryItemArranger::GetAdoptedSize(Size expectedSize) @@ -31934,6 +32075,28 @@ GuiGraphicsHost default:; } } + + if (!needRender) + { + { + ProcList procs; + CopyFrom(procs, afterRenderProcs); + afterRenderProcs.Clear(); + for (vint i = 0; i < procs.Count(); i++) + { + procs[i](); + } + } + { + ProcMap procs; + CopyFrom(procs, afterRenderKeyedProcs); + afterRenderKeyedProcs.Clear(); + for (vint i = 0; i < procs.Count(); i++) + { + procs.Values()[i](); + } + } + } } void GuiGraphicsHost::RequestRender() @@ -31941,6 +32104,18 @@ GuiGraphicsHost needRender = true; } + void GuiGraphicsHost::InvokeAfterRendering(const Func& proc, ProcKey key) + { + if (key.key == nullptr) + { + afterRenderProcs.Add(proc); + } + else + { + afterRenderKeyedProcs.Set(key, proc); + } + } + void GuiGraphicsHost::InvalidateTabOrderCache() { tabActionManager->InvalidateTabOrderCache(); @@ -38872,7 +39047,7 @@ GuiResourceFolder } } - void GuiResourceFolder::InitializeResourceFolder(GuiResourceInitializeContext& context) + void GuiResourceFolder::InitializeResourceFolder(GuiResourceInitializeContext& context, GuiResourceError::List& errors) { if (importUri != L"") return; FOREACH(Ptr, item, items.Values()) @@ -38880,13 +39055,13 @@ GuiResourceFolder auto typeResolver = GetResourceResolverManager()->GetTypeResolver(item->GetTypeName()); if (auto initialize = typeResolver->Initialize()) { - initialize->Initialize(item, context); + initialize->Initialize(item, context, errors); } } FOREACH(Ptr, folder, folders.Values()) { - folder->InitializeResourceFolder(context); + folder->InitializeResourceFolder(context, errors); } } @@ -39382,7 +39557,7 @@ GuiResource return context.targetFolder; } - void GuiResource::Initialize(GuiResourceUsage usage) + void GuiResource::Initialize(GuiResourceUsage usage, GuiResourceError::List& errors) { auto precompiledFolder = GetFolder(L"Precompiled"); if (!precompiledFolder) @@ -39401,7 +39576,7 @@ GuiResource for (vint i = 0; i <= maxPass; i++) { context.passIndex = i; - InitializeResourceFolder(context); + InitializeResourceFolder(context, errors); } } @@ -39870,20 +40045,28 @@ IGuiInstanceResourceManager resourceManager = nullptr; } - bool SetResource(Ptr resource, GuiResourceUsage usage)override + void SetResource(Ptr resource, GuiResourceError::List& errors, GuiResourceUsage usage)override { auto metadata = resource->GetMetadata(); if (metadata->name == L"") { - if (anonymousResources.Contains(resource.Obj())) return false; - resource->Initialize(usage); + if (anonymousResources.Contains(resource.Obj())) return; + resource->Initialize(usage, errors); + if (errors.Count() > 0) + { + return; + } anonymousResources.Add(resource); } else { CHECK_ERROR(!resources.Keys().Contains(metadata->name), L"GuiResourceManager::SetResource(Ptr, GuiResourceUsage)#A resource with the same name has been loaded."); - resource->Initialize(usage); + resource->Initialize(usage, errors); + if (errors.Count() > 0) + { + return; + } resources.Add(metadata->name, resource); } @@ -39910,12 +40093,11 @@ IGuiInstanceResourceManager if (pr->dependencies.Count() == 0) { pendingResources.Remove(pr.Obj()); - SetResource(pr->LoadResource(), pr->usage); + SetResource(pr->LoadResource(), errors, pr->usage); } } } } - return true; } Ptr GetResource(const WString& name)override @@ -39949,7 +40131,7 @@ IGuiInstanceResourceManager } } - void LoadResourceOrPending(stream::IStream& stream, GuiResourceUsage usage = GuiResourceUsage::DataOnly)override + void LoadResourceOrPending(stream::IStream& stream, GuiResourceError::List& errors, GuiResourceUsage usage)override { auto pr = MakePtr(); pr->usage = usage; @@ -39978,7 +40160,7 @@ IGuiInstanceResourceManager if (pr->dependencies.Count() == 0) { - SetResource(pr->LoadResource(), pr->usage); + SetResource(pr->LoadResource(), errors, pr->usage); } else { @@ -39990,6 +40172,13 @@ IGuiInstanceResourceManager } } + void LoadResourceOrPending(stream::IStream& stream, GuiResourceUsage usage)override + { + GuiResourceError::List errors; + LoadResourceOrPending(stream, errors, usage); + CHECK_ERROR(errors.Count() == 0, L"GuiResourceManager::LoadResourceOrPending(stream::IStream&, GuiResourceUsage)#Error happened."); + } + void GetPendingResourceNames(collections::List& names)override { CopyFrom(names, From(pendingResources).Select([](Ptr pr) {return pr->metadata->name; })); diff --git a/Import/GacUI.h b/Import/GacUI.h index 9777fb01..d7f6f03a 100644 --- a/Import/GacUI.h +++ b/Import/GacUI.h @@ -4345,7 +4345,7 @@ Resource Structure void LoadResourceFolderFromBinary(DelayLoadingList& delayLoadings, stream::internal::ContextFreeReader& reader, collections::List& typeNames, GuiResourceError::List& errors); void SaveResourceFolderToBinary(stream::internal::ContextFreeWriter& writer, collections::List& typeNames); void PrecompileResourceFolder(GuiResourcePrecompileContext& context, IGuiResourcePrecompileCallback* callback, GuiResourceError::List& errors); - void InitializeResourceFolder(GuiResourceInitializeContext& context); + void InitializeResourceFolder(GuiResourceInitializeContext& context, GuiResourceError::List& errors); void ImportFromUri(const WString& uri, GuiResourceTextPos position, GuiResourceError::List& errors); public: /// Create a resource folder. @@ -4499,7 +4499,8 @@ Resource /// Initialize a precompiled resource. /// In which role an application is initializing this resource. - void Initialize(GuiResourceUsage usage); + /// All collected errors during initializing a resource. + void Initialize(GuiResourceUsage usage, GuiResourceError::List& errors); /// Get a contained document model using a path like "Packages\Application\Name". If the path does not exists or the type does not match, an exception will be thrown. /// The containd resource object. @@ -4718,7 +4719,7 @@ Resource Type Resolver /// Initialize the resource item. /// The resource to initializer. /// The context for initializing. - virtual void Initialize(Ptr resource, GuiResourceInitializeContext& context) = 0; + virtual void Initialize(Ptr resource, GuiResourceInitializeContext& context, GuiResourceError::List& errors) = 0; }; /// Represents a symbol type for loading a resource without a preload type. @@ -8150,6 +8151,24 @@ namespace vl Basic Construction ***********************************************************************/ + /// + /// A helper object to test if a control has been deleted or not. + /// + class GuiDisposedFlag : public Object, public Description + { + friend class GuiControl; + protected: + GuiControl* owner = nullptr; + bool disposed = false; + + void SetDisposed(); + public: + GuiDisposedFlag(GuiControl* _owner); + ~GuiDisposedFlag(); + + bool IsDisposed(); + }; + /// /// The base class of all controls. /// When the control is destroyed, it automatically destroys sub controls, and the bounds composition from the style controller. @@ -8174,6 +8193,10 @@ Basic Construction theme::ThemeName controlThemeName; ControlTemplatePropertyType controlTemplate; templates::GuiControlTemplate* controlTemplateObject = nullptr; + Ptr disposedFlag; + + public: + Ptr GetDisposedFlag(); protected: compositions::GuiBoundsComposition* boundsComposition = nullptr; @@ -8192,7 +8215,8 @@ Basic Construction bool isVisible = true; WString alt; WString text; - FontProperties font; + Nullable font; + FontProperties displayFont; description::Value context; compositions::IGuiAltActionHost* activatingAltHost = nullptr; ControlServiceMap controlServices; @@ -8203,8 +8227,6 @@ Basic Construction GuiControl* tooltipControl = nullptr; vint tooltipWidth = 0; - Ptr flagDisposed; - virtual void BeforeControlTemplateUninstalled(); virtual void AfterControlTemplateInstalled(bool initialize); virtual void CheckAndStoreControlTemplate(templates::GuiControlTemplate* value); @@ -8218,6 +8240,7 @@ Basic Construction virtual void OnRenderTargetChanged(elements::IGuiGraphicsRenderTarget* renderTarget); virtual void OnBeforeReleaseGraphicsHost(); virtual void UpdateVisuallyEnabled(); + virtual void UpdateDisplayFont(); void OnGotFocus(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); void OnLostFocus(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); void SetFocusableComposition(compositions::GuiGraphicsComposition* value); @@ -8264,6 +8287,8 @@ Basic Construction compositions::GuiNotifyEvent TextChanged; /// Font changed event. This event will be raised when the font of the control is changed. compositions::GuiNotifyEvent FontChanged; + /// Display font changed event. This event will be raised when the display font of the control is changed. + compositions::GuiNotifyEvent DisplayFontChanged; /// Context changed event. This event will be raised when the font of the control is changed. compositions::GuiNotifyEvent ContextChanged; @@ -8368,12 +8393,15 @@ Basic Construction /// Set the text to display on the control. /// The text to display on the control. virtual void SetText(const WString& value); - /// Get the font to render the text. + /// Get the font of this control. + /// The font of this control. + virtual const Nullable& GetFont(); + /// Set the font of this control. + /// The font of this control. + virtual void SetFont(const Nullable& value); + /// Get the font to render the text. If the font of this control is null, then the display font is either the parent control's display font, or the system's default font when there is no parent control. /// The font to render the text. - virtual const FontProperties& GetFont(); - /// Set the font to render the text. - /// The font to render the text. - virtual void SetFont(const FontProperties& value); + virtual const FontProperties& GetDisplayFont(); /// Get the context of this control. The control template and all item templates (if it has) will see this context property. /// The context of this context. virtual description::Value GetContext(); @@ -9512,10 +9540,11 @@ IGuiResourceManager class IGuiResourceManager : public IDescriptable, public Description { public: - virtual bool SetResource(Ptr resource, GuiResourceUsage usage = GuiResourceUsage::DataOnly) = 0; + virtual void SetResource(Ptr resource, GuiResourceError::List& errors, GuiResourceUsage usage = GuiResourceUsage::DataOnly) = 0; virtual Ptr GetResource(const WString& name) = 0; virtual Ptr GetResourceFromClassName(const WString& classFullName) = 0; virtual void UnloadResource(const WString& name) = 0; + virtual void LoadResourceOrPending(stream::IStream& stream, GuiResourceError::List& errors, GuiResourceUsage usage = GuiResourceUsage::DataOnly) = 0; virtual void LoadResourceOrPending(stream::IStream& stream, GuiResourceUsage usage = GuiResourceUsage::DataOnly) = 0; virtual void GetPendingResourceNames(collections::List& names) = 0; }; @@ -11010,12 +11039,18 @@ Host { typedef collections::List CompositionList; typedef GuiGraphicsComposition::GraphicsHostRecord HostRecord; + typedef collections::Pair ProcKey; + typedef collections::List> ProcList; + typedef collections::Dictionary> ProcMap; public: static const vuint64_t CaretInterval = 500; + protected: HostRecord hostRecord; bool supressPaint = false; bool needRender = true; + ProcList afterRenderProcs; + ProcMap afterRenderKeyedProcs; GuiAltActionManager* altActionManager = nullptr; GuiTabActionManager* tabActionManager = nullptr; @@ -11088,6 +11123,10 @@ Host void Render(bool forceUpdate); /// Request a rendering void RequestRender(); + /// Invoke a specified function after rendering. + /// The specified function. + /// A key to cancel a previous binded key if not null. + void InvokeAfterRendering(const Func& proc, ProcKey key = { nullptr,-1 }); /// Invalidte the internal tab order control list. Next time when TAB is pressed it will be rebuilt. void InvalidateTabOrderCache(); @@ -11592,6 +11631,8 @@ Scroll View bool horizontalAlwaysVisible = true; bool verticalAlwaysVisible = true; + void UpdateDisplayFont()override; + void OnContainerBoundsChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); void OnHorizontalScroll(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); void OnVerticalScroll(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); @@ -11619,8 +11660,6 @@ Scroll View GuiScrollView(theme::ThemeName themeName); ~GuiScrollView(); - virtual void SetFont(const FontProperties& value)override; - /// Force to update contents and scroll bars. void CalculateView(); /// Get the view size. @@ -12167,6 +12206,17 @@ List Control //----------------------------------------------------------- // Item Layout Interfaces //----------------------------------------------------------- + + /// EnsureItemVisible result for item arranger. + enum class EnsureItemVisibleResult + { + /// The requested item does not exist. + ItemNotExists, + /// The view location is moved. + Moved, + /// The view location is not moved. + NotMoved, + }; /// Item arranger for a . Item arranger decides how to arrange and item controls. When implementing an item arranger, is suggested to use when calculating locations and sizes for item controls. class IItemArranger : public virtual IItemProviderCallback, public Description @@ -12205,9 +12255,9 @@ List Control /// The key direction. virtual vint FindItem(vint itemIndex, compositions::KeyDirection key) = 0; /// Adjust the view location to make an item visible. - /// Returns true if this operation succeeded. + /// Returns the result of this operation. /// The item index of the item to be made visible. - virtual bool EnsureItemVisible(vint itemIndex) = 0; + virtual EnsureItemVisibleResult EnsureItemVisible(vint itemIndex) = 0; /// Get the adopted size for the view bounds. /// The adopted size, making the vids bounds just enough to display several items. /// The expected size, to provide a guidance. @@ -12300,9 +12350,9 @@ List Control friend class collections::ArrayBase>; collections::Dictionary> visibleStyles; + void UpdateDisplayFont()override; void OnClientBoundsChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); void OnVisuallyEnabledChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); - void OnFontChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); void OnContextChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); void OnItemMouseEvent(compositions::GuiItemMouseEvent& itemEvent, ItemStyle* style, compositions::GuiGraphicsComposition* sender, compositions::GuiMouseEventArgs& arguments); void OnItemNotifyEvent(compositions::GuiItemNotifyEvent& itemEvent, ItemStyle* style, compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); @@ -13606,6 +13656,7 @@ ComboBox with GuiListControl templates::GuiTemplate* itemStyleController = nullptr; Ptr boundsChangedHandler; + void UpdateDisplayFont()override; void BeforeControlTemplateUninstalled()override; void AfterControlTemplateInstalled(bool initialize)override; void RemoveStyleController(); @@ -13613,7 +13664,6 @@ ComboBox with GuiListControl virtual void DisplaySelectedContent(vint itemIndex); void AdoptSubMenuSize(); void OnTextChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); - void OnFontChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); void OnContextChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); void OnVisuallyEnabledChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); void OnAfterSubMenuOpening(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); @@ -13792,7 +13842,7 @@ DateComboBox /// Selected data changed event. compositions::GuiNotifyEvent SelectedDateChanged; - void SetFont(const FontProperties& value)override; + void SetFont(const Nullable& value)override; /// Get the displayed date. /// The date. const DateTime& GetSelectedDate(); @@ -13866,7 +13916,7 @@ Predefined ItemArranger virtual void RearrangeItemBounds(); virtual void BeginPlaceItem(bool forMoving, Rect newBounds, vint& newStartIndex) = 0; - virtual void PlaceItem(bool forMoving, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent) = 0; + virtual void PlaceItem(bool forMoving, bool newCreatedStyle, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent) = 0; virtual bool IsItemOutOfViewBounds(vint index, ItemStyleRecord style, Rect bounds, Rect viewBounds) = 0; virtual bool EndPlaceItem(bool forMoving, Rect newBounds, vint newStartIndex) = 0; virtual void InvalidateItemSizeCache() = 0; @@ -13902,7 +13952,7 @@ Predefined ItemArranger void EnsureOffsetForItem(vint itemIndex); void BeginPlaceItem(bool forMoving, Rect newBounds, vint& newStartIndex)override; - void PlaceItem(bool forMoving, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent)override; + void PlaceItem(bool forMoving, bool newCreatedStyle, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent)override; bool IsItemOutOfViewBounds(vint index, ItemStyleRecord style, Rect bounds, Rect viewBounds)override; bool EndPlaceItem(bool forMoving, Rect newBounds, vint newStartIndex)override; void InvalidateItemSizeCache()override; @@ -13915,7 +13965,7 @@ Predefined ItemArranger void OnAttached(GuiListControl::IItemProvider* provider)override; void OnItemModified(vint start, vint count, vint newCount)override; vint FindItem(vint itemIndex, compositions::KeyDirection key)override; - bool EnsureItemVisible(vint itemIndex)override; + GuiListControl::EnsureItemVisibleResult EnsureItemVisible(vint itemIndex)override; Size GetAdoptedSize(Size expectedSize)override; }; @@ -13933,7 +13983,7 @@ Predefined ItemArranger virtual vint GetYOffset(); void BeginPlaceItem(bool forMoving, Rect newBounds, vint& newStartIndex)override; - void PlaceItem(bool forMoving, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent)override; + void PlaceItem(bool forMoving, bool newCreatedStyle, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent)override; bool IsItemOutOfViewBounds(vint index, ItemStyleRecord style, Rect bounds, Rect viewBounds)override; bool EndPlaceItem(bool forMoving, Rect newBounds, vint newStartIndex)override; void InvalidateItemSizeCache()override; @@ -13944,7 +13994,7 @@ Predefined ItemArranger ~FixedHeightItemArranger(); vint FindItem(vint itemIndex, compositions::KeyDirection key)override; - bool EnsureItemVisible(vint itemIndex)override; + GuiListControl::EnsureItemVisibleResult EnsureItemVisible(vint itemIndex)override; Size GetAdoptedSize(Size expectedSize)override; }; @@ -13960,7 +14010,7 @@ Predefined ItemArranger void CalculateRange(Size itemSize, Rect bounds, vint count, vint& start, vint& end); void BeginPlaceItem(bool forMoving, Rect newBounds, vint& newStartIndex)override; - void PlaceItem(bool forMoving, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent)override; + void PlaceItem(bool forMoving, bool newCreatedStyle, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent)override; bool IsItemOutOfViewBounds(vint index, ItemStyleRecord style, Rect bounds, Rect viewBounds)override; bool EndPlaceItem(bool forMoving, Rect newBounds, vint newStartIndex)override; void InvalidateItemSizeCache()override; @@ -13971,7 +14021,7 @@ Predefined ItemArranger ~FixedSizeMultiColumnItemArranger(); vint FindItem(vint itemIndex, compositions::KeyDirection key)override; - bool EnsureItemVisible(vint itemIndex)override; + GuiListControl::EnsureItemVisibleResult EnsureItemVisible(vint itemIndex)override; Size GetAdoptedSize(Size expectedSize)override; }; @@ -13989,7 +14039,7 @@ Predefined ItemArranger void CalculateRange(vint itemHeight, Rect bounds, vint& rows, vint& startColumn); void BeginPlaceItem(bool forMoving, Rect newBounds, vint& newStartIndex)override; - void PlaceItem(bool forMoving, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent)override; + void PlaceItem(bool forMoving, bool newCreatedStyle, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent)override; bool IsItemOutOfViewBounds(vint index, ItemStyleRecord style, Rect bounds, Rect viewBounds)override; bool EndPlaceItem(bool forMoving, Rect newBounds, vint newStartIndex)override; void InvalidateItemSizeCache()override; @@ -14000,7 +14050,7 @@ Predefined ItemArranger ~FixedHeightMultiColumnItemArranger(); vint FindItem(vint itemIndex, compositions::KeyDirection key)override; - bool EnsureItemVisible(vint itemIndex)override; + GuiListControl::EnsureItemVisibleResult EnsureItemVisible(vint itemIndex)override; Size GetAdoptedSize(Size expectedSize)override; }; } @@ -17442,11 +17492,12 @@ MultilineTextBox elements::GuiColorizedTextElement* textElement = nullptr; compositions::GuiBoundsComposition* textComposition = nullptr; - void CalculateViewAndSetScroll(); + void UpdateVisuallyEnabled()override; + void UpdateDisplayFont()override; void OnRenderTargetChanged(elements::IGuiGraphicsRenderTarget* renderTarget)override; Size QueryFullSize()override; void UpdateView(Rect viewBounds)override; - void OnVisuallyEnabledChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); + void CalculateViewAndSetScroll(); void OnBoundsMouseButtonDown(compositions::GuiGraphicsComposition* sender, compositions::GuiMouseEventArgs& arguments); public: /// Create a control with a specified style provider. @@ -17456,7 +17507,6 @@ MultilineTextBox const WString& GetText()override; void SetText(const WString& value)override; - void SetFont(const FontProperties& value)override; }; /*********************************************************************** @@ -17488,9 +17538,10 @@ SinglelineTextBox compositions::GuiTableComposition* textCompositionTable = nullptr; compositions::GuiCellComposition* textComposition = nullptr; + void UpdateVisuallyEnabled()override; + void UpdateDisplayFont()override; void RearrangeTextElement(); void OnRenderTargetChanged(elements::IGuiGraphicsRenderTarget* renderTarget)override; - void OnVisuallyEnabledChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments); void OnBoundsMouseButtonDown(compositions::GuiGraphicsComposition* sender, compositions::GuiMouseEventArgs& arguments); public: /// Create a control with a specified style provider. @@ -17500,7 +17551,6 @@ SinglelineTextBox const WString& GetText()override; void SetText(const WString& value)override; - void SetFont(const FontProperties& value)override; /// /// Get the password mode displaying character. @@ -19507,7 +19557,7 @@ GalleryItemArranger vint firstIndex = 0; void BeginPlaceItem(bool forMoving, Rect newBounds, vint& newStartIndex)override; - void PlaceItem(bool forMoving, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent)override; + void PlaceItem(bool forMoving, bool newCreatedStyle, vint index, ItemStyleRecord style, Rect viewBounds, Rect& bounds, Margin& alignmentToParent)override; bool IsItemOutOfViewBounds(vint index, ItemStyleRecord style, Rect bounds, Rect viewBounds)override; bool EndPlaceItem(bool forMoving, Rect newBounds, vint newStartIndex)override; void InvalidateItemSizeCache()override; @@ -19517,7 +19567,7 @@ GalleryItemArranger ~GalleryItemArranger(); vint FindItem(vint itemIndex, compositions::KeyDirection key)override; - bool EnsureItemVisible(vint itemIndex)override; + GuiListControl::EnsureItemVisibleResult EnsureItemVisible(vint itemIndex)override; Size GetAdoptedSize(Size expectedSize)override; void ScrollUp(); diff --git a/Import/GacUICompiler.cpp b/Import/GacUICompiler.cpp index 5aef701a..62c49990 100644 --- a/Import/GacUICompiler.cpp +++ b/Import/GacUICompiler.cpp @@ -3030,18 +3030,8 @@ GuiLocalizedStringInstanceBinder (str) if (errorCount == errors.Count()) { - auto stringExpr = MakePtr(); - stringExpr->value.value = L""; - stringExpr->codeRange = expression->codeRange; - - auto recoveryExpr = MakePtr(); - recoveryExpr->op = WfBinaryOperator::FailedThen; - recoveryExpr->first = expression; - recoveryExpr->second = stringExpr; - recoveryExpr->codeRange = expression->codeRange; - auto bindExpr = MakePtr(); - bindExpr->expression = recoveryExpr; + bindExpr->expression = expression; bindExpr->codeRange = expression->codeRange; return Workflow_InstallBindProperty(precompileContext, resolvingResult, variableName, propertyInfo, bindExpr); @@ -4139,14 +4129,18 @@ namespace vl if (manager->errors.Count() == 0) { compiled->assembly = GenerateAssembly(manager, compilerCallback); - compiled->Initialize(true); + WfAssemblyLoadErrors loadErrors; + if (!compiled->Initialize(true, loadErrors)) + { + manager->errors.Add(new ParsingError(L"Internal error happened during loading an assembly that just passed type verification.")); + } } else { - WorkflowVirtualScriptPositionVisitor visitor(context); for (vint i = 0; i < compiled->modules.Count(); i++) { auto module = compiled->modules[i]; + WorkflowVirtualScriptPositionVisitor visitor(context); visitor.VisitField(module.module.Obj()); Workflow_RecordScriptPosition(context, module.position, module.module); } @@ -10480,9 +10474,22 @@ Workflow_GenerateInstanceClass prop->configConst = WfAPConst::Writable; prop->configObserve = WfAPObserve::Observable; - auto nullExpr = MakePtr(); - nullExpr->value = WfLiteralValue::Null; - prop->expression = nullExpr; + auto localeNameExpr = MakePtr(); + localeNameExpr->value.value = L"en-US"; + + auto defaultLocalExpr = MakePtr(); + defaultLocalExpr->strategy = WfTypeCastingStrategy::Strong; + defaultLocalExpr->type = GetTypeFromTypeInfo(TypeInfoRetriver::CreateTypeInfo().Obj()); + defaultLocalExpr->expression = localeNameExpr; + + auto getExpr = MakePtr(); + getExpr->parent = GetExpressionFromTypeDescriptor(lsTd); + getExpr->name.value = L"Get"; + + auto callExpr = MakePtr(); + callExpr->function = getExpr; + callExpr->arguments.Add(defaultLocalExpr); + prop->expression = callExpr; } else { diff --git a/Import/GacUIReflection.cpp b/Import/GacUIReflection.cpp index 6ae2258a..1b12df11 100644 --- a/Import/GacUIReflection.cpp +++ b/Import/GacUIReflection.cpp @@ -20,11 +20,15 @@ namespace vl GuiInstanceSharedScript ***********************************************************************/ - void GuiInstanceCompiledWorkflow::Initialize(bool initializeContext) + bool GuiInstanceCompiledWorkflow::Initialize(bool initializeContext, workflow::runtime::WfAssemblyLoadErrors& loadErrors) { if (binaryToLoad) { - assembly = new WfAssembly(*binaryToLoad.Obj()); + assembly = WfAssembly::Deserialize(*binaryToLoad.Obj(), loadErrors); + if (!assembly) + { + return false; + } context = nullptr; binaryToLoad = nullptr; } @@ -34,6 +38,7 @@ GuiInstanceSharedScript context = new WfRuntimeGlobalContext(assembly); LoadFunction(context, L"")(); } + return true; } /*********************************************************************** @@ -67,7 +72,7 @@ Compiled Workflow Type Resolver (Workflow) return 1; } - void Initialize(Ptr resource, GuiResourceInitializeContext& context)override + void Initialize(Ptr resource, GuiResourceInitializeContext& context, GuiResourceError::List& errors)override { if (auto compiled = resource->GetContent().Cast()) { @@ -78,7 +83,22 @@ Compiled Workflow Type Resolver (Workflow) { if (context.usage == GuiResourceUsage::InstanceClass) { - compiled->Initialize(true); + WfAssemblyLoadErrors loadErrors; + if (!compiled->Initialize(true, loadErrors)) + { + FOREACH(WString, loadError, loadErrors.duplicatedTypes) + { + errors.Add({ {resource},L"Failed to add an existing type: " + loadError }); + } + FOREACH(WString, loadError, loadErrors.unresolvedTypes) + { + errors.Add({ {resource},L"Unable to resolve type: " + loadError }); + } + FOREACH(WString, loadError, loadErrors.unresolvedMembers) + { + errors.Add({ {resource},L"Unable to resolve member: " + loadError }); + } + } } } break; @@ -1542,6 +1562,12 @@ Type Declaration (Extra) CLASS_MEMBER_METHOD(OnTotalSizeChanged, NO_PARAMETER) END_INTERFACE_MEMBER(GuiListControl::IItemArrangerCallback) + BEGIN_ENUM_ITEM(GuiListControl::EnsureItemVisibleResult) + ENUM_CLASS_ITEM(ItemNotExists) + ENUM_CLASS_ITEM(Moved) + ENUM_CLASS_ITEM(NotMoved) + END_ENUM_ITEM(GuiListControl::EnsureItemVisibleResult) + BEGIN_INTERFACE_MEMBER(GuiListControl::IItemProvider) CLASS_MEMBER_BASE(IDescriptable) @@ -2048,11 +2074,16 @@ Type Declaration (Extra) Type Declaration (Class) ***********************************************************************/ + BEGIN_CLASS_MEMBER(GuiDisposedFlag) + CLASS_MEMBER_METHOD(IsDisposed, NO_PARAMETER) + END_CLASS_MEMBER(GuiDisposedFlag) + BEGIN_CLASS_MEMBER(GuiControl) CONTROL_CONSTRUCTOR_CONTROLT_TEMPLATE(GuiControl) CLASS_MEMBER_EXTERNALMETHOD(SafeDelete, NO_PARAMETER, void(GuiControl::*)(), vl::presentation::compositions::SafeDeleteControl) + CLASS_MEMBER_PROPERTY_READONLY_FAST(DisposedFlag) CLASS_MEMBER_GUIEVENT(ControlSignalTrigerred) CLASS_MEMBER_PROPERTY_GUIEVENT_FAST(ControlThemeName) CLASS_MEMBER_PROPERTY_GUIEVENT_FAST(ControlTemplate) @@ -2071,6 +2102,7 @@ Type Declaration (Class) CLASS_MEMBER_PROPERTY_GUIEVENT_FAST(Alt) CLASS_MEMBER_PROPERTY_GUIEVENT_FAST(Text) CLASS_MEMBER_PROPERTY_GUIEVENT_FAST(Font) + CLASS_MEMBER_PROPERTY_GUIEVENT_READONLY_FAST(DisplayFont) CLASS_MEMBER_PROPERTY_GUIEVENT_FAST(Context) CLASS_MEMBER_PROPERTY_FAST(Tag) CLASS_MEMBER_PROPERTY_FAST(TooltipControl) diff --git a/Import/GacUIReflection.h b/Import/GacUIReflection.h index 104cd079..999fac4b 100644 --- a/Import/GacUIReflection.h +++ b/Import/GacUIReflection.h @@ -57,7 +57,7 @@ namespace vl Ptr assembly; Ptr context; - void Initialize(bool initializeContext); + bool Initialize(bool initializeContext, workflow::runtime::WfAssemblyLoadErrors& loadErrors); }; } } @@ -336,6 +336,7 @@ Type List (Controls) F(presentation::controls::GuiListControl::IItemProviderCallback)\ F(presentation::controls::GuiListControl::IItemArrangerCallback)\ F(presentation::controls::GuiListControl::IItemProvider)\ + F(presentation::controls::GuiListControl::EnsureItemVisibleResult)\ F(presentation::controls::GuiListControl::IItemArranger)\ F(presentation::controls::list::ItemProviderBase)\ F(presentation::controls::list::RangedItemArrangerBase)\ @@ -403,6 +404,7 @@ Type List (Controls) F(presentation::controls::list::DataProvider)\ #define GUIREFLECTIONCONTROLS_CLASS_TYPELIST(F)\ + F(presentation::controls::GuiDisposedFlag)\ F(presentation::controls::GuiControl)\ F(presentation::controls::GuiCustomControl)\ F(presentation::controls::GuiLabel)\ @@ -851,7 +853,7 @@ Interface Proxy (Controls) INVOKEGET_INTERFACE_PROXY(FindItem, itemIndex, key); } - bool EnsureItemVisible(vint itemIndex)override + presentation::controls::GuiListControl::EnsureItemVisibleResult EnsureItemVisible(vint itemIndex)override { INVOKEGET_INTERFACE_PROXY(EnsureItemVisible, itemIndex); } diff --git a/Import/Skins/DarkSkin/DarkSkin.cpp b/Import/Skins/DarkSkin/DarkSkin.cpp index 3aa88634..75cfbeda 100644 --- a/Import/Skins/DarkSkin/DarkSkin.cpp +++ b/Import/Skins/DarkSkin/DarkSkin.cpp @@ -25209,7 +25209,7 @@ Class (::darkskin::HTrackerTemplateConstructor) ::vl::__vwsn::This(this->__vwsn_precompile_7)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(1); __vwsn_temp__.top = static_cast<::vl::vint>(1); __vwsn_temp__.right = static_cast<::vl::vint>(1); __vwsn_temp__.bottom = static_cast<::vl::vint>(1); return __vwsn_temp__; }()); } { - ::vl::__vwsn::This(this->__vwsn_precompile_6)->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.size = static_cast<::vl::vint>(1); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_6)->SetFont(::vl::Nullable<::vl::presentation::FontProperties>([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.size = static_cast<::vl::vint>(1); return __vwsn_temp__; }())); } { ::vl::__vwsn::This(this->__vwsn_precompile_6)->SetAutoFocus(false); @@ -31620,7 +31620,7 @@ Class (::darkskin::VTrackerTemplateConstructor) ::vl::__vwsn::This(this->__vwsn_precompile_7)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(1); __vwsn_temp__.top = static_cast<::vl::vint>(1); __vwsn_temp__.right = static_cast<::vl::vint>(1); __vwsn_temp__.bottom = static_cast<::vl::vint>(1); return __vwsn_temp__; }()); } { - ::vl::__vwsn::This(this->__vwsn_precompile_6)->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.size = static_cast<::vl::vint>(1); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_6)->SetFont(::vl::Nullable<::vl::presentation::FontProperties>([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.size = static_cast<::vl::vint>(1); return __vwsn_temp__; }())); } { ::vl::__vwsn::This(this->__vwsn_precompile_6)->SetAutoFocus(false); @@ -31846,7 +31846,7 @@ Class (::darkskin::WindowTemplateConstructor) ::vl::__vwsn::This(this->__vwsn_precompile_13)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(1); __vwsn_temp__.top = static_cast<::vl::vint>(1); __vwsn_temp__.right = static_cast<::vl::vint>(1); __vwsn_temp__.bottom = static_cast<::vl::vint>(1); return __vwsn_temp__; }()); } { - ::vl::__vwsn::This(this->__vwsn_precompile_12)->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Webdings", false); __vwsn_temp__.size = static_cast<::vl::vint>(16); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_12)->SetFont(::vl::Nullable<::vl::presentation::FontProperties>([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Webdings", false); __vwsn_temp__.size = static_cast<::vl::vint>(16); return __vwsn_temp__; }())); } { ::vl::__vwsn::This(this->__vwsn_precompile_12)->SetAutoFocus(false); @@ -31875,7 +31875,7 @@ Class (::darkskin::WindowTemplateConstructor) ::vl::__vwsn::This(this->__vwsn_precompile_16)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(1); __vwsn_temp__.top = static_cast<::vl::vint>(1); __vwsn_temp__.right = static_cast<::vl::vint>(1); __vwsn_temp__.bottom = static_cast<::vl::vint>(1); return __vwsn_temp__; }()); } { - ::vl::__vwsn::This(this->__vwsn_precompile_15)->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Webdings", false); __vwsn_temp__.size = static_cast<::vl::vint>(16); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_15)->SetFont(::vl::Nullable<::vl::presentation::FontProperties>([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Webdings", false); __vwsn_temp__.size = static_cast<::vl::vint>(16); return __vwsn_temp__; }())); } { ::vl::__vwsn::This(this->__vwsn_precompile_15)->SetAutoFocus(false); @@ -31904,7 +31904,7 @@ Class (::darkskin::WindowTemplateConstructor) ::vl::__vwsn::This(this->__vwsn_precompile_19)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(1); __vwsn_temp__.top = static_cast<::vl::vint>(1); __vwsn_temp__.right = static_cast<::vl::vint>(1); __vwsn_temp__.bottom = static_cast<::vl::vint>(1); return __vwsn_temp__; }()); } { - ::vl::__vwsn::This(this->__vwsn_precompile_18)->SetFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Webdings", false); __vwsn_temp__.size = static_cast<::vl::vint>(16); return __vwsn_temp__; }()); + ::vl::__vwsn::This(this->__vwsn_precompile_18)->SetFont(::vl::Nullable<::vl::presentation::FontProperties>([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ::vl::WString(L"Webdings", false); __vwsn_temp__.size = static_cast<::vl::vint>(16); return __vwsn_temp__; }())); } { ::vl::__vwsn::This(this->__vwsn_precompile_18)->SetAutoFocus(false); diff --git a/Import/Vlpp.h b/Import/Vlpp.h index 93df90fb..46ec6cd6 100644 --- a/Import/Vlpp.h +++ b/Import/Vlpp.h @@ -46,6 +46,10 @@ Macros: #endif #endif +#if defined VCZH_CLANG_AST_DUMP +#define abstract +#endif + #if defined VCZH_MSVC #include #elif defined VCZH_GCC @@ -14428,11 +14432,7 @@ ParameterAccessor> { Ptr arguments = IValueList::Create(); internal_helper::AddValueToList(arguments, ForwardValue(args)...); -#if defined VCZH_MSVC - typedef TypeInfoRetriver::TempValueType ResultType; -#elif defined VCZH_GCC typedef typename TypeInfoRetriver::TempValueType ResultType; -#endif ResultType proxyResult; description::UnboxParameter(functionProxy->Invoke(arguments), proxyResult); return proxyResult; diff --git a/Import/VlppWorkflowRuntime.cpp b/Import/VlppWorkflowRuntime.cpp index 53c74384..b5afe0c5 100644 --- a/Import/VlppWorkflowRuntime.cpp +++ b/Import/VlppWorkflowRuntime.cpp @@ -573,12 +573,22 @@ namespace vl { namespace internal { + struct WfDeserializationException + { + }; + struct WfReaderContext { Dictionary tdIndex; Dictionary miIndex; Dictionary piIndex; Dictionary eiIndex; + WfAssemblyLoadErrors& errors; + + WfReaderContext(WfAssemblyLoadErrors& _errors) + :errors(_errors) + { + } }; struct WfWriterContextPrepare @@ -874,7 +884,10 @@ Serizliation (ITypeDescriptor) WString id; reader << id; value = GetTypeDescriptor(id); - CHECK_ERROR(value, L"Failed to load type."); + if (!value) + { + reader.context->errors.unresolvedTypes.Add(id); + } } static void IO(WfWriter& writer, ITypeDescriptor*& value) @@ -1004,19 +1017,28 @@ Serizliation (Metadata) if (!group) { - CHECK_ERROR(value, L"Failed to load method."); + reader.context->errors.unresolvedMembers.Add(L"method: " + type->GetTypeName() + L"::" + name + L"(...): *"); + return; } vint methodFlag = -1; reader << methodFlag; - CHECK_ERROR(0 <= methodFlag && methodFlag <= 3, L"Failed to load method."); + if (0 > methodFlag || methodFlag > 3) + { + reader.context->errors.unresolvedMembers.Add(L"method: " + type->GetTypeName() + L"::" + name + L"(...): *"); + return; + } vint methodCount = group->GetMethodCount(); switch (methodFlag) { case 0: { - CHECK_ERROR(methodCount == 1, L"Failed to load method."); + if (methodCount > 1) + { + reader.context->errors.unresolvedMembers.Add(L"method: " + type->GetTypeName() + L"::" + name + L"(...): *; This is caused by a change to this class. When the current assembly was compiled, this imported method didn't have overloadings."); + return; + } value = group->GetMethod(0); } break; @@ -1024,15 +1046,39 @@ Serizliation (Metadata) { vint count = -1; reader << count; + + WString parameters; + for (vint i = 0; i < count; i++) + { + if (i == 0) + { + parameters = L"*"; + } + else + { + parameters += L", *"; + } + } + for (vint i = 0; i < methodCount; i++) { auto method = group->GetMethod(i); if (method->GetParameterCount() == count) { - CHECK_ERROR(!value, L"Failed to load method."); + if (value) + { + reader.context->errors.unresolvedMembers.Add(L"method: " + type->GetTypeName() + L"::" + name + L"(" + parameters + L"): *; This is caused by a change to this class. When the current assembly was compiled, this imported method didn't have overloadings with the same amount of parameters."); + return; + } value = method; } } + + if (!value) + { + reader.context->errors.unresolvedMembers.Add(L"method: " + type->GetTypeName() + L"::" + name + L"(" + parameters + L"): *; A qualified method doesn't exist."); + return; + } } break; case 2: @@ -1045,10 +1091,20 @@ Serizliation (Metadata) auto method = group->GetMethod(i); if (method->GetReturn()->GetTypeFriendlyName() == signature) { - CHECK_ERROR(!value, L"Failed to load method."); + if (value) + { + reader.context->errors.unresolvedMembers.Add(L"method: " + type->GetTypeName() + L"::" + name + L"(...): " + signature + L"; This is caused by a change to this class. When the current assembly was compiled, this imported method didn't have overloadings with the same return type."); + return; + } value = method; } } + + if (!value) + { + reader.context->errors.unresolvedMembers.Add(L"method: " + type->GetTypeName() + L"::" + name + L"(...): " + signature + L"; A qualified method doesn't exist."); + return; + } } break; case 3: @@ -1063,6 +1119,19 @@ Serizliation (Metadata) signatures.Add(type->GetTypeFriendlyName()); } + WString parameters; + for (vint i = 0; i < count; i++) + { + if (i == 0) + { + parameters = signatures[0]; + } + else + { + parameters += L", " + signatures[i]; + } + } + for (vint i = 0; i < methodCount; i++) { auto method = group->GetMethod(i); @@ -1080,11 +1149,21 @@ Serizliation (Metadata) if (found) { - CHECK_ERROR(!value, L"Failed to load method."); + if (value) + { + reader.context->errors.unresolvedMembers.Add(L"method: " + type->GetTypeName() + L"::" + name + L"(" + parameters + L"): *; This is caused by a change to this class. When the current assembly was compiled, this imported method didn't have overloadings with the same parameter types."); + return; + } value = method; } } } + + if (!value) + { + reader.context->errors.unresolvedMembers.Add(L"method: " + type->GetTypeName() + L"::" + name + L"(" + parameters + L"): *; A qualified method doesn't exist."); + return; + } } break; } @@ -1166,7 +1245,10 @@ Serizliation (Metadata) reader << typeIndex << name; auto type = reader.context->tdIndex[typeIndex]; value = type->GetPropertyByName(name, false); - CHECK_ERROR(value, L"Failed to load property."); + if (!value) + { + reader.context->errors.unresolvedMembers.Add(L"property: " + type->GetTypeName() + L"::" + name); + } } static void IO(WfWriter& writer, IPropertyInfo*& value) @@ -1188,7 +1270,10 @@ Serizliation (Metadata) reader << typeIndex << name; auto type = reader.context->tdIndex[typeIndex]; value = type->GetEventByName(name, false); - CHECK_ERROR(value, L"Failed to load event."); + if (!value) + { + reader.context->errors.unresolvedMembers.Add(L"event: " + type->GetTypeName() + L"::" + name); + } } static void IO(WfWriter& writer, IEventInfo*& value) @@ -1978,6 +2063,10 @@ Serialization (Assembly) { bool isFlags; WString typeName; + if (GetTypeDescriptor(typeName)) + { + reader.context->errors.duplicatedTypes.Add(typeName); + } reader << isFlags << typeName; type = MakePtr(isFlags, typeName); } @@ -1994,6 +2083,10 @@ Serialization (Assembly) { WString typeName; reader << typeName; + if (GetTypeDescriptor(typeName)) + { + reader.context->errors.duplicatedTypes.Add(typeName); + } type = MakePtr(typeName); } @@ -2045,9 +2138,9 @@ Serialization (Assembly) //---------------------------------------------------- - static void IOPrepare(WfReader& reader, WfAssembly& value) + static void IOPrepare(WfReader& reader, WfAssembly& value, WfAssemblyLoadErrors& errors) { - reader.context = new WfReaderContext; + reader.context = new WfReaderContext(errors); bool hasTypeImpl = false; reader << hasTypeImpl; if (hasTypeImpl) @@ -2071,6 +2164,11 @@ Serialization (Assembly) reader.context->tdIndex.Add(i, td); } + if (errors.unresolvedTypes.Count() + errors.duplicatedTypes.Count() > 0) + { + throw WfDeserializationException(); + } + if (hasTypeImpl) { Serialization::IO(reader, *value.typeImpl.Obj()); @@ -2095,9 +2193,14 @@ Serialization (Assembly) reader << ei; reader.context->eiIndex.Add(i, ei); } + + if (errors.unresolvedMembers.Count() > 0) + { + throw WfDeserializationException(); + } } - static void IOPrepare(WfWriter& writer, WfAssembly& value) + static void IOPrepare(WfWriter& writer, WfAssembly& value, WfAssemblyLoadErrors&) { writer.context = new WfWriterContext; bool hasTypeImpl = value.typeImpl != nullptr; @@ -2158,9 +2261,9 @@ Serialization (Assembly) //---------------------------------------------------- template - static void IO(TIO& io, WfAssembly& value) + static void IO(TIO& io, WfAssembly& value, WfAssemblyLoadErrors& errors) { - IOPrepare(io, value); + IOPrepare(io, value, errors); io << value.insBeforeCodegen << value.insAfterCodegen << value.variableNames @@ -2206,23 +2309,33 @@ WfAssembly { } - WfAssembly::WfAssembly(stream::IStream& input) - { - stream::internal::WfReader reader(input); - stream::internal::Serialization::IO(reader, *this); - Initialize(); - } - void WfAssembly::Initialize() { insBeforeCodegen->Initialize(); insAfterCodegen->Initialize(); } + Ptr WfAssembly::Deserialize(stream::IStream& input, WfAssemblyLoadErrors& errors) + { + try + { + auto assembly = MakePtr(); + stream::internal::WfReader reader(input); + stream::internal::Serialization::IO(reader, *assembly.Obj(), errors); + assembly->Initialize(); + return assembly; + } + catch (stream::internal::WfDeserializationException) + { + return {}; + } + } + void WfAssembly::Serialize(stream::IStream& output) { + WfAssemblyLoadErrors dummy; stream::internal::WfWriter writer(output); - stream::internal::Serialization::IO(writer, *this); + stream::internal::Serialization::IO(writer, *this, dummy); } } } diff --git a/Import/VlppWorkflowRuntime.h b/Import/VlppWorkflowRuntime.h index 33cdfcad..0f21767b 100644 --- a/Import/VlppWorkflowRuntime.h +++ b/Import/VlppWorkflowRuntime.h @@ -861,6 +861,15 @@ Assembly void Initialize(); }; + /// Representing failures during loading an assembly + class WfAssemblyLoadErrors + { + public: + collections::List unresolvedTypes; + collections::List duplicatedTypes; + collections::List unresolvedMembers; + }; + /// Representing a Workflow assembly. class WfAssembly : public Object, public reflection::Description { @@ -882,11 +891,15 @@ Assembly /// Create an empty assembly. WfAssembly(); - /// Deserialize an assembly. - /// Serialized binary data. - WfAssembly(stream::IStream& input); void Initialize(); + + /// Deserialize an assembly. + /// The deserialized assembly. Returns null if there are errors. + /// Serialized binary data. + /// Errors during loading an assembly. + static Ptr Deserialize(stream::IStream& input, WfAssemblyLoadErrors& errors); + /// Serialize an assembly. /// Serialized binary data. void Serialize(stream::IStream& output); diff --git a/Tools/CppMerge.exe b/Tools/CppMerge.exe index 73766f69..ec3feda0 100644 Binary files a/Tools/CppMerge.exe and b/Tools/CppMerge.exe differ diff --git a/Tools/GacGen32.exe b/Tools/GacGen32.exe index 16fae361..2c817f79 100644 Binary files a/Tools/GacGen32.exe and b/Tools/GacGen32.exe differ diff --git a/Tools/GacGen64.exe b/Tools/GacGen64.exe index 953bed87..841c4766 100644 Binary files a/Tools/GacGen64.exe and b/Tools/GacGen64.exe differ diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DataGridComponents.xml b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DataGridComponents.xml index 578bb765..7cb11599 100644 --- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DataGridComponents.xml +++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DataGridComponents.xml @@ -91,7 +91,7 @@ - + diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DatePickerTabPage.xml b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DatePickerTabPage.xml index 5a8e9531..07579004 100644 --- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DatePickerTabPage.xml +++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DatePickerTabPage.xml @@ -42,16 +42,16 @@ - + - + - + - + diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorBase.xml b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorBase.xml index da9fc51b..52b4460e 100644 --- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorBase.xml +++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorBase.xml @@ -378,7 +378,7 @@ var end = document.CaretEnd; var style = document.SummarizeStyle(begin, end); - var baselineFont = document.Font; + var baselineFont = document.DisplayFont; dialogFont.SelectedFont = { fontFamily: ( style.face is null ? baselineFont.fontFamily : cast string style.face ) diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorRibbon.xml b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorRibbon.xml index b452b4cc..65015c70 100644 --- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorRibbon.xml +++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/DocumentEditorRibbon.xml @@ -46,7 +46,7 @@ var styles = ViewModel.Style.styles; if (styles.color is not null) { styleLabel.Color = cast Color styles.color; } - var font = containerControl.Font; + var font = containerControl.DisplayFont; var fontFamily = font.fontFamily; var bold = font.bold; var italic = font.italic; @@ -103,7 +103,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -238,7 +238,7 @@ - + diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/LocalizedStringsTabPage.xml b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/LocalizedStringsTabPage.xml index 6671c768..009af01c 100644 --- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/LocalizedStringsTabPage.xml +++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/LocalizedStringsTabPage.xml @@ -68,7 +68,7 @@ - + diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.cpp b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.cpp index 79c01b67..2099e226 100644 --- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.cpp +++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.cpp @@ -1331,7 +1331,7 @@ Closures auto begin = ::vl::__vwsn::This(__vwsnthis_0->document)->GetCaretBegin(); auto end = ::vl::__vwsn::This(__vwsnthis_0->document)->GetCaretEnd(); auto style = ::vl::__vwsn::This(__vwsnthis_0->document)->SummarizeStyle(begin, end); - auto baselineFont = ::vl::__vwsn::This(__vwsnthis_0->document)->GetFont(); + auto baselineFont = ::vl::__vwsn::This(__vwsnthis_0->document)->GetDisplayFont(); ::vl::__vwsn::This(__vwsnthis_0->dialogFont)->SetSelectedFont([&](){ ::vl::presentation::FontProperties __vwsn_temp__; __vwsn_temp__.fontFamily = ((! static_cast(::vl::__vwsn::This(style.Obj())->face)) ? baselineFont.fontFamily : ::vl::__vwsn::This(style.Obj())->face.Value()); __vwsn_temp__.size = ((! static_cast(::vl::__vwsn::This(style.Obj())->size)) ? baselineFont.size : static_cast<::vl::vint>(::vl::__vwsn::This(style.Obj())->size.Value().size)); return __vwsn_temp__; }()); if (::vl::__vwsn::This(__vwsnthis_0->dialogFont)->ShowDialog()) { @@ -2890,24 +2890,6 @@ Closures } void __vwsnf237_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const - { - auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_2)->GetFont(); - auto __vwsn_new_ = ::vl::__vwsn::Unbox<::vl::presentation::FontProperties>(__vwsn_value_); - if ((__vwsn_old_ == __vwsn_new_)) - { - return; - } - ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_2)->SetFont(__vwsn_new_); - } - - //------------------------------------------------------------------- - - __vwsnf238_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_::__vwsnf238_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0) - :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) - { - } - - void __vwsnf238_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const { auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_2)->GetAcceptTabInput(); auto __vwsn_new_ = ::vl::__vwsn::Unbox(__vwsn_value_); @@ -2920,6 +2902,24 @@ Closures //------------------------------------------------------------------- + __vwsnf238_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_::__vwsnf238_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0) + :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) + { + } + + void __vwsnf238_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const + { + auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_5)->GetAcceptTabInput(); + auto __vwsn_new_ = ::vl::__vwsn::Unbox(__vwsn_value_); + if ((__vwsn_old_ == __vwsn_new_)) + { + return; + } + ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_5)->SetAcceptTabInput(__vwsn_new_); + } + + //------------------------------------------------------------------- + __vwsnf239_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_::__vwsnf239_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0) :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) { @@ -2927,13 +2927,13 @@ Closures void __vwsnf239_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const { - auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_5)->GetFont(); - auto __vwsn_new_ = ::vl::__vwsn::Unbox<::vl::presentation::FontProperties>(__vwsn_value_); + auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_8)->GetAcceptTabInput(); + auto __vwsn_new_ = ::vl::__vwsn::Unbox(__vwsn_value_); if ((__vwsn_old_ == __vwsn_new_)) { return; } - ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_5)->SetFont(__vwsn_new_); + ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_8)->SetAcceptTabInput(__vwsn_new_); } //------------------------------------------------------------------- @@ -2959,84 +2959,12 @@ Closures //------------------------------------------------------------------- - __vwsnf240_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_::__vwsnf240_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0) + __vwsnf240_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_::__vwsnf240_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0) :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) { } - void __vwsnf240_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const - { - auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_5)->GetAcceptTabInput(); - auto __vwsn_new_ = ::vl::__vwsn::Unbox(__vwsn_value_); - if ((__vwsn_old_ == __vwsn_new_)) - { - return; - } - ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_5)->SetAcceptTabInput(__vwsn_new_); - } - - //------------------------------------------------------------------- - - __vwsnf241_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_::__vwsnf241_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0) - :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) - { - } - - void __vwsnf241_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const - { - auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_8)->GetFont(); - auto __vwsn_new_ = ::vl::__vwsn::Unbox<::vl::presentation::FontProperties>(__vwsn_value_); - if ((__vwsn_old_ == __vwsn_new_)) - { - return; - } - ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_8)->SetFont(__vwsn_new_); - } - - //------------------------------------------------------------------- - - __vwsnf242_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_::__vwsnf242_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0) - :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) - { - } - - void __vwsnf242_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const - { - auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_8)->GetAcceptTabInput(); - auto __vwsn_new_ = ::vl::__vwsn::Unbox(__vwsn_value_); - if ((__vwsn_old_ == __vwsn_new_)) - { - return; - } - ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_8)->SetAcceptTabInput(__vwsn_new_); - } - - //------------------------------------------------------------------- - - __vwsnf243_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_::__vwsnf243_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0) - :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) - { - } - - void __vwsnf243_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const - { - auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_2)->GetFont(); - auto __vwsn_new_ = ::vl::__vwsn::Unbox<::vl::presentation::FontProperties>(__vwsn_value_); - if ((__vwsn_old_ == __vwsn_new_)) - { - return; - } - ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_2)->SetFont(__vwsn_new_); - } - - //------------------------------------------------------------------- - - __vwsnf244_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_::__vwsnf244_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0) - :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) - { - } - - void __vwsnf244_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const + void __vwsnf240_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const { auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_2)->GetAcceptTabInput(); auto __vwsn_new_ = ::vl::__vwsn::Unbox(__vwsn_value_); @@ -3049,30 +2977,12 @@ Closures //------------------------------------------------------------------- - __vwsnf245_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_::__vwsnf245_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0) + __vwsnf241_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_::__vwsnf241_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0) :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) { } - void __vwsnf245_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const - { - auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_5)->GetFont(); - auto __vwsn_new_ = ::vl::__vwsn::Unbox<::vl::presentation::FontProperties>(__vwsn_value_); - if ((__vwsn_old_ == __vwsn_new_)) - { - return; - } - ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_5)->SetFont(__vwsn_new_); - } - - //------------------------------------------------------------------- - - __vwsnf246_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_::__vwsnf246_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0) - :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) - { - } - - void __vwsnf246_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const + void __vwsnf241_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const { auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_5)->GetAcceptTabInput(); auto __vwsn_new_ = ::vl::__vwsn::Unbox(__vwsn_value_); @@ -3085,24 +2995,24 @@ Closures //------------------------------------------------------------------- - __vwsnf247_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::__vwsnf247_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0) + __vwsnf242_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::__vwsnf242_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0) :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) { } - void __vwsnf247_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::operator()(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments) const + void __vwsnf242_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::operator()(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments) const { ::vl::__vwsn::EventInvoke(::vl::__vwsn::This(__vwsnthis_0->self)->OnMakeFontLarger)(); } //------------------------------------------------------------------- - __vwsnf248_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::__vwsnf248_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0) + __vwsnf243_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::__vwsnf243_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0) :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) { } - void __vwsnf248_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const + void __vwsnf243_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const { auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_7)->GetEnabled(); auto __vwsn_new_ = ::vl::__vwsn::Unbox(__vwsn_value_); @@ -3115,18 +3025,42 @@ Closures //------------------------------------------------------------------- - __vwsnf249_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::__vwsnf249_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0) + __vwsnf244_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::__vwsnf244_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0) :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) { } - void __vwsnf249_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::operator()(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments) const + void __vwsnf244_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::operator()(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments) const { ::vl::__vwsn::EventInvoke(::vl::__vwsn::This(__vwsnthis_0->self)->OnMakeFontSmaller)(); } //------------------------------------------------------------------- + __vwsnf245_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::__vwsnf245_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0) + :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) + { + } + + void __vwsnf245_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::operator()() const + { + ::vl::__vwsn::This(__vwsnthis_0->self)->UpdateFont(GLOBAL_NAME ChangeFontSize(::vl::__vwsn::This(__vwsnthis_0->t1)->GetDisplayFont(), static_cast<::vl::vint>(5))); + } + + //------------------------------------------------------------------- + + __vwsnf246_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::__vwsnf246_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0) + :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) + { + } + + void __vwsnf246_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::operator()() const + { + ::vl::__vwsn::This(__vwsnthis_0->self)->UpdateFont(GLOBAL_NAME ChangeFontSize(::vl::__vwsn::This(__vwsnthis_0->t1)->GetDisplayFont(), (- static_cast<::vl::vint>(5)))); + } + + //------------------------------------------------------------------- + __vwsnf24_Demo_demo_DataGridTabPageConstructor___vwsn_demo_DataGridTabPage_Initialize_::__vwsnf24_Demo_demo_DataGridTabPageConstructor___vwsn_demo_DataGridTabPage_Initialize_(::demo::DataGridTabPageConstructor* __vwsnctorthis_0) :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) { @@ -3140,30 +3074,6 @@ Closures //------------------------------------------------------------------- - __vwsnf250_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::__vwsnf250_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0) - :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) - { - } - - void __vwsnf250_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::operator()() const - { - ::vl::__vwsn::This(__vwsnthis_0->self)->UpdateFont(GLOBAL_NAME ChangeFontSize(::vl::__vwsn::This(__vwsnthis_0->t1)->GetFont(), static_cast<::vl::vint>(5))); - } - - //------------------------------------------------------------------- - - __vwsnf251_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::__vwsnf251_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0) - :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) - { - } - - void __vwsnf251_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_::operator()() const - { - ::vl::__vwsn::This(__vwsnthis_0->self)->UpdateFont(GLOBAL_NAME ChangeFontSize(::vl::__vwsn::This(__vwsnthis_0->t1)->GetFont(), (- static_cast<::vl::vint>(5)))); - } - - //------------------------------------------------------------------- - __vwsnf25_Demo_demo_DataGridTabPageConstructor___vwsn_demo_DataGridTabPage_Initialize_::__vwsnf25_Demo_demo_DataGridTabPageConstructor___vwsn_demo_DataGridTabPage_Initialize_(::demo::DataGridTabPageConstructor* __vwsnctorthis_0) :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) { @@ -4430,7 +4340,7 @@ Closures void __vwsnf93_Demo_demo_CategoryItemTemplateConstructor___vwsn_demo_CategoryItemTemplate_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const { auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_0)->GetFont(); - auto __vwsn_new_ = ::vl::__vwsn::Unbox<::vl::presentation::FontProperties>(__vwsn_value_); + auto __vwsn_new_ = ::vl::__vwsn::Unbox<::vl::Nullable<::vl::presentation::FontProperties>>(__vwsn_value_); if ((__vwsn_old_ == __vwsn_new_)) { return; @@ -4448,7 +4358,7 @@ Closures void __vwsnf94_Demo_demo_CategoryVisualizerConstructor___vwsn_demo_CategoryVisualizer_Initialize_::operator()(const ::vl::reflection::description::Value& __vwsn_value_) const { auto __vwsn_old_ = ::vl::__vwsn::This(__vwsnthis_0->__vwsn_precompile_0)->GetFont(); - auto __vwsn_new_ = ::vl::__vwsn::Unbox<::vl::presentation::FontProperties>(__vwsn_value_); + auto __vwsn_new_ = ::vl::__vwsn::Unbox<::vl::Nullable<::vl::presentation::FontProperties>>(__vwsn_value_); if ((__vwsn_old_ == __vwsn_new_)) { return; @@ -4711,7 +4621,7 @@ Closures void __vwsnc101_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = [&](){ try{ return ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->Title(); } catch(...){ return ::vl::WString(L"", false); } }(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->Title(); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -5845,11 +5755,11 @@ Closures void __vwsnc119_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetTextBoxAcceptTabInput(); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } - void __vwsnc119_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0(::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_bind_callback_argument_0, ::vl::presentation::compositions::GuiEventArgs* __vwsn_bind_callback_argument_1) + void __vwsnc119_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0() { this->__vwsn_bind_activator_(); } @@ -5860,7 +5770,7 @@ Closures { (__vwsn_bind_opened_ = true); (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::DocumentBoxSubTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, ::vl::Func(this, &__vwsnc119_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); + (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->TextBoxAcceptTabInputChanged, ::vl::Func(this, &__vwsnc119_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); return true; } return false; @@ -5883,7 +5793,7 @@ Closures (__vwsn_bind_closed_ = true); if (static_cast(__vwsn_bind_handler_0_0)) { - ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, __vwsn_bind_handler_0_0); + ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->TextBoxAcceptTabInputChanged, __vwsn_bind_handler_0_0); (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); } (__vwsn_bind_cache_0 = static_cast<::demo::DocumentBoxSubTabPage*>(nullptr)); @@ -6051,11 +5961,11 @@ Closures void __vwsnc121_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetTextBoxAcceptTabInput(); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } - void __vwsnc121_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0(::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_bind_callback_argument_0, ::vl::presentation::compositions::GuiEventArgs* __vwsn_bind_callback_argument_1) + void __vwsnc121_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0() { this->__vwsn_bind_activator_(); } @@ -6066,7 +5976,7 @@ Closures { (__vwsn_bind_opened_ = true); (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::DocumentBoxSubTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, ::vl::Func(this, &__vwsnc121_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); + (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->TextBoxAcceptTabInputChanged, ::vl::Func(this, &__vwsnc121_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); return true; } return false; @@ -6083,67 +5993,6 @@ Closures } bool __vwsnc121_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Close() - { - if ((! __vwsn_bind_closed_)) - { - (__vwsn_bind_closed_ = true); - if (static_cast(__vwsn_bind_handler_0_0)) - { - ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, __vwsn_bind_handler_0_0); - (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); - } - (__vwsn_bind_cache_0 = static_cast<::demo::DocumentBoxSubTabPage*>(nullptr)); - (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); - return true; - } - return false; - } - - //------------------------------------------------------------------- - - __vwsnc122_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsnc122_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0) - :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) - { - this->__vwsn_bind_cache_0 = static_cast<::demo::DocumentBoxSubTabPage*>(nullptr); - this->__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>(); - this->__vwsn_bind_opened_ = false; - this->__vwsn_bind_closed_ = false; - } - - void __vwsnc122_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() - { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetTextBoxAcceptTabInput(); - ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); - } - - void __vwsnc122_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0() - { - this->__vwsn_bind_activator_(); - } - - bool __vwsnc122_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Open() - { - if ((! __vwsn_bind_opened_)) - { - (__vwsn_bind_opened_ = true); - (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::DocumentBoxSubTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->TextBoxAcceptTabInputChanged, ::vl::Func(this, &__vwsnc122_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); - return true; - } - return false; - } - - bool __vwsnc122_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Update() - { - if ((__vwsn_bind_opened_ && (! __vwsn_bind_closed_))) - { - this->__vwsn_bind_activator_(); - return true; - } - return false; - } - - bool __vwsnc122_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Close() { if ((! __vwsn_bind_closed_)) { @@ -6162,129 +6011,7 @@ Closures //------------------------------------------------------------------- - __vwsnc123_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsnc123_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0) - :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) - { - this->__vwsn_bind_cache_0 = static_cast<::demo::DocumentBoxSubTabPage*>(nullptr); - this->__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>(); - this->__vwsn_bind_opened_ = false; - this->__vwsn_bind_closed_ = false; - } - - void __vwsnc123_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() - { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont(); - ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); - } - - void __vwsnc123_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0(::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_bind_callback_argument_0, ::vl::presentation::compositions::GuiEventArgs* __vwsn_bind_callback_argument_1) - { - this->__vwsn_bind_activator_(); - } - - bool __vwsnc123_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Open() - { - if ((! __vwsn_bind_opened_)) - { - (__vwsn_bind_opened_ = true); - (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::DocumentBoxSubTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, ::vl::Func(this, &__vwsnc123_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); - return true; - } - return false; - } - - bool __vwsnc123_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Update() - { - if ((__vwsn_bind_opened_ && (! __vwsn_bind_closed_))) - { - this->__vwsn_bind_activator_(); - return true; - } - return false; - } - - bool __vwsnc123_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Close() - { - if ((! __vwsn_bind_closed_)) - { - (__vwsn_bind_closed_ = true); - if (static_cast(__vwsn_bind_handler_0_0)) - { - ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, __vwsn_bind_handler_0_0); - (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); - } - (__vwsn_bind_cache_0 = static_cast<::demo::DocumentBoxSubTabPage*>(nullptr)); - (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); - return true; - } - return false; - } - - //------------------------------------------------------------------- - - __vwsnc124_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsnc124_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0) - :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) - { - this->__vwsn_bind_cache_0 = static_cast<::demo::DocumentBoxSubTabPage*>(nullptr); - this->__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>(); - this->__vwsn_bind_opened_ = false; - this->__vwsn_bind_closed_ = false; - } - - void __vwsnc124_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() - { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetTextBoxAcceptTabInput(); - ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); - } - - void __vwsnc124_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0() - { - this->__vwsn_bind_activator_(); - } - - bool __vwsnc124_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Open() - { - if ((! __vwsn_bind_opened_)) - { - (__vwsn_bind_opened_ = true); - (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::DocumentBoxSubTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->TextBoxAcceptTabInputChanged, ::vl::Func(this, &__vwsnc124_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); - return true; - } - return false; - } - - bool __vwsnc124_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Update() - { - if ((__vwsn_bind_opened_ && (! __vwsn_bind_closed_))) - { - this->__vwsn_bind_activator_(); - return true; - } - return false; - } - - bool __vwsnc124_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Close() - { - if ((! __vwsn_bind_closed_)) - { - (__vwsn_bind_closed_ = true); - if (static_cast(__vwsn_bind_handler_0_0)) - { - ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->TextBoxAcceptTabInputChanged, __vwsn_bind_handler_0_0); - (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); - } - (__vwsn_bind_cache_0 = static_cast<::demo::DocumentBoxSubTabPage*>(nullptr)); - (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); - return true; - } - return false; - } - - //------------------------------------------------------------------- - - __vwsnc125_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsnc125_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0) + __vwsnc122_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsnc122_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0) :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) { this->__vwsn_bind_cache_0 = static_cast<::demo::TextBoxSubTabPage*>(nullptr); @@ -6293,91 +6020,30 @@ Closures this->__vwsn_bind_closed_ = false; } - void __vwsnc125_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() - { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont(); - ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); - } - - void __vwsnc125_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0(::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_bind_callback_argument_0, ::vl::presentation::compositions::GuiEventArgs* __vwsn_bind_callback_argument_1) - { - this->__vwsn_bind_activator_(); - } - - bool __vwsnc125_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Open() - { - if ((! __vwsn_bind_opened_)) - { - (__vwsn_bind_opened_ = true); - (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::TextBoxSubTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, ::vl::Func(this, &__vwsnc125_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); - return true; - } - return false; - } - - bool __vwsnc125_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Update() - { - if ((__vwsn_bind_opened_ && (! __vwsn_bind_closed_))) - { - this->__vwsn_bind_activator_(); - return true; - } - return false; - } - - bool __vwsnc125_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Close() - { - if ((! __vwsn_bind_closed_)) - { - (__vwsn_bind_closed_ = true); - if (static_cast(__vwsn_bind_handler_0_0)) - { - ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, __vwsn_bind_handler_0_0); - (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); - } - (__vwsn_bind_cache_0 = static_cast<::demo::TextBoxSubTabPage*>(nullptr)); - (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); - return true; - } - return false; - } - - //------------------------------------------------------------------- - - __vwsnc126_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsnc126_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0) - :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) - { - this->__vwsn_bind_cache_0 = static_cast<::demo::TextBoxSubTabPage*>(nullptr); - this->__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>(); - this->__vwsn_bind_opened_ = false; - this->__vwsn_bind_closed_ = false; - } - - void __vwsnc126_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() + void __vwsnc122_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetTextBoxAcceptTabInput(); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } - void __vwsnc126_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0() + void __vwsnc122_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0() { this->__vwsn_bind_activator_(); } - bool __vwsnc126_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Open() + bool __vwsnc122_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Open() { if ((! __vwsn_bind_opened_)) { (__vwsn_bind_opened_ = true); (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::TextBoxSubTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->TextBoxAcceptTabInputChanged, ::vl::Func(this, &__vwsnc126_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); + (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->TextBoxAcceptTabInputChanged, ::vl::Func(this, &__vwsnc122_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); return true; } return false; } - bool __vwsnc126_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Update() + bool __vwsnc122_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Update() { if ((__vwsn_bind_opened_ && (! __vwsn_bind_closed_))) { @@ -6387,7 +6053,7 @@ Closures return false; } - bool __vwsnc126_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Close() + bool __vwsnc122_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Close() { if ((! __vwsn_bind_closed_)) { @@ -6406,7 +6072,7 @@ Closures //------------------------------------------------------------------- - __vwsnc127_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsnc127_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0) + __vwsnc123_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsnc123_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0) :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) { this->__vwsn_bind_cache_0 = static_cast<::demo::TextBoxSubTabPage*>(nullptr); @@ -6415,91 +6081,30 @@ Closures this->__vwsn_bind_closed_ = false; } - void __vwsnc127_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() - { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont(); - ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); - } - - void __vwsnc127_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0(::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_bind_callback_argument_0, ::vl::presentation::compositions::GuiEventArgs* __vwsn_bind_callback_argument_1) - { - this->__vwsn_bind_activator_(); - } - - bool __vwsnc127_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Open() - { - if ((! __vwsn_bind_opened_)) - { - (__vwsn_bind_opened_ = true); - (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::TextBoxSubTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, ::vl::Func(this, &__vwsnc127_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); - return true; - } - return false; - } - - bool __vwsnc127_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Update() - { - if ((__vwsn_bind_opened_ && (! __vwsn_bind_closed_))) - { - this->__vwsn_bind_activator_(); - return true; - } - return false; - } - - bool __vwsnc127_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Close() - { - if ((! __vwsn_bind_closed_)) - { - (__vwsn_bind_closed_ = true); - if (static_cast(__vwsn_bind_handler_0_0)) - { - ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, __vwsn_bind_handler_0_0); - (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); - } - (__vwsn_bind_cache_0 = static_cast<::demo::TextBoxSubTabPage*>(nullptr)); - (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); - return true; - } - return false; - } - - //------------------------------------------------------------------- - - __vwsnc128_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsnc128_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0) - :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) - { - this->__vwsn_bind_cache_0 = static_cast<::demo::TextBoxSubTabPage*>(nullptr); - this->__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>(); - this->__vwsn_bind_opened_ = false; - this->__vwsn_bind_closed_ = false; - } - - void __vwsnc128_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() + void __vwsnc123_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetTextBoxAcceptTabInput(); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } - void __vwsnc128_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0() + void __vwsnc123_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0() { this->__vwsn_bind_activator_(); } - bool __vwsnc128_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Open() + bool __vwsnc123_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Open() { if ((! __vwsn_bind_opened_)) { (__vwsn_bind_opened_ = true); (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::TextBoxSubTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->TextBoxAcceptTabInputChanged, ::vl::Func(this, &__vwsnc128_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); + (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->TextBoxAcceptTabInputChanged, ::vl::Func(this, &__vwsnc123_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); return true; } return false; } - bool __vwsnc128_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Update() + bool __vwsnc123_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Update() { if ((__vwsn_bind_opened_ && (! __vwsn_bind_closed_))) { @@ -6509,7 +6114,7 @@ Closures return false; } - bool __vwsnc128_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Close() + bool __vwsnc123_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription::Close() { if ((! __vwsn_bind_closed_)) { @@ -6528,7 +6133,7 @@ Closures //------------------------------------------------------------------- - __vwsnc129_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsnc129_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0) + __vwsnc124_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsnc124_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0) :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) { this->__vwsn_bind_cache_0 = static_cast<::demo::TextBoxSubTabPage*>(nullptr); @@ -6537,30 +6142,30 @@ Closures this->__vwsn_bind_closed_ = false; } - void __vwsnc129_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() + void __vwsnc124_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = (::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont().size > static_cast<::vl::vint>(5)); + auto __vwsn_bind_activator_result_ = (::vl::__vwsn::This(__vwsn_bind_cache_0)->GetDisplayFont().size > static_cast<::vl::vint>(5)); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } - void __vwsnc129_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0(::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_bind_callback_argument_0, ::vl::presentation::compositions::GuiEventArgs* __vwsn_bind_callback_argument_1) + void __vwsnc124_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0(::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_bind_callback_argument_0, ::vl::presentation::compositions::GuiEventArgs* __vwsn_bind_callback_argument_1) { this->__vwsn_bind_activator_(); } - bool __vwsnc129_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription::Open() + bool __vwsnc124_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription::Open() { if ((! __vwsn_bind_opened_)) { (__vwsn_bind_opened_ = true); (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->t1; } catch(...){ return static_cast<::demo::TextBoxSubTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, ::vl::Func(this, &__vwsnc129_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); + (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, ::vl::Func(this, &__vwsnc124_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); return true; } return false; } - bool __vwsnc129_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription::Update() + bool __vwsnc124_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription::Update() { if ((__vwsn_bind_opened_ && (! __vwsn_bind_closed_))) { @@ -6570,14 +6175,14 @@ Closures return false; } - bool __vwsnc129_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription::Close() + bool __vwsnc124_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription::Close() { if ((! __vwsn_bind_closed_)) { (__vwsn_bind_closed_ = true); if (static_cast(__vwsn_bind_handler_0_0)) { - ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, __vwsn_bind_handler_0_0); + ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, __vwsn_bind_handler_0_0); (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); } (__vwsn_bind_cache_0 = static_cast<::demo::TextBoxSubTabPage*>(nullptr)); @@ -6589,6 +6194,160 @@ Closures //------------------------------------------------------------------- + __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings::__vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings(::vl::Locale __vwsnctor___vwsn_ls_locale) + :__vwsn_ls_locale(__vwsnctor___vwsn_ls_locale) + { + } + + ::vl::WString __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Currency(const ::vl::WString& __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatCurrency(__vwsn_ls_locale, __vwsn_ls_0); + return (::vl::WString(L"货币：", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings::DateFormat(::vl::DateTime __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::vl::WString(L"yyyy", false), __vwsn_ls_0); + return (::vl::WString(L"日期格式：", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Label() + { + return ::vl::WString(L"语言设置：", false); + } + + ::vl::WString __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings::LongDate(::vl::DateTime __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetLongDateFormats(__vwsn_ls_locale)), __vwsn_ls_0); + return (::vl::WString(L"长日期：", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings::LongTime(::vl::DateTime __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatTime(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetLongTimeFormats(__vwsn_ls_locale)), __vwsn_ls_0); + return (::vl::WString(L"长时间：", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Number(const ::vl::WString& __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatNumber(__vwsn_ls_locale, __vwsn_ls_0); + return (::vl::WString(L"数字：", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Sentence(const ::vl::WString& __vwsn_ls_0) + { + auto __vwsn_ls__0 = __vwsn_ls_0; + return ((::vl::WString(L"$", false) + __vwsn_ls__0) + ::vl::WString(L"，早上好！$", false)); + } + + ::vl::WString __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings::ShortDate(::vl::DateTime __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetShortDateFormats(__vwsn_ls_locale)), __vwsn_ls_0); + return (::vl::WString(L"短日期：", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings::ShortTime(::vl::DateTime __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatTime(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetShortTimeFormats(__vwsn_ls_locale)), __vwsn_ls_0); + return (::vl::WString(L"短时间：", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings::TimeFormat(::vl::DateTime __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatTime(__vwsn_ls_locale, ::vl::WString(L"HH", false), __vwsn_ls_0); + return (::vl::WString(L"时间格式： ", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Title() + { + return ::vl::WString(L"本地化", false); + } + + ::vl::WString __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings::YearMonthDate(::vl::DateTime __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetYearMonthDateFormats(__vwsn_ls_locale)), __vwsn_ls_0); + return (::vl::WString(L"年月：", false) + __vwsn_ls__0); + } + + //------------------------------------------------------------------- + + __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings::__vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings(::vl::Locale __vwsnctor___vwsn_ls_locale) + :__vwsn_ls_locale(__vwsnctor___vwsn_ls_locale) + { + } + + ::vl::WString __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Currency(const ::vl::WString& __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatCurrency(__vwsn_ls_locale, __vwsn_ls_0); + return (::vl::WString(L"Currency: ", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings::DateFormat(::vl::DateTime __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::vl::WString(L"yyyy", false), __vwsn_ls_0); + return (::vl::WString(L"DateFormat: ", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Label() + { + return ::vl::WString(L"Selected Locale:", false); + } + + ::vl::WString __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings::LongDate(::vl::DateTime __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetLongDateFormats(__vwsn_ls_locale)), __vwsn_ls_0); + return (::vl::WString(L"LongDate: ", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings::LongTime(::vl::DateTime __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatTime(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetLongTimeFormats(__vwsn_ls_locale)), __vwsn_ls_0); + return (::vl::WString(L"LongTime: ", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Number(const ::vl::WString& __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatNumber(__vwsn_ls_locale, __vwsn_ls_0); + return (::vl::WString(L"Number: ", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Sentence(const ::vl::WString& __vwsn_ls_0) + { + auto __vwsn_ls__0 = __vwsn_ls_0; + return ((::vl::WString(L"$Good morning, ", false) + __vwsn_ls__0) + ::vl::WString(L"!$", false)); + } + + ::vl::WString __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings::ShortDate(::vl::DateTime __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetShortDateFormats(__vwsn_ls_locale)), __vwsn_ls_0); + return (::vl::WString(L"ShortDate: ", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings::ShortTime(::vl::DateTime __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatTime(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetShortTimeFormats(__vwsn_ls_locale)), __vwsn_ls_0); + return (::vl::WString(L"ShortTime: ", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings::TimeFormat(::vl::DateTime __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatTime(__vwsn_ls_locale, ::vl::WString(L"HH", false), __vwsn_ls_0); + return (::vl::WString(L"TimeFormat: ", false) + __vwsn_ls__0); + } + + ::vl::WString __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Title() + { + return ::vl::WString(L"Localization", false); + } + + ::vl::WString __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings::YearMonthDate(::vl::DateTime __vwsn_ls_0) + { + auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetYearMonthDateFormats(__vwsn_ls_locale)), __vwsn_ls_0); + return (::vl::WString(L"YearMonthDate: ", false) + __vwsn_ls__0); + } + + //------------------------------------------------------------------- + __vwsnc12_Demo_demo_AnimationTabPageConstructor___vwsn_demo_AnimationTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsnc12_Demo_demo_AnimationTabPageConstructor___vwsn_demo_AnimationTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::AnimationTabPageConstructor* __vwsnctorthis_0) :__vwsnthis_0(::vl::__vwsn::This(__vwsnctorthis_0)) { @@ -6673,160 +6432,6 @@ Closures //------------------------------------------------------------------- - __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings::__vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings(::vl::Locale __vwsnctor___vwsn_ls_locale) - :__vwsn_ls_locale(__vwsnctor___vwsn_ls_locale) - { - } - - ::vl::WString __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Currency(const ::vl::WString& __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatCurrency(__vwsn_ls_locale, __vwsn_ls_0); - return (::vl::WString(L"货币：", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings::DateFormat(::vl::DateTime __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::vl::WString(L"yyyy", false), __vwsn_ls_0); - return (::vl::WString(L"日期格式：", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Label() - { - return ::vl::WString(L"语言设置：", false); - } - - ::vl::WString __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings::LongDate(::vl::DateTime __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetLongDateFormats(__vwsn_ls_locale)), __vwsn_ls_0); - return (::vl::WString(L"长日期：", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings::LongTime(::vl::DateTime __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatTime(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetLongTimeFormats(__vwsn_ls_locale)), __vwsn_ls_0); - return (::vl::WString(L"长时间：", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Number(const ::vl::WString& __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatNumber(__vwsn_ls_locale, __vwsn_ls_0); - return (::vl::WString(L"数字：", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Sentence(const ::vl::WString& __vwsn_ls_0) - { - auto __vwsn_ls__0 = __vwsn_ls_0; - return ((::vl::WString(L"$", false) + __vwsn_ls__0) + ::vl::WString(L"，早上好！$", false)); - } - - ::vl::WString __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings::ShortDate(::vl::DateTime __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetShortDateFormats(__vwsn_ls_locale)), __vwsn_ls_0); - return (::vl::WString(L"短日期：", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings::ShortTime(::vl::DateTime __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatTime(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetShortTimeFormats(__vwsn_ls_locale)), __vwsn_ls_0); - return (::vl::WString(L"短时间：", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings::TimeFormat(::vl::DateTime __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatTime(__vwsn_ls_locale, ::vl::WString(L"HH", false), __vwsn_ls_0); - return (::vl::WString(L"时间格式： ", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Title() - { - return ::vl::WString(L"本地化", false); - } - - ::vl::WString __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings::YearMonthDate(::vl::DateTime __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetYearMonthDateFormats(__vwsn_ls_locale)), __vwsn_ls_0); - return (::vl::WString(L"年月：", false) + __vwsn_ls__0); - } - - //------------------------------------------------------------------- - - __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings::__vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings(::vl::Locale __vwsnctor___vwsn_ls_locale) - :__vwsn_ls_locale(__vwsnctor___vwsn_ls_locale) - { - } - - ::vl::WString __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Currency(const ::vl::WString& __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatCurrency(__vwsn_ls_locale, __vwsn_ls_0); - return (::vl::WString(L"Currency: ", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings::DateFormat(::vl::DateTime __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::vl::WString(L"yyyy", false), __vwsn_ls_0); - return (::vl::WString(L"DateFormat: ", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Label() - { - return ::vl::WString(L"Selected Locale:", false); - } - - ::vl::WString __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings::LongDate(::vl::DateTime __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetLongDateFormats(__vwsn_ls_locale)), __vwsn_ls_0); - return (::vl::WString(L"LongDate: ", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings::LongTime(::vl::DateTime __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatTime(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetLongTimeFormats(__vwsn_ls_locale)), __vwsn_ls_0); - return (::vl::WString(L"LongTime: ", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Number(const ::vl::WString& __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatNumber(__vwsn_ls_locale, __vwsn_ls_0); - return (::vl::WString(L"Number: ", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Sentence(const ::vl::WString& __vwsn_ls_0) - { - auto __vwsn_ls__0 = __vwsn_ls_0; - return ((::vl::WString(L"$Good morning, ", false) + __vwsn_ls__0) + ::vl::WString(L"!$", false)); - } - - ::vl::WString __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings::ShortDate(::vl::DateTime __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetShortDateFormats(__vwsn_ls_locale)), __vwsn_ls_0); - return (::vl::WString(L"ShortDate: ", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings::ShortTime(::vl::DateTime __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatTime(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetShortTimeFormats(__vwsn_ls_locale)), __vwsn_ls_0); - return (::vl::WString(L"ShortTime: ", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings::TimeFormat(::vl::DateTime __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatTime(__vwsn_ls_locale, ::vl::WString(L"HH", false), __vwsn_ls_0); - return (::vl::WString(L"TimeFormat: ", false) + __vwsn_ls__0); - } - - ::vl::WString __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings::Title() - { - return ::vl::WString(L"Localization", false); - } - - ::vl::WString __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings::YearMonthDate(::vl::DateTime __vwsn_ls_0) - { - auto __vwsn_ls__0 = ::vl::reflection::description::Localization::FormatDate(__vwsn_ls_locale, ::demo::StringResource::__vwsn_ls_First(::vl::reflection::description::Localization::GetYearMonthDateFormats(__vwsn_ls_locale)), __vwsn_ls_0); - return (::vl::WString(L"YearMonthDate: ", false) + __vwsn_ls__0); - } - - //------------------------------------------------------------------- - __vwsnc13_Demo_demo_AnimationTabPage_BallAnimationWithDelay___vl_reflection_description_ICoroutine::__vwsnc13_Demo_demo_AnimationTabPage_BallAnimationWithDelay___vl_reflection_description_ICoroutine(::vl::presentation::controls::IGuiAnimationCoroutine::IImpl* __vwsnctor___vwsn_co_impl_, ::vl::presentation::compositions::GuiBoundsComposition* __vwsnctor_ball, ::vl::presentation::compositions::GuiBoundsComposition* __vwsnctor_container, ::vl::vint __vwsnctor_delay) :__vwsn_co_impl_(__vwsnctor___vwsn_co_impl_) , ball(__vwsnctor_ball) @@ -7700,7 +7305,7 @@ Closures void __vwsnc24_Demo_demo_CategoryDisplayerConstructor___vwsn_demo_CategoryDisplayer_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetDisplayFont(); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -7715,7 +7320,7 @@ Closures { (__vwsn_bind_opened_ = true); (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::CategoryDisplayer*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, ::vl::Func(this, &__vwsnc24_Demo_demo_CategoryDisplayerConstructor___vwsn_demo_CategoryDisplayer_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); + (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, ::vl::Func(this, &__vwsnc24_Demo_demo_CategoryDisplayerConstructor___vwsn_demo_CategoryDisplayer_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); return true; } return false; @@ -7738,7 +7343,7 @@ Closures (__vwsn_bind_closed_ = true); if (static_cast(__vwsn_bind_handler_0_0)) { - ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, __vwsn_bind_handler_0_0); + ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, __vwsn_bind_handler_0_0); (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); } (__vwsn_bind_cache_0 = static_cast<::demo::CategoryDisplayer*>(nullptr)); @@ -7883,7 +7488,7 @@ Closures void __vwsnc27_Demo_demo_CategoryItemTemplateConstructor___vwsn_demo_CategoryItemTemplate_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont(); + auto __vwsn_bind_activator_result_ = ::vl::Nullable<::vl::presentation::FontProperties>(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont()); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -7944,7 +7549,7 @@ Closures void __vwsnc28_Demo_demo_CategoryVisualizerConstructor___vwsn_demo_CategoryVisualizer_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont(); + auto __vwsn_bind_activator_result_ = ::vl::Nullable<::vl::presentation::FontProperties>(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont()); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -8387,7 +7992,7 @@ Closures void __vwsnc35_Demo_demo_DatePickerTabPageConstructor___vwsn_demo_DatePickerTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetDisplayFont(); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -8402,7 +8007,7 @@ Closures { (__vwsn_bind_opened_ = true); (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::DatePickerTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, ::vl::Func(this, &__vwsnc35_Demo_demo_DatePickerTabPageConstructor___vwsn_demo_DatePickerTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); + (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, ::vl::Func(this, &__vwsnc35_Demo_demo_DatePickerTabPageConstructor___vwsn_demo_DatePickerTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); return true; } return false; @@ -8425,7 +8030,7 @@ Closures (__vwsn_bind_closed_ = true); if (static_cast(__vwsn_bind_handler_0_0)) { - ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, __vwsn_bind_handler_0_0); + ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, __vwsn_bind_handler_0_0); (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); } (__vwsn_bind_cache_0 = static_cast<::demo::DatePickerTabPage*>(nullptr)); @@ -8509,7 +8114,7 @@ Closures void __vwsnc37_Demo_demo_DatePickerTabPageConstructor___vwsn_demo_DatePickerTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetDisplayFont(); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -8524,7 +8129,7 @@ Closures { (__vwsn_bind_opened_ = true); (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::DatePickerTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, ::vl::Func(this, &__vwsnc37_Demo_demo_DatePickerTabPageConstructor___vwsn_demo_DatePickerTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); + (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, ::vl::Func(this, &__vwsnc37_Demo_demo_DatePickerTabPageConstructor___vwsn_demo_DatePickerTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); return true; } return false; @@ -8547,7 +8152,7 @@ Closures (__vwsn_bind_closed_ = true); if (static_cast(__vwsn_bind_handler_0_0)) { - ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, __vwsn_bind_handler_0_0); + ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, __vwsn_bind_handler_0_0); (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); } (__vwsn_bind_cache_0 = static_cast<::demo::DatePickerTabPage*>(nullptr)); @@ -8631,7 +8236,7 @@ Closures void __vwsnc39_Demo_demo_DatePickerTabPageConstructor___vwsn_demo_DatePickerTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetDisplayFont(); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -8646,7 +8251,7 @@ Closures { (__vwsn_bind_opened_ = true); (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::DatePickerTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, ::vl::Func(this, &__vwsnc39_Demo_demo_DatePickerTabPageConstructor___vwsn_demo_DatePickerTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); + (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, ::vl::Func(this, &__vwsnc39_Demo_demo_DatePickerTabPageConstructor___vwsn_demo_DatePickerTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); return true; } return false; @@ -8669,7 +8274,7 @@ Closures (__vwsn_bind_closed_ = true); if (static_cast(__vwsn_bind_handler_0_0)) { - ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, __vwsn_bind_handler_0_0); + ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, __vwsn_bind_handler_0_0); (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); } (__vwsn_bind_cache_0 = static_cast<::demo::DatePickerTabPage*>(nullptr)); @@ -8769,7 +8374,7 @@ Closures void __vwsnc41_Demo_demo_DatePickerTabPageConstructor___vwsn_demo_DatePickerTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetDisplayFont(); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -8784,7 +8389,7 @@ Closures { (__vwsn_bind_opened_ = true); (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::DatePickerTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, ::vl::Func(this, &__vwsnc41_Demo_demo_DatePickerTabPageConstructor___vwsn_demo_DatePickerTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); + (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, ::vl::Func(this, &__vwsnc41_Demo_demo_DatePickerTabPageConstructor___vwsn_demo_DatePickerTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); return true; } return false; @@ -8807,7 +8412,7 @@ Closures (__vwsn_bind_closed_ = true); if (static_cast(__vwsn_bind_handler_0_0)) { - ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, __vwsn_bind_handler_0_0); + ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, __vwsn_bind_handler_0_0); (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); } (__vwsn_bind_cache_0 = static_cast<::demo::DatePickerTabPage*>(nullptr)); @@ -11353,7 +10958,7 @@ Closures void __vwsnc80_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetDisplayFont(); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -11368,7 +10973,7 @@ Closures { (__vwsn_bind_opened_ = true); (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::DocumentEditorRibbon*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, ::vl::Func(this, &__vwsnc80_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); + (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, ::vl::Func(this, &__vwsnc80_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); return true; } return false; @@ -11391,7 +10996,7 @@ Closures (__vwsn_bind_closed_ = true); if (static_cast(__vwsn_bind_handler_0_0)) { - ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, __vwsn_bind_handler_0_0); + ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, __vwsn_bind_handler_0_0); (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); } (__vwsn_bind_cache_0 = static_cast<::demo::DocumentEditorRibbon*>(nullptr)); @@ -11711,7 +11316,7 @@ Closures void __vwsnc86_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = [&](){ try{ return ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->Label(); } catch(...){ return ::vl::WString(L"", false); } }(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->Label(); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -11772,7 +11377,7 @@ Closures void __vwsnc87_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetFont(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(__vwsn_bind_cache_0)->GetDisplayFont(); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -11787,7 +11392,7 @@ Closures { (__vwsn_bind_opened_ = true); (__vwsn_bind_cache_0 = [&](){ try{ return __vwsnthis_0->self; } catch(...){ return static_cast<::demo::LocalizedStringsTabPage*>(nullptr); } }()); - (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, ::vl::Func(this, &__vwsnc87_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); + (__vwsn_bind_handler_0_0 = [&](){ try{ return ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, ::vl::Func(this, &__vwsnc87_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_callback_0_0)); } catch(...){ return ::vl::Ptr<::vl::reflection::description::IEventHandler>(); } }()); return true; } return false; @@ -11810,7 +11415,7 @@ Closures (__vwsn_bind_closed_ = true); if (static_cast(__vwsn_bind_handler_0_0)) { - ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->FontChanged, __vwsn_bind_handler_0_0); + ::vl::__vwsn::EventDetach(::vl::__vwsn::This(__vwsn_bind_cache_0)->DisplayFontChanged, __vwsn_bind_handler_0_0); (__vwsn_bind_handler_0_0 = ::vl::Ptr<::vl::reflection::description::IEventHandler>()); } (__vwsn_bind_cache_0 = static_cast<::demo::LocalizedStringsTabPage*>(nullptr)); @@ -11895,7 +11500,7 @@ Closures void __vwsnc89_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = [&](){ try{ return ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->ShortDate(::vl::__vwsn::This(__vwsnthis_0->self)->dateTime); } catch(...){ return ::vl::WString(L"", false); } }(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->ShortDate(::vl::__vwsn::This(__vwsnthis_0->self)->dateTime); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -12018,7 +11623,7 @@ Closures void __vwsnc90_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = [&](){ try{ return ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->LongDate(::vl::__vwsn::This(__vwsnthis_0->self)->dateTime); } catch(...){ return ::vl::WString(L"", false); } }(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->LongDate(::vl::__vwsn::This(__vwsnthis_0->self)->dateTime); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -12080,7 +11685,7 @@ Closures void __vwsnc91_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = [&](){ try{ return ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->YearMonthDate(::vl::__vwsn::This(__vwsnthis_0->self)->dateTime); } catch(...){ return ::vl::WString(L"", false); } }(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->YearMonthDate(::vl::__vwsn::This(__vwsnthis_0->self)->dateTime); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -12142,7 +11747,7 @@ Closures void __vwsnc92_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = [&](){ try{ return ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->ShortTime(::vl::__vwsn::This(__vwsnthis_0->self)->dateTime); } catch(...){ return ::vl::WString(L"", false); } }(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->ShortTime(::vl::__vwsn::This(__vwsnthis_0->self)->dateTime); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -12204,7 +11809,7 @@ Closures void __vwsnc93_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = [&](){ try{ return ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->LongTime(::vl::__vwsn::This(__vwsnthis_0->self)->dateTime); } catch(...){ return ::vl::WString(L"", false); } }(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->LongTime(::vl::__vwsn::This(__vwsnthis_0->self)->dateTime); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -12266,7 +11871,7 @@ Closures void __vwsnc94_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = [&](){ try{ return ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->DateFormat(::vl::__vwsn::This(__vwsnthis_0->self)->dateTime); } catch(...){ return ::vl::WString(L"", false); } }(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->DateFormat(::vl::__vwsn::This(__vwsnthis_0->self)->dateTime); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -12328,7 +11933,7 @@ Closures void __vwsnc95_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = [&](){ try{ return ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->TimeFormat(::vl::__vwsn::This(__vwsnthis_0->self)->dateTime); } catch(...){ return ::vl::WString(L"", false); } }(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->TimeFormat(::vl::__vwsn::This(__vwsnthis_0->self)->dateTime); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -12390,7 +11995,7 @@ Closures void __vwsnc96_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = [&](){ try{ return ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->Number(::vl::__vwsn::ToString(::vl::__vwsn::This(__vwsnthis_0->self)->number)); } catch(...){ return ::vl::WString(L"", false); } }(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->Number(::vl::__vwsn::ToString(::vl::__vwsn::This(__vwsnthis_0->self)->number)); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -12452,7 +12057,7 @@ Closures void __vwsnc97_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = [&](){ try{ return ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->Currency(::vl::__vwsn::ToString(::vl::__vwsn::This(__vwsnthis_0->self)->currency)); } catch(...){ return ::vl::WString(L"", false); } }(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->Currency(::vl::__vwsn::ToString(::vl::__vwsn::This(__vwsnthis_0->self)->currency)); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -12514,7 +12119,7 @@ Closures void __vwsnc98_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = [&](){ try{ return ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->Sentence(::vl::WString(L"John Smith", false)); } catch(...){ return ::vl::WString(L"", false); } }(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->Sentence(::vl::WString(L"John Smith", false)); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -12576,7 +12181,7 @@ Closures void __vwsnc99_Demo_demo_LocalizedStringsTabPageConstructor___vwsn_demo_LocalizedStringsTabPage_Initialize__vl_reflection_description_IValueSubscription::__vwsn_bind_activator_() { - auto __vwsn_bind_activator_result_ = [&](){ try{ return ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->Sentence(::vl::WString(L"John Smith", false)); } catch(...){ return ::vl::WString(L"", false); } }(); + auto __vwsn_bind_activator_result_ = ::vl::__vwsn::This(::vl::__vwsn::This(__vwsn_bind_cache_0)->GetStrings().Obj())->Sentence(::vl::WString(L"John Smith", false)); ::vl::__vwsn::EventInvoke(this->ValueChanged)(::vl::__vwsn::Box(__vwsn_bind_activator_result_)); } @@ -14590,27 +14195,12 @@ Class (::demo::DocumentBoxSubTabPageConstructor) ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf238_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(this))); ::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_); } - { - auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc121_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(this)); - ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf239_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(this))); - ::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_); - } - { - auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc122_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(this)); - ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf240_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(this))); - ::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_); - } { ::vl::__vwsn::This(this->__vwsn_precompile_5)->SetDocument(::vl::__vwsn::Ensure(::vl::__vwsn::SharedPtrCast<::vl::presentation::DocumentModel>(::vl::__vwsn::This(__vwsn_this_)->ResolveResource(::vl::WString(L"res", false), ::vl::WString(L"TextBoxComponents/DocFixed", false), true).Obj()))); } { - auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc123_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(this)); - ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf241_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(this))); - ::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_); - } - { - auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc124_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(this)); - ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf242_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(this))); + auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc121_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(this)); + ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf239_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(this))); ::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_); } { @@ -19739,7 +19329,7 @@ Class (::demo::LocalizedStringsTabPage) , dateTime(::vl::reflection::description::Sys::GetLocalTime()) , number(static_cast<::vl::vint>(2147483647)) , currency(static_cast(1342177.28)) - , __vwsn_prop_Strings(::vl::Ptr<::demo::IStringResourceStrings>()) + , __vwsn_prop_Strings(::demo::StringResource::Get(::vl::__vwsn::Parse<::vl::Locale>(::vl::WString(L"en-US", false)))) { auto __vwsn_resource_ = ::vl::__vwsn::This(::vl::presentation::GetResourceManager())->GetResourceFromClassName(::vl::WString(L"demo::LocalizedStringsTabPage", false)); auto __vwsn_resolver_ = ::vl::Ptr<::vl::presentation::GuiResourcePathResolver>(new ::vl::presentation::GuiResourcePathResolver(__vwsn_resource_, ::vl::__vwsn::This(__vwsn_resource_.Obj())->GetWorkingDirectory())); @@ -22214,9 +21804,9 @@ Class (::demo::StringResource) { if (::vl::__vwsn::InSet(::vl::__vwsn::ToString(__vwsn_ls_locale), (::vl::__vwsn::CreateList().Add(::vl::WString(L"zh-CN", false))).list)) { - return ::vl::Ptr<::demo::IStringResourceStrings>(new ::vl_workflow_global::__vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings(__vwsn_ls_locale)); + return ::vl::Ptr<::demo::IStringResourceStrings>(new ::vl_workflow_global::__vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings(__vwsn_ls_locale)); } - return ::vl::Ptr<::demo::IStringResourceStrings>(new ::vl_workflow_global::__vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings(__vwsn_ls_locale)); + return ::vl::Ptr<::demo::IStringResourceStrings>(new ::vl_workflow_global::__vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings(__vwsn_ls_locale)); } StringResource::StringResource() @@ -22373,7 +21963,7 @@ Class (::demo::StyleItemTemplateConstructor) ::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_); } { - ::vl::__vwsn::This(this->__vwsn_precompile_3.Obj())->SetFont(::vl::__vwsn::This(this->containerControl)->GetFont()); + ::vl::__vwsn::This(this->__vwsn_precompile_3.Obj())->SetFont(::vl::__vwsn::This(this->containerControl)->GetDisplayFont()); } { auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc83_Demo_demo_StyleItemTemplateConstructor___vwsn_demo_StyleItemTemplate_Initialize__vl_reflection_description_IValueSubscription(this)); @@ -22381,7 +21971,7 @@ Class (::demo::StyleItemTemplateConstructor) ::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_); } { - ::vl::__vwsn::This(this->__vwsn_precompile_7.Obj())->SetFont(::vl::__vwsn::This(this->containerControl)->GetFont()); + ::vl::__vwsn::This(this->__vwsn_precompile_7.Obj())->SetFont(::vl::__vwsn::This(this->containerControl)->GetDisplayFont()); } } @@ -22428,7 +22018,7 @@ Class (::demo::StyleItemTemplate) { ::vl::__vwsn::This(this->styleLabel.Obj())->SetColor(::vl::__vwsn::This(styles.Obj())->color.Value()); } - auto font = ::vl::__vwsn::This(this->containerControl)->GetFont(); + auto font = ::vl::__vwsn::This(this->containerControl)->GetDisplayFont(); auto fontFamily = font.fontFamily; auto bold = font.bold; auto italic = font.italic; @@ -22548,26 +22138,16 @@ Class (::demo::TextBoxSubTabPageConstructor) ::vl::__vwsn::This(::vl::__vwsn::This(this->self)->GetContainerComposition())->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_0)); } { - auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc125_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(this)); - ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf243_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(this))); - ::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_); - } - { - auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc126_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(this)); - ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf244_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(this))); + auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc122_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(this)); + ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf240_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(this))); ::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_); } { ::vl::__vwsn::This(this->__vwsn_precompile_5)->SetText(::vl::__vwsn::This(::vl::__vwsn::Ensure(::vl::__vwsn::SharedPtrCast<::vl::presentation::GuiTextData>(::vl::__vwsn::This(__vwsn_this_)->ResolveResource(::vl::WString(L"res", false), ::vl::WString(L"TextBoxComponents/Text", false), true).Obj())).Obj())->GetText()); } { - auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc127_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(this)); - ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf245_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(this))); - ::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_); - } - { - auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc128_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(this)); - ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf246_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(this))); + auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc123_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(this)); + ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf241_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(this))); ::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_); } } @@ -22751,24 +22331,24 @@ Class (::demo::TextBoxTabPageConstructor) ::vl::__vwsn::This(::vl::__vwsn::This(this->self)->GetContainerComposition())->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(this->__vwsn_precompile_0)); } { - auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf247_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(this)); + auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf242_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(this)); ::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_5)->Clicked, __vwsn_event_handler_); } { - auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc129_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription(this)); - ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf248_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(this))); + auto __vwsn_created_subscription_ = ::vl::Ptr<::vl::reflection::description::IValueSubscription>(new ::vl_workflow_global::__vwsnc124_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription(this)); + ::vl::__vwsn::EventAttach(::vl::__vwsn::This(__vwsn_created_subscription_.Obj())->ValueChanged, LAMBDA(::vl_workflow_global::__vwsnf243_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(this))); ::vl::__vwsn::This(__vwsn_this_)->AddSubscription(__vwsn_created_subscription_); } { - auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf249_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(this)); + auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf244_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(this)); ::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->__vwsn_precompile_7)->Clicked, __vwsn_event_handler_); } { - auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf250_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(this)); + auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf245_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(this)); ::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->self)->OnMakeFontLarger, __vwsn_event_handler_); } { - auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf251_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(this)); + auto __vwsn_event_handler_ = LAMBDA(::vl_workflow_global::__vwsnf246_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(this)); ::vl::__vwsn::EventAttach(::vl::__vwsn::This(this->self)->OnMakeFontSmaller, __vwsn_event_handler_); } } @@ -22796,10 +22376,10 @@ Class (::demo::TextBoxTabPage) void TextBoxTabPage::UpdateFont(::vl::presentation::FontProperties newFont) { - ::vl::__vwsn::This(this->t1)->SetFont(newFont); - ::vl::__vwsn::This(this->t2)->SetFont(newFont); - ::vl::__vwsn::This(this->d1)->SetFont(newFont); - ::vl::__vwsn::This(this->d2)->SetFont(newFont); + ::vl::__vwsn::This(this->t1)->SetFont(::vl::Nullable<::vl::presentation::FontProperties>(newFont)); + ::vl::__vwsn::This(this->t2)->SetFont(::vl::Nullable<::vl::presentation::FontProperties>(newFont)); + ::vl::__vwsn::This(this->d1)->SetFont(::vl::Nullable<::vl::presentation::FontProperties>(newFont)); + ::vl::__vwsn::This(this->d2)->SetFont(::vl::Nullable<::vl::presentation::FontProperties>(newFont)); } TextBoxTabPage::TextBoxTabPage() diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.h b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.h index 43e04155..f24614a8 100644 --- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.h +++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoPartialClasses.h @@ -177,19 +177,14 @@ namespace vl_workflow_global struct __vwsnf238_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; struct __vwsnf239_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; struct __vwsnf23_Demo_demo_DataGridTabPageConstructor___vwsn_demo_DataGridTabPage_Initialize_; - struct __vwsnf240_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; - struct __vwsnf241_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; - struct __vwsnf242_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; - struct __vwsnf243_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; - struct __vwsnf244_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; - struct __vwsnf245_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; - struct __vwsnf246_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; - struct __vwsnf247_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; - struct __vwsnf248_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; - struct __vwsnf249_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + struct __vwsnf240_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; + struct __vwsnf241_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; + struct __vwsnf242_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + struct __vwsnf243_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + struct __vwsnf244_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + struct __vwsnf245_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + struct __vwsnf246_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; struct __vwsnf24_Demo_demo_DataGridTabPageConstructor___vwsn_demo_DataGridTabPage_Initialize_; - struct __vwsnf250_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; - struct __vwsnf251_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; struct __vwsnf25_Demo_demo_DataGridTabPageConstructor___vwsn_demo_DataGridTabPage_Initialize_; struct __vwsnf26_Demo_demo_DataGridTabPageConstructor___vwsn_demo_DataGridTabPage_Initialize_; struct __vwsnf27_Demo_demo_DataGridTabPageConstructor___vwsn_demo_DataGridTabPage_Initialize_; @@ -300,17 +295,12 @@ namespace vl_workflow_global class __vwsnc11_Demo_demo_AnimationTabPageConstructor___vwsn_demo_AnimationTabPage_Initialize__vl_reflection_description_IValueSubscription; class __vwsnc120_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; class __vwsnc121_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - class __vwsnc122_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - class __vwsnc123_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - class __vwsnc124_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - class __vwsnc125_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - class __vwsnc126_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - class __vwsnc127_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - class __vwsnc128_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - class __vwsnc129_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription; + class __vwsnc122_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; + class __vwsnc123_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; + class __vwsnc124_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription; + class __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings; + class __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings; class __vwsnc12_Demo_demo_AnimationTabPageConstructor___vwsn_demo_AnimationTabPage_Initialize__vl_reflection_description_IValueSubscription; - class __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings; - class __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings; class __vwsnc13_Demo_demo_AnimationTabPage_BallAnimationWithDelay___vl_reflection_description_ICoroutine; class __vwsnc14_Demo_demo_AnimationTabPage_WaitingAnimation___vl_reflection_description_ICoroutine; class __vwsnc15_Demo_demo_DateEditorConstructor___vwsn_demo_DateEditor_Initialize__vl_reflection_description_IValueSubscription; @@ -1118,15 +1108,9 @@ namespace demo friend class ::vl_workflow_global::__vwsnc119_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; friend class ::vl_workflow_global::__vwsnc120_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; friend class ::vl_workflow_global::__vwsnc121_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend class ::vl_workflow_global::__vwsnc122_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend class ::vl_workflow_global::__vwsnc123_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend class ::vl_workflow_global::__vwsnc124_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; friend struct ::vl_workflow_global::__vwsnf237_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; friend struct ::vl_workflow_global::__vwsnf238_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; friend struct ::vl_workflow_global::__vwsnf239_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf240_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf241_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf242_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; #ifndef VCZH_DEBUG_NO_REFLECTION friend struct ::vl::reflection::description::CustomTypeDescriptorSelector; #endif @@ -1153,15 +1137,9 @@ namespace demo friend class ::vl_workflow_global::__vwsnc119_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; friend class ::vl_workflow_global::__vwsnc120_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; friend class ::vl_workflow_global::__vwsnc121_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend class ::vl_workflow_global::__vwsnc122_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend class ::vl_workflow_global::__vwsnc123_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend class ::vl_workflow_global::__vwsnc124_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; friend struct ::vl_workflow_global::__vwsnf237_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; friend struct ::vl_workflow_global::__vwsnf238_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; friend struct ::vl_workflow_global::__vwsnf239_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf240_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf241_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf242_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_; #ifndef VCZH_DEBUG_NO_REFLECTION friend struct ::vl::reflection::description::CustomTypeDescriptorSelector; #endif @@ -2693,8 +2671,8 @@ namespace demo class StringResource : public ::vl::Object, public ::vl::reflection::Description { - friend class ::vl_workflow_global::__vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings; - friend class ::vl_workflow_global::__vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings; + friend class ::vl_workflow_global::__vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings; + friend class ::vl_workflow_global::__vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings; #ifndef VCZH_DEBUG_NO_REFLECTION friend struct ::vl::reflection::description::CustomTypeDescriptorSelector; #endif @@ -2777,14 +2755,10 @@ namespace demo class TextBoxSubTabPageConstructor : public ::vl::Object, public ::vl::reflection::Description { - friend class ::vl_workflow_global::__vwsnc125_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend class ::vl_workflow_global::__vwsnc126_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend class ::vl_workflow_global::__vwsnc127_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend class ::vl_workflow_global::__vwsnc128_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend struct ::vl_workflow_global::__vwsnf243_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf244_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf245_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf246_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; + friend class ::vl_workflow_global::__vwsnc122_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; + friend class ::vl_workflow_global::__vwsnc123_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; + friend struct ::vl_workflow_global::__vwsnf240_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; + friend struct ::vl_workflow_global::__vwsnf241_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; #ifndef VCZH_DEBUG_NO_REFLECTION friend struct ::vl::reflection::description::CustomTypeDescriptorSelector; #endif @@ -2805,14 +2779,10 @@ namespace demo class TextBoxSubTabPage : public ::vl::presentation::controls::GuiTabPage, public ::demo::TextBoxSubTabPageConstructor, public ::vl::reflection::Description { friend class ::demo::TextBoxSubTabPageConstructor; - friend class ::vl_workflow_global::__vwsnc125_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend class ::vl_workflow_global::__vwsnc126_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend class ::vl_workflow_global::__vwsnc127_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend class ::vl_workflow_global::__vwsnc128_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend struct ::vl_workflow_global::__vwsnf243_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf244_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf245_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf246_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; + friend class ::vl_workflow_global::__vwsnc122_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; + friend class ::vl_workflow_global::__vwsnc123_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription; + friend struct ::vl_workflow_global::__vwsnf240_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; + friend struct ::vl_workflow_global::__vwsnf241_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_; #ifndef VCZH_DEBUG_NO_REFLECTION friend struct ::vl::reflection::description::CustomTypeDescriptorSelector; #endif @@ -2827,12 +2797,12 @@ namespace demo class TextBoxTabPageConstructor : public ::vl::Object, public ::vl::reflection::Description { - friend class ::vl_workflow_global::__vwsnc129_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend struct ::vl_workflow_global::__vwsnf247_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf248_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf249_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf250_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf251_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + friend class ::vl_workflow_global::__vwsnc124_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription; + friend struct ::vl_workflow_global::__vwsnf242_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + friend struct ::vl_workflow_global::__vwsnf243_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + friend struct ::vl_workflow_global::__vwsnf244_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + friend struct ::vl_workflow_global::__vwsnf245_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + friend struct ::vl_workflow_global::__vwsnf246_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; #ifndef VCZH_DEBUG_NO_REFLECTION friend struct ::vl::reflection::description::CustomTypeDescriptorSelector; #endif @@ -2858,12 +2828,12 @@ namespace demo class TextBoxTabPage : public ::vl::presentation::controls::GuiTabPage, public ::demo::TextBoxTabPageConstructor, public ::vl::reflection::Description { friend class ::demo::TextBoxTabPageConstructor; - friend class ::vl_workflow_global::__vwsnc129_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription; - friend struct ::vl_workflow_global::__vwsnf247_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf248_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf249_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf250_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; - friend struct ::vl_workflow_global::__vwsnf251_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + friend class ::vl_workflow_global::__vwsnc124_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription; + friend struct ::vl_workflow_global::__vwsnf242_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + friend struct ::vl_workflow_global::__vwsnf243_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + friend struct ::vl_workflow_global::__vwsnf244_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + friend struct ::vl_workflow_global::__vwsnf245_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; + friend struct ::vl_workflow_global::__vwsnf246_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_; #ifndef VCZH_DEBUG_NO_REFLECTION friend struct ::vl::reflection::description::CustomTypeDescriptorSelector; #endif @@ -4483,96 +4453,69 @@ Closures ::vl::reflection::description::Value operator()(const ::vl::reflection::description::Value& __vwsn_item_, const ::vl::reflection::description::Value& __vwsn_value_, bool __vwsn_update_) const; }; - struct __vwsnf240_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_ - { - ::demo::DocumentBoxSubTabPageConstructor* __vwsnthis_0; - - __vwsnf240_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0); - - void operator()(const ::vl::reflection::description::Value& __vwsn_value_) const; - }; - - struct __vwsnf241_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_ - { - ::demo::DocumentBoxSubTabPageConstructor* __vwsnthis_0; - - __vwsnf241_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0); - - void operator()(const ::vl::reflection::description::Value& __vwsn_value_) const; - }; - - struct __vwsnf242_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_ - { - ::demo::DocumentBoxSubTabPageConstructor* __vwsnthis_0; - - __vwsnf242_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize_(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0); - - void operator()(const ::vl::reflection::description::Value& __vwsn_value_) const; - }; - - struct __vwsnf243_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_ + struct __vwsnf240_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_ { ::demo::TextBoxSubTabPageConstructor* __vwsnthis_0; - __vwsnf243_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0); + __vwsnf240_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0); void operator()(const ::vl::reflection::description::Value& __vwsn_value_) const; }; - struct __vwsnf244_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_ + struct __vwsnf241_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_ { ::demo::TextBoxSubTabPageConstructor* __vwsnthis_0; - __vwsnf244_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0); + __vwsnf241_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0); void operator()(const ::vl::reflection::description::Value& __vwsn_value_) const; }; - struct __vwsnf245_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_ - { - ::demo::TextBoxSubTabPageConstructor* __vwsnthis_0; - - __vwsnf245_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0); - - void operator()(const ::vl::reflection::description::Value& __vwsn_value_) const; - }; - - struct __vwsnf246_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_ - { - ::demo::TextBoxSubTabPageConstructor* __vwsnthis_0; - - __vwsnf246_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize_(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0); - - void operator()(const ::vl::reflection::description::Value& __vwsn_value_) const; - }; - - struct __vwsnf247_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_ + struct __vwsnf242_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_ { ::demo::TextBoxTabPageConstructor* __vwsnthis_0; - __vwsnf247_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0); + __vwsnf242_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0); void operator()(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments) const; }; - struct __vwsnf248_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_ + struct __vwsnf243_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_ { ::demo::TextBoxTabPageConstructor* __vwsnthis_0; - __vwsnf248_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0); + __vwsnf243_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0); void operator()(const ::vl::reflection::description::Value& __vwsn_value_) const; }; - struct __vwsnf249_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_ + struct __vwsnf244_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_ { ::demo::TextBoxTabPageConstructor* __vwsnthis_0; - __vwsnf249_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0); + __vwsnf244_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0); void operator()(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs* arguments) const; }; + struct __vwsnf245_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_ + { + ::demo::TextBoxTabPageConstructor* __vwsnthis_0; + + __vwsnf245_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0); + + void operator()() const; + }; + + struct __vwsnf246_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_ + { + ::demo::TextBoxTabPageConstructor* __vwsnthis_0; + + __vwsnf246_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0); + + void operator()() const; + }; + struct __vwsnf24_Demo_demo_DataGridTabPageConstructor___vwsn_demo_DataGridTabPage_Initialize_ { ::demo::DataGridTabPageConstructor* __vwsnthis_0; @@ -4582,24 +4525,6 @@ Closures ::vl::WString operator()(const ::vl::reflection::description::Value& __vwsn_item_) const; }; - struct __vwsnf250_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_ - { - ::demo::TextBoxTabPageConstructor* __vwsnthis_0; - - __vwsnf250_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0); - - void operator()() const; - }; - - struct __vwsnf251_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_ - { - ::demo::TextBoxTabPageConstructor* __vwsnthis_0; - - __vwsnf251_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize_(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0); - - void operator()() const; - }; - struct __vwsnf25_Demo_demo_DataGridTabPageConstructor___vwsn_demo_DataGridTabPage_Initialize_ { ::demo::DataGridTabPageConstructor* __vwsnthis_0; @@ -5748,7 +5673,7 @@ Closures bool __vwsn_bind_opened_ = false; bool __vwsn_bind_closed_ = false; void __vwsn_bind_activator_(); - void __vwsn_bind_callback_0_0(::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_bind_callback_argument_0, ::vl::presentation::compositions::GuiEventArgs* __vwsn_bind_callback_argument_1); + void __vwsn_bind_callback_0_0(); bool Open() override; bool Update() override; bool Close() override; @@ -5800,24 +5725,6 @@ Closures __vwsnc121_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0); - ::demo::DocumentBoxSubTabPage* __vwsn_bind_cache_0 = nullptr; - ::vl::Ptr<::vl::reflection::description::IEventHandler> __vwsn_bind_handler_0_0; - bool __vwsn_bind_opened_ = false; - bool __vwsn_bind_closed_ = false; - void __vwsn_bind_activator_(); - void __vwsn_bind_callback_0_0(::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_bind_callback_argument_0, ::vl::presentation::compositions::GuiEventArgs* __vwsn_bind_callback_argument_1); - bool Open() override; - bool Update() override; - bool Close() override; - }; - - class __vwsnc122_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription : public ::vl::Object, public virtual ::vl::reflection::description::IValueSubscription - { - public: - ::demo::DocumentBoxSubTabPageConstructor* __vwsnthis_0; - - __vwsnc122_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0); - ::demo::DocumentBoxSubTabPage* __vwsn_bind_cache_0 = nullptr; ::vl::Ptr<::vl::reflection::description::IEventHandler> __vwsn_bind_handler_0_0; bool __vwsn_bind_opened_ = false; @@ -5829,66 +5736,12 @@ Closures bool Close() override; }; - class __vwsnc123_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription : public ::vl::Object, public virtual ::vl::reflection::description::IValueSubscription - { - public: - ::demo::DocumentBoxSubTabPageConstructor* __vwsnthis_0; - - __vwsnc123_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0); - - ::demo::DocumentBoxSubTabPage* __vwsn_bind_cache_0 = nullptr; - ::vl::Ptr<::vl::reflection::description::IEventHandler> __vwsn_bind_handler_0_0; - bool __vwsn_bind_opened_ = false; - bool __vwsn_bind_closed_ = false; - void __vwsn_bind_activator_(); - void __vwsn_bind_callback_0_0(::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_bind_callback_argument_0, ::vl::presentation::compositions::GuiEventArgs* __vwsn_bind_callback_argument_1); - bool Open() override; - bool Update() override; - bool Close() override; - }; - - class __vwsnc124_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription : public ::vl::Object, public virtual ::vl::reflection::description::IValueSubscription - { - public: - ::demo::DocumentBoxSubTabPageConstructor* __vwsnthis_0; - - __vwsnc124_Demo_demo_DocumentBoxSubTabPageConstructor___vwsn_demo_DocumentBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::DocumentBoxSubTabPageConstructor* __vwsnctorthis_0); - - ::demo::DocumentBoxSubTabPage* __vwsn_bind_cache_0 = nullptr; - ::vl::Ptr<::vl::reflection::description::IEventHandler> __vwsn_bind_handler_0_0; - bool __vwsn_bind_opened_ = false; - bool __vwsn_bind_closed_ = false; - void __vwsn_bind_activator_(); - void __vwsn_bind_callback_0_0(); - bool Open() override; - bool Update() override; - bool Close() override; - }; - - class __vwsnc125_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription : public ::vl::Object, public virtual ::vl::reflection::description::IValueSubscription + class __vwsnc122_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription : public ::vl::Object, public virtual ::vl::reflection::description::IValueSubscription { public: ::demo::TextBoxSubTabPageConstructor* __vwsnthis_0; - __vwsnc125_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0); - - ::demo::TextBoxSubTabPage* __vwsn_bind_cache_0 = nullptr; - ::vl::Ptr<::vl::reflection::description::IEventHandler> __vwsn_bind_handler_0_0; - bool __vwsn_bind_opened_ = false; - bool __vwsn_bind_closed_ = false; - void __vwsn_bind_activator_(); - void __vwsn_bind_callback_0_0(::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_bind_callback_argument_0, ::vl::presentation::compositions::GuiEventArgs* __vwsn_bind_callback_argument_1); - bool Open() override; - bool Update() override; - bool Close() override; - }; - - class __vwsnc126_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription : public ::vl::Object, public virtual ::vl::reflection::description::IValueSubscription - { - public: - ::demo::TextBoxSubTabPageConstructor* __vwsnthis_0; - - __vwsnc126_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0); + __vwsnc122_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0); ::demo::TextBoxSubTabPage* __vwsn_bind_cache_0 = nullptr; ::vl::Ptr<::vl::reflection::description::IEventHandler> __vwsn_bind_handler_0_0; @@ -5901,30 +5754,12 @@ Closures bool Close() override; }; - class __vwsnc127_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription : public ::vl::Object, public virtual ::vl::reflection::description::IValueSubscription + class __vwsnc123_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription : public ::vl::Object, public virtual ::vl::reflection::description::IValueSubscription { public: ::demo::TextBoxSubTabPageConstructor* __vwsnthis_0; - __vwsnc127_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0); - - ::demo::TextBoxSubTabPage* __vwsn_bind_cache_0 = nullptr; - ::vl::Ptr<::vl::reflection::description::IEventHandler> __vwsn_bind_handler_0_0; - bool __vwsn_bind_opened_ = false; - bool __vwsn_bind_closed_ = false; - void __vwsn_bind_activator_(); - void __vwsn_bind_callback_0_0(::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_bind_callback_argument_0, ::vl::presentation::compositions::GuiEventArgs* __vwsn_bind_callback_argument_1); - bool Open() override; - bool Update() override; - bool Close() override; - }; - - class __vwsnc128_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription : public ::vl::Object, public virtual ::vl::reflection::description::IValueSubscription - { - public: - ::demo::TextBoxSubTabPageConstructor* __vwsnthis_0; - - __vwsnc128_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0); + __vwsnc123_Demo_demo_TextBoxSubTabPageConstructor___vwsn_demo_TextBoxSubTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxSubTabPageConstructor* __vwsnctorthis_0); ::demo::TextBoxSubTabPage* __vwsn_bind_cache_0 = nullptr; ::vl::Ptr<::vl::reflection::description::IEventHandler> __vwsn_bind_handler_0_0; @@ -5937,12 +5772,12 @@ Closures bool Close() override; }; - class __vwsnc129_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription : public ::vl::Object, public virtual ::vl::reflection::description::IValueSubscription + class __vwsnc124_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription : public ::vl::Object, public virtual ::vl::reflection::description::IValueSubscription { public: ::demo::TextBoxTabPageConstructor* __vwsnthis_0; - __vwsnc129_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0); + __vwsnc124_Demo_demo_TextBoxTabPageConstructor___vwsn_demo_TextBoxTabPage_Initialize__vl_reflection_description_IValueSubscription(::demo::TextBoxTabPageConstructor* __vwsnctorthis_0); ::demo::TextBoxSubTabPage* __vwsn_bind_cache_0 = nullptr; ::vl::Ptr<::vl::reflection::description::IEventHandler> __vwsn_bind_handler_0_0; @@ -5955,6 +5790,48 @@ Closures bool Close() override; }; + class __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings : public ::vl::Object, public virtual ::demo::IStringResourceStrings + { + public: + ::vl::Locale __vwsn_ls_locale; + + __vwsnc125_Demo_demo_StringResource_Get__demo_IStringResourceStrings(::vl::Locale __vwsnctor___vwsn_ls_locale); + + ::vl::WString Currency(const ::vl::WString& __vwsn_ls_0) override; + ::vl::WString DateFormat(::vl::DateTime __vwsn_ls_0) override; + ::vl::WString Label() override; + ::vl::WString LongDate(::vl::DateTime __vwsn_ls_0) override; + ::vl::WString LongTime(::vl::DateTime __vwsn_ls_0) override; + ::vl::WString Number(const ::vl::WString& __vwsn_ls_0) override; + ::vl::WString Sentence(const ::vl::WString& __vwsn_ls_0) override; + ::vl::WString ShortDate(::vl::DateTime __vwsn_ls_0) override; + ::vl::WString ShortTime(::vl::DateTime __vwsn_ls_0) override; + ::vl::WString TimeFormat(::vl::DateTime __vwsn_ls_0) override; + ::vl::WString Title() override; + ::vl::WString YearMonthDate(::vl::DateTime __vwsn_ls_0) override; + }; + + class __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings : public ::vl::Object, public virtual ::demo::IStringResourceStrings + { + public: + ::vl::Locale __vwsn_ls_locale; + + __vwsnc126_Demo_demo_StringResource_Get__demo_IStringResourceStrings(::vl::Locale __vwsnctor___vwsn_ls_locale); + + ::vl::WString Currency(const ::vl::WString& __vwsn_ls_0) override; + ::vl::WString DateFormat(::vl::DateTime __vwsn_ls_0) override; + ::vl::WString Label() override; + ::vl::WString LongDate(::vl::DateTime __vwsn_ls_0) override; + ::vl::WString LongTime(::vl::DateTime __vwsn_ls_0) override; + ::vl::WString Number(const ::vl::WString& __vwsn_ls_0) override; + ::vl::WString Sentence(const ::vl::WString& __vwsn_ls_0) override; + ::vl::WString ShortDate(::vl::DateTime __vwsn_ls_0) override; + ::vl::WString ShortTime(::vl::DateTime __vwsn_ls_0) override; + ::vl::WString TimeFormat(::vl::DateTime __vwsn_ls_0) override; + ::vl::WString Title() override; + ::vl::WString YearMonthDate(::vl::DateTime __vwsn_ls_0) override; + }; + class __vwsnc12_Demo_demo_AnimationTabPageConstructor___vwsn_demo_AnimationTabPage_Initialize__vl_reflection_description_IValueSubscription : public ::vl::Object, public virtual ::vl::reflection::description::IValueSubscription { public: @@ -5976,48 +5853,6 @@ Closures bool Close() override; }; - class __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings : public ::vl::Object, public virtual ::demo::IStringResourceStrings - { - public: - ::vl::Locale __vwsn_ls_locale; - - __vwsnc130_Demo_demo_StringResource_Get__demo_IStringResourceStrings(::vl::Locale __vwsnctor___vwsn_ls_locale); - - ::vl::WString Currency(const ::vl::WString& __vwsn_ls_0) override; - ::vl::WString DateFormat(::vl::DateTime __vwsn_ls_0) override; - ::vl::WString Label() override; - ::vl::WString LongDate(::vl::DateTime __vwsn_ls_0) override; - ::vl::WString LongTime(::vl::DateTime __vwsn_ls_0) override; - ::vl::WString Number(const ::vl::WString& __vwsn_ls_0) override; - ::vl::WString Sentence(const ::vl::WString& __vwsn_ls_0) override; - ::vl::WString ShortDate(::vl::DateTime __vwsn_ls_0) override; - ::vl::WString ShortTime(::vl::DateTime __vwsn_ls_0) override; - ::vl::WString TimeFormat(::vl::DateTime __vwsn_ls_0) override; - ::vl::WString Title() override; - ::vl::WString YearMonthDate(::vl::DateTime __vwsn_ls_0) override; - }; - - class __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings : public ::vl::Object, public virtual ::demo::IStringResourceStrings - { - public: - ::vl::Locale __vwsn_ls_locale; - - __vwsnc131_Demo_demo_StringResource_Get__demo_IStringResourceStrings(::vl::Locale __vwsnctor___vwsn_ls_locale); - - ::vl::WString Currency(const ::vl::WString& __vwsn_ls_0) override; - ::vl::WString DateFormat(::vl::DateTime __vwsn_ls_0) override; - ::vl::WString Label() override; - ::vl::WString LongDate(::vl::DateTime __vwsn_ls_0) override; - ::vl::WString LongTime(::vl::DateTime __vwsn_ls_0) override; - ::vl::WString Number(const ::vl::WString& __vwsn_ls_0) override; - ::vl::WString Sentence(const ::vl::WString& __vwsn_ls_0) override; - ::vl::WString ShortDate(::vl::DateTime __vwsn_ls_0) override; - ::vl::WString ShortTime(::vl::DateTime __vwsn_ls_0) override; - ::vl::WString TimeFormat(::vl::DateTime __vwsn_ls_0) override; - ::vl::WString Title() override; - ::vl::WString YearMonthDate(::vl::DateTime __vwsn_ls_0) override; - }; - class __vwsnc13_Demo_demo_AnimationTabPage_BallAnimationWithDelay___vl_reflection_description_ICoroutine : public ::vl::Object, public virtual ::vl::reflection::description::ICoroutine { public: diff --git a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/TextBoxTabPage.xml b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/TextBoxTabPage.xml index b20c4c73..db22314d 100644 --- a/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/TextBoxTabPage.xml +++ b/Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/TextBoxTabPage.xml @@ -93,13 +93,13 @@ So as I pray, unlimited blade works.]]> - + - + @@ -127,18 +127,18 @@ So as I pray, unlimited blade works.]]> - + - + - + @@ -170,12 +170,12 @@ So as I pray, unlimited blade works.]]> @@ -208,7 +208,7 @@ So as I pray, unlimited blade works.]]>