diff options
Diffstat (limited to 'xfa/fwl')
-rw-r--r-- | xfa/fwl/basewidget/fwl_comboboximp.cpp | 2 | ||||
-rw-r--r-- | xfa/fwl/basewidget/fwl_monthcalendarimp.cpp | 4 | ||||
-rw-r--r-- | xfa/fwl/core/fwl_widgetimp.cpp | 2 | ||||
-rw-r--r-- | xfa/fwl/core/fwl_widgetmgrimp.cpp | 2 | ||||
-rw-r--r-- | xfa/fwl/lightwidget/cfwl_widget.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fwl/basewidget/fwl_comboboximp.cpp b/xfa/fwl/basewidget/fwl_comboboximp.cpp index d7fe209e16..d04c641fa3 100644 --- a/xfa/fwl/basewidget/fwl_comboboximp.cpp +++ b/xfa/fwl/basewidget/fwl_comboboximp.cpp @@ -201,7 +201,7 @@ void CFWL_ComboEditImp::SetComboBoxFocus(FX_BOOL bSet) { CFWL_ComboListImp::CFWL_ComboListImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter) : CFWL_ListBoxImp(properties, pOuter), m_bNotifyOwner(TRUE) { - FXSYS_assert(pOuter != NULL); + ASSERT(pOuter != NULL); } FWL_ERR CFWL_ComboListImp::Initialize() { if (CFWL_ListBoxImp::Initialize() != FWL_ERR_Succeeded) diff --git a/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp b/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp index 0c6539b51d..32cec6d2e7 100644 --- a/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp @@ -950,7 +950,7 @@ FX_BOOL CFWL_MonthCalendarImp::RemoveSelDay(int32_t iDay, FX_BOOL bAll) { return TRUE; } FX_BOOL CFWL_MonthCalendarImp::AddSelDay(int32_t iDay) { - FXSYS_assert(iDay > 0); + ASSERT(iDay > 0); if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_MultiSelect) { } else { if (m_arrSelDays.Find(iDay) == -1) { @@ -980,7 +980,7 @@ FX_BOOL CFWL_MonthCalendarImp::JumpToToday() { void CFWL_MonthCalendarImp::GetHeadText(int32_t iYear, int32_t iMonth, CFX_WideString& wsHead) { - FXSYS_assert(iMonth > 0 && iMonth < 13); + ASSERT(iMonth > 0 && iMonth < 13); static const FX_WCHAR* const pMonth[] = { L"January", L"February", L"March", L"April", L"May", L"June", L"July", L"August", diff --git a/xfa/fwl/core/fwl_widgetimp.cpp b/xfa/fwl/core/fwl_widgetimp.cpp index f6be8cac5e..df3228c6ed 100644 --- a/xfa/fwl/core/fwl_widgetimp.cpp +++ b/xfa/fwl/core/fwl_widgetimp.cpp @@ -521,7 +521,7 @@ CFWL_WidgetImp::CFWL_WidgetImp(const CFWL_WidgetImpProperties& properties, m_iLock(0) { *m_pProperties = properties; m_pWidgetMgr = static_cast<CFWL_WidgetMgr*>(FWL_GetWidgetMgr()); - FXSYS_assert(m_pWidgetMgr != NULL); + ASSERT(m_pWidgetMgr != NULL); } CFWL_WidgetImp::~CFWL_WidgetImp() { if (m_pPrivateData) { diff --git a/xfa/fwl/core/fwl_widgetmgrimp.cpp b/xfa/fwl/core/fwl_widgetmgrimp.cpp index e6ca4091e5..0bd1acffc7 100644 --- a/xfa/fwl/core/fwl_widgetmgrimp.cpp +++ b/xfa/fwl/core/fwl_widgetmgrimp.cpp @@ -34,7 +34,7 @@ CFWL_WidgetMgr::CFWL_WidgetMgr(IFWL_AdapterNative* pAdapterNative) : m_dwCapability(0) { m_pDelegate = new CFWL_WidgetMgrDelegate(this); m_pAdapter = pAdapterNative->GetWidgetMgr(m_pDelegate); - FXSYS_assert(m_pAdapter); + ASSERT(m_pAdapter); CFWL_WidgetMgrItem* pRoot = new CFWL_WidgetMgrItem; m_mapWidgetItem.SetAt(NULL, pRoot); #if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_) diff --git a/xfa/fwl/lightwidget/cfwl_widget.cpp b/xfa/fwl/lightwidget/cfwl_widget.cpp index 31c54d8efa..5fbe935767 100644 --- a/xfa/fwl/lightwidget/cfwl_widget.cpp +++ b/xfa/fwl/lightwidget/cfwl_widget.cpp @@ -215,7 +215,7 @@ CFWL_Widget::CFWL_Widget() : m_pIface(NULL), m_pDelegate(NULL), m_pProperties(NULL) { m_pProperties = new CFWL_WidgetProperties; m_pWidgetMgr = static_cast<CFWL_WidgetMgr*>(FWL_GetWidgetMgr()); - FXSYS_assert(m_pWidgetMgr != NULL); + ASSERT(m_pWidgetMgr != NULL); } CFWL_Widget::~CFWL_Widget() { |