Replace FWL_HLISTITEM with class IFWL_ListItem {}

xfa/fwl/basewidget/fwl_listboximp.cpp

 // 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
 
 #include "xfa/fwl/basewidget/fwl_listboximp.h"
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/basewidget/fwl_comboboximp.h"
@@ skipping 28 matching lines @@
   IFWL_ListBox* pListBox = new IFWL_ListBox;
   CFWL_ListBoxImp* pComboListImpl = new CFWL_ComboListImp(properties, pOuter);
   pListBox->SetImpl(pComboListImpl);
   pComboListImpl->SetInterface(pListBox);
   return pListBox;
 }
 IFWL_ListBox::IFWL_ListBox() {}
 int32_t IFWL_ListBox::CountSelItems() {
   return static_cast<CFWL_ListBoxImp*>(GetImpl())->CountSelItems();
 }
-FWL_HLISTITEM IFWL_ListBox::GetSelItem(int32_t nIndexSel) {
+IFWL_ListItem* IFWL_ListBox::GetSelItem(int32_t nIndexSel) {
   return static_cast<CFWL_ListBoxImp*>(GetImpl())->GetSelItem(nIndexSel);
 }
 int32_t IFWL_ListBox::GetSelIndex(int32_t nIndex) {
   return static_cast<CFWL_ListBoxImp*>(GetImpl())->GetSelIndex(nIndex);
 }
-FWL_Error IFWL_ListBox::SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect) {
+FWL_Error IFWL_ListBox::SetSelItem(IFWL_ListItem* hItem, FX_BOOL bSelect) {
   return static_cast<CFWL_ListBoxImp*>(GetImpl())->SetSelItem(hItem, bSelect);
 }
-FWL_Error IFWL_ListBox::GetItemText(FWL_HLISTITEM hItem,
+FWL_Error IFWL_ListBox::GetItemText(IFWL_ListItem* hItem,
                                     CFX_WideString& wsText) {
   return static_cast<CFWL_ListBoxImp*>(GetImpl())->GetItemText(hItem, wsText);
 }
 FWL_Error IFWL_ListBox::GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert) {
   return static_cast<CFWL_ListBoxImp*>(GetImpl())->GetScrollPos(fPos, bVert);
 }
 
 CFWL_ListBoxImp::CFWL_ListBoxImp(const CFWL_WidgetImpProperties& properties,
                                  IFWL_Widget* pOuter)
     : CFWL_WidgetImp(properties, pOuter),
@@ skipping 141 matching lines @@
   return FWL_Error::Succeeded;
 }
 int32_t CFWL_ListBoxImp::CountSelItems() {
   if (!m_pProperties->m_pDataProvider)
     return 0;
   int32_t iRet = 0;
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   int32_t iCount = pData->CountItems(m_pInterface);
   for (int32_t i = 0; i < iCount; i++) {
-    FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);
+    IFWL_ListItem* hItem = pData->GetItem(m_pInterface, i);
     if (!hItem) {
       continue;
     }
     uint32_t dwStyle = pData->GetItemStyles(m_pInterface, hItem);
     if (dwStyle & FWL_ITEMSTATE_LTB_Selected) {
       iRet++;
     }
   }
   return iRet;
 }
