Merge to XFA: Remove typdefs for pointer types in fx_system.h.

Original Review URL: https://codereview.chromium.org/1171733003

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1178613002.

26 files changed, 85 insertions, 85 deletions

diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
index 5658f87e13..7c489d2dee 100644
--- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
@@ -288,7 +288,7 @@ int32_t CFWL_ComboList::MatchItem(const CFX_WideString &wsMatch)
         FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);

         CFX_WideString wsText;

         pData->GetItemText(m_pInterface, hItem, wsText);

-        FX_STRSIZE pos = wsText.Find((FX_LPCWSTR)wsMatch);

+        FX_STRSIZE pos = wsText.Find((const FX_WCHAR*)wsMatch);

         if (!pos) {

             return i;

         }

@@ -726,7 +726,7 @@ FWL_ERR CFWL_ComboBoxImp::DrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *
         param.m_rtPart = rtTextBk;

         if (m_iCurSel >= 0) {

             IFWL_ListBoxDP* pData = (IFWL_ListBoxDP*)((CFWL_ComboList*)((IFWL_TargetData*)m_pListBox)->GetData())->m_pProperties->m_pDataProvider;

-            FX_LPVOID p = pData->GetItemData(m_pListBox, pData->GetItem(m_pListBox, m_iCurSel));

+            void* p = pData->GetItemData(m_pListBox, pData->GetItem(m_pListBox, m_iCurSel));

             if (p != NULL) {

                 param.m_pData = p;

             }

diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp
index c9f3367114..4c30244410 100644
--- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp
@@ -738,9 +738,9 @@ void CFWL_DateTimePickerImp::DrawDropDownButton(CFX_Graphics *pGraphics, IFWL_Th
 void CFWL_DateTimePickerImp::FormatDateString(int32_t iYear, int32_t iMonth, int32_t iDay, CFX_WideString &wsText)

 {

     if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_ShortDateFormat) == FWL_STYLEEXT_DTP_ShortDateFormat) {

-        wsText.Format(FX_LPCWSTR(L"%d-%d-%d"), iYear, iMonth, iDay);

+        wsText.Format(L"%d-%d-%d", iYear, iMonth, iDay);

     } else if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_LongDateFormat) == FWL_STYLEEXT_DTP_LongDateFormat) {

-        wsText.Format(FX_LPCWSTR(L"%d Year %d Month %d Day"), iYear, iMonth, iDay);

+        wsText.Format(L"%d Year %d Month %d Day", iYear, iMonth, iDay);

     } else if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_TimeFormat) == FWL_STYLEEXT_DTP_TimeFormat) {

     }

 }

diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
index 0afa1d5467..a8c1655ec8 100644
--- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
@@ -97,7 +97,7 @@ FWL_ERR	IFWL_Edit::SetFormatString(const CFX_WideString &wsFormat)
 {

     return ((CFWL_EditImp*)m_pData)->SetFormatString(wsFormat);

 }

-FWL_ERR IFWL_Edit::Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen)

+FWL_ERR IFWL_Edit::Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen)

 {

     return ((CFWL_EditImp*)m_pData)->Insert(nStart, lpText, nLen);

 }

@@ -480,7 +480,7 @@ FX_BOOL CFWL_EditImp::ReplaceSpellCheckWord(CFX_PointF pointf, FX_BSTR bsReplace
     }

     int32_t nDestLen = bsReplace.GetLength();

     CFX_WideString wsDest;

-    FX_LPWSTR pBuffer = wsDest.GetBuffer(nDestLen);

+    FX_WCHAR* pBuffer = wsDest.GetBuffer(nDestLen);

     for (int32_t i = 0; i < nDestLen; i++) {

         pBuffer[i] = bsReplace[i];

     }

@@ -663,7 +663,7 @@ FWL_ERR CFWL_EditImp::SetFormatString(const CFX_WideString &wsFormat)
     m_pEdtEngine->SetFormatBlock(0, wsFormat);

     return FWL_ERR_Succeeded;

 }

-FWL_ERR CFWL_EditImp::Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen)

+FWL_ERR CFWL_EditImp::Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen)

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pEdtEngine, FWL_ERR_Succeeded);

     if (	(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_ReadOnly)

@@ -803,7 +803,7 @@ FX_BOOL	CFWL_EditImp::Paste(const CFX_WideString &wsPaste)
 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pEdtEngine, FALSE);

     int32_t nCaret = m_pEdtEngine->GetCaretPos();

-    int32_t iError = m_pEdtEngine->Insert(nCaret, FX_LPCWSTR(wsPaste), wsPaste.GetLength());

+    int32_t iError = m_pEdtEngine->Insert(nCaret, wsPaste.c_str(), wsPaste.GetLength());

     if (iError < 0) {

         ProcessInsertError(iError);

         return FALSE;

@@ -2126,12 +2126,12 @@ void CFWL_EditImpDelegate::OnChar(CFWL_MsgKey *pMsg)
                 break;

             }

         case FWL_VKEY_Tab: {

-                iError = m_pOwner->m_pEdtEngine->Insert(nCaret, FX_LPCWSTR(L"\t"), 1);

+                iError = m_pOwner->m_pEdtEngine->Insert(nCaret, L"\t", 1);

                 break;

             }

         case FWL_VKEY_Return: {

                 if (m_pOwner->m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_WantReturn) {

-                    iError = m_pOwner->m_pEdtEngine->Insert(nCaret, FX_LPCWSTR(L"\n"), 1);

+                    iError = m_pOwner->m_pEdtEngine->Insert(nCaret, L"\n", 1);

                 }

                 break;

             }

diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp
index aed47639b2..c99b5c6002 100644
--- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp
@@ -398,7 +398,7 @@ void CFWL_MonthCalendarImp::DrawWeekNumber(CFX_Graphics *pGraphics, IFWL_ThemePr
         iTemp ++;

         iWeekNum = CalWeekNumber(m_iCurYear, iMonthNum, i);

         m_rtWeekNum.Set(fHStartPos, fVStartPos + m_fDateCellHei * iTemp, m_fWeekNumWid, m_fDateCellHei);

-        wsWeekNum.Format(FX_LPCWSTR(L"%d"), iWeekNum);

+        wsWeekNum.Format(L"%d", iWeekNum);

         params.m_wsText = wsWeekNum;

         params.m_rtPart = m_rtWeekNum;

         pTheme->DrawText(&params);

@@ -765,7 +765,7 @@ void CFWL_MonthCalendarImp::ReSetDateItem()
             iDayOfWeek = 0;

         }

         CFX_WideString wsDay;

-        wsDay.Format(FX_LPCWSTR(L"%d"), i + 1);

+        wsDay.Format(L"%d", i + 1);

         FX_DWORD dwStates = 0;

         if (m_iYear == m_iCurYear && m_iMonth == m_iCurMonth && m_iDay == (i + 1)) {

             dwStates |= FWL_ITEMSTATE_MCD_Flag;

@@ -888,25 +888,25 @@ FX_BOOL	CFWL_MonthCalendarImp::JumpToToday()
 void CFWL_MonthCalendarImp::GetHeadText(int32_t iYear, int32_t iMonth, CFX_WideString &wsHead)

 {

     FXSYS_assert(iMonth > 0 && iMonth < 13);

-    static FX_LPWSTR pMonth[] = {

-        FX_LPWSTR(L"January"),

-        FX_LPWSTR(L"February"),

-        FX_LPWSTR(L"March"),

-        FX_LPWSTR(L"April"),

-        FX_LPWSTR(L"May"),

-        FX_LPWSTR(L"June"),

-        FX_LPWSTR(L"July"),

-        FX_LPWSTR(L"August"),

-        FX_LPWSTR(L"September"),

-        FX_LPWSTR(L"October"),

-        FX_LPWSTR(L"November"),

-        FX_LPWSTR(L"December")

+    static const FX_WCHAR* const pMonth[] = {

+        L"January",

+        L"February",

+        L"March",

+        L"April",

+        L"May",

+        L"June",

+        L"July",

+        L"August",

+        L"September",

+        L"October",

+        L"November",

+        L"December"

     };

-    wsHead.Format(FX_LPCWSTR(L"%s, %d"), pMonth[iMonth - 1], iYear);

+    wsHead.Format(L"%s, %d", pMonth[iMonth - 1], iYear);

 }

 void CFWL_MonthCalendarImp::GetTodayText(int32_t iYear, int32_t iMonth, int32_t iDay, CFX_WideString &wsToday)

 {

-    wsToday.Format(FX_LPCWSTR(L", %d/%d/%d"), iDay, iMonth, iYear);

+    wsToday.Format(L", %d/%d/%d", iDay, iMonth, iYear);

 }

 int32_t CFWL_MonthCalendarImp::GetDayAtPoint(FX_FLOAT x, FX_FLOAT y)

 {

diff --git a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
index db9e25fb5c..e06cfa8d67 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
@@ -45,7 +45,7 @@ public:
     virtual FWL_ERR		SetLimit(int32_t nLimit);

     virtual FWL_ERR		SetAliasChar(FX_WCHAR wAlias);

     virtual FWL_ERR		SetFormatString(const CFX_WideString &wsFormat);

-    virtual FWL_ERR		Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen);

+    virtual FWL_ERR		Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen);

     virtual FWL_ERR		DeleteSelections();

     virtual FWL_ERR		DeleteRange(int32_t nStart, int32_t nCount = -1);

     virtual FWL_ERR		ReplaceSelections(const CFX_WideStringC &wsReplace);

diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp
index 4a9c138d86..0ea8975adc 100644
--- a/xfa/src/fwl/src/core/fwl_noteimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp
@@ -143,7 +143,7 @@ FX_BOOL CFWL_NoteDriver::SendNote(CFWL_Note *pNote)
         m_sendEventCalled ++;

         FX_POSITION pos = m_eventTargets.GetStartPosition();

         while (pos) {

-            FX_LPVOID key = NULL;

+            void* key = NULL;

             CFWL_EventTarget *pEventTarget;

             m_eventTargets.GetNextAssoc(pos, key, (void*&)pEventTarget);

             if (pEventTarget && !pEventTarget->IsInvalid()) {

@@ -169,15 +169,15 @@ FX_BOOL CFWL_NoteDriver::PostMessage(CFWL_Message *pMessage)
 #define FWL_NoteDriver_EventKey 1100

 FWL_ERR CFWL_NoteDriver::RegisterEventTarget(IFWL_Widget *pListener, IFWL_Widget *pEventSource , FX_DWORD dwFilter )

 {

-    FX_DWORD dwkey = (FX_DWORD)(uintptr_t)pListener->GetPrivateData((FX_LPVOID)(uintptr_t)FWL_NoteDriver_EventKey);

+    FX_DWORD dwkey = (FX_DWORD)(uintptr_t)pListener->GetPrivateData((void*)(uintptr_t)FWL_NoteDriver_EventKey);

     if (dwkey == 0) {

-        FX_LPVOID random = FX_Random_MT_Start(0);

+        void* random = FX_Random_MT_Start(0);

         dwkey =	rand();

         FX_Random_MT_Close(random);

-        pListener->SetPrivateData((FX_LPVOID)(uintptr_t)FWL_NoteDriver_EventKey, (FX_LPVOID)(uintptr_t)dwkey, NULL);

+        pListener->SetPrivateData((void*)(uintptr_t)FWL_NoteDriver_EventKey, (void*)(uintptr_t)dwkey, NULL);

     }

     CFWL_EventTarget *value = NULL;

-    if (!m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (FX_LPVOID&)value)) {

+    if (!m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (void*&)value)) {

         value = FX_NEW CFWL_EventTarget(this, pListener);

         m_eventTargets.SetAt((void*)(uintptr_t)dwkey, value);

     }

@@ -186,12 +186,12 @@ FWL_ERR CFWL_NoteDriver::RegisterEventTarget(IFWL_Widget *pListener, IFWL_Widget
 }

 FWL_ERR CFWL_NoteDriver::UnregisterEventTarget(IFWL_Widget *pListener)

 {

-    FX_DWORD dwkey = (FX_DWORD)(uintptr_t)pListener->GetPrivateData((FX_LPVOID)(uintptr_t)FWL_NoteDriver_EventKey);

+    FX_DWORD dwkey = (FX_DWORD)(uintptr_t)pListener->GetPrivateData((void*)(uintptr_t)FWL_NoteDriver_EventKey);

     if (dwkey == 0) {

         return FWL_ERR_Indefinite;

     }

     CFWL_EventTarget *value = NULL;

-    if (m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (FX_LPVOID&)value)) {

+    if (m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (void*&)value)) {

         value->FlagInvalid();

     }

     return FWL_ERR_Succeeded;

@@ -442,7 +442,7 @@ int32_t CFWL_NoteDriver::CountLoop()
 {

     return m_noteLoopQueue.GetSize();

 }

-void CFWL_NoteDriver::SetHook(FWLMessageHookCallback callback, FX_LPVOID info)

+void CFWL_NoteDriver::SetHook(FWLMessageHookCallback callback, void* info)

 {

     m_hook = callback;

     m_hookInfo = info;

@@ -799,7 +799,7 @@ void CFWL_NoteDriver::ClearInvalidEventTargets(FX_BOOL bRemoveAll)
 {

     FX_POSITION pos = m_eventTargets.GetStartPosition();

     while (pos) {

-        FX_LPVOID key = NULL;

+        void* key = NULL;

         CFWL_EventTarget *pEventTarget = NULL;

         m_eventTargets.GetNextAssoc(pos, key, (void*&)pEventTarget);

         if (pEventTarget && (bRemoveAll || pEventTarget->IsInvalid())) {

@@ -1119,7 +1119,7 @@ IFWL_Widget* FWL_GetCurrentThreadModalWidget(IFWL_NoteThread *pNoteThread)
     _FWL_RETURN_VALUE_IF_FAIL(widget, NULL);

     return widget->GetInterface();

 }

-FWL_ERR FWL_SetHook(IFWL_NoteDriver *driver, FWLMessageHookCallback callback, FX_LPVOID info)

+FWL_ERR FWL_SetHook(IFWL_NoteDriver *driver, FWLMessageHookCallback callback, void* info)

 {

     CFWL_NoteDriver *noteDriver = (CFWL_NoteDriver*)driver;

     noteDriver->SetHook(callback, info);

diff --git a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp
index 25636ea582..2fdaee126e 100644
--- a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp
@@ -107,15 +107,15 @@ FWL_ERR		CFWL_SDAdapterWidgetMgr::DispatchMessage()
 {

     return FWL_ERR_Succeeded;

 }

-FWL_ERR		CFWL_SDAdapterWidgetMgr::GetWidgetDC(IFWL_Widget *pWidget, FX_LPVOID &pDC)

+FWL_ERR		CFWL_SDAdapterWidgetMgr::GetWidgetDC(IFWL_Widget *pWidget, void* &pDC)

 {

     return FWL_ERR_Succeeded;

 }

-FWL_ERR		CFWL_SDAdapterWidgetMgr::ReleaseWidgetDC(IFWL_Widget *pWidget, FX_LPVOID pDC, CFX_RectF *pClip)

+FWL_ERR		CFWL_SDAdapterWidgetMgr::ReleaseWidgetDC(IFWL_Widget *pWidget, void* pDC, CFX_RectF *pClip)

 {

     return FWL_ERR_Succeeded;

 }

-FX_LPVOID	CFWL_SDAdapterWidgetMgr::GetWindow(IFWL_Widget *pWidget)

+void*	CFWL_SDAdapterWidgetMgr::GetWindow(IFWL_Widget *pWidget)

 {

     return NULL;

 }

@@ -135,7 +135,7 @@ FWL_ERR		CFWL_SDAdapterWidgetMgr::InitMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuD
 {

     return FWL_ERR_Succeeded;

 }

-FWL_ERR		CFWL_SDAdapterWidgetMgr::UpdateMenu(IFWL_Menu *pMenu, FX_LPCVOID hItem, int32_t iType)

+FWL_ERR		CFWL_SDAdapterWidgetMgr::UpdateMenu(IFWL_Menu *pMenu, const void* hItem, int32_t iType)

 {

     return FWL_ERR_Succeeded;

 }

diff --git a/xfa/src/fwl/src/core/fwl_targetimp.cpp b/xfa/src/fwl/src/core/fwl_targetimp.cpp
index 75e40db15a..c09b8ee447 100644
--- a/xfa/src/fwl/src/core/fwl_targetimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_targetimp.cpp
@@ -91,11 +91,11 @@ FWL_ERR CFWL_Target::Finalize()
 {

     return FWL_ERR_Succeeded;

 }

-FX_LPVOID IFWL_TargetData::GetData()

+void* IFWL_TargetData::GetData()

 {

     return m_pData;

 }

-void IFWL_TargetData::SetData(FX_LPVOID pData)

+void IFWL_TargetData::SetData(void* pData)

 {

     m_pData = pData;

 }

diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp
index 4659e6bc9e..d966296f95 100644
--- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp
@@ -71,11 +71,11 @@ FWL_ERR	IFWL_Widget::SetStates(FX_DWORD dwStates, FX_BOOL bSet )
 {

     return ((CFWL_WidgetImp*)m_pData)->SetStates(dwStates, bSet);

 }

-FWL_ERR	IFWL_Widget::SetPrivateData(FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback)

+FWL_ERR	IFWL_Widget::SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback)

 {

     return ((CFWL_WidgetImp*)m_pData)->SetPrivateData(module_id, pData, callback);

 }

-FX_LPVOID IFWL_Widget::GetPrivateData(FX_LPVOID module_id)

+void* IFWL_Widget::GetPrivateData(void* module_id)

 {

     return ((CFWL_WidgetImp*)m_pData)->GetPrivateData(module_id);

 }

@@ -309,7 +309,7 @@ FWL_ERR CFWL_WidgetImp::SetStates(FX_DWORD dwStates, FX_BOOL bSet )
     }

     return ret;

 }

-FWL_ERR CFWL_WidgetImp::SetPrivateData(FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback)

+FWL_ERR CFWL_WidgetImp::SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback)

 {

     if (!m_pPrivateData) {

         m_pPrivateData = new CFX_PrivateData;

@@ -317,7 +317,7 @@ FWL_ERR CFWL_WidgetImp::SetPrivateData(FX_LPVOID module_id, FX_LPVOID pData, PD_
     m_pPrivateData->SetPrivateData(module_id, pData, callback);

     return FWL_ERR_Succeeded;

 }

-FX_LPVOID CFWL_WidgetImp::GetPrivateData(FX_LPVOID module_id)

+void* CFWL_WidgetImp::GetPrivateData(void* module_id)

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pPrivateData, NULL);

     return m_pPrivateData->GetPrivateData(module_id);

@@ -657,7 +657,7 @@ void CFWL_WidgetImp::GetRelativeRect(CFX_RectF &rect)
     rect = m_pProperties->m_rtWidget;

     rect.left = rect.top = 0;

 }

-FX_LPVOID CFWL_WidgetImp::GetThemeCapacity(FX_DWORD dwCapacity)

+void* CFWL_WidgetImp::GetThemeCapacity(FX_DWORD dwCapacity)

 {

     IFWL_ThemeProvider *pTheme = GetAvailableTheme();

     _FWL_RETURN_VALUE_IF_FAIL(pTheme, NULL);

@@ -709,7 +709,7 @@ CFWL_WidgetImp* CFWL_WidgetImp::GetSameAncestor(CFWL_WidgetImp *pWidget)
         relation =  pAncestor->IsPopup() ? FWL_WGTRELATION_Owner : FWL_WGTRELATION_Parent;

     } while ((pAncestor = (CFWL_WidgetImp*)m_pWidgetMgr->GetWidget(pAncestor->m_pInterface, relation)) != NULL);

     for (int32_t i = 0; i < arr1.GetSize(); i ++) {

-        FX_LPVOID pVoid = arr1[i];

+        void* pVoid = arr1[i];

         if (arr2.Find(pVoid) < 0) {

             continue;

         } else {

diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
index a1e1d45718..4a89951d7d 100644
--- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
@@ -48,7 +48,7 @@ CFWL_WidgetMgr::~CFWL_WidgetMgr()
 {

     FX_POSITION ps = m_mapWidgetItem.GetStartPosition();

     while (ps) {

-        FX_LPVOID pWidget;

+        void* pWidget;

         CFWL_WidgetMgrItem *pItem;

         m_mapWidgetItem.GetNextAssoc(ps, pWidget, (void*&)pItem);

         delete pItem;

@@ -213,7 +213,7 @@ FX_BOOL CFWL_WidgetMgr::SetWidgetIndex(IFWL_Widget *pWidget, int32_t nIndex)
     }

     return TRUE;

 }

-FX_BOOL CFWL_WidgetMgr::IsWidget(FX_LPVOID pObj)

+FX_BOOL CFWL_WidgetMgr::IsWidget(void* pObj)

 {

     _FWL_RETURN_VALUE_IF_FAIL(pObj, FALSE);

     return GetWidgetMgrItem((IFWL_Widget*)pObj) != NULL;

@@ -985,7 +985,7 @@ FX_BOOL CFWL_WidgetMgrDelegate::bUseOffscreenDirect(IFWL_Widget *pWidget)
 #endif

     return pItem->iRedrawCounter == 0;

 }

-static void FWL_WriteBMP(CFX_DIBitmap* pBitmap, FX_LPCSTR filename)

+static void FWL_WriteBMP(CFX_DIBitmap* pBitmap, const FX_CHAR* filename)

 {

     FILE* file = fopen(filename, "wb");

     if (file == NULL) {

@@ -1017,7 +1017,7 @@ static void FWL_WriteBMP(CFX_DIBitmap* pBitmap, FX_LPCSTR filename)
     buffer[14] = pBitmap->GetBPP();

     fwrite(buffer, 40, 1, file);

     for (int row = 0; row < pBitmap->GetHeight(); row ++) {

-        FX_LPBYTE scan_line = pBitmap->GetBuffer() + row * pBitmap->GetPitch();

+        uint8_t* scan_line = pBitmap->GetBuffer() + row * pBitmap->GetPitch();

         fwrite(scan_line, pBitmap->GetPitch(), 1, file);

     }

     fclose(file);

diff --git a/xfa/src/fwl/src/core/include/fwl_noteimp.h b/xfa/src/fwl/src/core/include/fwl_noteimp.h
index 699840d27e..78afc35313 100644
--- a/xfa/src/fwl/src/core/include/fwl_noteimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_noteimp.h
@@ -63,7 +63,7 @@ public:
     FX_BOOL				UnqueueMessage(CFWL_NoteLoop *pNoteLoop);

     CFWL_NoteLoop*		GetTopLoop();

     int32_t            CountLoop();

-    void                SetHook(FWLMessageHookCallback callback, FX_LPVOID info);

+    void                SetHook(FWLMessageHookCallback callback, void* info);

     FX_BOOL				ProcessMessage(CFWL_Message *pMessage);

 protected:

     FX_BOOL				DispatchMessage(CFWL_Message *pMessage, IFWL_Widget *pMessageForm);

@@ -94,9 +94,9 @@ protected:
     IFWL_Widget			*m_pGrab;

     CFWL_NoteLoop		*m_pNoteLoop;

     FWLMessageHookCallback m_hook;

-    FX_LPVOID              m_hookInfo;

+    void*              m_hookInfo;

 };

-typedef CFX_MapPtrTemplate<FX_LPVOID, FX_DWORD> CFWL_EventSource;

+typedef CFX_MapPtrTemplate<void*, FX_DWORD> CFWL_EventSource;

 class CFWL_EventTarget

 {

 public:

diff --git a/xfa/src/fwl/src/core/include/fwl_targetimp.h b/xfa/src/fwl/src/core/include/fwl_targetimp.h
index 2fa2bf7322..1287a63870 100644
--- a/xfa/src/fwl/src/core/include/fwl_targetimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_targetimp.h
@@ -26,7 +26,7 @@ protected:
 class IFWL_TargetData : public IFWL_Target

 {

 public:

-    FX_LPVOID GetData();

-    void	  SetData(FX_LPVOID pData);

+    void* GetData();

+    void	  SetData(void* pData);

 };

 #endif

diff --git a/xfa/src/fwl/src/core/include/fwl_widgetimp.h b/xfa/src/fwl/src/core/include/fwl_widgetimp.h
index 4d28722576..af4ceced95 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_widgetimp.h
@@ -36,8 +36,8 @@ public:
     virtual FWL_ERR		ModifyStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved);

     virtual FX_DWORD	GetStates();

     virtual FWL_ERR		SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE);

-    virtual FWL_ERR		SetPrivateData(FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback);

-    virtual FX_LPVOID	GetPrivateData(FX_LPVOID module_id);

+    virtual FWL_ERR		SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback);

+    virtual void*	GetPrivateData(void* module_id);

     virtual	FWL_ERR		Update();

     virtual FWL_ERR		LockUpdate();

     virtual FWL_ERR		UnlockUpdate();

@@ -76,7 +76,7 @@ protected:
     FX_FLOAT	GetBorderSize(FX_BOOL bCX = TRUE);

     FX_FLOAT	GetEdgeWidth();

     void		GetRelativeRect(CFX_RectF &rect);

-    FX_LPVOID	GetThemeCapacity(FX_DWORD dwCapacity);

+    void*	GetThemeCapacity(FX_DWORD dwCapacity);

     IFWL_ThemeProvider* GetAvailableTheme();

     CFWL_WidgetImp*	GetRootOuter();

     CFWL_WidgetImp*	GetSameAncestor(CFWL_WidgetImp *pWidget);

diff --git a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
index f730f5b33d..12b629ff06 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
@@ -59,7 +59,7 @@ public:
     virtual IFWL_Widget*	GetWidget(IFWL_Widget *pWidget, FWL_WGTRELATION eRelation);

     virtual int32_t		GetWidgetIndex(IFWL_Widget *pWidget);

     virtual FX_BOOL			SetWidgetIndex(IFWL_Widget *pWidget, int32_t nIndex);

-    virtual FX_BOOL			IsWidget(FX_LPVOID pObj);

+    virtual FX_BOOL			IsWidget(void* pObj);

     virtual FWL_ERR			RepaintWidget(IFWL_Widget *pWidget, const CFX_RectF *pRect = NULL);

     virtual FX_DWORD		GetCapability()

     {

diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/src/lightwidget/combobox.cpp
index c443dfbcb3..c0806ef15b 100644
--- a/xfa/src/fwl/src/lightwidget/combobox.cpp
+++ b/xfa/src/fwl/src/lightwidget/combobox.cpp
@@ -135,14 +135,14 @@ FWL_ERR CFWL_ComboBox::SetMaxListHeight(FX_FLOAT fMaxHeight)
     m_comboBoxData.m_fMaxListHeight = fMaxHeight;

     return FWL_ERR_Succeeded;

 }

-FWL_ERR	CFWL_ComboBox::SetItemData(int32_t iIndex, FX_LPVOID pData)

+FWL_ERR	CFWL_ComboBox::SetItemData(int32_t iIndex, void* pData)

 {

     CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget *)this, iIndex));

     _FWL_RETURN_VALUE_IF_FAIL(pItem, FWL_ERR_Indefinite);

     pItem->m_pData = pData;

     return FWL_ERR_Succeeded;

 }

-FX_LPVOID CFWL_ComboBox::GetItemData(int32_t iIndex)

+void* CFWL_ComboBox::GetItemData(int32_t iIndex)

 {

     CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget *)this, iIndex));

     _FWL_RETURN_VALUE_IF_FAIL(pItem, NULL);

