diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-04-28 10:51:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-28 10:51:13 -0700 |
| commit | 7322343b9322b93d97077575f95a00dcca3f0451 (patch) | |
| tree | 36337e0a2aff2147a9067477f982496129f0f7a1 /xfa/fxfa/app/xfa_ffpushbutton.cpp | |
| parent | e6ebf7af7ea94d48091be300cec84b499d3b8ae0 (diff) | |
| download | pdfium-7322343b9322b93d97077575f95a00dcca3f0451.tar.xz | |
More FWL interface cleanup.
This CL merges the IFWL_Target class into IFWL_Widget and IFWL_Thread into
IFWL_App. The IFWL_WidgetMgrDelegate, IFWL_NoteDriver and IFWL_NotThread are
removed in favour of their concrete classes.
Review-Url: https://codereview.chromium.org/1921853006
Diffstat (limited to 'xfa/fxfa/app/xfa_ffpushbutton.cpp')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffpushbutton.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fxfa/app/xfa_ffpushbutton.cpp b/xfa/fxfa/app/xfa_ffpushbutton.cpp index 6136fd3ce8..3893bc29fb 100644 --- a/xfa/fxfa/app/xfa_ffpushbutton.cpp +++ b/xfa/fxfa/app/xfa_ffpushbutton.cpp @@ -6,8 +6,8 @@ #include "xfa/fxfa/app/xfa_ffpushbutton.h" -#include "xfa/fwl/core/ifwl_notedriver.h" -#include "xfa/fwl/core/ifwl_widgetmgrdelegate.h" +#include "xfa/fwl/core/fwl_noteimp.h" +#include "xfa/fwl/core/fwl_widgetmgrimp.h" #include "xfa/fwl/lightwidget/cfwl_pushbutton.h" #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_ffwidgetacc.h" @@ -52,7 +52,7 @@ void CXFA_FFPushButton::RenderWidget(CFX_Graphics* pGS, pGS, &mt); } FX_BOOL CXFA_FFPushButton::LoadWidget() { - ASSERT(m_pNormalWidget == NULL); + ASSERT(!m_pNormalWidget); CFWL_PushButton* pPushButton = CFWL_PushButton::Create(); if (pPushButton) { pPushButton->Initialize(); @@ -61,7 +61,7 @@ FX_BOOL CXFA_FFPushButton::LoadWidget() { m_pNormalWidget = (CFWL_Widget*)pPushButton; IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); m_pNormalWidget->SetPrivateData(pWidget, this, NULL); - IFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); + CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); m_pNormalWidget->LockUpdate(); UpdateWidgetProperty(); |