-FWL_HLISTITEM CFWL_ListBoxImp::GetSelItem(int32_t nIndexSel) {
+IFWL_ListItem* CFWL_ListBoxImp::GetSelItem(int32_t nIndexSel) {
   if (!m_pProperties->m_pDataProvider)
     return NULL;
   int32_t index = 0;
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   int32_t iCount = pData->CountItems(m_pInterface);
   for (int32_t i = 0; i < iCount; i++) {
-    FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);
+    IFWL_ListItem* hItem = pData->GetItem(m_pInterface, i);
     if (!hItem) {
       return NULL;
     }
     uint32_t dwStyle = pData->GetItemStyles(m_pInterface, hItem);
     if (dwStyle & FWL_ITEMSTATE_LTB_Selected) {
       if (index == nIndexSel) {
         return hItem;
       } else {
         index++;
       }
     }
   }
   return NULL;
 }
 int32_t CFWL_ListBoxImp::GetSelIndex(int32_t nIndex) {
   if (!m_pProperties->m_pDataProvider)
     return -1;
   int32_t index = 0;
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   int32_t iCount = pData->CountItems(m_pInterface);
   for (int32_t i = 0; i < iCount; i++) {
-    FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);
+    IFWL_ListItem* hItem = pData->GetItem(m_pInterface, i);

[dsinclair, 2016/06/02 01:28:58]

Should the variables in here be rename to p instead of h? So, pItem?

[Tom Sepez, 2016/06/02 21:02:59]

Done.

     if (!hItem) {
       return -1;
     }
     uint32_t dwStyle = pData->GetItemStyles(m_pInterface, hItem);
     if (dwStyle & FWL_ITEMSTATE_LTB_Selected) {
       if (index == nIndex) {
         return i;
       } else {
         index++;
       }
     }
   }
   return -1;
 }
-FWL_Error CFWL_ListBoxImp::SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect) {
+FWL_Error CFWL_ListBoxImp::SetSelItem(IFWL_ListItem* hItem, FX_BOOL bSelect) {
   if (!m_pProperties->m_pDataProvider)
     return FWL_Error::Indefinite;
   if (!hItem) {
     if (bSelect) {
       SelectAll();
     } else {
       ClearSelection();
       SetFocusItem(NULL);
     }
     return FWL_Error::Indefinite;
   }
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_MultiSelection) {
     SetSelectionDirect(hItem, bSelect);
   } else {
     SetSelection(hItem, hItem, bSelect);
   }
   return FWL_Error::Succeeded;
 }
-FWL_Error CFWL_ListBoxImp::GetItemText(FWL_HLISTITEM hItem,
+FWL_Error CFWL_ListBoxImp::GetItemText(IFWL_ListItem* hItem,
                                        CFX_WideString& wsText) {
   if (!m_pProperties->m_pDataProvider)
     return FWL_Error::Indefinite;
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   if (!hItem)
     return FWL_Error::Indefinite;
   pData->GetItemText(m_pInterface, hItem, wsText);
   return FWL_Error::Succeeded;
 }
 
 FWL_Error CFWL_ListBoxImp::GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert) {
   if ((bVert && IsShowScrollBar(TRUE)) || (!bVert && IsShowScrollBar(FALSE))) {
     IFWL_ScrollBar* pScrollBar =
         bVert ? m_pVertScrollBar.get() : m_pHorzScrollBar.get();
     fPos = pScrollBar->GetPos();
     return FWL_Error::Succeeded;
   }
   return FWL_Error::Indefinite;
 }
 
-FWL_HLISTITEM CFWL_ListBoxImp::GetItem(FWL_HLISTITEM hItem,
-                                       uint32_t dwKeyCode) {
-  FWL_HLISTITEM hRet = NULL;
+IFWL_ListItem* CFWL_ListBoxImp::GetItem(IFWL_ListItem* hItem,
+                                        uint32_t dwKeyCode) {
+  IFWL_ListItem* hRet = NULL;
   switch (dwKeyCode) {
     case FWL_VKEY_Up:
     case FWL_VKEY_Down:
     case FWL_VKEY_Home:
     case FWL_VKEY_End: {
       const bool bUp = dwKeyCode == FWL_VKEY_Up;
       const bool bDown = dwKeyCode == FWL_VKEY_Down;
       const bool bHome = dwKeyCode == FWL_VKEY_Home;
       IFWL_ListBoxDP* pData =
           static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
       int32_t iDstItem = -1;
       if (bUp || bDown) {
         int32_t index = pData->GetItemIndex(m_pInterface, hItem);
         iDstItem = dwKeyCode == FWL_VKEY_Up ? index - 1 : index + 1;
       } else if (bHome) {
         iDstItem = 0;
       } else {
         int32_t iCount = pData->CountItems(m_pInterface);
         iDstItem = iCount - 1;
       }
       hRet = pData->GetItem(m_pInterface, iDstItem);
       break;
     }
     default: {}
   }
   return hRet;
 }
-void CFWL_ListBoxImp::SetSelection(FWL_HLISTITEM hStart,
-                                   FWL_HLISTITEM hEnd,
+void CFWL_ListBoxImp::SetSelection(IFWL_ListItem* hStart,
+                                   IFWL_ListItem* hEnd,
                                    FX_BOOL bSelected) {
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   int32_t iStart = pData->GetItemIndex(m_pInterface, hStart);
   int32_t iEnd = pData->GetItemIndex(m_pInterface, hEnd);
   if (iStart > iEnd) {
     int32_t iTemp = iStart;
     iStart = iEnd;
     iEnd = iTemp;
   }
   if (bSelected) {
     int32_t iCount = pData->CountItems(m_pInterface);
     for (int32_t i = 0; i < iCount; i++) {
-      FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);
+      IFWL_ListItem* hItem = pData->GetItem(m_pInterface, i);
       SetSelectionDirect(hItem, FALSE);
     }
   }
   for (; iStart <= iEnd; iStart++) {
-    FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, iStart);
+    IFWL_ListItem* hItem = pData->GetItem(m_pInterface, iStart);
     SetSelectionDirect(hItem, bSelected);
   }
 }
