diff options
author | dsinclair <dsinclair@chromium.org> | 2016-11-23 16:17:20 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-11-23 16:17:21 -0800 |
commit | 2c489cc41023a40648dfde988d11b8ec2b66c7d0 (patch) | |
tree | 78255c80c547a5954ed5778f1a809d3166a5f3e2 /xfa/fwl/core/cfwl_form.cpp | |
parent | 0ce11eef157b791c661d7e82e1c5641605b9f03d (diff) | |
download | pdfium-2c489cc41023a40648dfde988d11b8ec2b66c7d0.tar.xz |
Merge IFWL and CFWL classes.
This CL merges the IFWL hierarchy into the CFWL hierachy. All CFWL proxy methods
have been replaced by the IFWL implementations.
Review-Url: https://codereview.chromium.org/2524173002
Diffstat (limited to 'xfa/fwl/core/cfwl_form.cpp')
-rw-r--r-- | xfa/fwl/core/cfwl_form.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fwl/core/cfwl_form.cpp b/xfa/fwl/core/cfwl_form.cpp index d2fe14993e..4eec163900 100644 --- a/xfa/fwl/core/cfwl_form.cpp +++ b/xfa/fwl/core/cfwl_form.cpp @@ -40,8 +40,8 @@ const uint8_t kCornerEnlarge = 10; CFWL_Form::CFWL_Form(const CFWL_App* app, std::unique_ptr<CFWL_WidgetProperties> properties, - IFWL_Widget* pOuter) - : IFWL_Widget(app, std::move(properties), pOuter), + CFWL_Widget* pOuter) + : CFWL_Widget(app, std::move(properties), pOuter), #if (_FX_OS_ == _FX_MACOSX_) m_bMouseIn(false), #endif @@ -77,7 +77,7 @@ FWL_Type CFWL_Form::GetClassID() const { bool CFWL_Form::IsInstance(const CFX_WideStringC& wsClass) const { if (wsClass == CFX_WideStringC(FWL_CLASS_Form)) return true; - return IFWL_Widget::IsInstance(wsClass); + return CFWL_Widget::IsInstance(wsClass); } void CFWL_Form::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) { @@ -267,7 +267,7 @@ void CFWL_Form::DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) { #endif } -IFWL_Widget* CFWL_Form::DoModal() { +CFWL_Widget* CFWL_Form::DoModal() { const CFWL_App* pApp = GetOwnerApp(); if (!pApp) return nullptr; |