From 6714cd8dd3327c0352f3d1fd03433692ff83b07f Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Apr 2015 13:22:54 -0700 Subject: Merge to XFA: Fix windows-specific usage of CFX_WideStr::operator LPCWSTR(). Original Review URL: https://codereview.chromium.org/1103343002 R=brucedawson@chromium.org TBR=brucedawson@chromium.org Review URL: https://codereview.chromium.org/1105253002 --- core/include/fxge/fx_ge_win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/include/fxge') diff --git a/core/include/fxge/fx_ge_win32.h b/core/include/fxge/fx_ge_win32.h index 311d355ef7..d39a8071e3 100644 --- a/core/include/fxge/fx_ge_win32.h +++ b/core/include/fxge/fx_ge_win32.h @@ -38,7 +38,7 @@ public: static CFX_DIBitmap* LoadFromFile(FX_LPCSTR filename) { - return LoadFromFile(CFX_WideString::FromLocal(filename)); + return LoadFromFile(CFX_WideString::FromLocal(filename).c_str()); } static CFX_DIBitmap* LoadDIBitmap(WINDIB_Open_Args_ args); -- cgit v1.2.3