| Index: xfa/fwl/core/fwl_appimp.cpp
|
| diff --git a/xfa/fwl/core/fwl_appimp.cpp b/xfa/fwl/core/fwl_appimp.cpp
|
| index 0017aad8ad459ace6bf2858f634da3fc76705632..5d2abb0aba97d0b1512592f14f6bb59bc5027fb0 100644
|
| --- a/xfa/fwl/core/fwl_appimp.cpp
|
| +++ b/xfa/fwl/core/fwl_appimp.cpp
|
| @@ -20,11 +20,11 @@ IFWL_App* IFWL_App::Create(IFWL_AdapterNative* pAdapter) {
|
|
|
| void IFWL_App::Release() {}
|
|
|
| -FWL_ERR IFWL_App::Initialize() {
|
| +FWL_Error IFWL_App::Initialize() {
|
| return static_cast<CFWL_AppImp*>(GetImpl())->Initialize();
|
| }
|
|
|
| -FWL_ERR IFWL_App::Finalize() {
|
| +FWL_Error IFWL_App::Finalize() {
|
| return static_cast<CFWL_AppImp*>(GetImpl())->Finalize();
|
| }
|
|
|
| @@ -40,11 +40,11 @@ IFWL_ThemeProvider* IFWL_App::GetThemeProvider() {
|
| return static_cast<CFWL_AppImp*>(GetImpl())->GetThemeProvider();
|
| }
|
|
|
| -FWL_ERR IFWL_App::SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) {
|
| +FWL_Error IFWL_App::SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) {
|
| return static_cast<CFWL_AppImp*>(GetImpl())->SetThemeProvider(pThemeProvider);
|
| }
|
|
|
| -FWL_ERR IFWL_App::Exit(int32_t iExitCode) {
|
| +FWL_Error IFWL_App::Exit(int32_t iExitCode) {
|
| return static_cast<CFWL_AppImp*>(GetImpl())->Exit(iExitCode);
|
| }
|
|
|
| @@ -62,15 +62,15 @@ CFWL_AppImp::~CFWL_AppImp() {
|
| CFWL_ToolTipContainer::DeleteInstance();
|
| }
|
|
|
| -FWL_ERR CFWL_AppImp::Initialize() {
|
| +FWL_Error CFWL_AppImp::Initialize() {
|
| if (!m_pWidgetMgr) {
|
| m_pWidgetMgr.reset(new CFWL_WidgetMgr(m_pAdapterNative));
|
| }
|
| - return FWL_ERR_Succeeded;
|
| + return FWL_Error::Succeeded;
|
| }
|
| -FWL_ERR CFWL_AppImp::Finalize() {
|
| +FWL_Error CFWL_AppImp::Finalize() {
|
| m_pWidgetMgr.reset();
|
| - return FWL_ERR_Succeeded;
|
| + return FWL_Error::Succeeded;
|
| }
|
| IFWL_AdapterNative* CFWL_AppImp::GetAdapterNative() const {
|
| return m_pAdapterNative;
|
| @@ -82,11 +82,11 @@ IFWL_AdapterWidgetMgr* FWL_GetAdapterWidgetMgr() {
|
| IFWL_WidgetMgr* CFWL_AppImp::GetWidgetMgr() const {
|
| return m_pWidgetMgr.get();
|
| }
|
| -FWL_ERR CFWL_AppImp::SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) {
|
| +FWL_Error CFWL_AppImp::SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) {
|
| m_pThemeProvider = pThemeProvider;
|
| - return FWL_ERR_Succeeded;
|
| + return FWL_Error::Succeeded;
|
| }
|
| -FWL_ERR CFWL_AppImp::Exit(int32_t iExitCode) {
|
| +FWL_Error CFWL_AppImp::Exit(int32_t iExitCode) {
|
| while (m_pNoteDriver->PopNoteLoop()) {
|
| continue;
|
| }
|
|
|