-void CFWL_ListBoxImp::SetSelectionDirect(FWL_HLISTITEM hItem, FX_BOOL bSelect) {
+void CFWL_ListBoxImp::SetSelectionDirect(IFWL_ListItem* hItem,
+                                         FX_BOOL bSelect) {
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   uint32_t dwOldStyle = pData->GetItemStyles(m_pInterface, hItem);
   bSelect ? dwOldStyle |= FWL_ITEMSTATE_LTB_Selected
           : dwOldStyle &= ~FWL_ITEMSTATE_LTB_Selected;
   pData->SetItemStyles(m_pInterface, hItem, dwOldStyle);
 }
-FX_BOOL CFWL_ListBoxImp::IsItemSelected(FWL_HLISTITEM hItem) {
+FX_BOOL CFWL_ListBoxImp::IsItemSelected(IFWL_ListItem* hItem) {
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   uint32_t dwState = pData->GetItemStyles(m_pInterface, hItem);
   return (dwState & FWL_ITEMSTATE_LTB_Selected) != 0;
 }
 void CFWL_ListBoxImp::ClearSelection() {
   FX_BOOL bMulti =
       m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_MultiSelection;
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   int32_t iCount = pData->CountItems(m_pInterface);
   for (int32_t i = 0; i < iCount; i++) {
-    FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);
+    IFWL_ListItem* hItem = pData->GetItem(m_pInterface, i);
     uint32_t dwState = pData->GetItemStyles(m_pInterface, hItem);
     if (!(dwState & FWL_ITEMSTATE_LTB_Selected))
       continue;
     SetSelectionDirect(hItem, FALSE);
     if (!bMulti)
       return;
   }
 }
 void CFWL_ListBoxImp::SelectAll() {
   FX_BOOL bMulti =
       m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_MultiSelection;
   if (!bMulti) {
     return;
   }
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   int32_t iCount = pData->CountItems(m_pInterface);
   if (iCount > 0) {
-    FWL_HLISTITEM hItemStart = pData->GetItem(m_pInterface, 0);
-    FWL_HLISTITEM hItemEnd = pData->GetItem(m_pInterface, iCount - 1);
+    IFWL_ListItem* hItemStart = pData->GetItem(m_pInterface, 0);
+    IFWL_ListItem* hItemEnd = pData->GetItem(m_pInterface, iCount - 1);
     SetSelection(hItemStart, hItemEnd, FALSE);
   }
 }
-FWL_HLISTITEM CFWL_ListBoxImp::GetFocusedItem() {
+IFWL_ListItem* CFWL_ListBoxImp::GetFocusedItem() {
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   int32_t iCount = pData->CountItems(m_pInterface);
   for (int32_t i = 0; i < iCount; i++) {
-    FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);
+    IFWL_ListItem* hItem = pData->GetItem(m_pInterface, i);
     if (!hItem)
       return NULL;
     if (pData->GetItemStyles(m_pInterface, hItem) & FWL_ITEMSTATE_LTB_Focused) {
       return hItem;
     }
   }
   return NULL;
 }
-void CFWL_ListBoxImp::SetFocusItem(FWL_HLISTITEM hItem) {
+void CFWL_ListBoxImp::SetFocusItem(IFWL_ListItem* hItem) {
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
-  FWL_HLISTITEM hFocus = GetFocusedItem();
+  IFWL_ListItem* hFocus = GetFocusedItem();
   if (hItem != hFocus) {
     if (hFocus) {
       uint32_t dwStyle = pData->GetItemStyles(m_pInterface, hFocus);
       dwStyle &= ~FWL_ITEMSTATE_LTB_Focused;
       pData->SetItemStyles(m_pInterface, hFocus, dwStyle);
     }
     if (hItem) {
       uint32_t dwStyle = pData->GetItemStyles(m_pInterface, hItem);
       dwStyle |= FWL_ITEMSTATE_LTB_Focused;
       pData->SetItemStyles(m_pInterface, hItem, dwStyle);
     }
   }
 }
-FWL_HLISTITEM CFWL_ListBoxImp::GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy) {
+IFWL_ListItem* CFWL_ListBoxImp::GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy) {
   fx -= m_rtConent.left, fy -= m_rtConent.top;
   FX_FLOAT fPosX = 0.0f;
   if (m_pHorzScrollBar) {
     fPosX = m_pHorzScrollBar->GetPos();
   }
   FX_FLOAT fPosY = 0.0;
   if (m_pVertScrollBar) {
     fPosY = m_pVertScrollBar->GetPos();
   }
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   int32_t nCount = pData->CountItems(m_pInterface);
   for (int32_t i = 0; i < nCount; i++) {
-    FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);
+    IFWL_ListItem* hItem = pData->GetItem(m_pInterface, i);
     if (!hItem) {
       continue;
     }
     CFX_RectF rtItem;
     pData->GetItemRect(m_pInterface, hItem, rtItem);
     rtItem.Offset(-fPosX, -fPosY);
     if (rtItem.Contains(fx, fy)) {
       return hItem;
     }
   }
   return NULL;
 }
