IFWL cleanup in the Combo classes

xfa/fwl/core/ifwl_listbox.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef XFA_FWL_CORE_IFWL_LISTBOX_H_
 #define XFA_FWL_CORE_IFWL_LISTBOX_H_
 
 #include <memory>
@@ skipping 33 matching lines @@
 
 FWL_EVENT_DEF(CFWL_EvtLtbDrawItem,
               CFWL_EventType::DrawItem,
               CFX_Graphics* m_pGraphics;
               CFX_Matrix m_matrix;
               int32_t m_index;
               CFX_RectF m_rect;)
 
 class IFWL_ListBoxDP : public IFWL_DataProvider {
  public:
-  virtual int32_t CountItems(const IFWL_Widget* pWidget) = 0;
+  virtual int32_t CountItems(const IFWL_Widget* pWidget) const = 0;
   virtual CFWL_ListItem* GetItem(const IFWL_Widget* pWidget,
-                                 int32_t nIndex) = 0;
+                                 int32_t nIndex) const = 0;
   virtual int32_t GetItemIndex(IFWL_Widget* pWidget, CFWL_ListItem* pItem) = 0;
   virtual bool SetItemIndex(IFWL_Widget* pWidget,
                             CFWL_ListItem* pItem,
                             int32_t nIndex) = 0;
   virtual uint32_t GetItemStyles(IFWL_Widget* pWidget,
                                  CFWL_ListItem* pItem) = 0;
   virtual void GetItemText(IFWL_Widget* pWidget,
                            CFWL_ListItem* pItem,
                            CFX_WideString& wsText) = 0;
   virtual void GetItemRect(IFWL_Widget* pWidget,
@@ skipping 45 matching lines @@
   void OnDrawWidget(CFX_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix) override;
 
   int32_t CountSelItems();
   CFWL_ListItem* GetSelItem(int32_t nIndexSel);
   int32_t GetSelIndex(int32_t nIndex);
   void SetSelItem(CFWL_ListItem* hItem, bool bSelect = true);
   void GetItemText(CFWL_ListItem* hItem, CFX_WideString& wsText);
   void GetScrollPos(FX_FLOAT& fPos, bool bVert = true);
 
+  FX_FLOAT GetItemHeight() const { return m_fItemHeight; }
+  FX_FLOAT CalcItemHeight();
+
  protected:
   CFWL_ListItem* GetItem(CFWL_ListItem* hItem, uint32_t dwKeyCode);
   void SetSelection(CFWL_ListItem* hStart, CFWL_ListItem* hEnd, bool bSelected);
   CFWL_ListItem* GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy);
   bool ScrollToVisible(CFWL_ListItem* hItem);
-  FX_FLOAT CalcItemHeight();
   void InitScrollBar(bool bVert = true);
   bool IsShowScrollBar(bool bVert);
-  FX_FLOAT GetItemHeight() const { return m_fItemHeight; }
   IFWL_ScrollBar* GetVertScrollBar() const { return m_pVertScrollBar.get(); }
   const CFX_RectF& GetRTClient() const { return m_rtClient; }
 
  private:
   void SetSelectionDirect(CFWL_ListItem* hItem, bool bSelect);
   bool IsItemSelected(CFWL_ListItem* hItem);
   void ClearSelection();
   void SelectAll();
   CFWL_ListItem* GetFocusedItem();
   void SetFocusItem(CFWL_ListItem* hItem);
@@ skipping 39 matching lines @@
   uint32_t m_dwTTOStyles;
   int32_t m_iTTOAligns;
   CFWL_ListItem* m_hAnchor;
   FX_FLOAT m_fItemHeight;
   FX_FLOAT m_fScorllBarWidth;
   bool m_bLButtonDown;
   IFWL_ThemeProvider* m_pScrollBarTP;
 };
 
 #endif  // XFA_FWL_CORE_IFWL_LISTBOX_H_