Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / xfa / src / fwl / src / basewidget / fwl_editimp.cpp
index 0afa1d5..a8c1655 100644 (file)
@@ -97,7 +97,7 @@ FWL_ERR       IFWL_Edit::SetFormatString(const CFX_WideString &wsFormat)
 {\r
     return ((CFWL_EditImp*)m_pData)->SetFormatString(wsFormat);\r
 }\r
-FWL_ERR IFWL_Edit::Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen)\r
+FWL_ERR IFWL_Edit::Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen)\r
 {\r
     return ((CFWL_EditImp*)m_pData)->Insert(nStart, lpText, nLen);\r
 }\r
@@ -480,7 +480,7 @@ FX_BOOL CFWL_EditImp::ReplaceSpellCheckWord(CFX_PointF pointf, FX_BSTR bsReplace
     }\r
     int32_t nDestLen = bsReplace.GetLength();\r
     CFX_WideString wsDest;\r
-    FX_LPWSTR pBuffer = wsDest.GetBuffer(nDestLen);\r
+    FX_WCHAR* pBuffer = wsDest.GetBuffer(nDestLen);\r
     for (int32_t i = 0; i < nDestLen; i++) {\r
         pBuffer[i] = bsReplace[i];\r
     }\r
@@ -663,7 +663,7 @@ FWL_ERR CFWL_EditImp::SetFormatString(const CFX_WideString &wsFormat)
     m_pEdtEngine->SetFormatBlock(0, wsFormat);\r
     return FWL_ERR_Succeeded;\r
 }\r
-FWL_ERR CFWL_EditImp::Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen)\r
+FWL_ERR CFWL_EditImp::Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen)\r
 {\r
     _FWL_RETURN_VALUE_IF_FAIL(m_pEdtEngine, FWL_ERR_Succeeded);\r
     if (       (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_ReadOnly)\r
@@ -803,7 +803,7 @@ FX_BOOL     CFWL_EditImp::Paste(const CFX_WideString &wsPaste)
 {\r
     _FWL_RETURN_VALUE_IF_FAIL(m_pEdtEngine, FALSE);\r
     int32_t nCaret = m_pEdtEngine->GetCaretPos();\r
-    int32_t iError = m_pEdtEngine->Insert(nCaret, FX_LPCWSTR(wsPaste), wsPaste.GetLength());\r
+    int32_t iError = m_pEdtEngine->Insert(nCaret, wsPaste.c_str(), wsPaste.GetLength());\r
     if (iError < 0) {\r
         ProcessInsertError(iError);\r
         return FALSE;\r
@@ -2126,12 +2126,12 @@ void CFWL_EditImpDelegate::OnChar(CFWL_MsgKey *pMsg)
                 break;\r
             }\r
         case FWL_VKEY_Tab: {\r
-                iError = m_pOwner->m_pEdtEngine->Insert(nCaret, FX_LPCWSTR(L"\t"), 1);\r
+                iError = m_pOwner->m_pEdtEngine->Insert(nCaret, L"\t", 1);\r
                 break;\r
             }\r
         case FWL_VKEY_Return: {\r
                 if (m_pOwner->m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_WantReturn) {\r
-                    iError = m_pOwner->m_pEdtEngine->Insert(nCaret, FX_LPCWSTR(L"\n"), 1);\r
+                    iError = m_pOwner->m_pEdtEngine->Insert(nCaret, L"\n", 1);\r
                 }\r
                 break;\r
             }\r