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/adapter/fwl_adapterclipboardmgr.h | 6 +++--- xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h | 2 +- xfa/include/fwl/adapter/fwl_sdadapterimp.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/include/fwl/adapter') diff --git a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h index 1ad09eda96..943d7caa12 100644 --- a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h @@ -26,11 +26,11 @@ public: virtual int32_t GetDataSize(FWL_HCLIPBOARDDATA hData) = 0; virtual void* LockDataBuffer(FWL_HCLIPBOARDDATA hData) = 0; virtual FX_BOOL UnLockDataBuffer(FWL_HCLIPBOARDDATA hData) = 0; - virtual FWL_ERR SetStringData(FX_WSTR ws) = 0; - virtual FWL_ERR SetStringData(FX_BSTR bs) = 0; + virtual FWL_ERR SetStringData(const CFX_WideStringC& ws) = 0; + virtual FWL_ERR SetStringData(const CFX_ByteStringC& bs) = 0; virtual FWL_ERR GetStringData(CFX_WideString &ws) = 0; virtual FWL_ERR GetStringData(CFX_ByteString &bs) = 0; virtual FWL_ERR EnumFormats(CFX_DWordArray &formats) = 0; - virtual FX_DWORD RegisterFormat(FX_WSTR wsFormat) = 0; + virtual FX_DWORD RegisterFormat(const CFX_WideStringC& wsFormat) = 0; }; #endif diff --git a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h index bff8e8a885..603e931084 100644 --- a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h @@ -24,7 +24,7 @@ public: virtual FWL_ERR SetWidgetPosition(IFWL_Widget *pWidget, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FWL_ERR SetParentWidget(IFWL_Widget *pWidget, IFWL_Widget *pParent) = 0; virtual FWL_ERR SetWidgetIcon(IFWL_Widget *pWidget, const CFX_DIBitmap *pIcon, FX_BOOL bBig) = 0; - virtual FWL_ERR SetWidgetCaption(IFWL_Widget *pWidget, FX_WSTR wsCaption) = 0; + virtual FWL_ERR SetWidgetCaption(IFWL_Widget *pWidget, const CFX_WideStringC& wsCaption) = 0; virtual FWL_ERR SetBorderRegion(IFWL_Widget *pWidget, CFX_Path *pPath) = 0; virtual FWL_ERR SetTransparent(IFWL_Widget *pWidget, FX_DWORD dwAlpha) = 0; virtual FWL_ERR ShowWidget(IFWL_Widget *pWidget) = 0; diff --git a/xfa/include/fwl/adapter/fwl_sdadapterimp.h b/xfa/include/fwl/adapter/fwl_sdadapterimp.h index ba14ae66c6..733a14da33 100644 --- a/xfa/include/fwl/adapter/fwl_sdadapterimp.h +++ b/xfa/include/fwl/adapter/fwl_sdadapterimp.h @@ -37,7 +37,7 @@ public: public: virtual FWL_ERR GetWidgetRect(IFWL_Widget *pWidget, CFX_RectF &rect); virtual FWL_ERR SetWidgetIcon(IFWL_Widget *pWidget, const CFX_DIBitmap *pIcon, FX_BOOL bBig); - virtual FWL_ERR SetWidgetCaption(IFWL_Widget *pWidget, FX_WSTR wsCaption); + virtual FWL_ERR SetWidgetCaption(IFWL_Widget *pWidget, const CFX_WideStringC& wsCaption); virtual FWL_ERR SetBorderRegion(IFWL_Widget *pWidget, CFX_Path *pPath); virtual FWL_ERR SetTransparent(IFWL_Widget *pWidget, FX_DWORD dwAlpha); virtual FWL_ERR SetFullScreen(IFWL_Widget *pWidget, FX_BOOL bFullScreen); -- cgit v1.2.3