Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / include / fxfa / fxfa_widget.h
index 4488502..72581ae 100644 (file)
@@ -25,7 +25,7 @@ public:
     CXFA_WidgetAcc(CXFA_FFDocView* pDocView, CXFA_Node* pNode);\r
     ~CXFA_WidgetAcc();\r
 \r
-    FX_BOOL                    GetName(CFX_WideString &wsName, FX_INT32 iNameType = 0);\r
+    FX_BOOL                    GetName(CFX_WideString &wsName, int32_t iNameType = 0);\r
     FX_BOOL                    ProcessValueChanged();\r
 \r
 public:\r
@@ -33,7 +33,7 @@ public:
     void                       ResetData();\r
 \r
 \r
-    void                       SetImageEdit(FX_WSTR wsContentType, FX_WSTR wsHref, FX_WSTR wsData);\r
+    void                       SetImageEdit(const CFX_WideStringC& wsContentType, const CFX_WideStringC& wsHref, const CFX_WideStringC& wsData);\r
 \r
     CXFA_WidgetAcc*    GetExclGroup();\r
     CXFA_FFDocView*            GetDocView();\r
@@ -41,21 +41,21 @@ public:
     CXFA_FFApp*                        GetApp();\r
     IXFA_AppProvider*  GetAppProvider();\r
 \r
-    FX_INT32           ProcessEvent(FX_INT32 iActivity, CXFA_EventParam* pEventParam);\r
-    FX_INT32           ProcessEvent(CXFA_Event& event, CXFA_EventParam* pEventParam);\r
-    FX_INT32           ProcessCalculate();\r
-    FX_INT32           ProcessValidate(FX_INT32 iFlags = 0);\r
-    FX_INT32           ExecuteScript(CXFA_Script script, CXFA_EventParam* pEventParam, FXJSE_HVALUE* pRetValue = NULL);\r
+    int32_t            ProcessEvent(int32_t iActivity, CXFA_EventParam* pEventParam);\r
+    int32_t            ProcessEvent(CXFA_Event& event, CXFA_EventParam* pEventParam);\r
+    int32_t            ProcessCalculate();\r
+    int32_t            ProcessValidate(int32_t iFlags = 0);\r
+    int32_t            ExecuteScript(CXFA_Script script, CXFA_EventParam* pEventParam, FXJSE_HVALUE* pRetValue = NULL);\r
 \r
     CXFA_FFWidget*     GetNextWidget(CXFA_FFWidget* pWidget);\r
     void                       StartWidgetLayout(FX_FLOAT &fCalcWidth, FX_FLOAT& fCalcHeight);\r
-    FX_BOOL                    FindSplitPos(FX_INT32 iBlockIndex, FX_FLOAT &fCalcHeight);\r
+    FX_BOOL                    FindSplitPos(int32_t iBlockIndex, FX_FLOAT &fCalcHeight);\r
     FX_BOOL                            LoadCaption();\r
     FX_BOOL                            LoadText();\r
     FX_BOOL                            LoadImageImage();\r
     FX_BOOL                            LoadImageEditImage();\r
-    void                               GetImageDpi(FX_INT32 &iImageXDpi, FX_INT32 &iImageYDpi);\r
-    void                               GetImageEditDpi(FX_INT32 &iImageXDpi, FX_INT32 &iImageYDpi);\r
+    void                               GetImageDpi(int32_t &iImageXDpi, int32_t &iImageYDpi);\r
+    void                               GetImageEditDpi(int32_t &iImageXDpi, int32_t &iImageYDpi);\r
     CXFA_TextLayout*   GetCaptionTextLayout();\r
     CXFA_TextLayout*   GetTextLayout();\r
     CFX_DIBitmap*              GetImageImage();\r
@@ -63,7 +63,7 @@ public:
     void                               SetImageImage(CFX_DIBitmap* newImage);\r
     void                               SetImageEditImage(CFX_DIBitmap* newImage);\r
     void                       UpdateUIDisplay(CXFA_FFWidget* pExcept = NULL);\r
-    void                       NotifyEvent(FX_DWORD dwEvent, CXFA_FFWidget* pWidget = NULL, FX_LPVOID pParam = NULL, FX_LPVOID pAdditional = NULL);\r
+    void                       NotifyEvent(FX_DWORD dwEvent, CXFA_FFWidget* pWidget = NULL, void* pParam = NULL, void* pAdditional = NULL);\r
 \r
 \r
     CXFA_Node*         GetDatasets();\r
@@ -73,9 +73,9 @@ public:
     FX_FLOAT           GetLineHeight();\r
     CXFA_WidgetLayoutData* GetWidgetLayoutData();\r
 protected:\r
-    void                       ProcessScriptTestValidate(CXFA_Validate validate, FX_INT32 iRet, FXJSE_HVALUE pRetValue, FX_BOOL bVersionFlag);\r
-    FX_INT32           ProcessFormatTestValidate(CXFA_Validate validate, FX_BOOL bVersionFlag);\r
-    FX_INT32           ProcessNullTestValidate(CXFA_Validate validate, FX_INT32 iFlags, FX_BOOL bVersionFlag);\r
+    void                       ProcessScriptTestValidate(CXFA_Validate validate, int32_t iRet, FXJSE_HVALUE pRetValue, FX_BOOL bVersionFlag);\r
+    int32_t            ProcessFormatTestValidate(CXFA_Validate validate, FX_BOOL bVersionFlag);\r
+    int32_t            ProcessNullTestValidate(CXFA_Validate validate, int32_t iFlags, FX_BOOL bVersionFlag);\r
     void                       GetValidateCaptionName(CFX_WideString& wsCaptionName, FX_BOOL bVersionFlag);\r
     void                       GetValidateMessage(IXFA_AppProvider* pAppProvider, CFX_WideString& wsMessage, FX_BOOL bError, FX_BOOL bVersionFlag);\r
     void                       CalcCaptionSize(CFX_SizeF &szCap);\r