| Index: fpdfsdk/src/fxedit/fxet_list.cpp
|
| diff --git a/fpdfsdk/src/fxedit/fxet_list.cpp b/fpdfsdk/src/fxedit/fxet_list.cpp
|
| index 1ece0ef11ac423e1ecccf30e01e20e6e5e90c3ee..4e8ae0cb8e0c947b8d7cb8584b65620a6d9bc746 100644
|
| --- a/fpdfsdk/src/fxedit/fxet_list.cpp
|
| +++ b/fpdfsdk/src/fxedit/fxet_list.cpp
|
| @@ -6,10 +6,6 @@
|
|
|
| #include "fpdfsdk/include/fxedit/fxet_edit.h"
|
| #include "fpdfsdk/include/fxedit/fxet_list.h"
|
| -#include "fpdfsdk/include/fxedit/fxet_stub.h"
|
| -
|
| -/* ------------------------------- CFX_ListItem
|
| - * ---------------------------------- */
|
|
|
| CFX_ListItem::CFX_ListItem()
|
| : m_pEdit(NULL),
|
| @@ -100,9 +96,6 @@ CFX_WideString CFX_ListItem::GetText() const {
|
| return L"";
|
| }
|
|
|
| -/* ------------------------------------ CFX_List
|
| - * --------------------------------- */
|
| -
|
| CFX_List::CFX_List()
|
| : m_fFontSize(0.0f), m_pFontMap(NULL), m_bMultiple(FALSE) {}
|
|
|
| @@ -308,9 +301,6 @@ CFX_WideString CFX_List::GetItemText(int32_t nIndex) const {
|
| return L"";
|
| }
|
|
|
| -/* ------------------------------------ CPLST_Select
|
| - * ---------------------------------- */
|
| -
|
| CPLST_Select::CPLST_Select() {}
|
|
|
| CPLST_Select::~CPLST_Select() {
|
| @@ -323,9 +313,9 @@ CPLST_Select::~CPLST_Select() {
|
| void CPLST_Select::Add(int32_t nItemIndex) {
|
| int32_t nIndex = Find(nItemIndex);
|
|
|
| - if (nIndex < 0)
|
| + if (nIndex < 0) {
|
| m_aItems.Add(new CPLST_Select_Item(nItemIndex, 1));
|
| - else {
|
| + } else {
|
| if (CPLST_Select_Item* pItem = m_aItems.GetAt(nIndex)) {
|
| pItem->nState = 1;
|
| }
|
| @@ -418,9 +408,6 @@ void CPLST_Select::Done() {
|
| }
|
| }
|
|
|
| -/* ------------------------------------ CFX_ListCtrl
|
| - * --------------------------------- */
|
| -
|
| CFX_ListCtrl::CFX_ListCtrl()
|
| : m_pNotify(NULL),
|
| m_bNotifyFlag(FALSE),
|
| @@ -591,8 +578,6 @@ FX_BOOL CFX_ListCtrl::OnChar(FX_WORD nChar, FX_BOOL bShift, FX_BOOL bCtrl) {
|
| return FALSE;
|
| }
|
|
|
| -/* -------- inner methods ------- */
|
| -
|
| void CFX_ListCtrl::SetPlateRect(const CPDF_Rect& rect) {
|
| CFX_ListContainer::SetPlateRect(rect);
|
| m_ptScrollPos.x = rect.left;
|
| @@ -710,8 +695,9 @@ void CFX_ListCtrl::Select(int32_t nItemIndex) {
|
| if (IsMultipleSel()) {
|
| m_aSelItems.Add(nItemIndex);
|
| SelectItems();
|
| - } else
|
| + } else {
|
| SetSingleSelect(nItemIndex);
|
| + }
|
| }
|
|
|
| FX_BOOL CFX_ListCtrl::IsItemVisible(int32_t nItemIndex) const {
|
|
|