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/fxfa/app/xfa_fwltheme.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/fxfa/app/xfa_fwltheme.cpp')
| -rw-r--r-- | xfa/fxfa/app/xfa_fwltheme.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/xfa/fxfa/app/xfa_fwltheme.cpp b/xfa/fxfa/app/xfa_fwltheme.cpp index 782038a741..0222ddd7f7 100644 --- a/xfa/fxfa/app/xfa_fwltheme.cpp +++ b/xfa/fxfa/app/xfa_fwltheme.cpp @@ -9,19 +9,19 @@ #include "xfa/fde/tto/fde_textout.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fgas/font/cfgas_gefont.h" +#include "xfa/fwl/core/cfwl_barcode.h" #include "xfa/fwl/core/cfwl_caret.h" +#include "xfa/fwl/core/cfwl_checkbox.h" +#include "xfa/fwl/core/cfwl_combobox.h" +#include "xfa/fwl/core/cfwl_datetimepicker.h" +#include "xfa/fwl/core/cfwl_edit.h" +#include "xfa/fwl/core/cfwl_listbox.h" #include "xfa/fwl/core/cfwl_monthcalendar.h" +#include "xfa/fwl/core/cfwl_picturebox.h" +#include "xfa/fwl/core/cfwl_pushbutton.h" #include "xfa/fwl/core/cfwl_scrollbar.h" #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_themetext.h" -#include "xfa/fwl/core/ifwl_barcode.h" -#include "xfa/fwl/core/ifwl_checkbox.h" -#include "xfa/fwl/core/ifwl_combobox.h" -#include "xfa/fwl/core/ifwl_datetimepicker.h" -#include "xfa/fwl/core/ifwl_edit.h" -#include "xfa/fwl/core/ifwl_listbox.h" -#include "xfa/fwl/core/ifwl_picturebox.h" -#include "xfa/fwl/core/ifwl_pushbutton.h" #include "xfa/fxfa/xfa_ffapp.h" #include "xfa/fxfa/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_color.h" @@ -34,8 +34,8 @@ const FX_WCHAR* const g_FWLTheme_CalFonts[] = { } // namespace -CXFA_FFWidget* XFA_ThemeGetOuterWidget(IFWL_Widget* pWidget) { - IFWL_Widget* pOuter = pWidget; +CXFA_FFWidget* XFA_ThemeGetOuterWidget(CFWL_Widget* pWidget) { + CFWL_Widget* pOuter = pWidget; while (pOuter && pOuter->GetOuter()) pOuter = pOuter->GetOuter(); @@ -342,7 +342,7 @@ void CXFA_FWLTheme::CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) { pParams->m_wsText.GetLength(), rect); } -CFWL_WidgetTP* CXFA_FWLTheme::GetTheme(IFWL_Widget* pWidget) { +CFWL_WidgetTP* CXFA_FWLTheme::GetTheme(CFWL_Widget* pWidget) { switch (pWidget->GetClassID()) { case FWL_Type::CheckBox: return m_pCheckBoxTP.get(); |