From 569d7f099981f4807c2f0aa0d0f8bda0ff83f801 Mon Sep 17 00:00:00 2001 From: Zihan Chen Date: Thu, 10 Jan 2019 15:05:57 -0800 Subject: [PATCH] Compiles --- Tutorial/GacUI_Controls/AddressBook/Main.cpp | 4 +++- Tutorial/GacUI_HelloWorlds/Xml/Main.cpp | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Tutorial/GacUI_Controls/AddressBook/Main.cpp b/Tutorial/GacUI_Controls/AddressBook/Main.cpp index 4586f8ce..376ae200 100644 --- a/Tutorial/GacUI_Controls/AddressBook/Main.cpp +++ b/Tutorial/GacUI_Controls/AddressBook/Main.cpp @@ -272,7 +272,9 @@ void GuiMain() { { FileStream fileStream(L"../UIRes/AddressBook.bin", FileStream::ReadOnly); - GetResourceManager()->LoadResourceOrPending(fileStream); + auto resource = GuiResource::LoadPrecompiledBinary(fileStream); + GuiResourceError::List errors; + GetResourceManager()->SetResource(resource, errors); folderImage = resource->GetImageByPath(L"Images/Folder"); contactBigImage = resource->GetImageByPath(L"Images/ContactBig"); diff --git a/Tutorial/GacUI_HelloWorlds/Xml/Main.cpp b/Tutorial/GacUI_HelloWorlds/Xml/Main.cpp index b6138f06..4d871f3e 100644 --- a/Tutorial/GacUI_HelloWorlds/Xml/Main.cpp +++ b/Tutorial/GacUI_HelloWorlds/Xml/Main.cpp @@ -13,8 +13,7 @@ void GuiMain() #else FileStream fileStream(L"../UIRes/Xml.bin.x86", FileStream::ReadOnly); #endif - auto resource = GuiResource::LoadPrecompiledBinary(fileStream); - GetResourceManager()->SetResource(resource, GuiResourceUsage::InstanceClass); + GetResourceManager()->LoadResourceOrPending(fileStream, GuiResourceUsage::InstanceClass); } auto window = UnboxValue(Value::Create(L"helloworld::MainWindow"));