-FX_BOOL CFWL_ListBoxImp::GetItemCheckRect(FWL_HLISTITEM hItem,
+FX_BOOL CFWL_ListBoxImp::GetItemCheckRect(IFWL_ListItem* hItem,
                                           CFX_RectF& rtCheck) {
   if (!m_pProperties->m_pDataProvider)
     return FALSE;
   if (!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_Check)) {
     return FALSE;
   }
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   pData->GetItemCheckRect(m_pInterface, hItem, rtCheck);
   return TRUE;
 }
-FX_BOOL CFWL_ListBoxImp::GetItemChecked(FWL_HLISTITEM hItem) {
+FX_BOOL CFWL_ListBoxImp::GetItemChecked(IFWL_ListItem* hItem) {
   if (!m_pProperties->m_pDataProvider)
     return FALSE;
   if (!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_Check)) {
     return FALSE;
   }
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   return (pData->GetItemCheckState(m_pInterface, hItem) &
           FWL_ITEMSTATE_LTB_Checked);
 }
-FX_BOOL CFWL_ListBoxImp::SetItemChecked(FWL_HLISTITEM hItem, FX_BOOL bChecked) {
+FX_BOOL CFWL_ListBoxImp::SetItemChecked(IFWL_ListItem* hItem,
+                                        FX_BOOL bChecked) {
   if (!m_pProperties->m_pDataProvider)
     return FALSE;
   if (!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_Check)) {
     return FALSE;
   }
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   pData->SetItemCheckState(m_pInterface, hItem,
                            bChecked ? FWL_ITEMSTATE_LTB_Checked : 0);
   return TRUE;
 }