@@ -299,7 +299,7 @@ FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::GetItemRect(IFWL_Widget *pWidget, FWL_HL
                pItem->m_rtItem.height);

     return FWL_ERR_Succeeded;

 }

-FX_LPVOID CFWL_ComboBox::CFWL_ComboBoxDP::GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)

+void* CFWL_ComboBox::CFWL_ComboBoxDP::GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)

 {

     _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL);

     CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)hItem;

@@ -311,7 +311,7 @@ FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemStyles(IFWL_Widget *pWidget, FWL_
     ((CFWL_ComboBoxItem*)hItem)->m_dwStyles = dwStyle;

     return FWL_ERR_Succeeded;

 }

-FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_LPCWSTR pszText)

+FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText)

 {

     _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

     ((CFWL_ComboBoxItem*)hItem)->m_wsText = pszText;

diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/src/lightwidget/edit.cpp
index 8bace71d74..1ee1066793 100644
--- a/xfa/src/fwl/src/lightwidget/edit.cpp
+++ b/xfa/src/fwl/src/lightwidget/edit.cpp
@@ -112,7 +112,7 @@ FWL_ERR CFWL_Edit::SetFormatString(const CFX_WideString &wsFormat)
     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

     return ((IFWL_Edit*)m_pImp)->SetFormatString(wsFormat);

 }

