From ca3ac5e9ffc936066267fbb1c329e5297d8e23e6 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 10 Jun 2015 17:38:11 -0700 Subject: Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs. Nearly automatic merge + re-run script on new files. Original Review URL: https://codereview.chromium.org/1180593004. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1174303002. --- xfa/include/fwl/lightwidget/listbox.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/include/fwl/lightwidget/listbox.h') diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h index 839bc18a9a..d095e0e5e3 100644 --- a/xfa/include/fwl/lightwidget/listbox.h +++ b/xfa/include/fwl/lightwidget/listbox.h @@ -17,7 +17,7 @@ public: static CFWL_ListBox* Create(); FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL); FWL_ERR AddDIBitmap(CFX_DIBitmap * pDIB, FWL_HLISTITEM hItem); - FWL_HLISTITEM AddString(FX_WSTR wsAdd, FX_BOOL bSelect = FALSE); + FWL_HLISTITEM AddString(const CFX_WideStringC& wsAdd, FX_BOOL bSelect = FALSE); FX_BOOL DeleteString(FWL_HLISTITEM hItem); FX_BOOL DeleteAll(); int32_t CountSelItems(); @@ -32,7 +32,7 @@ public: FWL_ERR* Sort(IFWL_ListBoxCompare *pCom); int32_t CountItems(); FWL_HLISTITEM GetItem(int32_t nIndex); - FWL_ERR SetItemString(FWL_HLISTITEM hItem, FX_WSTR wsText); + FWL_ERR SetItemString(FWL_HLISTITEM hItem, const CFX_WideStringC& wsText); FWL_ERR GetItemString(FWL_HLISTITEM hItem, CFX_WideString &wsText); FWL_ERR SetItemData(FWL_HLISTITEM hItem, void* pData); void* GetItemData(FWL_HLISTITEM hItem); -- cgit v1.2.3