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/pushbutton.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xfa/include/fwl/lightwidget/pushbutton.h') 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(); -- cgit v1.2.3