-FWL_ERR CFWL_Edit::Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen)

+FWL_ERR CFWL_Edit::Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen)

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

     return ((IFWL_Edit*)m_pImp)->Insert(nStart, lpText, nLen);

diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/src/lightwidget/listbox.cpp
index f3278df1f9..a9890bd283 100644
--- a/xfa/src/fwl/src/lightwidget/listbox.cpp
+++ b/xfa/src/fwl/src/lightwidget/listbox.cpp
@@ -163,14 +163,14 @@ FWL_ERR CFWL_ListBox::GetItemString(FWL_HLISTITEM hItem, CFX_WideString &wsText)
     wsText = pItem->m_wsText;

     return FWL_ERR_Succeeded;

 }

-FWL_ERR	CFWL_ListBox::SetItemData(FWL_HLISTITEM hItem, FX_LPVOID pData)

+FWL_ERR	CFWL_ListBox::SetItemData(FWL_HLISTITEM hItem, void* pData)

 {

     _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

     CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

     pItem->m_pData = pData;

     return FWL_ERR_Succeeded;

 }

-FX_LPVOID CFWL_ListBox::GetItemData(FWL_HLISTITEM hItem)

+void* CFWL_ListBox::GetItemData(FWL_HLISTITEM hItem)

 {

     _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL);

     CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

