Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / xfa / src / fwl / src / lightwidget / combobox.cpp
index c443dfb..c0806ef 100644 (file)
@@ -135,14 +135,14 @@ FWL_ERR CFWL_ComboBox::SetMaxListHeight(FX_FLOAT fMaxHeight)
     m_comboBoxData.m_fMaxListHeight = fMaxHeight;\r
     return FWL_ERR_Succeeded;\r
 }\r
-FWL_ERR        CFWL_ComboBox::SetItemData(int32_t iIndex, FX_LPVOID pData)\r
+FWL_ERR        CFWL_ComboBox::SetItemData(int32_t iIndex, void* pData)\r
 {\r
     CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget *)this, iIndex));\r
     _FWL_RETURN_VALUE_IF_FAIL(pItem, FWL_ERR_Indefinite);\r
     pItem->m_pData = pData;\r
     return FWL_ERR_Succeeded;\r
 }\r
-FX_LPVOID CFWL_ComboBox::GetItemData(int32_t iIndex)\r
+void* CFWL_ComboBox::GetItemData(int32_t iIndex)\r
 {\r
     CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget *)this, iIndex));\r
     _FWL_RETURN_VALUE_IF_FAIL(pItem, NULL);\r
@@ -299,7 +299,7 @@ FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::GetItemRect(IFWL_Widget *pWidget, FWL_HL
                pItem->m_rtItem.height);\r
     return FWL_ERR_Succeeded;\r
 }\r
-FX_LPVOID CFWL_ComboBox::CFWL_ComboBoxDP::GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)\r
+void* CFWL_ComboBox::CFWL_ComboBoxDP::GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)\r
 {\r
     _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL);\r
     CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)hItem;\r
@@ -311,7 +311,7 @@ FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemStyles(IFWL_Widget *pWidget, FWL_
     ((CFWL_ComboBoxItem*)hItem)->m_dwStyles = dwStyle;\r
     return FWL_ERR_Succeeded;\r
 }\r
-FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_LPCWSTR pszText)\r
+FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText)\r
 {\r
     _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);\r
     ((CFWL_ComboBoxItem*)hItem)->m_wsText = pszText;\r