From 6dd8b3192e6dff666eb22328ac7f1fb6071246f4 Mon Sep 17 00:00:00 2001 From: Zihan Chen Date: Sat, 11 Mar 2017 23:52:05 -0800 Subject: [PATCH] Upgrade Tutorial\GacUI_Layout --- Tutorial/GacUI_Layout/Alignment/Main.cpp | 3 +-- Tutorial/GacUI_Layout/Flow/Main.cpp | 3 +-- Tutorial/GacUI_Layout/RichTextEmbedding/Main.cpp | 3 +-- Tutorial/GacUI_Layout/RichTextEmbedding/UI/MainWindow.xml | 4 +++- Tutorial/GacUI_Layout/Stack/Main.cpp | 3 +-- Tutorial/GacUI_Layout/Table/Main.cpp | 3 +-- Tutorial/GacUI_Layout/TableSplitter/Main.cpp | 3 +-- 7 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Tutorial/GacUI_Layout/Alignment/Main.cpp b/Tutorial/GacUI_Layout/Alignment/Main.cpp index 7f911b9f..48825533 100644 --- a/Tutorial/GacUI_Layout/Alignment/Main.cpp +++ b/Tutorial/GacUI_Layout/Alignment/Main.cpp @@ -13,9 +13,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Alignment.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window; diff --git a/Tutorial/GacUI_Layout/Flow/Main.cpp b/Tutorial/GacUI_Layout/Flow/Main.cpp index 6d20b9bd..14f84f91 100644 --- a/Tutorial/GacUI_Layout/Flow/Main.cpp +++ b/Tutorial/GacUI_Layout/Flow/Main.cpp @@ -13,9 +13,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/Flow.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window; diff --git a/Tutorial/GacUI_Layout/RichTextEmbedding/Main.cpp b/Tutorial/GacUI_Layout/RichTextEmbedding/Main.cpp index 69e45284..354866f4 100644 --- a/Tutorial/GacUI_Layout/RichTextEmbedding/Main.cpp +++ b/Tutorial/GacUI_Layout/RichTextEmbedding/Main.cpp @@ -22,9 +22,8 @@ public: void GuiMain() { { - List errors; FileStream fileStream(L"../UIRes/RichTextEmbedding.bin", FileStream::ReadOnly); - auto resource = GuiResource::LoadPrecompiledBinary(fileStream, errors); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); GetResourceManager()->SetResource(L"Resource", resource); } demo::MainWindow window(new ViewModel); diff --git a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/MainWindow.xml b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/MainWindow.xml index 379d7b29..a21e8569 100644 --- a/Tutorial/GacUI_Layout/RichTextEmbedding/UI/MainWindow.xml +++ b/Tutorial/GacUI_Layout/RichTextEmbedding/UI/MainWindow.xml @@ -8,7 +8,9 @@ - ViewModel.OpenUrl(documentViewer.ActiveHyperlinkReference); +