@@ -270,7 +270,7 @@ FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::GetItemRect(IFWL_Widget *pWidget, FWL_HLIS
     rtItem = pItem->m_rtItem;

     return FWL_ERR_Succeeded;

 }

-FX_LPVOID CFWL_ListBox::CFWL_ListBoxDP::GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)

+void* CFWL_ListBox::CFWL_ListBoxDP::GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)

 {

     _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL);

     CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

@@ -282,7 +282,7 @@ FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemStyles(IFWL_Widget *pWidget, FWL_HL
     ((CFWL_ListItem*)hItem)->m_dwStates = dwStyle;

     return FWL_ERR_Succeeded;

 }

-FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_LPCWSTR pszText)

+FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText)

 {

     _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

     ((CFWL_ListItem*)hItem)->m_wsText = pszText;

diff --git a/xfa/src/fwl/src/lightwidget/theme.cpp b/xfa/src/fwl/src/lightwidget/theme.cpp
index 84925f562e..f9a2bab6a2 100644
--- a/xfa/src/fwl/src/lightwidget/theme.cpp
+++ b/xfa/src/fwl/src/lightwidget/theme.cpp
@@ -47,7 +47,7 @@ FX_BOOL CFWL_Theme::DrawText(CFWL_ThemeText *pParams)
     FXSYS_assert(pTheme);

     return pTheme->DrawText(pParams);

 }

