Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / xfa / include / fwl / lightwidget / combobox.h
index 594c056..fe1b5c4 100644 (file)
@@ -36,8 +36,8 @@ public:
     FX_BOOL            EditRedo(FX_BSTR bsRecord);\r
     FX_BOOL            EditUndo(FX_BSTR bsRecord);\r
     FWL_ERR            SetMaxListHeight(FX_FLOAT fMaxHeight);\r
-    FWL_ERR            SetItemData(int32_t iIndex, FX_LPVOID pData);\r
-    FX_LPVOID  GetItemData(int32_t iIndex);\r
+    FWL_ERR            SetItemData(int32_t iIndex, void* pData);\r
+    void*      GetItemData(int32_t iIndex);\r
     FWL_ERR            SetListTheme(IFWL_ThemeProvider *pTheme);\r
     FX_BOOL            AfterFocusShowDropList();\r
     FWL_ERR            OpenDropDownList(FX_BOOL bActivate);\r
@@ -78,9 +78,9 @@ protected:
         virtual        FX_DWORD                GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);\r
         virtual        FWL_ERR                 GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText);\r
         virtual FWL_ERR                        GetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_RectF& rtItem);\r
-        virtual FX_LPVOID              GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);\r
+        virtual void*          GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);\r
         virtual        FWL_ERR                 SetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_DWORD dwStyle);\r
-        virtual FWL_ERR                        SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_LPCWSTR pszText);\r
+        virtual FWL_ERR                        SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText);\r
         virtual FWL_ERR                        SetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const CFX_RectF& rtItem);\r
         virtual FX_FLOAT               GetItemHeight(IFWL_Widget *pWidget);\r
         virtual CFX_DIBitmap*  GetItemIcon(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);\r
@@ -110,6 +110,6 @@ public:
     CFX_DIBitmap       *m_pDIB;\r
     FX_DWORD           m_dwCheckState;\r
     CFX_RectF          m_rtCheckBox;\r
-    FX_LPVOID          m_pData;\r
+    void*              m_pData;\r
 };\r
 #endif\r