Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / src / fwl / src / core / fwl_formimp.cpp
index 2491999..3683854 100644 (file)
@@ -154,7 +154,7 @@ FX_DWORD CFWL_FormImp::GetClassID() const
 {\r
     return FWL_CLASSHASH_Form;\r
 }\r
-FX_BOOL        CFWL_FormImp::IsInstance(FX_WSTR wsClass) const\r
+FX_BOOL        CFWL_FormImp::IsInstance(const CFX_WideStringC& wsClass) const\r
 {\r
     if (wsClass == CFX_WideStringC(FWL_CLASS_Form)) {\r
         return TRUE;\r
@@ -326,7 +326,7 @@ FWL_ERR CFWL_FormImp::DrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMat
     _FWL_RETURN_VALUE_IF_FAIL(m_pProperties->m_pThemeProvider, FWL_ERR_Indefinite);\r
     IFWL_ThemeProvider *pTheme = m_pProperties->m_pThemeProvider;\r
     FX_BOOL bInactive = !IsActive();\r
-    FX_INT32 iState = bInactive ? FWL_PARTSTATE_FRM_Inactive : FWL_PARTSTATE_FRM_Normal;\r
+    int32_t iState = bInactive ? FWL_PARTSTATE_FRM_Inactive : FWL_PARTSTATE_FRM_Normal;\r
     if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_FRM_NoDrawClient) == 0) {\r
         DrawBackground(pGraphics, pTheme);\r
     }\r
@@ -599,7 +599,7 @@ CFWL_SysBtn* CFWL_FormImp::GetSysBtnByState(FX_DWORD dwState)
     }\r
     return NULL;\r
 }\r
-CFWL_SysBtn* CFWL_FormImp::GetSysBtnByIndex(FX_INT32 nIndex)\r
+CFWL_SysBtn* CFWL_FormImp::GetSysBtnByIndex(int32_t nIndex)\r
 {\r
     if (nIndex < 0) {\r
         return NULL;\r
@@ -616,7 +616,7 @@ CFWL_SysBtn* CFWL_FormImp::GetSysBtnByIndex(FX_INT32 nIndex)
     }\r
     return (CFWL_SysBtn*) arrBtn[nIndex];\r
 }\r
-FX_INT32 CFWL_FormImp::GetSysBtnIndex(CFWL_SysBtn *pBtn)\r
+int32_t CFWL_FormImp::GetSysBtnIndex(CFWL_SysBtn *pBtn)\r
 {\r
     CFX_PtrArray arrBtn;\r
     if (m_pMinBox) {\r
@@ -989,12 +989,12 @@ CFWL_FormDelegate::CFWL_FormDelegate(CFWL_FormImp *pOwner)
     : m_pOwner(pOwner)\r
 {\r
 }\r
-FX_INT32 CFWL_FormDelegate::OnProcessMessage(CFWL_Message *pMessage)\r
+int32_t CFWL_FormDelegate::OnProcessMessage(CFWL_Message *pMessage)\r
 {\r
 #ifdef FWL_UseMacSystemBorder\r
     _FWL_RETURN_VALUE_IF_FAIL(pMessage, 0);\r
     FX_DWORD dwMsgCode = pMessage->GetClassID();\r
-    FX_INT32 iRet = 1;\r
+    int32_t iRet = 1;\r
     switch (dwMsgCode) {\r
         case FWL_MSGHASH_Activate: {\r
                 m_pOwner->m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Deactivated;\r
@@ -1011,7 +1011,7 @@ FX_INT32 CFWL_FormDelegate::OnProcessMessage(CFWL_Message *pMessage)
 #else\r
     _FWL_RETURN_VALUE_IF_FAIL(pMessage, 0);\r
     FX_DWORD dwMsgCode = pMessage->GetClassID();\r
-    FX_INT32 iRet = 1;\r
+    int32_t iRet = 1;\r
     switch (dwMsgCode) {\r
         case FWL_MSGHASH_Activate: {\r
                 m_pOwner->m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Deactivated;\r