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/checkbox.h | 2 +- xfa/include/fwl/lightwidget/combobox.h | 10 +++++----- xfa/include/fwl/lightwidget/datetimepicker.h | 2 +- xfa/include/fwl/lightwidget/edit.h | 6 +++--- xfa/include/fwl/lightwidget/listbox.h | 4 ++-- xfa/include/fwl/lightwidget/pushbutton.h | 2 +- xfa/include/fwl/lightwidget/tooltipctrl.h | 2 +- xfa/include/fwl/lightwidget/widget.h | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) (limited to 'xfa/include/fwl/lightwidget') diff --git a/xfa/include/fwl/lightwidget/checkbox.h b/xfa/include/fwl/lightwidget/checkbox.h index ebad96fd8e..f06750821f 100644 --- a/xfa/include/fwl/lightwidget/checkbox.h +++ b/xfa/include/fwl/lightwidget/checkbox.h @@ -18,7 +18,7 @@ public: FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL); FWL_ERR GetCaption(CFX_WideString &wsCaption); - FWL_ERR SetCaption(FX_WSTR wsCaption); + FWL_ERR SetCaption(const CFX_WideStringC& wsCaption); FWL_ERR SetBoxSize(FX_FLOAT fHeight); int32_t GetCheckState(); FWL_ERR SetCheckState(int32_t iCheck); 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); diff --git a/xfa/include/fwl/lightwidget/datetimepicker.h b/xfa/include/fwl/lightwidget/datetimepicker.h index 4af07a99bc..13d223cf8e 100644 --- a/xfa/include/fwl/lightwidget/datetimepicker.h +++ b/xfa/include/fwl/lightwidget/datetimepicker.h @@ -18,7 +18,7 @@ public: FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL); FWL_ERR SetToday(int32_t iYear, int32_t iMonth, int32_t iDay); FWL_ERR GetEditText(CFX_WideString &wsText); - FWL_ERR SetEditText(FX_WSTR wsText); + FWL_ERR SetEditText(const CFX_WideStringC& wsText); int32_t CountSelRanges(); int32_t GetSelRange(int32_t nIndex, int32_t &nStart); FWL_ERR GetCurSel(int32_t &iYear, int32_t &iMonth, int32_t &iDay); diff --git a/xfa/include/fwl/lightwidget/edit.h b/xfa/include/fwl/lightwidget/edit.h index 94a4ac48e4..06c10728b0 100644 --- a/xfa/include/fwl/lightwidget/edit.h +++ b/xfa/include/fwl/lightwidget/edit.h @@ -34,8 +34,8 @@ public: FWL_ERR ReplaceSelections(const CFX_WideStringC &wsReplace); FWL_ERR Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC &wsReplace); FWL_ERR DoClipboard(int32_t iCmd); - FX_BOOL Redo(FX_BSTR bsRecord); - FX_BOOL Undo(FX_BSTR bsRecord); + FX_BOOL Redo(const CFX_ByteStringC& bsRecord); + FX_BOOL Undo(const CFX_ByteStringC& bsRecord); FWL_ERR SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant); FWL_ERR SetNumberRange(int32_t iMin, int32_t iMax); FWL_ERR SetBackColor(FX_DWORD dwColor); @@ -50,7 +50,7 @@ public: FX_BOOL Delete(); void SetScrollOffset(FX_FLOAT fScrollOffset); FX_BOOL GetSuggestWords(CFX_PointF pointf, CFX_ByteStringArray &sSuggest); - FX_BOOL ReplaceSpellCheckWord(CFX_PointF pointf, FX_BSTR bsReplace); + FX_BOOL ReplaceSpellCheckWord(CFX_PointF pointf, const CFX_ByteStringC& bsReplace); CFWL_Edit(); virtual ~CFWL_Edit(); }; 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); diff --git a/xfa/include/fwl/lightwidget/pushbutton.h b/xfa/include/fwl/lightwidget/pushbutton.h index a7c2a13cfa..feb9450951 100644 --- a/xfa/include/fwl/lightwidget/pushbutton.h +++ b/xfa/include/fwl/lightwidget/pushbutton.h @@ -17,7 +17,7 @@ public: static CFWL_PushButton* Create(); FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL); FWL_ERR GetCaption(CFX_WideString &wsCaption); - FWL_ERR SetCaption(FX_WSTR wsCaption); + FWL_ERR SetCaption(const CFX_WideStringC& wsCaption); CFX_DIBitmap* GetPicture(); FWL_ERR SetPicture(CFX_DIBitmap *pBitmap); CFWL_PushButton(); diff --git a/xfa/include/fwl/lightwidget/tooltipctrl.h b/xfa/include/fwl/lightwidget/tooltipctrl.h index 821e042533..703283963b 100644 --- a/xfa/include/fwl/lightwidget/tooltipctrl.h +++ b/xfa/include/fwl/lightwidget/tooltipctrl.h @@ -17,7 +17,7 @@ public: static CFWL_ToolTip* Create(); FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL); FWL_ERR GetCaption(CFX_WideString &wsCaption); - FWL_ERR SetCaption(FX_WSTR wsCaption); + FWL_ERR SetCaption(const CFX_WideStringC& wsCaption); int32_t GetInitialDelay(); int32_t SetInitialDelay(int32_t nDelayTime); int32_t GetAutoPopDelay(); diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h index b6bd62bb2a..8f1246ba41 100644 --- a/xfa/include/fwl/lightwidget/widget.h +++ b/xfa/include/fwl/lightwidget/widget.h @@ -44,7 +44,7 @@ public: FX_DWORD GetRefCount() const; FWL_ERR GetClassName(CFX_WideString &wsClass) const; FX_DWORD GetClassID() const; - virtual FX_BOOL IsInstance(FX_WSTR wsClass) const; + virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const; protected: FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL); public: -- cgit v1.2.3