-FX_LPVOID CFWL_Theme::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

+void* CFWL_Theme::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

 {

     CFWL_WidgetTP *pTheme = GetTheme(pThemePart->m_pWidget);

     FXSYS_assert(pTheme);

@@ -133,7 +133,7 @@ CFWL_Theme::~CFWL_Theme()
     }

     m_arrThemes.RemoveAll();

 }

-FWL_ERR	CFWL_Theme::SetFont(IFWL_Widget *pWidget, FX_LPCWSTR strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont)

+FWL_ERR	CFWL_Theme::SetFont(IFWL_Widget *pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont)

 {

     int32_t iCount = m_arrThemes.GetSize();

     for (int32_t i = 0; i < iCount; i ++) {

diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/src/lightwidget/widget.cpp
index 6171eecf31..b1cbd9ae9e 100644
--- a/xfa/src/fwl/src/lightwidget/widget.cpp
+++ b/xfa/src/fwl/src/lightwidget/widget.cpp
@@ -54,7 +54,7 @@ FX_BOOL CFWL_Widget::IsInstance(FX_WSTR wsClass) const
     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

     return m_pImp->IsInstance(wsClass);

 }

-static FX_LPVOID gs_pFWLWidget = (FX_LPVOID)FXBSTR_ID('l', 'i', 'g', 't');

+static void* gs_pFWLWidget = (void*)FXBSTR_ID('l', 'i', 'g', 't');

 FWL_ERR CFWL_Widget::Initialize(const CFWL_WidgetProperties *pProperties )

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

@@ -133,12 +133,12 @@ FWL_ERR	CFWL_Widget::SetStates(FX_DWORD dwStates, FX_BOOL bSet )
     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

     return m_pImp->SetStates(dwStates, bSet);

 }

