diff --git a/SampleForDoc/GacUI/RunResource/GuiMain.cpp b/SampleForDoc/GacUI/RunResource/GuiMain.cpp index fe9b935b..458b07d2 100644 --- a/SampleForDoc/GacUI/RunResource/GuiMain.cpp +++ b/SampleForDoc/GacUI/RunResource/GuiMain.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include "resource.h" using namespace vl; diff --git a/Tutorial/GacUI_Controls/AddressBook/Main.cpp b/Tutorial/GacUI_Controls/AddressBook/Main.cpp index b2e1f8d7..3c090e1f 100644 --- a/Tutorial/GacUI_Controls/AddressBook/Main.cpp +++ b/Tutorial/GacUI_Controls/AddressBook/Main.cpp @@ -149,7 +149,7 @@ class RootCategory : public Object, public ICategory public: RootCategory() { - folders.Add(new StaticCategory); + folders.Add(Ptr(new StaticCategory)); } ICategory* GetParent()override @@ -188,7 +188,7 @@ class ViewModel : public Object, public IViewModel public: ViewModel() { - rootCategory = new RootCategory; + rootCategory = Ptr(new RootCategory); } vl::Ptr GetRootCategory()override @@ -228,7 +228,7 @@ class ViewModel : public Object, public IViewModel { if (auto current = dynamic_cast(selectedCategory.Obj())) { - auto category = new Category(current); + auto category = Ptr(new Category(current)); category->name = name; current->folders.Add(category); } @@ -247,7 +247,7 @@ class ViewModel : public Object, public IViewModel { if (auto category = dynamic_cast(selectedCategory.Obj())) { - auto contact = new Contact(category); + auto contact = Ptr(new Contact(category)); contact->Update(L"Mr. New Contact", DateTime::LocalTime(), L"(123)-456-7890", L"110 st, New York, NY 10118"); return contact; } @@ -280,7 +280,7 @@ void GuiMain() contactBigImage = resource->GetImageByPath(L"Images/ContactBig"); contactSmallImage = resource->GetImageByPath(L"Images/ContactSmall"); } - MainWindow window(new ViewModel); + MainWindow window(Ptr(new ViewModel)); window.MoveToScreenCenter(); GetApplication()->Run(&window); diff --git a/Tutorial/GacUI_Controls/CalculatorAndStateMachine/Main.cpp b/Tutorial/GacUI_Controls/CalculatorAndStateMachine/Main.cpp index dda58d60..2f7bb25d 100644 --- a/Tutorial/GacUI_Controls/CalculatorAndStateMachine/Main.cpp +++ b/Tutorial/GacUI_Controls/CalculatorAndStateMachine/Main.cpp @@ -10,7 +10,7 @@ void GuiMain() FileStream fileStream(L"../UIRes/CalculatorAndStateMachine.bin", FileStream::ReadOnly); GetResourceManager()->LoadResourceOrPending(fileStream); } - demo::MainWindow window(new demo::Calculator); + demo::MainWindow window(Ptr(new demo::Calculator)); window.MoveToScreenCenter(); GetApplication()->Run(&window); } \ No newline at end of file diff --git a/Tutorial/GacUI_Controls/ColorPicker/Main.cpp b/Tutorial/GacUI_Controls/ColorPicker/Main.cpp index 152bc360..a3eef298 100644 --- a/Tutorial/GacUI_Controls/ColorPicker/Main.cpp +++ b/Tutorial/GacUI_Controls/ColorPicker/Main.cpp @@ -36,22 +36,22 @@ class ViewModel : public Object, public demo::IViewModel public: ViewModel() { - items.Add(new ColorItem(L"Black", L"#000000")); - items.Add(new ColorItem(L"Maroon", L"#800000")); - items.Add(new ColorItem(L"Green", L"#008000")); - items.Add(new ColorItem(L"Olive", L"#808000")); - items.Add(new ColorItem(L"Navy", L"#000080")); - items.Add(new ColorItem(L"Purble", L"#800080")); - items.Add(new ColorItem(L"Teal", L"#008080")); - items.Add(new ColorItem(L"Silver", L"#C0C0C0")); - items.Add(new ColorItem(L"Gray", L"#808080")); - items.Add(new ColorItem(L"Red", L"#FF0000")); - items.Add(new ColorItem(L"Lime", L"#00FF00")); - items.Add(new ColorItem(L"Yellow", L"#FFFF00")); - items.Add(new ColorItem(L"Blue", L"#0000FF")); - items.Add(new ColorItem(L"Fuchsia", L"#FF00FF")); - items.Add(new ColorItem(L"Aqua", L"#00FFFF")); - items.Add(new ColorItem(L"White", L"#FFFFFF")); + items.Add(Ptr(new ColorItem(L"Black", L"#000000"))); + items.Add(Ptr(new ColorItem(L"Maroon", L"#800000"))); + items.Add(Ptr(new ColorItem(L"Green", L"#008000"))); + items.Add(Ptr(new ColorItem(L"Olive", L"#808000"))); + items.Add(Ptr(new ColorItem(L"Navy", L"#000080"))); + items.Add(Ptr(new ColorItem(L"Purble", L"#800080"))); + items.Add(Ptr(new ColorItem(L"Teal", L"#008080"))); + items.Add(Ptr(new ColorItem(L"Silver", L"#C0C0C0"))); + items.Add(Ptr(new ColorItem(L"Gray", L"#808080"))); + items.Add(Ptr(new ColorItem(L"Red", L"#FF0000"))); + items.Add(Ptr(new ColorItem(L"Lime", L"#00FF00"))); + items.Add(Ptr(new ColorItem(L"Yellow", L"#FFFF00"))); + items.Add(Ptr(new ColorItem(L"Blue", L"#0000FF"))); + items.Add(Ptr(new ColorItem(L"Fuchsia", L"#FF00FF"))); + items.Add(Ptr(new ColorItem(L"Aqua", L"#00FFFF"))); + items.Add(Ptr(new ColorItem(L"White", L"#FFFFFF"))); } LazyList> GetColorItems()override @@ -66,7 +66,7 @@ void GuiMain() FileStream fileStream(L"../UIRes/ColorPicker.bin", FileStream::ReadOnly); GetResourceManager()->LoadResourceOrPending(fileStream); } - demo::MainWindow window(new ViewModel); + demo::MainWindow window(Ptr(new ViewModel)); window.MoveToScreenCenter(); GetApplication()->Run(&window); } \ No newline at end of file diff --git a/Tutorial/GacUI_Controls/ProgressAndAsync/Main.cpp b/Tutorial/GacUI_Controls/ProgressAndAsync/Main.cpp index 50912fa9..9abe9d77 100644 --- a/Tutorial/GacUI_Controls/ProgressAndAsync/Main.cpp +++ b/Tutorial/GacUI_Controls/ProgressAndAsync/Main.cpp @@ -52,7 +52,7 @@ void GuiMain() FileStream fileStream(L"../UIRes/ProgressAndAsync.bin", FileStream::ReadOnly); GetResourceManager()->LoadResourceOrPending(fileStream); } - demo::MainWindow window(new ViewModel); + demo::MainWindow window(Ptr(new ViewModel)); window.MoveToScreenCenter(); GetApplication()->Run(&window); } \ No newline at end of file diff --git a/Tutorial/GacUI_Controls/TextEditor/Main.cpp b/Tutorial/GacUI_Controls/TextEditor/Main.cpp index 2cf27460..13cdd678 100644 --- a/Tutorial/GacUI_Controls/TextEditor/Main.cpp +++ b/Tutorial/GacUI_Controls/TextEditor/Main.cpp @@ -112,5 +112,5 @@ class XmlColorizer : public GuiTextBoxRegexColorizer void SetColorizer(GuiMultilineTextBox* textBox, bool forXml) { - textBox->SetColorizer(forXml ? new XmlColorizer : nullptr); + textBox->SetColorizer(forXml ? Ptr(new XmlColorizer) : nullptr); } \ No newline at end of file diff --git a/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp b/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp index c5ed5d29..6a09d757 100644 --- a/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp +++ b/Tutorial/GacUI_Controls/TextEditor/UI/Source/MainWindow.cpp @@ -298,7 +298,7 @@ namespace demo {/* USER_CONTENT_BEGIN(::demo::MainWindow) */ if (!findWindow) { - auto window = MakePtr(); + auto window = Ptr(new FindWindow); window->textBox = textBox; window->MoveToScreenCenter(); window->GetNativeWindow()->SetParent(GetNativeWindow()); diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/Main.cpp b/Tutorial/GacUI_HelloWorlds/MVVM/Main.cpp index 3eff27b3..cca9b0e6 100644 --- a/Tutorial/GacUI_HelloWorlds/MVVM/Main.cpp +++ b/Tutorial/GacUI_HelloWorlds/MVVM/Main.cpp @@ -81,7 +81,7 @@ void GuiMain() FileStream fileStream(L"../UIRes/MVVM.bin", FileStream::ReadOnly); GetResourceManager()->LoadResourceOrPending(fileStream); } - auto viewModel = MakePtr(); + auto viewModel = Ptr(new ViewModel); auto window = new helloworld::MainWindow(viewModel); window->MoveToScreenCenter(); GetApplication()->Run(window); diff --git a/Tutorial/GacUI_HelloWorlds/WorkflowScript/Main.cpp b/Tutorial/GacUI_HelloWorlds/WorkflowScript/Main.cpp index 5cd90960..1dd5c072 100644 --- a/Tutorial/GacUI_HelloWorlds/WorkflowScript/Main.cpp +++ b/Tutorial/GacUI_HelloWorlds/WorkflowScript/Main.cpp @@ -41,7 +41,7 @@ void GuiMain() codes.Add(WorkflowScript); workflow::Parser workflowParser; auto assembly = Compile(workflowParser, codes, errors); - globalContext = MakePtr(assembly); + globalContext = Ptr(new WfRuntimeGlobalContext(assembly)); LoadFunction(globalContext, L"")(); } diff --git a/Tutorial/GacUI_Layout/RichTextEmbedding/Main.cpp b/Tutorial/GacUI_Layout/RichTextEmbedding/Main.cpp index 898e7f8a..c872df23 100644 --- a/Tutorial/GacUI_Layout/RichTextEmbedding/Main.cpp +++ b/Tutorial/GacUI_Layout/RichTextEmbedding/Main.cpp @@ -24,7 +24,7 @@ void GuiMain() FileStream fileStream(L"../UIRes/RichTextEmbedding.bin", FileStream::ReadOnly); GetResourceManager()->LoadResourceOrPending(fileStream); } - demo::MainWindow window(new ViewModel); + demo::MainWindow window(Ptr(new ViewModel)); window.MoveToScreenCenter(); GetApplication()->Run(&window); } \ No newline at end of file diff --git a/Tutorial/GacUI_Windows/Direct2DClock/AnimationControl.cpp b/Tutorial/GacUI_Windows/Direct2DClock/AnimationControl.cpp index cb883f1b..1740f25c 100644 --- a/Tutorial/GacUI_Windows/Direct2DClock/AnimationControl.cpp +++ b/Tutorial/GacUI_Windows/Direct2DClock/AnimationControl.cpp @@ -98,7 +98,7 @@ namespace demo AnimationControl::AnimationControl() :GuiControl(theme::ThemeName::CustomControl) - , members(MakePtr()) + , members(Ptr(new AnimationControlMembers)) { element = D2DElement::Create(); element->BeforeRenderTargetChanged.AttachMethod(this, &AnimationControl::OnBeforeRenderTargetChanged); @@ -107,7 +107,7 @@ namespace demo { auto bounds = new GuiBoundsComposition(); bounds->SetAlignmentToParent(Margin(0, 0, 0, 0)); - bounds->SetOwnedElement(element); + bounds->SetOwnedElement(Ptr(element)); GetContainerComposition()->AddChild(bounds); } diff --git a/Tutorial/GacUI_Xml/Binding_ViewModel/Main.cpp b/Tutorial/GacUI_Xml/Binding_ViewModel/Main.cpp index f3f78f0b..e737c7af 100644 --- a/Tutorial/GacUI_Xml/Binding_ViewModel/Main.cpp +++ b/Tutorial/GacUI_Xml/Binding_ViewModel/Main.cpp @@ -19,7 +19,7 @@ void GuiMain() FileStream fileStream(L"../UIRes/Binding_ViewModel.bin", FileStream::ReadOnly); GetResourceManager()->LoadResourceOrPending(fileStream); } - demo::MainWindow window(new ViewModelImpl); + demo::MainWindow window(Ptr(new ViewModelImpl)); window.MoveToScreenCenter(); GetApplication()->Run(&window); } \ No newline at end of file diff --git a/Tutorial/GacUI_Xml/Event_ViewModel/Main.cpp b/Tutorial/GacUI_Xml/Event_ViewModel/Main.cpp index 1f88de38..ab52c46a 100644 --- a/Tutorial/GacUI_Xml/Event_ViewModel/Main.cpp +++ b/Tutorial/GacUI_Xml/Event_ViewModel/Main.cpp @@ -24,7 +24,7 @@ void GuiMain() FileStream fileStream(L"../UIRes/Event_ViewModel.bin", FileStream::ReadOnly); GetResourceManager()->LoadResourceOrPending(fileStream); } - demo::MainWindow window(new ViewModelImpl); + demo::MainWindow window(Ptr(new ViewModelImpl)); window.MoveToScreenCenter(); GetApplication()->Run(&window); } \ No newline at end of file diff --git a/Tutorial/GacUI_Xml/Member_Parameter/Main.cpp b/Tutorial/GacUI_Xml/Member_Parameter/Main.cpp index 1c2107b8..aad8e5aa 100644 --- a/Tutorial/GacUI_Xml/Member_Parameter/Main.cpp +++ b/Tutorial/GacUI_Xml/Member_Parameter/Main.cpp @@ -19,7 +19,7 @@ void GuiMain() FileStream fileStream(L"../UIRes/Member_Parameter.bin", FileStream::ReadOnly); GetResourceManager()->LoadResourceOrPending(fileStream); } - demo::MainWindow window(new ViewModelImpl); + demo::MainWindow window(Ptr(new ViewModelImpl)); window.MoveToScreenCenter(); GetApplication()->Run(&window); } \ No newline at end of file diff --git a/Tutorial/Lib/GacUI/WinMain.cpp b/Tutorial/Lib/GacUI/WinMain.cpp index 35941d75..38ff2e6e 100644 --- a/Tutorial/Lib/GacUI/WinMain.cpp +++ b/Tutorial/Lib/GacUI/WinMain.cpp @@ -14,7 +14,7 @@ class DefaultSkinPlugin : public Object, public IGuiPlugin void Load()override { - RegisterTheme(MakePtr()); + RegisterTheme(Ptr(new darkskin::Theme)); } void Unload()override diff --git a/Tutorial/Lib/GacUILite/WinMain.cpp b/Tutorial/Lib/GacUILite/WinMain.cpp index 35941d75..38ff2e6e 100644 --- a/Tutorial/Lib/GacUILite/WinMain.cpp +++ b/Tutorial/Lib/GacUILite/WinMain.cpp @@ -14,7 +14,7 @@ class DefaultSkinPlugin : public Object, public IGuiPlugin void Load()override { - RegisterTheme(MakePtr()); + RegisterTheme(Ptr(new darkskin::Theme)); } void Unload()override