diff options
author | dsinclair <dsinclair@chromium.org> | 2016-05-05 10:28:02 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-05 10:28:03 -0700 |
commit | b4d40ffae3f955fab2fac838430c89aca452c45f (patch) | |
tree | 046c0a461e9dc0dc295da5839b831e4b53526541 /xfa/fwl/basewidget/fwl_editimp.cpp | |
parent | 439bb9e0b2f72cd1ede65b84130fe9ed573f74b0 (diff) | |
download | pdfium-b4d40ffae3f955fab2fac838430c89aca452c45f.tar.xz |
Remove CLASSHASH defines in favour of an enum class.
This Cl updates all the CLASSHASH defines to use an enum class. A few defines
where unabled and were either updated or removed if the number no longer exists
in the code base.
Review-Url: https://codereview.chromium.org/1946213003
Diffstat (limited to 'xfa/fwl/basewidget/fwl_editimp.cpp')
-rw-r--r-- | xfa/fwl/basewidget/fwl_editimp.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp index 563519a475..e47fb1b739 100644 --- a/xfa/fwl/basewidget/fwl_editimp.cpp +++ b/xfa/fwl/basewidget/fwl_editimp.cpp @@ -222,6 +222,7 @@ CFWL_EditImp::CFWL_EditImp(const CFWL_WidgetImpProperties& properties, m_rtEngine.Reset(); m_rtStatic.Reset(); } + CFWL_EditImp::~CFWL_EditImp() { if (m_pEdtEngine) { m_pEdtEngine->Release(); @@ -229,25 +230,29 @@ CFWL_EditImp::~CFWL_EditImp() { } ClearRecord(); } + FWL_Error CFWL_EditImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_Edit; return FWL_Error::Succeeded; } -uint32_t CFWL_EditImp::GetClassID() const { - return FWL_CLASSHASH_Edit; + +FWL_Type CFWL_EditImp::GetClassID() const { + return FWL_Type::Edit; } + FWL_Error CFWL_EditImp::Initialize() { if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded) return FWL_Error::Indefinite; - if (!m_pDelegate) { + if (!m_pDelegate) m_pDelegate = new CFWL_EditImpDelegate(this); - } + InitCaret(); - if (!m_pEdtEngine) { + if (!m_pEdtEngine) InitEngine(); - } + return FWL_Error::Succeeded; } + FWL_Error CFWL_EditImp::Finalize() { if (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) { ShowCaret(FALSE); @@ -1507,7 +1512,7 @@ void CFWL_EditImp::Layout() { m_rtEngine.Deflate(pUIMargin->left, pUIMargin->top, pUIMargin->width, pUIMargin->height); } - } else if (m_pOuter->GetClassID() == FWL_CLASSHASH_DateTimePicker) { + } else if (m_pOuter->GetClassID() == FWL_Type::DateTimePicker) { CFWL_ThemePart part; part.m_pWidget = m_pOuter; CFX_RectF* pUIMargin = |