Merge to XFA: Use stdint.h types throughout PDFium.
[pdfium.git] / xfa / src / fwl / src / core / include / fwl_widgetimp.h
index 862bb53..4d28722 100644 (file)
@@ -83,8 +83,8 @@ protected:
     CFX_SizeF  GetOffsetFromAncestor(CFWL_WidgetImp *pAncestor);\r
     FX_BOOL            TransformToOuter(FX_FLOAT &fx, FX_FLOAT &fy);\r
     FX_BOOL            TransformFromOuter(FX_FLOAT &fx, FX_FLOAT &fy);\r
-    CFX_SizeF  CalcTextSize(const CFX_WideString &wsText, IFWL_ThemeProvider *pTheme, FX_BOOL bMultiLine = FALSE, FX_INT32 iLineWidth = -1);\r
-    void               CalcTextRect(const CFX_WideString &wsText, IFWL_ThemeProvider *pTheme, FX_DWORD dwTTOStyles, FX_INT32 iTTOAlign, CFX_RectF &rect);\r
+    CFX_SizeF  CalcTextSize(const CFX_WideString &wsText, IFWL_ThemeProvider *pTheme, FX_BOOL bMultiLine = FALSE, int32_t iLineWidth = -1);\r
+    void               CalcTextRect(const CFX_WideString &wsText, IFWL_ThemeProvider *pTheme, FX_DWORD dwTTOStyles, int32_t iTTOAlign, CFX_RectF &rect);\r
     void               SetFocus(FX_BOOL bFocus);\r
     void               SetGrab(FX_BOOL bSet);\r
     FX_BOOL            GetPopupPos(FX_FLOAT fMinHeight, FX_FLOAT fMaxHeight, const CFX_RectF &rtAnchor, CFX_RectF &rtPopup);\r
@@ -97,9 +97,9 @@ protected:
     void               DispatchKeyEvent(CFWL_MsgKey *pNote);\r
     void               DispatchEvent(CFWL_Event *pEvent);\r
     void               Repaint(const CFX_RectF *pRect = NULL);\r
-    void               DrawBackground(CFX_Graphics *pGraphics, FX_INT32 iPartBk, IFWL_ThemeProvider *pTheme, const CFX_Matrix *pMatrix = NULL);\r
-    void               DrawBorder(CFX_Graphics *pGraphics, FX_INT32 iPartBorder, IFWL_ThemeProvider *pTheme, const CFX_Matrix *pMatrix = NULL);\r
-    void               DrawEdge(CFX_Graphics *pGraphics, FX_INT32 iPartEdge, IFWL_ThemeProvider *pTheme, const CFX_Matrix *pMatrix = NULL);\r
+    void               DrawBackground(CFX_Graphics *pGraphics, int32_t iPartBk, IFWL_ThemeProvider *pTheme, const CFX_Matrix *pMatrix = NULL);\r
+    void               DrawBorder(CFX_Graphics *pGraphics, int32_t iPartBorder, IFWL_ThemeProvider *pTheme, const CFX_Matrix *pMatrix = NULL);\r
+    void               DrawEdge(CFX_Graphics *pGraphics, int32_t iPartEdge, IFWL_ThemeProvider *pTheme, const CFX_Matrix *pMatrix = NULL);\r
     void               NotifyDriver();\r
 \r
     FX_BOOL            IsParent(IFWL_Widget *pParent);\r
@@ -111,7 +111,7 @@ protected:
     IFWL_WidgetDelegate                   *m_pCurDelegate;\r
     IFWL_Widget                               *m_pOuter;\r
     IFWL_Widget                                   *m_pInterface;\r
-    FX_INT32                                   m_iLock;\r
+    int32_t                                    m_iLock;\r
     friend class CFWL_WidgetImpDelegate;\r
     friend void FWL_SetWidgetRect(IFWL_Widget *widget, const CFX_RectF &rect);\r
     friend void FWL_SetWidgetStates(IFWL_Widget *widget, FX_DWORD dwStates);\r
@@ -121,7 +121,7 @@ class CFWL_WidgetImpDelegate
 {\r
 public:\r
     CFWL_WidgetImpDelegate();\r
-    virtual FX_INT32   OnProcessMessage(CFWL_Message *pMessage);\r
+    virtual int32_t    OnProcessMessage(CFWL_Message *pMessage);\r
     virtual FWL_ERR            OnProcessEvent(CFWL_Event *pEvent);\r
     virtual FWL_ERR            OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL);\r
 };\r