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/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 fe1b5c4f25..fc09f63af0 100644 --- a/xfa/include/fwl/lightwidget/combobox.h +++ b/xfa/include/fwl/lightwidget/combobox.h @@ -17,15 +17,15 @@ class CFWL_ComboBox : public CFWL_Widget public: static CFWL_ComboBox* Create(); FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL); - int32_t AddString(FX_WSTR wsText); - int32_t AddString(FX_WSTR wsText, CFX_DIBitmap *pIcon); + int32_t AddString(const CFX_WideStringC& wsText); + int32_t AddString(const CFX_WideStringC& wsText, CFX_DIBitmap *pIcon); int32_t RemoveAt(int32_t iIndex); int32_t RemoveAll(); int32_t CountItems(); FWL_ERR GetTextByIndex(int32_t iIndex, CFX_WideString &wsText); int32_t GetCurSel(); FWL_ERR SetCurSel(int32_t iSel); - FWL_ERR SetEditText(FX_WSTR wsText); + FWL_ERR SetEditText(const CFX_WideStringC& wsText); int32_t GetEditTextLength() const; FWL_ERR GetEditText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const ; FWL_ERR SetEditSelRange(int32_t nStart, int32_t nCount = -1); @@ -33,8 +33,8 @@ public: int32_t GetEditLimit(); FWL_ERR SetEditLimit(int32_t nLimit); FWL_ERR EditDoClipboard(int32_t iCmd); - FX_BOOL EditRedo(FX_BSTR bsRecord); - FX_BOOL EditUndo(FX_BSTR bsRecord); + FX_BOOL EditRedo(const CFX_ByteStringC& bsRecord); + FX_BOOL EditUndo(const CFX_ByteStringC& bsRecord); FWL_ERR SetMaxListHeight(FX_FLOAT fMaxHeight); FWL_ERR SetItemData(int32_t iIndex, void* pData); void* GetItemData(int32_t iIndex); -- cgit v1.2.3