Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / xfa / src / fwl / src / basewidget / fwl_comboboximp.cpp
index 5658f87..7c489d2 100644 (file)
@@ -288,7 +288,7 @@ int32_t CFWL_ComboList::MatchItem(const CFX_WideString &wsMatch)
         FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);\r
         CFX_WideString wsText;\r
         pData->GetItemText(m_pInterface, hItem, wsText);\r
-        FX_STRSIZE pos = wsText.Find((FX_LPCWSTR)wsMatch);\r
+        FX_STRSIZE pos = wsText.Find((const FX_WCHAR*)wsMatch);\r
         if (!pos) {\r
             return i;\r
         }\r
@@ -726,7 +726,7 @@ FWL_ERR CFWL_ComboBoxImp::DrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *
         param.m_rtPart = rtTextBk;\r
         if (m_iCurSel >= 0) {\r
             IFWL_ListBoxDP* pData = (IFWL_ListBoxDP*)((CFWL_ComboList*)((IFWL_TargetData*)m_pListBox)->GetData())->m_pProperties->m_pDataProvider;\r
-            FX_LPVOID p = pData->GetItemData(m_pListBox, pData->GetItem(m_pListBox, m_iCurSel));\r
+            void* p = pData->GetItemData(m_pListBox, pData->GetItem(m_pListBox, m_iCurSel));\r
             if (p != NULL) {\r
                 param.m_pData = p;\r
             }\r