summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/fxedit/fxet_list.cpp6
-rw-r--r--fpdfsdk/fxedit/fxet_list.h31
2 files changed, 17 insertions, 20 deletions
diff --git a/fpdfsdk/fxedit/fxet_list.cpp b/fpdfsdk/fxedit/fxet_list.cpp
index 949d99217d..fa085f237f 100644
--- a/fpdfsdk/fxedit/fxet_list.cpp
+++ b/fpdfsdk/fxedit/fxet_list.cpp
@@ -29,10 +29,6 @@ void CFX_ListCtrl::Item::SetFontMap(IPVT_FontMap* pFontMap) {
m_pEdit->SetFontMap(pFontMap);
}
-CFX_Edit_Iterator* CFX_ListCtrl::Item::GetIterator() const {
- return m_pEdit->GetIterator();
-}
-
void CFX_ListCtrl::Item::SetText(const CFX_WideString& text) {
m_pEdit->SetText(text);
}
@@ -47,7 +43,7 @@ float CFX_ListCtrl::Item::GetItemHeight() const {
uint16_t CFX_ListCtrl::Item::GetFirstChar() const {
CPVT_Word word;
- CFX_Edit_Iterator* pIterator = GetIterator();
+ CFX_Edit_Iterator* pIterator = m_pEdit->GetIterator();
pIterator->SetAt(1);
pIterator->GetWord(word);
return word.Word;
diff --git a/fpdfsdk/fxedit/fxet_list.h b/fpdfsdk/fxedit/fxet_list.h
index 2b353a8a46..6a37d6125a 100644
--- a/fpdfsdk/fxedit/fxet_list.h
+++ b/fpdfsdk/fxedit/fxet_list.h
@@ -55,7 +55,6 @@ class CFX_ListCtrl {
void OnVK_RIGHT(bool bShift, bool bCtrl);
void OnVK_HOME(bool bShift, bool bCtrl);
void OnVK_END(bool bShift, bool bCtrl);
- void OnVK(int32_t nItemIndex, bool bShift, bool bCtrl);
bool OnChar(uint16_t nChar, bool bShift, bool bCtrl);
void SetScrollPos(const CFX_PointF& point);
@@ -66,9 +65,6 @@ class CFX_ListCtrl {
int32_t GetTopItem() const;
void SetContentRect(const CFX_FloatRect& rect) { m_rcContent = rect; }
CFX_FloatRect GetContentRect() const;
- CFX_PointF GetBTPoint() const {
- return CFX_PointF(m_rcPlate.left, m_rcPlate.top);
- }
int32_t GetItemIndex(const CFX_PointF& point) const;
void AddString(const CFX_WideString& str);
@@ -91,20 +87,9 @@ class CFX_ListCtrl {
float GetFirstHeight() const;
void SetMultipleSel(bool bMultiple) { m_bMultiple = bMultiple; }
bool IsMultipleSel() const { return m_bMultiple; }
- bool IsValid(int32_t nItemIndex) const;
int32_t FindNext(int32_t nIndex, wchar_t nChar) const;
int32_t GetFirstSelected() const;
- CFX_PointF InToOut(const CFX_PointF& point) const;
- CFX_PointF OutToIn(const CFX_PointF& point) const;
- CFX_FloatRect InToOut(const CFX_FloatRect& rect) const;
- CFX_FloatRect OutToIn(const CFX_FloatRect& rect) const;
-
- CFX_PointF InnerToOuter(const CFX_PointF& point) const;
- CFX_PointF OuterToInner(const CFX_PointF& point) const;
- CFX_FloatRect InnerToOuter(const CFX_FloatRect& rect) const;
- CFX_FloatRect OuterToInner(const CFX_FloatRect& rect) const;
-
private:
class Item {
public:
@@ -133,6 +118,19 @@ class CFX_ListCtrl {
CFX_FloatRect m_rcListItem;
};
+ CFX_PointF InToOut(const CFX_PointF& point) const;
+ CFX_PointF OutToIn(const CFX_PointF& point) const;
+ CFX_FloatRect InToOut(const CFX_FloatRect& rect) const;
+ CFX_FloatRect OutToIn(const CFX_FloatRect& rect) const;
+
+ CFX_PointF InnerToOuter(const CFX_PointF& point) const;
+ CFX_PointF OuterToInner(const CFX_PointF& point) const;
+ CFX_FloatRect InnerToOuter(const CFX_FloatRect& rect) const;
+ CFX_FloatRect OuterToInner(const CFX_FloatRect& rect) const;
+
+ void OnVK(int32_t nItemIndex, bool bShift, bool bCtrl);
+ bool IsValid(int32_t nItemIndex) const;
+
void ReArrange(int32_t nItemIndex);
CFX_FloatRect GetItemRectInternal(int32_t nIndex) const;
CFX_FloatRect GetContentRectInternal() const;
@@ -147,6 +145,9 @@ class CFX_ListCtrl {
CFX_WideString GetItemText(int32_t nIndex) const;
void SetItemSelect(int32_t nItemIndex, bool bSelected);
int32_t GetLastSelected() const;
+ CFX_PointF GetBTPoint() const {
+ return CFX_PointF(m_rcPlate.left, m_rcPlate.top);
+ }
CFX_FloatRect m_rcPlate;
CFX_FloatRect m_rcContent;