Remove FX_DWORD from XFA, part 2

xfa/fwl/core/fwl_formimp.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef XFA_FWL_CORE_FWL_FORMIMP_H_
 #define XFA_FWL_CORE_FWL_FORMIMP_H_
 
 #include "xfa/fwl/core/fwl_panelimp.h"
@@ skipping 35 matching lines @@
   }
   void SetDisabled(FX_BOOL bDisabled) {
     bDisabled ? m_dwState |= FWL_SYSBUTTONSTATE_Disabled
               : m_dwState &= ~FWL_SYSBUTTONSTATE_Disabled;
   }
   int32_t GetPartState() {
     return (IsDisabled() ? FWL_PARTSTATE_FRM_Disabled : (m_dwState + 1));
   }
 
   CFX_RectF m_rtBtn;
-  FX_DWORD m_dwState;
+  uint32_t m_dwState;
 };
 enum FORM_RESIZETYPE {
   FORM_RESIZETYPE_None = 0,
   FORM_RESIZETYPE_Cap,
   FORM_RESIZETYPE_Left,
   FORM_RESIZETYPE_Top,
   FORM_RESIZETYPE_Right,
   FORM_RESIZETYPE_Bottom,
   FORM_RESIZETYPE_LeftTop,
   FORM_RESIZETYPE_LeftBottom,
   FORM_RESIZETYPE_RightTop,
   FORM_RESIZETYPE_RightBottom
 };
 typedef struct RestoreResizeInfo {
   CFX_PointF m_ptStart;
   CFX_SizeF m_szStart;
 } RestoreInfo;
 class CFWL_FormImp : public CFWL_PanelImp {
  public:
   CFWL_FormImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter);
   virtual ~CFWL_FormImp();
   virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
-  virtual FX_DWORD GetClassID() const;
+  virtual uint32_t GetClassID() const;
   virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const;
   virtual FWL_ERR Initialize();
   virtual FWL_ERR Finalize();
 
   virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
   virtual FWL_ERR GetClientRect(CFX_RectF& rect);
   virtual FWL_ERR Update();
-  virtual FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy);
+  virtual uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy);
   virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics,
                              const CFX_Matrix* pMatrix = NULL);
   virtual FWL_FORMSIZE GetFormSize();
   virtual FWL_ERR SetFormSize(FWL_FORMSIZE eFormSize);
   virtual IFWL_Widget* DoModal();
-  virtual IFWL_Widget* DoModal(FX_DWORD& dwCommandID);
+  virtual IFWL_Widget* DoModal(uint32_t& dwCommandID);
   virtual FWL_ERR EndDoModal();
   virtual FWL_ERR SetBorderRegion(CFX_Path* pPath);
   virtual void DrawBackground(CFX_Graphics* pGraphics,
                               IFWL_ThemeProvider* pTheme);
   CFWL_WidgetImp* GetSubFocus();
   void SetSubFocus(CFWL_WidgetImp* pWidget);
   CFX_MapAccelerators& GetAccelerator();
   void SetAccelerator(CFX_MapAccelerators* pAccelerators);
 
  protected:
   void ShowChildWidget(IFWL_Widget* pParent);
   void RemoveSysButtons();
   void CalcContentRect(CFX_RectF& rtContent);
   CFWL_SysBtn* GetSysBtnAtPoint(FX_FLOAT fx, FX_FLOAT fy);
-  CFWL_SysBtn* GetSysBtnByState(FX_DWORD dwState);
+  CFWL_SysBtn* GetSysBtnByState(uint32_t dwState);
   CFWL_SysBtn* GetSysBtnByIndex(int32_t nIndex);
   int32_t GetSysBtnIndex(CFWL_SysBtn* pBtn);
   FX_FLOAT GetCaptionHeight();
   void DrawCaptionText(CFX_Graphics* pGs,
                        IFWL_ThemeProvider* pTheme,
                        const CFX_Matrix* pMatrix = NULL);
   void DrawIconImage(CFX_Graphics* pGs,
                      IFWL_ThemeProvider* pTheme,
                      const CFX_Matrix* pMatrix = NULL);
   void GetEdgeRect(CFX_RectF& rtEdge);
@@ skipping 67 matching lines @@
   void OnMouseMove(CFWL_MsgMouse* pMsg);
   void OnMouseHover(CFWL_MsgMouse* pMsg);
   void OnMouseLeave(CFWL_MsgMouse* pMsg);
   void OnLButtonDblClk(CFWL_MsgMouse* pMsg);
   void OnWindowMove(CFWL_MsgWindowMove* pMsg);
   void OnClose(CFWL_MsgClose* pMsg);
   CFWL_FormImp* m_pOwner;
 };
 
 #endif  // XFA_FWL_CORE_FWL_FORMIMP_H_