-FWL_ERR	CFWL_Widget::SetPrivateData(FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback)

+FWL_ERR	CFWL_Widget::SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback)

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

     return m_pImp->SetPrivateData(module_id, pData, callback);

 }

-FX_LPVOID CFWL_Widget::GetPrivateData(FX_LPVOID module_id)

+void* CFWL_Widget::GetPrivateData(void* module_id)

 {

     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);

     return m_pImp->GetPrivateData(module_id);

diff --git a/xfa/src/fwl/src/theme/comboboxtp.cpp b/xfa/src/fwl/src/theme/comboboxtp.cpp
index c7218955c9..28a1958f58 100644
--- a/xfa/src/fwl/src/theme/comboboxtp.cpp
+++ b/xfa/src/fwl/src/theme/comboboxtp.cpp
@@ -78,7 +78,7 @@ void CFWL_ComboBoxTP::DrawStrethHandler(CFWL_ThemeBackground *pParams, FX_DWORD
     pParams->m_pGraphics->SetFillColor(&cr);

     pParams->m_pGraphics->FillPath(&path, FXFILL_WINDING, &pParams->m_matrix);

 }

-FX_LPVOID CFWL_ComboBoxTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

+void* CFWL_ComboBoxTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

 {

     if (dwCapacity == FWL_WGTCAPACITY_CMB_ComboFormHandler) {

         m_fValue = FWLTHEME_CAPACITY_ComboFormHandler;

diff --git a/xfa/src/fwl/src/theme/formtp.cpp b/xfa/src/fwl/src/theme/formtp.cpp
index ce12c15e78..db152edea5 100644
--- a/xfa/src/fwl/src/theme/formtp.cpp
+++ b/xfa/src/fwl/src/theme/formtp.cpp
@@ -144,7 +144,7 @@ FX_BOOL	CFWL_FormTP::DrawText(CFWL_ThemeText *pParams)
     }

     return CFWL_WidgetTP::DrawText(pParams);

 }

