From d7e5cc754a937605d1f73db5e7967c58ddd80742 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 10 Jun 2015 14:33:37 -0700 Subject: Merge to XFA: Remove typdefs for pointer types in fx_system.h. Original Review URL: https://codereview.chromium.org/1171733003 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1178613002. --- xfa/include/fwl/lightwidget/combobox.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/include/fwl/lightwidget/combobox.h') diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h index 594c056e83..fe1b5c4f25 100644 --- a/xfa/include/fwl/lightwidget/combobox.h +++ b/xfa/include/fwl/lightwidget/combobox.h @@ -36,8 +36,8 @@ public: FX_BOOL EditRedo(FX_BSTR bsRecord); FX_BOOL EditUndo(FX_BSTR bsRecord); FWL_ERR SetMaxListHeight(FX_FLOAT fMaxHeight); - FWL_ERR SetItemData(int32_t iIndex, FX_LPVOID pData); - FX_LPVOID GetItemData(int32_t iIndex); + FWL_ERR SetItemData(int32_t iIndex, void* pData); + void* GetItemData(int32_t iIndex); FWL_ERR SetListTheme(IFWL_ThemeProvider *pTheme); FX_BOOL AfterFocusShowDropList(); FWL_ERR OpenDropDownList(FX_BOOL bActivate); @@ -78,9 +78,9 @@ protected: virtual FX_DWORD GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem); virtual FWL_ERR GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText); virtual FWL_ERR GetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_RectF& rtItem); - virtual FX_LPVOID GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem); + virtual void* GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem); virtual FWL_ERR SetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_DWORD dwStyle); - virtual FWL_ERR SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_LPCWSTR pszText); + virtual FWL_ERR SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText); virtual FWL_ERR SetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const CFX_RectF& rtItem); virtual FX_FLOAT GetItemHeight(IFWL_Widget *pWidget); virtual CFX_DIBitmap* GetItemIcon(IFWL_Widget *pWidget, FWL_HLISTITEM hItem); @@ -110,6 +110,6 @@ public: CFX_DIBitmap *m_pDIB; FX_DWORD m_dwCheckState; CFX_RectF m_rtCheckBox; - FX_LPVOID m_pData; + void* m_pData; }; #endif -- cgit v1.2.3