From ddd5c70e09b6e1db3c01b4900e6424f11fd5c93d Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 13 Apr 2016 19:04:01 -0700 Subject: Unused FWL Classes. This Cl removes several FWL classes that aren't removed. These include: * IFWL_Content * CFWL_ContentImp * CFWL_CustomPanelImp * CFWL_CustomImp * IFWL_Custom * IFWL_CustomPanel * IFWL_Proxy * CFWL_App BUG=pdfium:468 Review URL: https://codereview.chromium.org/1883943002 --- BUILD.gn | 12 +--- xfa.gyp | 8 --- xfa/fwl/core/fwl_contentimp.cpp | 94 ------------------------------- xfa/fwl/core/fwl_contentimp.h | 35 ------------ xfa/fwl/core/fwl_formimp.cpp | 10 ---- xfa/fwl/core/fwl_panelimp.cpp | 117 +-------------------------------------- xfa/fwl/core/fwl_panelimp.h | 7 +-- xfa/fwl/core/fwl_widgetimp.cpp | 60 +------------------- xfa/fwl/core/ifwl_content.h | 30 ---------- xfa/fwl/core/ifwl_custom.h | 26 --------- xfa/fwl/core/ifwl_custompanel.h | 28 ---------- xfa/fwl/core/ifwl_panel.h | 9 --- xfa/fwl/core/ifwl_proxy.h | 21 ------- xfa/fwl/lightwidget/cfwl_app.cpp | 35 ------------ xfa/fwl/lightwidget/cfwl_app.h | 31 ----------- 15 files changed, 6 insertions(+), 517 deletions(-) delete mode 100644 xfa/fwl/core/fwl_contentimp.cpp delete mode 100644 xfa/fwl/core/fwl_contentimp.h delete mode 100644 xfa/fwl/core/ifwl_content.h delete mode 100644 xfa/fwl/core/ifwl_custom.h delete mode 100644 xfa/fwl/core/ifwl_custompanel.h delete mode 100644 xfa/fwl/core/ifwl_proxy.h delete mode 100644 xfa/fwl/lightwidget/cfwl_app.cpp delete mode 100644 xfa/fwl/lightwidget/cfwl_app.h diff --git a/BUILD.gn b/BUILD.gn index 64f03e16c6..e27ce22992 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -42,9 +42,7 @@ config("pdfium_config") { } if (is_win) { - cflags += [ - "/wd4267", - ] + cflags += [ "/wd4267" ] } if (is_clang || is_posix) { @@ -1037,8 +1035,6 @@ if (pdf_enable_xfa) { "xfa/fwl/core/cfwl_widgetimpproperties.h", "xfa/fwl/core/fwl_appimp.cpp", "xfa/fwl/core/fwl_appimp.h", - "xfa/fwl/core/fwl_contentimp.cpp", - "xfa/fwl/core/fwl_contentimp.h", "xfa/fwl/core/fwl_error.h", "xfa/fwl/core/fwl_formimp.cpp", "xfa/fwl/core/fwl_formimp.h", @@ -1062,16 +1058,12 @@ if (pdf_enable_xfa) { "xfa/fwl/core/ifwl_adapterthreadmgr.h", "xfa/fwl/core/ifwl_adapterwidgetmgr.h", "xfa/fwl/core/ifwl_app.h", - "xfa/fwl/core/ifwl_content.h", - "xfa/fwl/core/ifwl_custom.h", - "xfa/fwl/core/ifwl_custompanel.h", "xfa/fwl/core/ifwl_dataprovider.h", "xfa/fwl/core/ifwl_form.h", "xfa/fwl/core/ifwl_notedriver.h", "xfa/fwl/core/ifwl_noteloop.h", "xfa/fwl/core/ifwl_notethread.h", "xfa/fwl/core/ifwl_panel.h", - "xfa/fwl/core/ifwl_proxy.h", "xfa/fwl/core/ifwl_target.h", "xfa/fwl/core/ifwl_themeprovider.h", "xfa/fwl/core/ifwl_thread.h", @@ -1082,8 +1074,6 @@ if (pdf_enable_xfa) { "xfa/fwl/core/ifwl_widgetmgr.h", "xfa/fwl/core/ifwl_widgetmgrdelegate.h", "xfa/fwl/core/include/ifwl_adaptertimermgr.h", - "xfa/fwl/lightwidget/cfwl_app.cpp", - "xfa/fwl/lightwidget/cfwl_app.h", "xfa/fwl/lightwidget/cfwl_barcode.cpp", "xfa/fwl/lightwidget/cfwl_barcode.h", "xfa/fwl/lightwidget/cfwl_checkbox.cpp", diff --git a/xfa.gyp b/xfa.gyp index a0de466975..8e050f7569 100644 --- a/xfa.gyp +++ b/xfa.gyp @@ -183,8 +183,6 @@ "xfa/fwl/core/cfwl_widgetimpproperties.h", "xfa/fwl/core/fwl_appimp.cpp", "xfa/fwl/core/fwl_appimp.h", - "xfa/fwl/core/fwl_contentimp.cpp", - "xfa/fwl/core/fwl_contentimp.h", "xfa/fwl/core/fwl_error.h", "xfa/fwl/core/fwl_formimp.cpp", "xfa/fwl/core/fwl_formimp.h", @@ -208,16 +206,12 @@ "xfa/fwl/core/ifwl_adapterthreadmgr.h", "xfa/fwl/core/ifwl_adapterwidgetmgr.h", "xfa/fwl/core/ifwl_app.h", - "xfa/fwl/core/ifwl_content.h", - "xfa/fwl/core/ifwl_custom.h", - "xfa/fwl/core/ifwl_custompanel.h", "xfa/fwl/core/ifwl_dataprovider.h", "xfa/fwl/core/ifwl_form.h", "xfa/fwl/core/ifwl_notedriver.h", "xfa/fwl/core/ifwl_noteloop.h", "xfa/fwl/core/ifwl_notethread.h", "xfa/fwl/core/ifwl_panel.h", - "xfa/fwl/core/ifwl_proxy.h", "xfa/fwl/core/ifwl_target.h", "xfa/fwl/core/ifwl_themeprovider.h", "xfa/fwl/core/ifwl_thread.h", @@ -228,8 +222,6 @@ "xfa/fwl/core/ifwl_widgetmgr.h", "xfa/fwl/core/ifwl_widgetmgrdelegate.h", "xfa/fwl/core/include/ifwl_adaptertimermgr.h", - "xfa/fwl/lightwidget/cfwl_app.cpp", - "xfa/fwl/lightwidget/cfwl_app.h", "xfa/fwl/lightwidget/cfwl_barcode.cpp", "xfa/fwl/lightwidget/cfwl_barcode.h", "xfa/fwl/lightwidget/cfwl_checkbox.cpp", diff --git a/xfa/fwl/core/fwl_contentimp.cpp b/xfa/fwl/core/fwl_contentimp.cpp deleted file mode 100644 index 5bfac08df4..0000000000 --- a/xfa/fwl/core/fwl_contentimp.cpp +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#include "xfa/fwl/core/fwl_contentimp.h" - -#include "xfa/fwl/core/fwl_noteimp.h" -#include "xfa/fwl/core/fwl_targetimp.h" -#include "xfa/fwl/core/fwl_threadimp.h" -#include "xfa/fwl/core/fwl_widgetimp.h" -#include "xfa/fwl/core/fwl_widgetmgrimp.h" -#include "xfa/fwl/core/ifwl_content.h" - -FWL_ERR IFWL_Content::InsertWidget(IFWL_Widget* pChild, int32_t nIndex) { - return static_cast(GetImpl())->InsertWidget(pChild, nIndex); -} -FWL_ERR IFWL_Content::RemoveWidget(IFWL_Widget* pWidget) { - return static_cast(GetImpl())->RemoveWidget(pWidget); -} -FWL_ERR IFWL_Content::RemoveAllWidgets() { - return static_cast(GetImpl())->RemoveAllWidgets(); -} -FWL_ERR IFWL_Content::GetMinSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight) { - return static_cast(GetImpl())->GetMinSize(fWidth, fHeight); -} -FWL_ERR IFWL_Content::SetMinSize(FX_FLOAT fWidth, FX_FLOAT fHeight) { - return static_cast(GetImpl())->SetMinSize(fWidth, fHeight); -} -FWL_ERR IFWL_Content::GetMaxSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight) { - return static_cast(GetImpl())->GetMaxSize(fWidth, fHeight); -} -FWL_ERR IFWL_Content::SetMaxSize(FX_FLOAT fWidth, FX_FLOAT fHeight) { - return static_cast(GetImpl())->SetMaxSize(fWidth, fHeight); -} -IFWL_Content::IFWL_Content() {} -CFWL_ContentImp::CFWL_ContentImp(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter) - : CFWL_WidgetImp(properties, pOuter), - m_fWidthMin(0), - m_fWidthMax(10000), - m_fHeightMin(0), - m_fHeightMax(10000) {} -CFWL_ContentImp::~CFWL_ContentImp() {} -FWL_ERR CFWL_ContentImp::InsertWidget(IFWL_Widget* pChild, int32_t nIndex) { - if (!pChild) - return FWL_ERR_Indefinite; - pChild->SetParent(m_pInterface); - if (nIndex == -1) { - return FWL_ERR_Succeeded; - } - CFWL_WidgetMgr* pMgr = static_cast(FWL_GetWidgetMgr()); - if (!pMgr) - return FWL_ERR_Indefinite; - pMgr->SetWidgetIndex(pChild, nIndex); - return FWL_ERR_Succeeded; -} -FWL_ERR CFWL_ContentImp::RemoveWidget(IFWL_Widget* pWidget) { - if (!pWidget) - return FWL_ERR_Indefinite; - pWidget->SetParent(NULL); - return FWL_ERR_Succeeded; -} -FWL_ERR CFWL_ContentImp::RemoveAllWidgets() { - CFWL_WidgetMgr* pMgr = static_cast(FWL_GetWidgetMgr()); - if (!pMgr) - return FWL_ERR_Indefinite; - while (IFWL_Widget* widget = - pMgr->GetWidget(m_pInterface, FWL_WGTRELATION_FirstChild)) { - pMgr->SetParent(NULL, widget); - } - return FWL_ERR_Succeeded; -} -FWL_ERR CFWL_ContentImp::GetMinSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight) { - fWidth = m_fWidthMin; - fHeight = m_fHeightMin; - return FWL_ERR_Succeeded; -} -FWL_ERR CFWL_ContentImp::SetMinSize(FX_FLOAT fWidth, FX_FLOAT fHeight) { - m_fWidthMin = fWidth; - m_fHeightMin = fHeight; - return FWL_ERR_Succeeded; -} -FWL_ERR CFWL_ContentImp::GetMaxSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight) { - fWidth = m_fWidthMax; - fHeight = m_fHeightMax; - return FWL_ERR_Succeeded; -} -FWL_ERR CFWL_ContentImp::SetMaxSize(FX_FLOAT fWidth, FX_FLOAT fHeight) { - m_fWidthMax = fWidth; - m_fHeightMax = fHeight; - return FWL_ERR_Succeeded; -} diff --git a/xfa/fwl/core/fwl_contentimp.h b/xfa/fwl/core/fwl_contentimp.h deleted file mode 100644 index b7a44d3a53..0000000000 --- a/xfa/fwl/core/fwl_contentimp.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef XFA_FWL_CORE_FWL_CONTENTIMP_H_ -#define XFA_FWL_CORE_FWL_CONTENTIMP_H_ - -#include "xfa/fwl/core/fwl_widgetimp.h" - -class IFWL_Widget; - -class CFWL_ContentImp : public CFWL_WidgetImp { - public: - CFWL_ContentImp(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter); - - virtual ~CFWL_ContentImp(); - virtual FWL_ERR InsertWidget(IFWL_Widget* pChild, int32_t nIndex = -1); - virtual FWL_ERR RemoveWidget(IFWL_Widget* pWidget); - virtual FWL_ERR RemoveAllWidgets(); - FWL_ERR GetMinSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight); - FWL_ERR SetMinSize(FX_FLOAT fWidth, FX_FLOAT fHeight); - FWL_ERR GetMaxSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight); - FWL_ERR SetMaxSize(FX_FLOAT fWidth, FX_FLOAT fHeight); - - protected: - FX_FLOAT m_fWidthMin; - FX_FLOAT m_fWidthMax; - FX_FLOAT m_fHeightMin; - FX_FLOAT m_fHeightMax; -}; - -#endif // XFA_FWL_CORE_FWL_CONTENTIMP_H_ diff --git a/xfa/fwl/core/fwl_formimp.cpp b/xfa/fwl/core/fwl_formimp.cpp index 27014d9d62..919f85f532 100644 --- a/xfa/fwl/core/fwl_formimp.cpp +++ b/xfa/fwl/core/fwl_formimp.cpp @@ -21,7 +21,6 @@ #include "xfa/fwl/core/fwl_widgetmgrimp.h" #include "xfa/fwl/core/ifwl_adapterwidgetmgr.h" #include "xfa/fwl/core/ifwl_app.h" -#include "xfa/fwl/core/ifwl_content.h" #include "xfa/fwl/core/ifwl_themeprovider.h" #define FWL_SYSBTNSIZE 21 @@ -127,9 +126,6 @@ FWL_ERR CFWL_FormImp::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) { FX_FLOAT fCXBorder = GetBorderSize(TRUE); FX_FLOAT fCYBorder = GetBorderSize(FALSE); FX_FLOAT fEdge = GetEdgeWidth(); - if (m_pContent) { - m_pContent->GetWidgetRect(rect, TRUE); - } rect.height += fCapHeight + fCYBorder + fEdge + fEdge; rect.width += fCXBorder + fCXBorder + fEdge + fEdge; } else { @@ -644,12 +640,6 @@ void CFWL_FormImp::Layout() { #ifndef FWL_UseMacSystemBorder ReSetSysBtn(); #endif - if (m_pContent) { - CFX_RectF rtClient; - GetClientRect(rtClient); - m_pContent->SetWidgetRect(rtClient); - m_pContent->Update(); - } } void CFWL_FormImp::ReSetSysBtn() { m_fCXBorder = diff --git a/xfa/fwl/core/fwl_panelimp.cpp b/xfa/fwl/core/fwl_panelimp.cpp index a3e304b810..29ff60634f 100644 --- a/xfa/fwl/core/fwl_panelimp.cpp +++ b/xfa/fwl/core/fwl_panelimp.cpp @@ -11,31 +11,13 @@ #include "xfa/fwl/core/fwl_targetimp.h" #include "xfa/fwl/core/fwl_widgetimp.h" #include "xfa/fwl/core/fwl_widgetmgrimp.h" -#include "xfa/fwl/core/ifwl_content.h" -#include "xfa/fwl/core/ifwl_custompanel.h" #include "xfa/fwl/core/ifwl_panel.h" -#include "xfa/fwl/core/ifwl_proxy.h" -// static -IFWL_Panel* IFWL_Panel::Create(CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter) { - IFWL_Panel* pPanel = new IFWL_Panel; - CFWL_PanelImp* pPanelImpl = new CFWL_PanelImp(properties, pOuter); - pPanel->SetImpl(pPanelImpl); - pPanelImpl->SetInterface(pPanel); - return pPanel; -} IFWL_Panel::IFWL_Panel() {} -IFWL_Content* IFWL_Panel::GetContent() { - return static_cast(GetImpl())->GetContent(); -} -FWL_ERR IFWL_Panel::SetContent(IFWL_Content* pContent) { - return static_cast(GetImpl())->SetContent(pContent); -} CFWL_PanelImp::CFWL_PanelImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter) - : CFWL_WidgetImp(properties, pOuter), m_pContent(nullptr) {} + : CFWL_WidgetImp(properties, pOuter) {} CFWL_PanelImp::~CFWL_PanelImp() {} FWL_ERR CFWL_PanelImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_Panel; @@ -45,103 +27,8 @@ uint32_t CFWL_PanelImp::GetClassID() const { return FWL_CLASSHASH_Panel; } FWL_ERR CFWL_PanelImp::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) { - if (bAutoSize) { - if (m_pContent) { - m_pContent->GetWidgetRect(rect, TRUE); - } - } else { + if (!bAutoSize) rect = m_pProperties->m_rtWidget; - } - return FWL_ERR_Succeeded; -} -FWL_ERR CFWL_PanelImp::Update() { - if (m_pContent) { - CFX_RectF rtClient; - GetClientRect(rtClient); - IFWL_WidgetMgr* pWidgetMgr = FWL_GetWidgetMgr(); - if (!pWidgetMgr) - return FWL_ERR_Indefinite; - m_pContent->SetWidgetRect(rtClient); - m_pContent->Update(); - } return FWL_ERR_Succeeded; } -IFWL_Content* CFWL_PanelImp::GetContent() { - return m_pContent; -} -FWL_ERR CFWL_PanelImp::SetContent(IFWL_Content* pContent) { - if (!pContent) - return FWL_ERR_Indefinite; - m_pContent = pContent; - return pContent->SetParent(m_pInterface); -} -class CFWL_CustomPanelImp : public CFWL_WidgetImp { - public: - CFWL_CustomPanelImp(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter); - virtual ~CFWL_CustomPanelImp(); - virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_ERR Update(); - virtual IFWL_Content* GetContent(); - virtual FWL_ERR SetContent(IFWL_Content* pContent); - FWL_ERR SetProxy(IFWL_Proxy* pProxy); - - protected: - IFWL_Content* m_pContent; - IFWL_Proxy* m_pProxy; -}; -CFWL_CustomPanelImp::CFWL_CustomPanelImp( - const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter) - : CFWL_WidgetImp(properties, pOuter), - m_pContent(nullptr), - m_pProxy(nullptr) {} -CFWL_CustomPanelImp::~CFWL_CustomPanelImp() {} -FWL_ERR CFWL_CustomPanelImp::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) { - if (bAutoSize && m_pProxy && - (m_pProxy->GetWidgetRect(rect, bAutoSize) == FWL_ERR_Succeeded)) { - return FWL_ERR_Succeeded; - } - return CFWL_WidgetImp::GetWidgetRect(rect, bAutoSize); -} -FWL_ERR CFWL_CustomPanelImp::Update() { - if (m_pProxy) { - return m_pProxy->Update(); - } - return CFWL_WidgetImp::Update(); -} -IFWL_Content* CFWL_CustomPanelImp::GetContent() { - return m_pContent; -} -FWL_ERR CFWL_CustomPanelImp::SetContent(IFWL_Content* pContent) { - if (!pContent) - return FWL_ERR_Indefinite; - m_pContent = pContent; - return pContent->SetParent(m_pInterface); -} -FWL_ERR CFWL_CustomPanelImp::SetProxy(IFWL_Proxy* pProxy) { - m_pProxy = pProxy; - return FWL_ERR_Succeeded; -} - -// statuc -IFWL_CustomPanel* IFWL_CustomPanel::Create(CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter) { - IFWL_CustomPanel* pCustomPanel = new IFWL_CustomPanel; - CFWL_CustomPanelImp* pCustomPanelImpl = - new CFWL_CustomPanelImp(properties, pOuter); - pCustomPanel->SetImpl(pCustomPanelImpl); - pCustomPanelImpl->SetInterface(pCustomPanel); - return pCustomPanel; -} -IFWL_CustomPanel::IFWL_CustomPanel() {} -IFWL_Content* IFWL_CustomPanel::GetContent() { - return static_cast(GetImpl())->GetContent(); -} -FWL_ERR IFWL_CustomPanel::SetContent(IFWL_Content* pContent) { - return static_cast(GetImpl())->SetContent(pContent); -} -FWL_ERR IFWL_CustomPanel::SetProxy(IFWL_Proxy* pProxy) { - return static_cast(GetImpl())->SetProxy(pProxy); -} diff --git a/xfa/fwl/core/fwl_panelimp.h b/xfa/fwl/core/fwl_panelimp.h index 81e74c189b..34e236da1a 100644 --- a/xfa/fwl/core/fwl_panelimp.h +++ b/xfa/fwl/core/fwl_panelimp.h @@ -18,15 +18,10 @@ class CFWL_PanelImp : public CFWL_WidgetImp { CFWL_PanelImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); virtual ~CFWL_PanelImp(); + virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; virtual uint32_t GetClassID() const; virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_ERR Update(); - virtual IFWL_Content* GetContent(); - virtual FWL_ERR SetContent(IFWL_Content* pContent); - - protected: - IFWL_Content* m_pContent; }; #endif // XFA_FWL_CORE_FWL_PANELIMP_H_ diff --git a/xfa/fwl/core/fwl_widgetimp.cpp b/xfa/fwl/core/fwl_widgetimp.cpp index 19b2f2430a..0f895eb5d2 100644 --- a/xfa/fwl/core/fwl_widgetimp.cpp +++ b/xfa/fwl/core/fwl_widgetimp.cpp @@ -24,10 +24,7 @@ #include "xfa/fwl/core/ifwl_adapterthreadmgr.h" #include "xfa/fwl/core/ifwl_adapterwidgetmgr.h" #include "xfa/fwl/core/ifwl_app.h" -#include "xfa/fwl/core/ifwl_content.h" -#include "xfa/fwl/core/ifwl_custom.h" #include "xfa/fwl/core/ifwl_form.h" -#include "xfa/fwl/core/ifwl_proxy.h" #include "xfa/fwl/core/ifwl_themeprovider.h" #define FWL_CLASSHASH_Menu 3957949655 @@ -170,17 +167,9 @@ FWL_ERR CFWL_WidgetImp::Initialize() { } FWL_ERR CFWL_WidgetImp::Finalize() { NotifyDriver(); - IFWL_Form* pForm = static_cast( - FWL_GetWidgetMgr()->GetWidget(m_pInterface, FWL_WGTRELATION_SystemForm)); - if (pForm && pForm != m_pInterface) { - IFWL_Content* pContent = pForm->GetContent(); - if (pContent) { - pContent->RemoveWidget(m_pInterface); - } - } - if (!IsChild()) { + if (!IsChild()) m_pWidgetMgr->DestroyWidget_Native(m_pInterface); - } + m_pWidgetMgr->RemoveWidget(m_pInterface); return FWL_ERR_Succeeded; } @@ -1040,48 +1029,3 @@ FWL_ERR CFWL_WidgetImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics, evt.m_pGraphics = pGraphics; return FWL_ERR_Succeeded; } -class CFWL_CustomImp : public CFWL_WidgetImp { - public: - CFWL_CustomImp(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter); - virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_ERR Update(); - virtual FWL_ERR SetProxy(IFWL_Proxy* pProxy); - - protected: - IFWL_Proxy* m_pProxy; -}; -CFWL_CustomImp::CFWL_CustomImp(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter) - : CFWL_WidgetImp(properties, pOuter), m_pProxy(NULL) {} -FWL_ERR CFWL_CustomImp::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) { - if (m_pProxy && - (m_pProxy->GetWidgetRect(rect, bAutoSize) == FWL_ERR_Succeeded)) { - return FWL_ERR_Succeeded; - } - return CFWL_WidgetImp::GetWidgetRect(rect, bAutoSize); -} -FWL_ERR CFWL_CustomImp::Update() { - if (m_pProxy) { - return m_pProxy->Update(); - } - return CFWL_WidgetImp::Update(); -} -FWL_ERR CFWL_CustomImp::SetProxy(IFWL_Proxy* pProxy) { - m_pProxy = pProxy; - return FWL_ERR_Succeeded; -} - -// static -IFWL_Custom* IFWL_Custom::Create(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter) { - IFWL_Custom* pCustom = new IFWL_Custom; - CFWL_CustomImp* pCustomImpl = new CFWL_CustomImp(properties, pOuter); - pCustom->SetImpl(pCustomImpl); - pCustomImpl->SetInterface(pCustom); - return pCustom; -} -IFWL_Custom::IFWL_Custom() {} -FWL_ERR IFWL_Custom::SetProxy(IFWL_Proxy* pProxy) { - return static_cast(GetImpl())->SetProxy(pProxy); -} diff --git a/xfa/fwl/core/ifwl_content.h b/xfa/fwl/core/ifwl_content.h deleted file mode 100644 index 76292a609c..0000000000 --- a/xfa/fwl/core/ifwl_content.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef XFA_FWL_CORE_IFWL_CONTENT_H_ -#define XFA_FWL_CORE_IFWL_CONTENT_H_ - -#include "xfa/fwl/core/fwl_widgetimp.h" -#include "xfa/fwl/core/ifwl_widget.h" -#include "core/fxcrt/include/fx_system.h" -#include "xfa/fwl/core/fwl_error.h" - -class IFWL_Content : public IFWL_Widget { - public: - static IFWL_Content* Create(); - FWL_ERR InsertWidget(IFWL_Widget* pChild, int32_t nIndex = -1); - FWL_ERR RemoveWidget(IFWL_Widget* pWidget); - FWL_ERR RemoveAllWidgets(); - FWL_ERR GetMinSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight); - FWL_ERR SetMinSize(FX_FLOAT fWidth, FX_FLOAT fHeight); - FWL_ERR GetMaxSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight); - FWL_ERR SetMaxSize(FX_FLOAT fWidth, FX_FLOAT fHeight); - - protected: - IFWL_Content(); -}; - -#endif // XFA_FWL_CORE_IFWL_CONTENT_H_ diff --git a/xfa/fwl/core/ifwl_custom.h b/xfa/fwl/core/ifwl_custom.h deleted file mode 100644 index d7f1b40923..0000000000 --- a/xfa/fwl/core/ifwl_custom.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef XFA_FWL_CORE_IFWL_CUSTOM_H_ -#define XFA_FWL_CORE_IFWL_CUSTOM_H_ - -#include "xfa/fwl/core/fwl_error.h" -#include "xfa/fwl/core/ifwl_widget.h" - -class IFWL_Proxy; - -class IFWL_Custom : public IFWL_Widget { - public: - static IFWL_Custom* Create(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter); - - FWL_ERR SetProxy(IFWL_Proxy* pProxy); - - protected: - IFWL_Custom(); -}; - -#endif // XFA_FWL_CORE_IFWL_CUSTOM_H_ diff --git a/xfa/fwl/core/ifwl_custompanel.h b/xfa/fwl/core/ifwl_custompanel.h deleted file mode 100644 index 3491227af0..0000000000 --- a/xfa/fwl/core/ifwl_custompanel.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef XFA_FWL_CORE_IFWL_CUSTOMPANEL_H_ -#define XFA_FWL_CORE_IFWL_CUSTOMPANEL_H_ - -#include "xfa/fwl/core/fwl_widgetimp.h" -#include "xfa/fwl/core/ifwl_widget.h" - -class IFWL_Proxy; - -class IFWL_CustomPanel : public IFWL_Widget { - public: - static IFWL_CustomPanel* Create(CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter); - - IFWL_Content* GetContent(); - FWL_ERR SetContent(IFWL_Content* pContent); - FWL_ERR SetProxy(IFWL_Proxy* pProxy); - - protected: - IFWL_CustomPanel(); -}; - -#endif // XFA_FWL_CORE_IFWL_CUSTOMPANEL_H_ diff --git a/xfa/fwl/core/ifwl_panel.h b/xfa/fwl/core/ifwl_panel.h index ec9b02d3f7..2261703b94 100644 --- a/xfa/fwl/core/ifwl_panel.h +++ b/xfa/fwl/core/ifwl_panel.h @@ -10,19 +10,10 @@ #include "xfa/fwl/core/fwl_widgetimp.h" #include "xfa/fwl/core/ifwl_widget.h" -class IFWL_Content; - #define FWL_CLASS_Panel L"FWL_Panel" #define FWL_CLASSHASH_Panel 881567292 class IFWL_Panel : public IFWL_Widget { - public: - static IFWL_Panel* Create(CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter); - - IFWL_Content* GetContent(); - FWL_ERR SetContent(IFWL_Content* pContent); - protected: IFWL_Panel(); }; diff --git a/xfa/fwl/core/ifwl_proxy.h b/xfa/fwl/core/ifwl_proxy.h deleted file mode 100644 index 80393c5382..0000000000 --- a/xfa/fwl/core/ifwl_proxy.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef XFA_FWL_CORE_IFWL_PROXY_H_ -#define XFA_FWL_CORE_IFWL_PROXY_H_ - -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_system.h" -#include "xfa/fwl/core/fwl_error.h" - -class IFWL_Proxy { - public: - virtual ~IFWL_Proxy() {} - virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) = 0; - virtual FWL_ERR Update() = 0; -}; - -#endif // XFA_FWL_CORE_IFWL_PROXY_H_ diff --git a/xfa/fwl/lightwidget/cfwl_app.cpp b/xfa/fwl/lightwidget/cfwl_app.cpp deleted file mode 100644 index c09e5c0a26..0000000000 --- a/xfa/fwl/lightwidget/cfwl_app.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#include "xfa/fwl/lightwidget/cfwl_app.h" - -#include "core/fxcrt/include/fx_coordinates.h" -#include "xfa/fwl/core/fwl_error.h" -#include "xfa/fwl/core/ifwl_app.h" -#include "xfa/fwl/lightwidget/cfwl_theme.h" - -CFWL_App::CFWL_App() : m_pIface(IFWL_App::Create(nullptr)), m_pTheme(nullptr) {} - -CFWL_App::~CFWL_App() { - if (m_pTheme) { - m_pTheme->Finalize(); - delete m_pTheme; - } - m_pIface->Release(); -} - -FWL_ERR CFWL_App::Initialize() { - m_pTheme = new CFWL_Theme; - m_pTheme->Initialize(); - m_pIface->SetThemeProvider(m_pTheme); - return m_pIface->Initialize(); -} - -FWL_ERR CFWL_App::Exit(int32_t iExitCode) { - if (!m_pIface) - return FWL_ERR_Indefinite; - return m_pIface->Exit(iExitCode); -} diff --git a/xfa/fwl/lightwidget/cfwl_app.h b/xfa/fwl/lightwidget/cfwl_app.h deleted file mode 100644 index 24cbd5abb4..0000000000 --- a/xfa/fwl/lightwidget/cfwl_app.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef XFA_FWL_LIGHTWIDGET_CFWL_APP_H_ -#define XFA_FWL_LIGHTWIDGET_CFWL_APP_H_ - -#include "xfa/fwl/core/fwl_error.h" - -class CFWL_Theme; -class IFWL_App; - -class CFWL_App { - public: - CFWL_App(); - virtual ~CFWL_App(); - - FWL_ERR Initialize(); - FWL_ERR Exit(int32_t iExitCode); - - CFWL_Theme* GetTheme() const { return m_pTheme; } - IFWL_App* GetInterface() const { return m_pIface; } - - private: - IFWL_App* m_pIface; - CFWL_Theme* m_pTheme; -}; - -#endif // XFA_FWL_LIGHTWIDGET_CFWL_APP_H_ -- cgit v1.2.3