summaryrefslogtreecommitdiff
path: root/xfa/fwl/theme
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fwl/theme')
-rw-r--r--xfa/fwl/theme/cfwl_carettp.h2
-rw-r--r--xfa/fwl/theme/cfwl_checkboxtp.h20
-rw-r--r--xfa/fwl/theme/cfwl_listboxtp.h4
-rw-r--r--xfa/fwl/theme/cfwl_scrollbartp.h8
-rw-r--r--xfa/fwl/theme/cfwl_widgettp.cpp14
-rw-r--r--xfa/fwl/theme/cfwl_widgettp.h28
6 files changed, 38 insertions, 38 deletions
diff --git a/xfa/fwl/theme/cfwl_carettp.h b/xfa/fwl/theme/cfwl_carettp.h
index 03b376a61e..faf37e725a 100644
--- a/xfa/fwl/theme/cfwl_carettp.h
+++ b/xfa/fwl/theme/cfwl_carettp.h
@@ -23,7 +23,7 @@ class CFWL_CaretTP : public CFWL_WidgetTP {
uint32_t dwStates,
const CFX_RectF* pRect,
CFX_Color* crFill,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
};
#endif // XFA_FWL_THEME_CFWL_CARETTP_H_
diff --git a/xfa/fwl/theme/cfwl_checkboxtp.h b/xfa/fwl/theme/cfwl_checkboxtp.h
index a502b92926..ce44f70aef 100644
--- a/xfa/fwl/theme/cfwl_checkboxtp.h
+++ b/xfa/fwl/theme/cfwl_checkboxtp.h
@@ -30,44 +30,44 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP {
CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
uint32_t dwStates,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawSign(IFWL_Widget* pWidget,
CFX_Graphics* pGraphics,
const CFX_RectF* pRtBox,
uint32_t dwStates,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawSignNeutral(CFX_Graphics* pGraphics,
const CFX_RectF* pRtSign,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawSignCheck(CFX_Graphics* pGraphics,
const CFX_RectF* pRtSign,
FX_ARGB argbFill,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawSignCircle(CFX_Graphics* pGraphics,
const CFX_RectF* pRtSign,
FX_ARGB argbFill,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawSignCross(CFX_Graphics* pGraphics,
const CFX_RectF* pRtSign,
FX_ARGB argbFill,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawSignDiamond(CFX_Graphics* pGraphics,
const CFX_RectF* pRtSign,
FX_ARGB argbFill,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawSignSquare(CFX_Graphics* pGraphics,
const CFX_RectF* pRtSign,
FX_ARGB argbFill,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawSignStar(CFX_Graphics* pGraphics,
const CFX_RectF* pRtSign,
FX_ARGB argbFill,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawSignBorder(IFWL_Widget* pWidget,
CFX_Graphics* pGraphics,
const CFX_RectF* pRtBox,
FX_BOOL bDisable = FALSE,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void SetThemeData(uint32_t dwID);
void initCheckPath(FX_FLOAT fCheckLen);
struct CKBThemeData {
diff --git a/xfa/fwl/theme/cfwl_listboxtp.h b/xfa/fwl/theme/cfwl_listboxtp.h
index a13df08845..9a6c457d5d 100644
--- a/xfa/fwl/theme/cfwl_listboxtp.h
+++ b/xfa/fwl/theme/cfwl_listboxtp.h
@@ -24,8 +24,8 @@ class CFWL_ListBoxTP : public CFWL_WidgetTP {
void DrawListBoxItem(CFX_Graphics* pGraphics,
uint32_t dwStates,
const CFX_RectF* prtItem,
- void* pData = NULL,
- CFX_Matrix* pMatrix = NULL);
+ void* pData = nullptr,
+ CFX_Matrix* pMatrix = nullptr);
};
#endif // XFA_FWL_THEME_CFWL_LISTBOXTP_H_
diff --git a/xfa/fwl/theme/cfwl_scrollbartp.h b/xfa/fwl/theme/cfwl_scrollbartp.h
index 84e18193db..ce32f5e774 100644
--- a/xfa/fwl/theme/cfwl_scrollbartp.h
+++ b/xfa/fwl/theme/cfwl_scrollbartp.h
@@ -38,23 +38,23 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP {
FX_BOOL bVert,
FWLTHEME_STATE eState,
FX_BOOL bPawButton = TRUE,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawTrack(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
FX_BOOL bVert,
FWLTHEME_STATE eState,
FX_BOOL bLowerTrack,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawMaxMinBtn(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
FWLTHEME_DIRECTION eDict,
FWLTHEME_STATE eState,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawPaw(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
FX_BOOL bVert,
FWLTHEME_STATE eState,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void SetThemeData(uint32_t dwID);
struct SBThemeData* m_pThemeData;
diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp
index 867e908a0e..3ef9b0ba2d 100644
--- a/xfa/fwl/theme/cfwl_widgettp.cpp
+++ b/xfa/fwl/theme/cfwl_widgettp.cpp
@@ -150,7 +150,7 @@ void* CFWL_WidgetTP::GetCapacity(CFWL_ThemePart* pThemePart,
m_rtMargin.Set(0, 0, 0, 0);
return &m_rtMargin;
}
- default: { return NULL; }
+ default: { return nullptr; }
}
return &m_fValue;
}
@@ -665,17 +665,17 @@ void CFWL_WidgetTP::DrawArrowBtn(CFX_Graphics* pGraphics,
CFWL_ArrowData::GetInstance()->m_pColorData;
DrawArrow(pGraphics, pRect, eDict, pColorData->clrSign[eState - 1], pMatrix);
}
-CFWL_ArrowData::CFWL_ArrowData() : m_pColorData(NULL) {
+CFWL_ArrowData::CFWL_ArrowData() : m_pColorData(nullptr) {
SetColorData(0);
}
CFWL_FontData::CFWL_FontData()
: m_dwStyles(0),
m_dwCodePage(0),
m_pFont(0),
- m_pFontMgr(NULL)
+ m_pFontMgr(nullptr)
#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
,
- m_pFontSource(NULL)
+ m_pFontSource(nullptr)
#endif
{
}
@@ -687,7 +687,7 @@ CFWL_FontData::~CFWL_FontData() {
m_pFontMgr->Release();
}
#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
- if (m_pFontSource != NULL) {
+ if (m_pFontSource) {
m_pFontSource->Release();
}
#endif
@@ -714,7 +714,7 @@ FX_BOOL CFWL_FontData::LoadFont(const CFX_WideStringC& wsFontFamily,
}
m_pFont = CFGAS_GEFont::LoadFont(wsFontFamily.c_str(), dwFontStyles,
dwCodePage, m_pFontMgr);
- return m_pFont != NULL;
+ return !!m_pFont;
}
CFWL_FontManager* CFWL_FontManager::s_FontManager = nullptr;
@@ -756,7 +756,7 @@ uint32_t FWL_GetThemeColor(uint32_t dwThemeID) {
return 0x0000ffff & dwThemeID;
}
-CFWL_ArrowData* CFWL_ArrowData::m_pInstance = NULL;
+CFWL_ArrowData* CFWL_ArrowData::m_pInstance = nullptr;
CFWL_ArrowData* CFWL_ArrowData::GetInstance() {
if (!m_pInstance)
diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h
index 20be62619e..d8015e19db 100644
--- a/xfa/fwl/theme/cfwl_widgettp.h
+++ b/xfa/fwl/theme/cfwl_widgettp.h
@@ -147,7 +147,7 @@ class CFWL_WidgetTP {
void DrawEdge(CFX_Graphics* pGraphics,
uint32_t dwStyles,
const CFX_RectF* pRect,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void Draw3DRect(CFX_Graphics* pGraphics,
FWLTHEME_EDGE eType,
FX_FLOAT fWidth,
@@ -156,7 +156,7 @@ class CFWL_WidgetTP {
FX_ARGB cr2,
FX_ARGB cr3,
FX_ARGB cr4,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void Draw3DCircle(CFX_Graphics* pGraphics,
FWLTHEME_EDGE eType,
FX_FLOAT fWidth,
@@ -165,17 +165,17 @@ class CFWL_WidgetTP {
FX_ARGB cr2,
FX_ARGB cr3,
FX_ARGB cr4,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawBorder(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void FillBackground(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void FillSoildRect(CFX_Graphics* pGraphics,
FX_ARGB fillColor,
const CFX_RectF* pRect,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawAxialShading(CFX_Graphics* pGraphics,
FX_FLOAT fx1,
FX_FLOAT fy1,
@@ -185,40 +185,40 @@ class CFWL_WidgetTP {
FX_ARGB endColor,
CFX_Path* path,
int32_t fillMode = FXFILL_WINDING,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawAnnulusRect(CFX_Graphics* pGraphics,
FX_ARGB fillColor,
const CFX_RectF* pRect,
FX_FLOAT fRingWidth = 1,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawAnnulusCircle(CFX_Graphics* pGraphics,
FX_ARGB fillColor,
const CFX_RectF* pRect,
FX_FLOAT fWidth = 1,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawFocus(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawArrow(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
FWLTHEME_DIRECTION eDict,
FX_ARGB argbFill,
FX_BOOL bPressed,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawArrow(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
FWLTHEME_DIRECTION eDict,
FX_ARGB argSign,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawBtn(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
FWLTHEME_STATE eState,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
void DrawArrowBtn(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
FWLTHEME_DIRECTION eDict,
FWLTHEME_STATE eState,
- CFX_Matrix* pMatrix = NULL);
+ CFX_Matrix* pMatrix = nullptr);
uint32_t m_dwRefCount;
std::unique_ptr<CFDE_TextOut> m_pTextOut;
CFGAS_GEFont* m_pFDEFont;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 17:16:13 +0000