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/theme/cfwl_widgettp.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/theme/cfwl_widgettp.cpp')
| -rw-r--r-- | xfa/fwl/theme/cfwl_widgettp.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp index 3f294aab30..d578435d8a 100644 --- a/xfa/fwl/theme/cfwl_widgettp.cpp +++ b/xfa/fwl/theme/cfwl_widgettp.cpp @@ -15,9 +15,9 @@ #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_themepart.h" #include "xfa/fwl/core/cfwl_themetext.h" +#include "xfa/fwl/core/cfwl_widget.h" #include "xfa/fwl/core/cfwl_widgetmgr.h" #include "xfa/fwl/core/ifwl_themeprovider.h" -#include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fwl/theme/cfwl_arrowdata.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" @@ -37,7 +37,7 @@ const float kCYBorder = 1.0f; } // namespace -bool CFWL_WidgetTP::IsValidWidget(IFWL_Widget* pWidget) { +bool CFWL_WidgetTP::IsValidWidget(CFWL_Widget* pWidget) { return false; } @@ -136,7 +136,7 @@ void CFWL_WidgetTP::Finalize() { CFWL_WidgetTP::~CFWL_WidgetTP() {} -void CFWL_WidgetTP::SetFont(IFWL_Widget* pWidget, +void CFWL_WidgetTP::SetFont(CFWL_Widget* pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont) { @@ -149,7 +149,7 @@ void CFWL_WidgetTP::SetFont(IFWL_Widget* pWidget, m_pTextOut->SetTextColor(rgbFont); } -void CFWL_WidgetTP::SetFont(IFWL_Widget* pWidget, +void CFWL_WidgetTP::SetFont(CFWL_Widget* pWidget, CFGAS_GEFont* pFont, FX_FLOAT fFontSize, FX_ARGB rgbFont) { @@ -161,7 +161,7 @@ void CFWL_WidgetTP::SetFont(IFWL_Widget* pWidget, m_pTextOut->SetTextColor(rgbFont); } -CFGAS_GEFont* CFWL_WidgetTP::GetFont(IFWL_Widget* pWidget) { +CFGAS_GEFont* CFWL_WidgetTP::GetFont(CFWL_Widget* pWidget) { return m_pFDEFont; } |