Remove FX_DWORD from XFA.

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

10 files changed, 55 insertions, 55 deletions

diff --git a/xfa/fwl/theme/carettp.cpp b/xfa/fwl/theme/carettp.cpp
index b1cf5ef65a..a5782f30b6 100644
--- a/xfa/fwl/theme/carettp.cpp
+++ b/xfa/fwl/theme/carettp.cpp
@@ -37,7 +37,7 @@ FX_BOOL CFWL_CaretTP::DrawBackground(CFWL_ThemeBackground* pParams) {
   return TRUE;
 }
 void CFWL_CaretTP::DrawCaretBK(CFX_Graphics* pGraphics,
-                               FX_DWORD dwStates,
+                               uint32_t dwStates,
                                const CFX_RectF* pRect,
                                CFX_Color* crFill,
                                CFX_Matrix* pMatrix) {
diff --git a/xfa/fwl/theme/checkboxtp.cpp b/xfa/fwl/theme/checkboxtp.cpp
index e7d206a1a0..ee485fb7ac 100644
--- a/xfa/fwl/theme/checkboxtp.cpp
+++ b/xfa/fwl/theme/checkboxtp.cpp
@@ -41,8 +41,8 @@ CFWL_CheckBoxTP::~CFWL_CheckBoxTP() {
 FX_BOOL CFWL_CheckBoxTP::IsValidWidget(IFWL_Widget* pWidget) {
   return pWidget && pWidget->GetClassID() == FWL_CLASSHASH_CheckBox;
 }
-FX_DWORD CFWL_CheckBoxTP::SetThemeID(IFWL_Widget* pWidget,
-                                     FX_DWORD dwThemeID,
+uint32_t CFWL_CheckBoxTP::SetThemeID(IFWL_Widget* pWidget,
+                                     uint32_t dwThemeID,
                                      FX_BOOL bChildren) {
   if (m_pThemeData) {
     SetThemeData(FWL_GetThemeColor(dwThemeID));
@@ -111,11 +111,11 @@ FWL_ERR CFWL_CheckBoxTP::Finalize() {
 void CFWL_CheckBoxTP::DrawBoxBk(IFWL_Widget* pWidget,
                                 CFX_Graphics* pGraphics,
                                 const CFX_RectF* pRect,
-                                FX_DWORD dwStates,
+                                uint32_t dwStates,
                                 CFX_Matrix* pMatrix) {
   dwStates &= 0x03;
   int32_t fillMode = FXFILL_WINDING;
-  FX_DWORD dwStyleEx = pWidget->GetStylesEx();
+  uint32_t dwStyleEx = pWidget->GetStylesEx();
   dwStyleEx &= FWL_STYLEEXT_CKB_ShapeMask;
   CFX_Path path;
   path.Create();
@@ -176,11 +176,11 @@ void CFWL_CheckBoxTP::DrawBoxBk(IFWL_Widget* pWidget,
 void CFWL_CheckBoxTP::DrawSign(IFWL_Widget* pWidget,
                                CFX_Graphics* pGraphics,
                                const CFX_RectF* pRtBox,
-                               FX_DWORD dwStates,
+                               uint32_t dwStates,
                                CFX_Matrix* pMatrix) {
   CFX_RectF rtSign(*pRtBox);
   rtSign.Deflate(CHECKBOX_SIZE_SIGNMARGIN, CHECKBOX_SIZE_SIGNMARGIN);
-  FX_DWORD dwColor = m_pThemeData->clrSignCheck;
+  uint32_t dwColor = m_pThemeData->clrSignCheck;
   FX_BOOL bCheck = TRUE;
   if (((dwStates & FWL_PARTSTATE_CKB_Mask1) == FWL_PARTSTATE_CKB_Disabled) &&
       ((dwStates & FWL_PARTSTATE_CKB_Mask2) == FWL_PARTSTATE_CKB_Checked)) {
@@ -209,7 +209,7 @@ void CFWL_CheckBoxTP::DrawSign(IFWL_Widget* pWidget,
     }
   }
   if (bCheck) {
-    FX_DWORD dwStyle = pWidget->GetStylesEx();
+    uint32_t dwStyle = pWidget->GetStylesEx();
     switch (dwStyle & FWL_STYLEEXT_CKB_SignShapeMask) {
       case FWL_STYLEEXT_CKB_SignShapeCheck: {
         DrawSignCheck(pGraphics, &rtSign, dwColor, pMatrix);
@@ -393,8 +393,8 @@ void CFWL_CheckBoxTP::DrawSignBorder(IFWL_Widget* pWidget,
     }
   }
 }
-void CFWL_CheckBoxTP::SetThemeData(FX_DWORD dwID) {
-  FX_DWORD* pData = (FX_DWORD*)&m_pThemeData->clrBoxBk;
+void CFWL_CheckBoxTP::SetThemeData(uint32_t dwID) {
+  uint32_t* pData = (uint32_t*)&m_pThemeData->clrBoxBk;
   if (dwID) {
     *pData++ = 0, *pData++ = 0, *pData++ = ArgbEncode(255, 220, 220, 215),
     *pData++ = ArgbEncode(255, 255, 255, 255),
diff --git a/xfa/fwl/theme/comboboxtp.cpp b/xfa/fwl/theme/comboboxtp.cpp
index 23b1320fe3..578793b002 100644
--- a/xfa/fwl/theme/comboboxtp.cpp
+++ b/xfa/fwl/theme/comboboxtp.cpp
@@ -72,7 +72,7 @@ FX_BOOL CFWL_ComboBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) {
   return TRUE;
 }
 void CFWL_ComboBoxTP::DrawStrethHandler(CFWL_ThemeBackground* pParams,
-                                        FX_DWORD dwStates,
+                                        uint32_t dwStates,
                                         CFX_Matrix* pMatrix) {
   CFX_Path path;
   path.Create();
@@ -83,7 +83,7 @@ void CFWL_ComboBoxTP::DrawStrethHandler(CFWL_ThemeBackground* pParams,
   pParams->m_pGraphics->FillPath(&path, FXFILL_WINDING, &pParams->m_matrix);
 }
 void* CFWL_ComboBoxTP::GetCapacity(CFWL_ThemePart* pThemePart,
-                                   FX_DWORD dwCapacity) {
+                                   uint32_t dwCapacity) {
   if (dwCapacity == FWL_WGTCAPACITY_CMB_ComboFormHandler) {
     m_fValue = FWLTHEME_CAPACITY_ComboFormHandler;
     return &m_fValue;
@@ -92,7 +92,7 @@ void* CFWL_ComboBoxTP::GetCapacity(CFWL_ThemePart* pThemePart,
 }
 #ifdef THEME_XPSimilar
 void CFWL_ComboBoxTP::DrawDropDownButton(CFWL_ThemeBackground* pParams,
-                                         FX_DWORD dwStates,
+                                         uint32_t dwStates,
                                          CFX_Matrix* pMatrix) {
   FWLTHEME_STATE eState = FWLTHEME_STATE_Normal;
   switch (dwStates) {
@@ -119,7 +119,7 @@ void CFWL_ComboBoxTP::DrawDropDownButton(CFWL_ThemeBackground* pParams,
 }
 #else
 void CFWL_ComboBoxTP::DrawDropDownButton(CFWL_ThemeBackground* pParams,
-                                         FX_DWORD dwStates,
+                                         uint32_t dwStates,
                                          CFX_Matrix* pMatrix) {
   FX_BOOL bPressed = ((pParams->m_dwStates & FWL_CMBPARTSTATE_Pressed) ==
                       FWL_CMBPARTSTATE_Pressed);
diff --git a/xfa/fwl/theme/datetimepickertp.cpp b/xfa/fwl/theme/datetimepickertp.cpp
index 99c5ccb448..63fbc13110 100644
--- a/xfa/fwl/theme/datetimepickertp.cpp
+++ b/xfa/fwl/theme/datetimepickertp.cpp
@@ -45,7 +45,7 @@ FX_BOOL CFWL_DateTimePickerTP::DrawBackground(CFWL_ThemeBackground* pParams) {
 #ifdef THEME_XPSimilar
 void CFWL_DateTimePickerTP::DrawDropDownButton(CFWL_ThemeBackground* pParams,
                                                CFX_Matrix* pMatrix) {
-  FX_DWORD dwStates = pParams->m_dwStates;
+  uint32_t dwStates = pParams->m_dwStates;
   dwStates &= 0x03;
   FWLTHEME_STATE eState = FWLTHEME_STATE_Normal;
   switch (eState & dwStates) {
@@ -111,7 +111,7 @@ void CFWL_DateTimePickerTP::DrawDropDownButton(CFWL_ThemeBackground* pParams,
 }
 #endif
 void CFWL_DateTimePickerTP::initThemeData() {
-  FX_DWORD* pData = (FX_DWORD*)&m_pThemeData->BoxBkColor;
+  uint32_t* pData = (uint32_t*)&m_pThemeData->BoxBkColor;
   *pData++ = 0, *pData++ = 0, *pData++ = ArgbEncode(255, 220, 220, 215),
   *pData++ = ArgbEncode(255, 255, 255, 255),
   *pData++ = ArgbEncode(255, 255, 240, 207),
diff --git a/xfa/fwl/theme/formtp.cpp b/xfa/fwl/theme/formtp.cpp
index 67ef025f7e..28a8805dee 100644
--- a/xfa/fwl/theme/formtp.cpp
+++ b/xfa/fwl/theme/formtp.cpp
@@ -62,11 +62,11 @@ FWL_ERR CFWL_FormTP::Finalize() {
 FX_BOOL CFWL_FormTP::IsValidWidget(IFWL_Widget* pWidget) {
   if (!pWidget)
     return FALSE;
-  FX_DWORD dwHash = pWidget->GetClassID();
+  uint32_t dwHash = pWidget->GetClassID();
   return dwHash == FWL_CLASSHASH_Form;
 }
-FX_DWORD CFWL_FormTP::SetThemeID(IFWL_Widget* pWidget,
-                                 FX_DWORD dwThemeID,
+uint32_t CFWL_FormTP::SetThemeID(IFWL_Widget* pWidget,
+                                 uint32_t dwThemeID,
                                  FX_BOOL bChildren) {
   if (m_pThemeData) {
     SetThemeData(FWL_GetThemeColor(dwThemeID));
@@ -159,7 +159,7 @@ FX_BOOL CFWL_FormTP::DrawText(CFWL_ThemeText* pParams) {
   return CFWL_WidgetTP::DrawText(pParams);
 }
 void* CFWL_FormTP::GetCapacity(CFWL_ThemePart* pThemePart,
-                               FX_DWORD dwCapacity) {
+                               uint32_t dwCapacity) {
   FX_BOOL bDefPro = FALSE;
   FX_BOOL bDwordVal = FALSE;
   switch (dwCapacity) {
@@ -230,7 +230,7 @@ FWL_ERR CFWL_FormTP::GetPartRect(CFWL_ThemePart* pThemePart,
   return FWL_ERR_Succeeded;
 }
 void CFWL_FormTP::CalCloseBox(IFWL_Widget* pWidget, CFX_RectF& rect) {
-  FX_DWORD dwStyles = pWidget->GetStyles();
+  uint32_t dwStyles = pWidget->GetStyles();
   CFX_RectF rtWidget;
   pWidget->GetWidgetRect(rtWidget);
   rtWidget.Offset(-rtWidget.left, -rtWidget.top);
@@ -244,7 +244,7 @@ void CFWL_FormTP::CalCloseBox(IFWL_Widget* pWidget, CFX_RectF& rect) {
   }
 }
 void CFWL_FormTP::CalMaxBox(IFWL_Widget* pWidget, CFX_RectF& rect) {
-  FX_DWORD dwStyles = pWidget->GetStyles();
+  uint32_t dwStyles = pWidget->GetStyles();
   CFX_RectF rtWidget;
   pWidget->GetWidgetRect(rtWidget);
   rtWidget.Offset(-rtWidget.left, -rtWidget.top);
@@ -260,7 +260,7 @@ void CFWL_FormTP::CalMaxBox(IFWL_Widget* pWidget, CFX_RectF& rect) {
   }
 }
 void CFWL_FormTP::CalMinBox(IFWL_Widget* pWidget, CFX_RectF& rect) {
-  FX_DWORD dwStyles = pWidget->GetStyles();
+  uint32_t dwStyles = pWidget->GetStyles();
   CFX_RectF rtWidget;
   pWidget->GetWidgetRect(rtWidget);
   rtWidget.Offset(-rtWidget.left, -rtWidget.top);
@@ -578,7 +578,7 @@ void CFWL_FormTP::DrawIconImage(CFX_Graphics* pGraphics,
                                 int32_t iActive) {
   pGraphics->StretchImage(pDIBitmap, *pRect, pMatrix);
 }
-void CFWL_FormTP::SetThemeData(FX_DWORD dwID) {
+void CFWL_FormTP::SetThemeData(uint32_t dwID) {
   m_pThemeData->clrTransWhite = ArgbEncode(0x65, 255, 255, 255);
   m_pThemeData->clrCloseBtBKStart[0][0] = ArgbEncode(0xff, 240, 166, 148);
   m_pThemeData->clrCloseBtBKEnd[0][0] = ArgbEncode(0xff, 228, 61, 5);
diff --git a/xfa/fwl/theme/listboxtp.cpp b/xfa/fwl/theme/listboxtp.cpp
index 0022e06f50..5c38166afa 100644
--- a/xfa/fwl/theme/listboxtp.cpp
+++ b/xfa/fwl/theme/listboxtp.cpp
@@ -53,7 +53,7 @@ FX_BOOL CFWL_ListBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) {
       break;
     }
     case FWL_PART_LTB_Check: {
-      FX_DWORD color = 0xFF000000;
+      uint32_t color = 0xFF000000;
       if (pParams->m_dwStates == FWL_PARTSTATE_LTB_Checked) {
         color = 0xFFFF0000;
       } else if (pParams->m_dwStates == FWL_PARTSTATE_LTB_UnChecked) {
@@ -75,7 +75,7 @@ FWL_ERR CFWL_ListBoxTP::Finalize() {
   return CFWL_WidgetTP::Finalize();
 }
 void CFWL_ListBoxTP::DrawListBoxItem(CFX_Graphics* pGraphics,
-                                     FX_DWORD dwStates,
+                                     uint32_t dwStates,
                                      const CFX_RectF* prtItem,
                                      void* pData,
                                      CFX_Matrix* pMatrix) {
diff --git a/xfa/fwl/theme/monthcalendartp.cpp b/xfa/fwl/theme/monthcalendartp.cpp
index 832adde73a..2ae154860a 100644
--- a/xfa/fwl/theme/monthcalendartp.cpp
+++ b/xfa/fwl/theme/monthcalendartp.cpp
@@ -71,8 +71,8 @@ FX_BOOL CFWL_MonthCalendarTP::IsValidWidget(IFWL_Widget* pWidget) {
     return FALSE;
   return pWidget->GetClassID() == FWL_CLASSHASH_MonthCalendar;
 }
-FX_DWORD CFWL_MonthCalendarTP::SetThemeID(IFWL_Widget* pWidget,
-                                          FX_DWORD dwThemeID,
+uint32_t CFWL_MonthCalendarTP::SetThemeID(IFWL_Widget* pWidget,
+                                          uint32_t dwThemeID,
                                           FX_BOOL bChildren) {
   if (m_pThemeData) {
     SetThemeData(FWL_GetThemeColor(dwThemeID));
@@ -160,7 +160,7 @@ FX_BOOL CFWL_MonthCalendarTP::DrawText(CFWL_ThemeText* pParams) {
   return CFWL_WidgetTP::DrawText(pParams);
 }
 void* CFWL_MonthCalendarTP::GetCapacity(CFWL_ThemePart* pThemePart,
-                                        FX_DWORD dwCapacity) {
+                                        uint32_t dwCapacity) {
   FX_BOOL bDefPro = FALSE;
   FX_BOOL bDwordVal = FALSE;
   switch (dwCapacity) {
@@ -558,7 +558,7 @@ FX_BOOL CFWL_MonthCalendarTP::DrawTodayCircle(CFWL_ThemeBackground* pParams,
   pParams->m_pGraphics->RestoreGraphState();
   return TRUE;
 }
-FWLTHEME_STATE CFWL_MonthCalendarTP::GetState(FX_DWORD dwFWLStates) {
+FWLTHEME_STATE CFWL_MonthCalendarTP::GetState(uint32_t dwFWLStates) {
   if (dwFWLStates & FWL_PARTSTATE_MCD_Hovered) {
     return FWLTHEME_STATE_Hover;
   } else if (dwFWLStates & FWL_PARTSTATE_MCD_Pressed) {
@@ -566,7 +566,7 @@ FWLTHEME_STATE CFWL_MonthCalendarTP::GetState(FX_DWORD dwFWLStates) {
   }
   return FWLTHEME_STATE_Normal;
 }
-void CFWL_MonthCalendarTP::SetThemeData(FX_DWORD dwThemeID) {
+void CFWL_MonthCalendarTP::SetThemeData(uint32_t dwThemeID) {
   if (dwThemeID == 0) {
     m_pThemeData->clrCaption = ArgbEncode(0xff, 0, 153, 255);
     m_pThemeData->clrSeperator = ArgbEncode(0xff, 141, 161, 239);
diff --git a/xfa/fwl/theme/pushbuttontp.cpp b/xfa/fwl/theme/pushbuttontp.cpp
index 091375094e..00ff3e9737 100644
--- a/xfa/fwl/theme/pushbuttontp.cpp
+++ b/xfa/fwl/theme/pushbuttontp.cpp
@@ -27,8 +27,8 @@ CFWL_PushButtonTP::~CFWL_PushButtonTP() {
 FX_BOOL CFWL_PushButtonTP::IsValidWidget(IFWL_Widget* pWidget) {
   return pWidget->GetClassID() == FWL_CLASSHASH_PushButton;
 }
-FX_DWORD CFWL_PushButtonTP::SetThemeID(IFWL_Widget* pWidget,
-                                       FX_DWORD dwThemeID,
+uint32_t CFWL_PushButtonTP::SetThemeID(IFWL_Widget* pWidget,
+                                       uint32_t dwThemeID,
                                        FX_BOOL bChildren) {
   SetThemeData(FWL_GetThemeColor(dwThemeID));
   return CFWL_WidgetTP::SetThemeID(pWidget, dwThemeID, bChildren);
@@ -96,7 +96,7 @@ FX_BOOL CFWL_PushButtonTP::DrawBackground(CFWL_ThemeBackground* pParams) {
   return TRUE;
 }
 void* CFWL_PushButtonTP::GetCapacity(CFWL_ThemePart* pThemePart,
-                                     FX_DWORD dwCapacity) {
+                                     uint32_t dwCapacity) {
   if (dwCapacity == FWL_WGTCAPACITY_PSB_Margin) {
     m_fValue = 0;
     return &m_fValue;
@@ -111,7 +111,7 @@ FWL_ERR CFWL_PushButtonTP::Finalize() {
   FinalizeTTO();
   return CFWL_WidgetTP::Finalize();
 }
-void CFWL_PushButtonTP::SetThemeData(FX_DWORD dwID) {
+void CFWL_PushButtonTP::SetThemeData(uint32_t dwID) {
   if (dwID) {
     m_pThemeData->clrBorder[0] = ArgbEncode(255, 55, 98, 6);
     m_pThemeData->clrBorder[1] = ArgbEncode(255, 55, 98, 6);
@@ -156,6 +156,6 @@ void CFWL_PushButtonTP::SetThemeData(FX_DWORD dwID) {
     m_pThemeData->clrFill[4] = ArgbEncode(255, 245, 244, 234);
   }
 }
-int32_t CFWL_PushButtonTP::GetColorID(FX_DWORD dwStates) {
+int32_t CFWL_PushButtonTP::GetColorID(uint32_t dwStates) {
   return dwStates &= FWL_PARTSTATE_PSB_Mask;
 }
diff --git a/xfa/fwl/theme/scrollbartp.cpp b/xfa/fwl/theme/scrollbartp.cpp
index 2c7bed02da..2df08d68be 100644
--- a/xfa/fwl/theme/scrollbartp.cpp
+++ b/xfa/fwl/theme/scrollbartp.cpp
@@ -31,15 +31,15 @@ FX_BOOL CFWL_ScrollBarTP::IsValidWidget(IFWL_Widget* pWidget) {
   return pWidget->GetClassID() == FWL_CLASSHASH_ScrollBar;
 }
 void* CFWL_ScrollBarTP::GetCapacity(CFWL_ThemePart* pThemePart,
-                                    FX_DWORD dwCapacity) {
+                                    uint32_t dwCapacity) {
   if (dwCapacity == FWL_CAPACITY_SCB_Size) {
     m_fValue = 5;
     return &m_fValue;
   }
   return CFWL_WidgetTP::GetCapacity(pThemePart, dwCapacity);
 }
-FX_DWORD CFWL_ScrollBarTP::SetThemeID(IFWL_Widget* pWidget,
-                                      FX_DWORD dwThemeID,
+uint32_t CFWL_ScrollBarTP::SetThemeID(IFWL_Widget* pWidget,
+                                      uint32_t dwThemeID,
                                       FX_BOOL bChildren) {
   if (m_pThemeData) {
     SetThemeData(FWL_GetThemeColor(dwThemeID));
@@ -335,7 +335,7 @@ void CFWL_ScrollBarTP::DrawMaxMinBtn(CFX_Graphics* pGraphics,
             eState == FWLTHEME_STATE_Pressed, pMatrix);
 }
 #endif
-void CFWL_ScrollBarTP::SetThemeData(FX_DWORD dwID) {
+void CFWL_ScrollBarTP::SetThemeData(uint32_t dwID) {
   m_pThemeData->clrPawColorLight[3] = ArgbEncode(0xff, 208, 223, 172);
   m_pThemeData->clrPawColorDark[3] = ArgbEncode(0xff, 140, 157, 115);
   m_pThemeData->clrBtnBK[3][0] = ArgbEncode(0xff, 164, 180, 139);
diff --git a/xfa/fwl/theme/widgettp.cpp b/xfa/fwl/theme/widgettp.cpp
index 2eda644838..c87c70c1c2 100644
--- a/xfa/fwl/theme/widgettp.cpp
+++ b/xfa/fwl/theme/widgettp.cpp
@@ -18,7 +18,7 @@
 #include "xfa/fxgraphics/cfx_path.h"
 #include "xfa/fxgraphics/cfx_shading.h"
 
-static void FWL_SetChildThemeID(IFWL_Widget* pParent, FX_DWORD dwThemeID) {
+static void FWL_SetChildThemeID(IFWL_Widget* pParent, uint32_t dwThemeID) {
   IFWL_WidgetMgr* pWidgetMgr = FWL_GetWidgetMgr();
   IFWL_Widget* pChild =
       pWidgetMgr->GetWidget(pParent, FWL_WGTRELATION_FirstChild);
@@ -34,13 +34,13 @@ static void FWL_SetChildThemeID(IFWL_Widget* pParent, FX_DWORD dwThemeID) {
 FX_BOOL CFWL_WidgetTP::IsValidWidget(IFWL_Widget* pWidget) {
   return FALSE;
 }
-FX_DWORD CFWL_WidgetTP::GetThemeID(IFWL_Widget* pWidget) {
+uint32_t CFWL_WidgetTP::GetThemeID(IFWL_Widget* pWidget) {
   return m_dwThemeID;
 }
-FX_DWORD CFWL_WidgetTP::SetThemeID(IFWL_Widget* pWidget,
-                                   FX_DWORD dwThemeID,
+uint32_t CFWL_WidgetTP::SetThemeID(IFWL_Widget* pWidget,
+                                   uint32_t dwThemeID,
                                    FX_BOOL bChildren) {
-  FX_DWORD dwOld = m_dwThemeID;
+  uint32_t dwOld = m_dwThemeID;
   m_dwThemeID = dwThemeID;
   if (CFWL_ArrowData::IsInstance()) {
     CFWL_ArrowData::GetInstance()->SetColorData(FWL_GetThemeColor(dwThemeID));
@@ -81,7 +81,7 @@ FX_BOOL CFWL_WidgetTP::DrawText(CFWL_ThemeText* pParams) {
   return TRUE;
 }
 void* CFWL_WidgetTP::GetCapacity(CFWL_ThemePart* pThemePart,
-                                 FX_DWORD dwCapacity) {
+                                 uint32_t dwCapacity) {
   switch (dwCapacity) {
     case FWL_WGTCAPACITY_CXBorder: {
       m_fValue = FWLTHEME_CAPACITY_CXBorder;
@@ -222,7 +222,7 @@ FX_ERR CFWL_WidgetTP::FinalizeTTO() {
 }
 #ifdef THEME_XPSimilar
 void CFWL_WidgetTP::DrawEdge(CFX_Graphics* pGraphics,
-                             FX_DWORD dwStyles,
+                             uint32_t dwStyles,
                              const CFX_RectF* pRect,
                              CFX_Matrix* pMatrix) {
   if (!pGraphics)
@@ -249,7 +249,7 @@ void CFWL_WidgetTP::DrawEdge(CFX_Graphics* pGraphics,
 }
 #else
 void CFWL_WidgetTP::DrawEdge(CFX_Graphics* pGraphics,
-                             FX_DWORD dwStyles,
+                             uint32_t dwStyles,
                              const CFX_RectF* pRect,
                              CFX_Matrix* pMatrix) {
   if (!pGraphics)
@@ -717,13 +717,13 @@ CFWL_FontData::~CFWL_FontData() {
 #endif
 }
 FX_BOOL CFWL_FontData::Equal(const CFX_WideStringC& wsFontFamily,
-                             FX_DWORD dwFontStyles,
+                             uint32_t dwFontStyles,
                              uint16_t wCodePage) {
   return m_wsFamily == wsFontFamily && m_dwStyles == dwFontStyles &&
          m_dwCodePage == wCodePage;
 }
 FX_BOOL CFWL_FontData::LoadFont(const CFX_WideStringC& wsFontFamily,
-                                FX_DWORD dwFontStyles,
+                                uint32_t dwFontStyles,
                                 uint16_t dwCodePage) {
   m_wsFamily = wsFontFamily;
   m_dwStyles = dwFontStyles;
@@ -754,7 +754,7 @@ void CFWL_FontManager::DestroyInstance() {
 CFWL_FontManager::CFWL_FontManager() {}
 CFWL_FontManager::~CFWL_FontManager() {}
 IFX_Font* CFWL_FontManager::FindFont(const CFX_WideStringC& wsFontFamily,
-                                     FX_DWORD dwFontStyles,
+                                     uint32_t dwFontStyles,
                                      uint16_t wCodePage) {
   for (const auto& pData : m_FontsArray) {
     if (pData->Equal(wsFontFamily, dwFontStyles, wCodePage))
@@ -773,13 +773,13 @@ void FWLTHEME_Release() {
   CFWL_ArrowData::DestroyInstance();
   CFWL_FontManager::DestroyInstance();
 }
-FX_DWORD FWL_GetThemeLayout(FX_DWORD dwThemeID) {
+uint32_t FWL_GetThemeLayout(uint32_t dwThemeID) {
   return 0xffff0000 & dwThemeID;
 }
-FX_DWORD FWL_GetThemeColor(FX_DWORD dwThemeID) {
+uint32_t FWL_GetThemeColor(uint32_t dwThemeID) {
   return 0x0000ffff & dwThemeID;
 }
-FX_DWORD FWL_MakeThemeID(FX_DWORD dwLayout, FX_DWORD dwColor) {
+uint32_t FWL_MakeThemeID(uint32_t dwLayout, uint32_t dwColor) {
   return (dwLayout << 16) | (0x0000FFFF & dwColor);
 }
 CFWL_ArrowData* CFWL_ArrowData::m_pInstance = NULL;
@@ -804,7 +804,7 @@ CFWL_ArrowData::~CFWL_ArrowData() {
     m_pColorData = NULL;
   }
 }
-void CFWL_ArrowData::SetColorData(FX_DWORD dwID) {
+void CFWL_ArrowData::SetColorData(uint32_t dwID) {
   if (!m_pColorData) {
     m_pColorData = new CColorData;
   }