Index: xfa/fwl/lightwidget/cfwl_combobox.cpp |
diff --git a/xfa/fwl/lightwidget/cfwl_combobox.cpp b/xfa/fwl/lightwidget/cfwl_combobox.cpp |
index 01b64dcd0719affc08b03ecd1026e346823a193b..3bae9ff04752da4fbe537f2fbf40f52e01c886d7 100644 |
--- a/xfa/fwl/lightwidget/cfwl_combobox.cpp |
+++ b/xfa/fwl/lightwidget/cfwl_combobox.cpp |
@@ -11,6 +11,14 @@ |
#include "xfa/fwl/core/fwl_error.h" |
#include "xfa/fwl/core/ifwl_widget.h" |
+IFWL_ComboBox* CFWL_ComboBox::GetWidget() { |
+ return static_cast<IFWL_ComboBox*>(m_pIface.get()); |
+} |
+ |
+const IFWL_ComboBox* CFWL_ComboBox::GetWidget() const { |
+ return static_cast<IFWL_ComboBox*>(m_pIface.get()); |
+} |
+ |
CFWL_ComboBox* CFWL_ComboBox::Create() { |
return new CFWL_ComboBox; |
} |
@@ -27,7 +35,7 @@ FWL_Error CFWL_ComboBox::Initialize(const CFWL_WidgetProperties* pProperties) { |
if (ret != FWL_Error::Succeeded) { |
return ret; |
} |
- m_pIface = pComboBox.release(); |
+ m_pIface = std::move(pComboBox); |
CFWL_Widget::Initialize(); |
return FWL_Error::Succeeded; |
} |
@@ -69,8 +77,8 @@ int32_t CFWL_ComboBox::CountItems() { |
FWL_Error CFWL_ComboBox::GetTextByIndex(int32_t iIndex, |
CFX_WideString& wsText) { |
- CFWL_ComboBoxItem* pItem = |
- static_cast<CFWL_ComboBoxItem*>(m_comboBoxData.GetItem(m_pIface, iIndex)); |
+ CFWL_ComboBoxItem* pItem = static_cast<CFWL_ComboBoxItem*>( |
+ m_comboBoxData.GetItem(m_pIface.get(), iIndex)); |
if (!pItem) |
return FWL_Error::Indefinite; |
wsText = pItem->m_wsText; |
@@ -78,78 +86,77 @@ FWL_Error CFWL_ComboBox::GetTextByIndex(int32_t iIndex, |
} |
int32_t CFWL_ComboBox::GetCurSel() { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return -1; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->GetCurSel(); |
+ return GetWidget()->GetCurSel(); |
} |
FWL_Error CFWL_ComboBox::SetCurSel(int32_t iSel) { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FWL_Error::Indefinite; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->SetCurSel(iSel); |
+ return GetWidget()->SetCurSel(iSel); |
} |
FWL_Error CFWL_ComboBox::SetEditText(const CFX_WideString& wsText) { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FWL_Error::Indefinite; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->SetEditText(wsText); |
+ return GetWidget()->SetEditText(wsText); |
} |
int32_t CFWL_ComboBox::GetEditTextLength() const { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return 0; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->GetEditTextLength(); |
+ return GetWidget()->GetEditTextLength(); |
} |
FWL_Error CFWL_ComboBox::GetEditText(CFX_WideString& wsText, |
int32_t nStart, |
int32_t nCount) const { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FWL_Error::Indefinite; |
- return static_cast<IFWL_ComboBox*>(m_pIface) |
- ->GetEditText(wsText, nStart, nCount); |
+ return GetWidget()->GetEditText(wsText, nStart, nCount); |
} |
FWL_Error CFWL_ComboBox::SetEditSelRange(int32_t nStart, int32_t nCount) { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FWL_Error::Indefinite; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->SetEditSelRange(nStart, nCount); |
+ return GetWidget()->SetEditSelRange(nStart, nCount); |
} |
int32_t CFWL_ComboBox::GetEditSelRange(int32_t nIndex, int32_t& nStart) { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return 0; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->GetEditSelRange(nIndex, nStart); |
+ return GetWidget()->GetEditSelRange(nIndex, nStart); |
} |
int32_t CFWL_ComboBox::GetEditLimit() { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return 0; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->GetEditLimit(); |
+ return GetWidget()->GetEditLimit(); |
} |
FWL_Error CFWL_ComboBox::SetEditLimit(int32_t nLimit) { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FWL_Error::Indefinite; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->SetEditLimit(nLimit); |
+ return GetWidget()->SetEditLimit(nLimit); |
} |
FWL_Error CFWL_ComboBox::EditDoClipboard(int32_t iCmd) { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FWL_Error::Indefinite; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditDoClipboard(iCmd); |
+ return GetWidget()->EditDoClipboard(iCmd); |
} |
FX_BOOL CFWL_ComboBox::EditRedo(const IFDE_TxtEdtDoRecord* pRecord) { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditRedo(pRecord); |
+ return GetWidget()->EditRedo(pRecord); |
} |
FX_BOOL CFWL_ComboBox::EditUndo(const IFDE_TxtEdtDoRecord* pRecord) { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditUndo(pRecord); |
+ return GetWidget()->EditUndo(pRecord); |
} |
FWL_Error CFWL_ComboBox::SetMaxListHeight(FX_FLOAT fMaxHeight) { |
@@ -158,8 +165,8 @@ FWL_Error CFWL_ComboBox::SetMaxListHeight(FX_FLOAT fMaxHeight) { |
} |
FWL_Error CFWL_ComboBox::SetItemData(int32_t iIndex, void* pData) { |
- CFWL_ComboBoxItem* pItem = |
- static_cast<CFWL_ComboBoxItem*>(m_comboBoxData.GetItem(m_pIface, iIndex)); |
+ CFWL_ComboBoxItem* pItem = static_cast<CFWL_ComboBoxItem*>( |
+ m_comboBoxData.GetItem(m_pIface.get(), iIndex)); |
if (!pItem) |
return FWL_Error::Indefinite; |
pItem->m_pData = pData; |
@@ -167,114 +174,112 @@ FWL_Error CFWL_ComboBox::SetItemData(int32_t iIndex, void* pData) { |
} |
void* CFWL_ComboBox::GetItemData(int32_t iIndex) { |
- CFWL_ComboBoxItem* pItem = |
- static_cast<CFWL_ComboBoxItem*>(m_comboBoxData.GetItem(m_pIface, iIndex)); |
+ CFWL_ComboBoxItem* pItem = static_cast<CFWL_ComboBoxItem*>( |
+ m_comboBoxData.GetItem(m_pIface.get(), iIndex)); |
return pItem ? pItem->m_pData : nullptr; |
} |
FWL_Error CFWL_ComboBox::SetListTheme(IFWL_ThemeProvider* pTheme) { |
- return static_cast<IFWL_ComboBox*>(m_pIface)->GetListBoxt()->SetThemeProvider( |
- pTheme); |
+ return GetWidget()->GetListBoxt()->SetThemeProvider(pTheme); |
} |
FX_BOOL CFWL_ComboBox::AfterFocusShowDropList() { |
- return static_cast<IFWL_ComboBox*>(m_pIface)->AfterFocusShowDropList(); |
+ return GetWidget()->AfterFocusShowDropList(); |
} |
FWL_Error CFWL_ComboBox::OpenDropDownList(FX_BOOL bActivate) { |
- return static_cast<IFWL_ComboBox*>(m_pIface)->OpenDropDownList(bActivate); |
+ return GetWidget()->OpenDropDownList(bActivate); |
} |
FX_BOOL CFWL_ComboBox::EditCanUndo() { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditCanUndo(); |
+ return GetWidget()->EditCanUndo(); |
} |
FX_BOOL CFWL_ComboBox::EditCanRedo() { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditCanRedo(); |
+ return GetWidget()->EditCanRedo(); |
} |
FX_BOOL CFWL_ComboBox::EditUndo() { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditUndo(); |
+ return GetWidget()->EditUndo(); |
} |
FX_BOOL CFWL_ComboBox::EditRedo() { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditRedo(); |
+ return GetWidget()->EditRedo(); |
} |
FX_BOOL CFWL_ComboBox::EditCanCopy() { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditCanCopy(); |
+ return GetWidget()->EditCanCopy(); |
} |
FX_BOOL CFWL_ComboBox::EditCanCut() { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditCanCut(); |
+ return GetWidget()->EditCanCut(); |
} |
FX_BOOL CFWL_ComboBox::EditCanSelectAll() { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditCanSelectAll(); |
+ return GetWidget()->EditCanSelectAll(); |
} |
FX_BOOL CFWL_ComboBox::EditCopy(CFX_WideString& wsCopy) { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditCopy(wsCopy); |
+ return GetWidget()->EditCopy(wsCopy); |
} |
FX_BOOL CFWL_ComboBox::EditCut(CFX_WideString& wsCut) { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditCut(wsCut); |
+ return GetWidget()->EditCut(wsCut); |
} |
FX_BOOL CFWL_ComboBox::EditPaste(const CFX_WideString& wsPaste) { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditPaste(wsPaste); |
+ return GetWidget()->EditPaste(wsPaste); |
} |
FX_BOOL CFWL_ComboBox::EditSelectAll() { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditSelectAll(); |
+ return GetWidget()->EditSelectAll(); |
} |
FX_BOOL CFWL_ComboBox::EditDelete() { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditDelete(); |
+ return GetWidget()->EditDelete(); |
} |
FX_BOOL CFWL_ComboBox::EditDeSelect() { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FALSE; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->EditDeSelect(); |
+ return GetWidget()->EditDeSelect(); |
} |
FWL_Error CFWL_ComboBox::GetBBox(CFX_RectF& rect) { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FWL_Error::Indefinite; |
- return static_cast<IFWL_ComboBox*>(m_pIface)->GetBBox(rect); |
+ return GetWidget()->GetBBox(rect); |
} |
FWL_Error CFWL_ComboBox::EditModifyStylesEx(uint32_t dwStylesExAdded, |
uint32_t dwStylesExRemoved) { |
- if (!m_pIface) |
+ if (!GetWidget()) |
return FWL_Error::Indefinite; |
- return static_cast<IFWL_ComboBox*>(m_pIface) |
- ->EditModifyStylesEx(dwStylesExAdded, dwStylesExRemoved); |
+ return GetWidget()->EditModifyStylesEx(dwStylesExAdded, dwStylesExRemoved); |
} |
CFWL_ComboBox::CFWL_ComboBox() {} |