-FX_LPVOID CFWL_FormTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

+void* CFWL_FormTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

 {

     FX_BOOL bDefPro = FALSE;

     FX_BOOL bDwordVal = FALSE;

diff --git a/xfa/src/fwl/src/theme/listboxtp.cpp b/xfa/src/fwl/src/theme/listboxtp.cpp
index a623509973..c16df585d9 100644
--- a/xfa/src/fwl/src/theme/listboxtp.cpp
+++ b/xfa/src/fwl/src/theme/listboxtp.cpp
@@ -67,7 +67,7 @@ FWL_ERR	CFWL_ListBoxTP::Finalize()
     FinalizeTTO();

     return CFWL_WidgetTP::Finalize();

 }

-void CFWL_ListBoxTP::DrawListBoxItem(CFX_Graphics *pGraphics, FX_DWORD dwStates, const CFX_RectF *prtItem, FX_LPVOID pData , CFX_Matrix *pMatrix )

+void CFWL_ListBoxTP::DrawListBoxItem(CFX_Graphics *pGraphics, FX_DWORD dwStates, const CFX_RectF *prtItem, void* pData , CFX_Matrix *pMatrix )

 {

     if (dwStates & FWL_PARTSTATE_LTB_Selected) {

         pGraphics->SaveGraphState();

diff --git a/xfa/src/fwl/src/theme/monthcalendartp.cpp b/xfa/src/fwl/src/theme/monthcalendartp.cpp
index 2104d873f3..de7f3a847b 100644
--- a/xfa/src/fwl/src/theme/monthcalendartp.cpp
+++ b/xfa/src/fwl/src/theme/monthcalendartp.cpp
@@ -130,7 +130,7 @@ FX_BOOL	CFWL_MonthCalendarTP::DrawText(CFWL_ThemeText *pParams)
     }

     return CFWL_WidgetTP::DrawText(pParams);

 }

-FX_LPVOID CFWL_MonthCalendarTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

+void* CFWL_MonthCalendarTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

 {

     FX_BOOL bDefPro = FALSE;

     FX_BOOL bDwordVal = FALSE;

diff --git a/xfa/src/fwl/src/theme/pushbuttontp.cpp b/xfa/src/fwl/src/theme/pushbuttontp.cpp
index 8194b249be..9f3127f5b7 100644
--- a/xfa/src/fwl/src/theme/pushbuttontp.cpp
+++ b/xfa/src/fwl/src/theme/pushbuttontp.cpp
@@ -94,7 +94,7 @@ FX_BOOL	CFWL_PushButtonTP::DrawBackground(CFWL_ThemeBackground *pParams)
     }

     return TRUE;

 }

-FX_LPVOID CFWL_PushButtonTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

+void* CFWL_PushButtonTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

 {

     if (dwCapacity == FWL_WGTCAPACITY_PSB_Margin) {

         m_fValue = 0;

diff --git a/xfa/src/fwl/src/theme/scrollbartp.cpp b/xfa/src/fwl/src/theme/scrollbartp.cpp
index a90dafa17e..c10507a57e 100644
--- a/xfa/src/fwl/src/theme/scrollbartp.cpp
+++ b/xfa/src/fwl/src/theme/scrollbartp.cpp
@@ -23,7 +23,7 @@ FX_BOOL	CFWL_ScrollBarTP::IsValidWidget(IFWL_Widget *pWidget)
     _FWL_RETURN_VALUE_IF_FAIL(pWidget, FALSE);

     return pWidget->GetClassID() == FWL_CLASSHASH_ScrollBar;

 }

-FX_LPVOID CFWL_ScrollBarTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

+void* CFWL_ScrollBarTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

 {

     if (dwCapacity == FWL_CAPACITY_SCB_Size) {

         m_fValue = 5;

diff --git a/xfa/src/fwl/src/theme/widgettp.cpp b/xfa/src/fwl/src/theme/widgettp.cpp
index aac6516799..a4c876956d 100644
--- a/xfa/src/fwl/src/theme/widgettp.cpp
+++ b/xfa/src/fwl/src/theme/widgettp.cpp
@@ -69,7 +69,7 @@ FX_BOOL	CFWL_WidgetTP::DrawText(CFWL_ThemeText *pParams)
     m_pTextOut->DrawLogicText(pParams->m_wsText, iLen, pParams->m_rtPart);

     return TRUE;

 }

-FX_LPVOID CFWL_WidgetTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

+void* CFWL_WidgetTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

 {

     switch(dwCapacity) {

         case FWL_WGTCAPACITY_CXBorder: {

@@ -162,7 +162,7 @@ FWL_ERR	CFWL_WidgetTP::Finalize()
 CFWL_WidgetTP::~CFWL_WidgetTP()

 {

 }

-FWL_ERR CFWL_WidgetTP::SetFont(IFWL_Widget *pWidget, FX_LPCWSTR strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont)

+FWL_ERR CFWL_WidgetTP::SetFont(IFWL_Widget *pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont)

 {

     if (!m_pTextOut) {

         return FWL_ERR_Succeeded;