-FX_BOOL CFWL_ListBoxImp::ScrollToVisible(FWL_HLISTITEM hItem) {
+FX_BOOL CFWL_ListBoxImp::ScrollToVisible(IFWL_ListItem* hItem) {
   if (!m_pVertScrollBar)
     return FALSE;
   CFX_RectF rtItem;
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   pData->GetItemRect(m_pInterface, hItem, rtItem);
   FX_BOOL bScroll = FALSE;
   FX_FLOAT fPosY = m_pVertScrollBar->GetPos();
   rtItem.Offset(0, -fPosY + m_rtConent.top);
   if (rtItem.top < m_rtConent.top) {
@@ skipping 50 matching lines @@
   }
   if (m_pVertScrollBar) {
     rtView.width -= m_fScorllBarWidth;
   }
   FX_BOOL bMultiCol =
       m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_MultiColumn;
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   int32_t iCount = pData->CountItems(m_pInterface);
   for (int32_t i = 0; i < iCount; i++) {
-    FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);
+    IFWL_ListItem* hItem = pData->GetItem(m_pInterface, i);
     if (!hItem) {
       continue;
     }
     CFX_RectF rtItem;
     pData->GetItemRect(m_pInterface, hItem, rtItem);
     rtItem.Offset(m_rtConent.left - fPosX, m_rtConent.top - fPosY);
     if (rtItem.bottom() < m_rtConent.top) {
       continue;
     }
     if (rtItem.top >= m_rtConent.bottom()) {
@@ skipping 10 matching lines @@
       ev.m_index = i;
       ev.m_rect = rtItem;
       DispatchEvent(&ev);
     } else {
       DrawItem(pGraphics, pTheme, hItem, i, rtItem, pMatrix);
     }
   }
 }
 void CFWL_ListBoxImp::DrawItem(CFX_Graphics* pGraphics,
                                IFWL_ThemeProvider* pTheme,
-                               FWL_HLISTITEM hItem,
+                               IFWL_ListItem* hItem,
                                int32_t Index,
                                const CFX_RectF& rtItem,
                                const CFX_Matrix* pMatrix) {
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   uint32_t dwItemStyles = pData->GetItemStyles(m_pInterface, hItem);
   uint32_t dwPartStates = CFWL_PartState_Normal;
   if (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) {
     dwPartStates = CFWL_PartState_Disabled;
   } else if (dwItemStyles & FWL_ITEMSTATE_LTB_Selected) {
@@ skipping 98 matching lines @@
         GetThemeCapacity(CFWL_WidgetCapacity::UIMargin));
     if (pUIMargin) {
       m_rtConent.Deflate(pUIMargin->left, pUIMargin->top, pUIMargin->width,
                          pUIMargin->height);
     }
   }
   FX_FLOAT fWidth = 0;
   if (m_pProperties->m_pThemeProvider->IsCustomizedLayout(m_pInterface)) {
     IFWL_ListBoxDP* pData =
         static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
-    if (!bAutoSize) {
-    }
     int32_t iCount = pData->CountItems(m_pInterface);
     for (int32_t i = 0; i < iCount; i++) {
-      FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);
+      IFWL_ListItem* hItem = pData->GetItem(m_pInterface, i);
       CFWL_ThemePart itemPart;
       itemPart.m_pWidget = m_pInterface;
       itemPart.m_iPart = CFWL_Part::ListItem;
       itemPart.m_pData = m_pProperties->m_pDataProvider;
       itemPart.m_bMaximize = i > 0;
       CFX_RectF r;
       m_pProperties->m_pThemeProvider->GetPartRect(&itemPart, r);
       if (!bAutoSize) {
         CFX_RectF rtItem;
         rtItem.Set(m_rtClient.left, m_rtClient.top + fs.y, r.width, r.height);
@@ skipping 20 matching lines @@
     IFWL_ListBoxDP* pData =
         static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
     m_fItemHeight = GetItemHeigt();
     FX_BOOL bHasIcon;
     bHasIcon = GetStylesEx() & FWL_STYLEEXT_LTB_Icon;
     if (bHasIcon) {
       fWidth += m_fItemHeight;
     }
     int32_t iCount = pData->CountItems(m_pInterface);
     for (int32_t i = 0; i < iCount; i++) {
-      FWL_HLISTITEM htem = pData->GetItem(m_pInterface, i);
+      IFWL_ListItem* htem = pData->GetItem(m_pInterface, i);
       GetItemSize(fs, htem, fWidth, m_fItemHeight, bAutoSize);
     }
   }
   if (bAutoSize) {
     return fs;
   }
   FX_FLOAT iWidth = m_rtClient.width - rtUIMargin.left - rtUIMargin.width;
   FX_FLOAT iHeight = m_rtClient.height;
   FX_BOOL bShowVertScr =
       (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_ShowScrollBarAlaways) &&
@@ skipping 83 matching lines @@
     m_pHorzScrollBar->SetStates(FWL_WGTSTATE_Invisible, TRUE);
   }
   if (bShowVertScr && bShowHorzScr) {
     m_rtStatic.Set(m_rtClient.right() - m_fScorllBarWidth,
                    m_rtClient.bottom() - m_fScorllBarWidth, m_fScorllBarWidth,
                    m_fScorllBarWidth);
   }
   return fs;
 }
 void CFWL_ListBoxImp::GetItemSize(CFX_SizeF& size,
-                                  FWL_HLISTITEM hItem,
+                                  IFWL_ListItem* hItem,
                                   FX_FLOAT fWidth,
                                   FX_FLOAT m_fItemHeight,
                                   FX_BOOL bAutoSize) {
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_MultiColumn) {
   } else {
     if (!bAutoSize) {
       CFX_RectF rtItem;
       rtItem.Set(0, size.y, fWidth, m_fItemHeight);
       IFWL_ListBoxDP* pData =
           static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
       pData->SetItemRect(m_pInterface, hItem, rtItem);
     }
     size.x = fWidth;
     size.y += m_fItemHeight;
   }
 }
 FX_FLOAT CFWL_ListBoxImp::GetMaxTextWidth() {
   FX_FLOAT fRet = 0.0f;
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   int32_t iCount = pData->CountItems(m_pInterface);
   for (int32_t i = 0; i < iCount; i++) {
-    FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);
+    IFWL_ListItem* hItem = pData->GetItem(m_pInterface, i);
     if (!hItem) {
       continue;
     }
     CFX_WideString wsText;
     pData->GetItemText(m_pInterface, hItem, wsText);
     CFX_SizeF sz = CalcTextSize(wsText, m_pProperties->m_pThemeProvider);
     if (sz.x > fRet) {
       fRet = sz.x;
     }
   }
