Index: core/include/fxcrt/fx_string.h |
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h |
index 1c1e2370763b3f83e0a472070d157fede6e7dbc2..6abcf52c7623644f1f19c869ff519edd0bbb95da 100644 |
--- a/core/include/fxcrt/fx_string.h |
+++ b/core/include/fxcrt/fx_string.h |
@@ -794,9 +794,7 @@ inline bool operator!=(const wchar_t* lhs, const CFX_WideString& rhs) { |
inline bool operator!=(const CFX_WideStringC& lhs, const CFX_WideString& rhs) { |
return rhs != lhs; |
} |
-FX_FLOAT FX_atof(const CFX_ByteStringC& str); |
-void FX_atonum(const CFX_ByteStringC& str, FX_BOOL& bInteger, void* pData); |
-FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_CHAR* buf); |
+ |
CFX_ByteString FX_UTF8Encode(const FX_WCHAR* pwsStr, FX_STRSIZE len); |
inline CFX_ByteString FX_UTF8Encode(const CFX_WideStringC& wsStr) { |
return FX_UTF8Encode(wsStr.GetPtr(), wsStr.GetLength()); |
@@ -805,4 +803,11 @@ inline CFX_ByteString FX_UTF8Encode(const CFX_WideString& wsStr) { |
return FX_UTF8Encode(wsStr.c_str(), wsStr.GetLength()); |
} |
+FX_FLOAT FX_atof(const CFX_ByteStringC& str); |
+inline FX_FLOAT FX_atof(const CFX_WideStringC& wsStr) { |
+ return FX_atof(FX_UTF8Encode(wsStr.GetPtr(), wsStr.GetLength())); |
+} |
+void FX_atonum(const CFX_ByteStringC& str, FX_BOOL& bInteger, void* pData); |
+FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_CHAR* buf); |
+ |
#endif // CORE_INCLUDE_FXCRT_FX_STRING_H_ |