@@ skipping 36 matching lines @@
   return !(m_pProperties->m_dwStyleExes &
            FWL_STYLEEXT_LTB_ShowScrollBarFocus) ||
          (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused);
 }
 void CFWL_ListBoxImp::ProcessSelChanged() {
   CFWL_EvtLtbSelChanged selEvent;
   selEvent.m_pSrcTarget = m_pInterface;
   CFX_Int32Array arrSels;
   int32_t iCount = CountSelItems();
   for (int32_t i = 0; i < iCount; i++) {
-    FWL_HLISTITEM item = GetSelItem(i);
+    IFWL_ListItem* item = GetSelItem(i);
     if (item == NULL) {
       continue;
     }
     selEvent.iarraySels.Add(i);
   }
   DispatchEvent(&selEvent);
 }
 
 CFWL_ListBoxImpDelegate::CFWL_ListBoxImpDelegate(CFWL_ListBoxImp* pOwner)
     : m_pOwner(pOwner) {}
@@ skipping 83 matching lines @@
   } else {
     m_pOwner->m_pProperties->m_dwStates &= ~(FWL_WGTSTATE_Focused);
   }
   m_pOwner->Repaint(&m_pOwner->m_rtClient);
 }
 void CFWL_ListBoxImpDelegate::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   m_pOwner->m_bLButtonDown = TRUE;
   if ((m_pOwner->m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) == 0) {
     m_pOwner->SetFocus(TRUE);
   }
-  FWL_HLISTITEM hItem = m_pOwner->GetItemAtPoint(pMsg->m_fx, pMsg->m_fy);
+  IFWL_ListItem* hItem = m_pOwner->GetItemAtPoint(pMsg->m_fx, pMsg->m_fy);
   if (!hItem) {
     return;
   }
   if (m_pOwner->m_pProperties->m_dwStyleExes &
       FWL_STYLEEXT_LTB_MultiSelection) {
     if (pMsg->m_dwFlags & FWL_KEYFLAG_Ctrl) {
       FX_BOOL bSelected = m_pOwner->IsItemSelected(hItem);
       m_pOwner->SetSelectionDirect(hItem, !bSelected);
       m_pOwner->m_hAnchor = hItem;
     } else if (pMsg->m_dwFlags & FWL_KEYFLAG_Shift) {
       if (m_pOwner->m_hAnchor) {
         m_pOwner->SetSelection(m_pOwner->m_hAnchor, hItem, TRUE);
       } else {
         m_pOwner->SetSelectionDirect(hItem, TRUE);
       }
     } else {
       m_pOwner->SetSelection(hItem, hItem, TRUE);
       m_pOwner->m_hAnchor = hItem;
     }
   } else {
     m_pOwner->SetSelection(hItem, hItem, TRUE);
   }
   if (m_pOwner->m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_Check) {
-    FWL_HLISTITEM hSelectedItem =
+    IFWL_ListItem* hSelectedItem =
         m_pOwner->GetItemAtPoint(pMsg->m_fx, pMsg->m_fy);
     CFX_RectF rtCheck;
     m_pOwner->GetItemCheckRect(hSelectedItem, rtCheck);
     FX_BOOL bChecked = m_pOwner->GetItemChecked(hItem);
     if (rtCheck.Contains(pMsg->m_fx, pMsg->m_fy)) {
       if (bChecked) {
         m_pOwner->SetItemChecked(hItem, FALSE);
       } else {
         m_pOwner->SetItemChecked(hItem, TRUE);
       }
@@ skipping 22 matching lines @@
   pDelegate->OnProcessMessage(pMsg);
 }
 void CFWL_ListBoxImpDelegate::OnKeyDown(CFWL_MsgKey* pMsg) {
   uint32_t dwKeyCode = pMsg->m_dwKeyCode;
   switch (dwKeyCode) {
     case FWL_VKEY_Tab:
     case FWL_VKEY_Up:
     case FWL_VKEY_Down:
     case FWL_VKEY_Home:
     case FWL_VKEY_End: {
-      FWL_HLISTITEM hItem = m_pOwner->GetFocusedItem();
+      IFWL_ListItem* hItem = m_pOwner->GetFocusedItem();
       hItem = m_pOwner->GetItem(hItem, dwKeyCode);
       FX_BOOL bShift = pMsg->m_dwFlags & FWL_KEYFLAG_Shift;
       FX_BOOL bCtrl = pMsg->m_dwFlags & FWL_KEYFLAG_Ctrl;
       OnVK(hItem, bShift, bCtrl);
       DispatchSelChangedEv();
       m_pOwner->ProcessSelChanged();
       break;
     }
     default: {}
   }
 }
-void CFWL_ListBoxImpDelegate::OnVK(FWL_HLISTITEM hItem,
+void CFWL_ListBoxImpDelegate::OnVK(IFWL_ListItem* hItem,
                                    FX_BOOL bShift,
                                    FX_BOOL bCtrl) {
   if (!hItem) {
     return;
   }
   if (m_pOwner->m_pProperties->m_dwStyleExes &
       FWL_STYLEEXT_LTB_MultiSelection) {
     if (bCtrl) {
     } else if (bShift) {
       if (m_pOwner->m_hAnchor) {
@@ skipping 72 matching lines @@
     pScrollBar->SetTrackPos(fPos);
     m_pOwner->Repaint(&m_pOwner->m_rtClient);
   }
   return TRUE;
 }
 void CFWL_ListBoxImpDelegate::DispatchSelChangedEv() {
   CFWL_EvtLtbSelChanged ev;
   ev.m_pSrcTarget = m_pOwner->m_pInterface;
   m_pOwner->DispatchEvent(&ev);
 }