diff options
Diffstat (limited to 'xfa/src/fwl')
45 files changed, 152 insertions, 152 deletions
diff --git a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp index 026acad0ed..ab6c0eb42d 100644 --- a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp @@ -23,13 +23,13 @@ IFWL_Barcode::~IFWL_Barcode() { }
}
FWL_ERR IFWL_Barcode::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_BarcodeImp(pOuter);
+ m_pData = new CFWL_BarcodeImp(pOuter);
((CFWL_BarcodeImp*)m_pData)->SetInterface(this);
return ((CFWL_BarcodeImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_Barcode::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_BarcodeImp(properties, pOuter);
+ m_pData = new CFWL_BarcodeImp(properties, pOuter);
((CFWL_BarcodeImp*)m_pData)->SetInterface(this);
return ((CFWL_BarcodeImp*)m_pData)->Initialize();
}
@@ -62,7 +62,7 @@ FX_DWORD CFWL_BarcodeImp::GetClassID() const { }
FWL_ERR CFWL_BarcodeImp::Initialize() {
if (!m_pDelegate) {
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_BarcodeImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_BarcodeImpDelegate(this);
}
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_EditImp::Initialize(),
FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp index 1ccab7af7f..c7c52b1c69 100644 --- a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp @@ -22,13 +22,13 @@ IFWL_Caret::~IFWL_Caret() { }
}
FWL_ERR IFWL_Caret::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CaretImp(pOuter);
+ m_pData = new CFWL_CaretImp(pOuter);
((CFWL_CaretImp*)m_pData)->SetInterface(this);
return ((CFWL_CaretImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_Caret::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CaretImp(properties, pOuter);
+ m_pData = new CFWL_CaretImp(properties, pOuter);
((CFWL_CaretImp*)m_pData)->SetInterface(this);
return ((CFWL_CaretImp*)m_pData)->Initialize();
}
@@ -46,7 +46,7 @@ FWL_ERR IFWL_Caret::SetColor(CFX_Color crFill) { }
CFWL_CaretImp::CFWL_CaretImp(IFWL_Widget* pOuter) : m_hTimer(NULL) {
m_dwElapse = 400;
- m_pTimer = FX_NEW CFWL_CaretTimer(this);
+ m_pTimer = new CFWL_CaretTimer(this);
m_bSetColor = FALSE;
SetStates(FWL_STATE_CAT_HightLight);
}
@@ -54,7 +54,7 @@ CFWL_CaretImp::CFWL_CaretImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter)
: m_hTimer(NULL) {
m_dwElapse = 400;
- m_pTimer = FX_NEW CFWL_CaretTimer(this);
+ m_pTimer = new CFWL_CaretTimer(this);
m_bSetColor = FALSE;
SetStates(FWL_STATE_CAT_HightLight);
}
@@ -74,7 +74,7 @@ FX_DWORD CFWL_CaretImp::GetClassID() const { FWL_ERR CFWL_CaretImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_CaretImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_CaretImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_CaretImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp index 8fb17ce534..1a77f3b121 100644 --- a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp @@ -24,13 +24,13 @@ IFWL_CheckBox::~IFWL_CheckBox() { }
}
FWL_ERR IFWL_CheckBox::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CheckBoxImp(pOuter);
+ m_pData = new CFWL_CheckBoxImp(pOuter);
((CFWL_CheckBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_CheckBoxImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_CheckBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CheckBoxImp(properties, pOuter);
+ m_pData = new CFWL_CheckBoxImp(properties, pOuter);
((CFWL_CheckBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_CheckBoxImp*)m_pData)->Initialize();
}
@@ -53,13 +53,13 @@ IFWL_RadioButton::~IFWL_RadioButton() { }
}
FWL_ERR IFWL_RadioButton::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CheckBoxImp(pOuter);
+ m_pData = new CFWL_CheckBoxImp(pOuter);
((CFWL_CheckBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_CheckBoxImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_RadioButton::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CheckBoxImp(properties, pOuter);
+ m_pData = new CFWL_CheckBoxImp(properties, pOuter);
((CFWL_CheckBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_CheckBoxImp*)m_pData)->Initialize();
}
@@ -99,7 +99,7 @@ FX_DWORD CFWL_CheckBoxImp::GetClassID() const { FWL_ERR CFWL_CheckBoxImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_CheckBoxImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_CheckBoxImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_CheckBoxImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp index 45c3cae8d8..4460a8d0e1 100644 --- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp @@ -31,13 +31,13 @@ IFWL_ComboBox::~IFWL_ComboBox() { }
}
FWL_ERR IFWL_ComboBox::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ComboBoxImp(pOuter);
+ m_pData = new CFWL_ComboBoxImp(pOuter);
((CFWL_ComboBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_ComboBoxImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_ComboBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ComboBoxImp(properties, pOuter);
+ m_pData = new CFWL_ComboBoxImp(properties, pOuter);
((CFWL_ComboBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_ComboBoxImp*)m_pData)->Initialize();
}
@@ -218,7 +218,7 @@ FWL_ERR CFWL_ComboList::Initialize() { delete (CFWL_ComboListDelegate*)m_pDelegate;
m_pDelegate = NULL;
}
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_ComboListDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ComboListDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_ComboList::Finalize() {
@@ -526,7 +526,7 @@ FWL_ERR CFWL_ComboBoxImp::Initialize() { }
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_WGTSTATE_Invisible);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_ComboBoxImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ComboBoxImpDelegate(this);
CFWL_WidgetImpProperties prop;
prop.m_pThemeProvider = m_pProperties->m_pThemeProvider;
prop.m_dwStyles |= FWL_WGTSTYLE_Border | FWL_WGTSTYLE_VScroll;
@@ -534,13 +534,13 @@ FWL_ERR CFWL_ComboBoxImp::Initialize() { prop.m_dwStyleExes |= FWL_STYLEEXT_LTB_Icon;
}
prop.m_pDataProvider = m_pProperties->m_pDataProvider;
- CFWL_ComboList* pList = FX_NEW CFWL_ComboList(prop, m_pInterface);
+ CFWL_ComboList* pList = new CFWL_ComboList(prop, m_pInterface);
m_pListBox = IFWL_ListBox::Create();
pList->SetInterface(m_pListBox);
((IFWL_TargetData*)m_pListBox)->SetData(pList);
pList->Initialize();
if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CMB_DropDown) && !m_pEdit) {
- CFWL_ComboEdit* pEdit = FX_NEW CFWL_ComboEdit(m_pInterface);
+ CFWL_ComboEdit* pEdit = new CFWL_ComboEdit(m_pInterface);
m_pEdit = IFWL_Edit::Create();
pEdit->SetInterface(m_pEdit);
((IFWL_TargetData*)m_pEdit)->SetData(pEdit);
@@ -595,7 +595,7 @@ FWL_ERR CFWL_ComboBoxImp::ModifyStylesEx(FX_DWORD dwStylesExAdded, FX_BOOL bAddDropDown = dwStylesExAdded & FWL_STYLEEXT_CMB_DropDown;
FX_BOOL bRemoveDropDown = dwStylesExRemoved & FWL_STYLEEXT_CMB_DropDown;
if (bAddDropDown && !m_pEdit) {
- CFWL_ComboEdit* pEdit = FX_NEW CFWL_ComboEdit(m_pInterface);
+ CFWL_ComboEdit* pEdit = new CFWL_ComboEdit(m_pInterface);
m_pEdit = IFWL_Edit::Create();
pEdit->SetInterface(m_pEdit);
((IFWL_TargetData*)m_pEdit)->SetData(pEdit);
@@ -1156,19 +1156,19 @@ void CFWL_ComboBoxImp::InitProxyForm() { propForm.m_pOwner = m_pInterface;
propForm.m_dwStyles = FWL_WGTSTYLE_Popup;
propForm.m_dwStates = FWL_WGTSTATE_Invisible;
- m_pProxy = FX_NEW CFWL_FormProxyImp(propForm, m_pListBox);
+ m_pProxy = new CFWL_FormProxyImp(propForm, m_pListBox);
m_pForm = IFWL_Form::Create();
m_pProxy->SetInterface(m_pForm);
((IFWL_TargetData*)m_pForm)->SetData(m_pProxy);
m_pProxy->Initialize();
m_pListBox->SetParent((IFWL_Widget*)m_pForm);
- m_pListProxyDelegate = FX_NEW CFWL_ComboProxyImpDelegate(m_pForm, this);
+ m_pListProxyDelegate = new CFWL_ComboProxyImpDelegate(m_pForm, this);
m_pProxy->SetDelegate((IFWL_WidgetDelegate*)m_pListProxyDelegate);
}
FWL_ERR CFWL_ComboBoxImp::DisForm_Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_WGTSTATE_Invisible);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_ComboBoxImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ComboBoxImpDelegate(this);
DisForm_InitComboList();
DisForm_InitComboEdit();
return FWL_ERR_Succeeded;
@@ -1183,7 +1183,7 @@ void CFWL_ComboBoxImp::DisForm_InitComboList() { prop.m_dwStates = FWL_WGTSTATE_Invisible;
prop.m_pDataProvider = m_pProperties->m_pDataProvider;
prop.m_pThemeProvider = m_pProperties->m_pThemeProvider;
- CFWL_ComboList* pList = FX_NEW CFWL_ComboList(prop, m_pInterface);
+ CFWL_ComboList* pList = new CFWL_ComboList(prop, m_pInterface);
m_pListBox = IFWL_ListBox::Create();
pList->SetInterface(m_pListBox);
((IFWL_TargetData*)m_pListBox)->SetData(pList);
@@ -1198,7 +1198,7 @@ void CFWL_ComboBoxImp::DisForm_InitComboEdit() { prop.m_pThemeProvider = m_pProperties->m_pThemeProvider;
if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CMB_DropDown) == 0) {
}
- CFWL_ComboEdit* pEdit = FX_NEW CFWL_ComboEdit(prop, m_pInterface);
+ CFWL_ComboEdit* pEdit = new CFWL_ComboEdit(prop, m_pInterface);
m_pEdit = IFWL_Edit::Create();
pEdit->SetInterface(m_pEdit);
((IFWL_TargetData*)m_pEdit)->SetData(pEdit);
diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp index 7bf4f0d8aa..b7bc8fc349 100644 --- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp @@ -23,21 +23,21 @@ IFWL_DateTimePicker* IFWL_DateTimePicker::Create() { FWL_ERR IFWL_DateTimeForm::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_FormProxyImp(properties, pOuter);
+ m_pData = new CFWL_FormProxyImp(properties, pOuter);
((CFWL_FormProxyImp*)m_pData)->SetInterface(this);
return ((CFWL_FormProxyImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_DateTimeCalender::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_DateTimeCalendar(properties, pOuter);
+ m_pData = new CFWL_DateTimeCalendar(properties, pOuter);
((CFWL_DateTimeCalendar*)m_pData)->SetInterface(this);
return ((CFWL_DateTimeCalendar*)m_pData)->Initialize();
}
FWL_ERR IFWL_DateTimeEdit::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_DateTimeEdit(properties, pOuter);
+ m_pData = new CFWL_DateTimeEdit(properties, pOuter);
((CFWL_DateTimeEdit*)m_pData)->SetInterface(this);
return ((CFWL_DateTimeEdit*)m_pData)->Initialize();
}
@@ -51,14 +51,14 @@ IFWL_DateTimePicker::~IFWL_DateTimePicker() { }
}
FWL_ERR IFWL_DateTimePicker::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_DateTimePickerImp(pOuter);
+ m_pData = new CFWL_DateTimePickerImp(pOuter);
((CFWL_DateTimePickerImp*)m_pData)->SetInterface(this);
return ((CFWL_DateTimePickerImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_DateTimePicker::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_DateTimePickerImp(properties, pOuter);
+ m_pData = new CFWL_DateTimePickerImp(properties, pOuter);
((CFWL_DateTimePickerImp*)m_pData)->SetInterface(this);
return ((CFWL_DateTimePickerImp*)m_pData)->Initialize();
}
@@ -145,7 +145,7 @@ CFWL_DateTimeEdit::CFWL_DateTimeEdit(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter)
: CFWL_EditImp(properties, pOuter) {}
FWL_ERR CFWL_DateTimeEdit::Initialize() {
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_DateTimeEditDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_DateTimeEditDelegate(this);
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_EditImp::Initialize(),
FWL_ERR_Indefinite);
return FWL_ERR_Succeeded;
@@ -211,7 +211,7 @@ FWL_ERR CFWL_DateTimeCalendar::Initialize() { delete (CFWL_MonthCalendarImpDelegate*)m_pDelegate;
}
m_pDelegate =
- (IFWL_WidgetDelegate*)FX_NEW CFWL_DateTimeCalendarDelegate(this);
+ (IFWL_WidgetDelegate*)new CFWL_DateTimeCalendarDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_DateTimeCalendar::Finalize() {
@@ -455,7 +455,7 @@ FWL_ERR CFWL_DateTimePickerImp::Initialize() { _FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
m_pDelegate =
- (IFWL_WidgetDelegate*)FX_NEW CFWL_DateTimePickerImpDelegate(this);
+ (IFWL_WidgetDelegate*)new CFWL_DateTimePickerImpDelegate(this);
m_pProperties->m_dwStyleExes = FWL_STYLEEXT_DTP_ShortDateFormat;
CFWL_WidgetImpProperties propMonth;
propMonth.m_dwStyles = FWL_WGTSTYLE_Popup | FWL_WGTSTYLE_Border;
diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp index e73cc5f7e0..93061f35cb 100644 --- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp @@ -27,13 +27,13 @@ IFWL_Edit::~IFWL_Edit() { }
}
FWL_ERR IFWL_Edit::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_EditImp(pOuter);
+ m_pData = new CFWL_EditImp(pOuter);
((CFWL_EditImp*)m_pData)->SetInterface(this);
return ((CFWL_EditImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_Edit::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_EditImp(properties, pOuter);
+ m_pData = new CFWL_EditImp(properties, pOuter);
((CFWL_EditImp*)m_pData)->SetInterface(this);
return ((CFWL_EditImp*)m_pData)->Initialize();
}
@@ -245,7 +245,7 @@ FWL_ERR CFWL_EditImp::Initialize() { _FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
if (!m_pDelegate) {
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_EditImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_EditImpDelegate(this);
}
InitCaret();
if (!m_pEdtEngine) {
diff --git a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp index 5dcbb8af6f..57c9490d71 100644 --- a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp @@ -33,7 +33,7 @@ FX_BOOL CFWL_FormProxyImp::IsInstance(const CFX_WideStringC& wsClass) const { FWL_ERR CFWL_FormProxyImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_FormProxyImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_FormProxyImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_FormProxyImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp index e20afa32c5..1151f2f8ee 100644 --- a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp @@ -24,13 +24,13 @@ IFWL_ListBox::~IFWL_ListBox() { }
}
FWL_ERR IFWL_ListBox::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ListBoxImp(pOuter);
+ m_pData = new CFWL_ListBoxImp(pOuter);
((CFWL_ListBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_ListBoxImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_ListBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ListBoxImp(properties, pOuter);
+ m_pData = new CFWL_ListBoxImp(properties, pOuter);
((CFWL_ListBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_ListBoxImp*)m_pData)->Initialize();
}
@@ -104,7 +104,7 @@ FX_DWORD CFWL_ListBoxImp::GetClassID() const { FWL_ERR CFWL_ListBoxImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_ListBoxImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ListBoxImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_ListBoxImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp index 822160f6b0..494bc3151c 100644 --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp @@ -30,14 +30,14 @@ IFWL_MonthCalendar::~IFWL_MonthCalendar() { }
}
FWL_ERR IFWL_MonthCalendar::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_MonthCalendarImp(pOuter);
+ m_pData = new CFWL_MonthCalendarImp(pOuter);
((CFWL_MonthCalendarImp*)m_pData)->SetInterface(this);
return ((CFWL_MonthCalendarImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_MonthCalendar::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_MonthCalendarImp(properties, pOuter);
+ m_pData = new CFWL_MonthCalendarImp(properties, pOuter);
((CFWL_MonthCalendarImp*)m_pData)->SetInterface(this);
return ((CFWL_MonthCalendarImp*)m_pData)->Initialize();
}
@@ -132,7 +132,7 @@ FWL_ERR CFWL_MonthCalendarImp::Initialize() { _FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
m_pDelegate =
- (IFWL_WidgetDelegate*)FX_NEW CFWL_MonthCalendarImpDelegate(this);
+ (IFWL_WidgetDelegate*)new CFWL_MonthCalendarImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_MonthCalendarImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp index 4818945f8a..219aa88598 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp @@ -22,13 +22,13 @@ IFWL_PictureBox::~IFWL_PictureBox() { }
}
FWL_ERR IFWL_PictureBox::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_PictureBoxImp(pOuter);
+ m_pData = new CFWL_PictureBoxImp(pOuter);
((CFWL_PictureBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_PictureBoxImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_PictureBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_PictureBoxImp(properties, pOuter);
+ m_pData = new CFWL_PictureBoxImp(properties, pOuter);
((CFWL_PictureBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_PictureBoxImp*)m_pData)->Initialize();
}
@@ -63,7 +63,7 @@ FX_DWORD CFWL_PictureBoxImp::GetClassID() const { FWL_ERR CFWL_PictureBoxImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_PictureBoxImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_PictureBoxImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_PictureBoxImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp index 3329a76ee7..7fe9a7fb3f 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp @@ -13,13 +13,13 @@ IFWL_PushButton* IFWL_PushButton::Create() { return new IFWL_PushButton;
}
FWL_ERR IFWL_PushButton::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_PushButtonImp(pOuter);
+ m_pData = new CFWL_PushButtonImp(pOuter);
((CFWL_PushButtonImp*)m_pData)->SetInterface(this);
return ((CFWL_PushButtonImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_PushButton::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_PushButtonImp(properties, pOuter);
+ m_pData = new CFWL_PushButtonImp(properties, pOuter);
((CFWL_PushButtonImp*)m_pData)->SetInterface(this);
return ((CFWL_PushButtonImp*)m_pData)->Initialize();
}
@@ -61,7 +61,7 @@ FX_DWORD CFWL_PushButtonImp::GetClassID() const { FWL_ERR CFWL_PushButtonImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_PushButtonImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_PushButtonImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_PushButtonImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp index a692d50448..6d0887b263 100644 --- a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp @@ -24,13 +24,13 @@ IFWL_ScrollBar::~IFWL_ScrollBar() { }
}
FWL_ERR IFWL_ScrollBar::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ScrollBarImp(pOuter);
+ m_pData = new CFWL_ScrollBarImp(pOuter);
((CFWL_ScrollBarImp*)m_pData)->SetInterface(this);
return ((CFWL_ScrollBarImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_ScrollBar::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ScrollBarImp(properties, pOuter);
+ m_pData = new CFWL_ScrollBarImp(properties, pOuter);
((CFWL_ScrollBarImp*)m_pData)->SetInterface(this);
return ((CFWL_ScrollBarImp*)m_pData)->Initialize();
}
@@ -148,7 +148,7 @@ FX_DWORD CFWL_ScrollBarImp::GetClassID() const { FWL_ERR CFWL_ScrollBarImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_ScrollBarImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ScrollBarImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_ScrollBarImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp index 28d3be46ca..8736b17906 100644 --- a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp @@ -25,13 +25,13 @@ IFWL_SpinButton::~IFWL_SpinButton() { }
}
FWL_ERR IFWL_SpinButton::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_SpinButtonImp;
+ m_pData = new CFWL_SpinButtonImp;
((CFWL_SpinButtonImp*)m_pData)->SetInterface(this);
return ((CFWL_SpinButtonImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_SpinButton::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_SpinButtonImp(properties);
+ m_pData = new CFWL_SpinButtonImp(properties);
((CFWL_SpinButtonImp*)m_pData)->SetInterface(this);
return ((CFWL_SpinButtonImp*)m_pData)->Initialize();
}
@@ -78,7 +78,7 @@ FX_DWORD CFWL_SpinButtonImp::GetClassID() const { FWL_ERR CFWL_SpinButtonImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_SpinButtonImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_SpinButtonImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_SpinButtonImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp index a0a9a85634..6de913615d 100644 --- a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp @@ -15,13 +15,13 @@ IFWL_ToolTip* IFWL_ToolTip::Create() { return new IFWL_ToolTip;
}
FWL_ERR IFWL_ToolTip::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ToolTipImp(pOuter);
+ m_pData = new CFWL_ToolTipImp(pOuter);
((CFWL_ToolTipImp*)m_pData)->SetInterface(this);
return ((CFWL_ToolTipImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_ToolTip::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ToolTipImp(properties, pOuter);
+ m_pData = new CFWL_ToolTipImp(properties, pOuter);
((CFWL_ToolTipImp*)m_pData)->SetInterface(this);
return ((CFWL_ToolTipImp*)m_pData)->Initialize();
}
@@ -90,7 +90,7 @@ FWL_ERR CFWL_ToolTipImp::Initialize() { m_pProperties->m_dwStyles &= ~FWL_WGTSTYLE_Child;
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_ToolTipImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ToolTipImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_ToolTipImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp index f20fe0f6db..45efbe9823 100644 --- a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp @@ -9,27 +9,27 @@ static CBC_CodeBase* FX_Barcode_CreateBarCodeEngineObject(BC_TYPE type) {
switch (type) {
case BC_CODE39:
- return FX_NEW CBC_Code39();
+ return new CBC_Code39();
case BC_CODABAR:
- return FX_NEW CBC_Codabar();
+ return new CBC_Codabar();
case BC_CODE128:
- return FX_NEW CBC_Code128(BC_CODE128_B);
+ return new CBC_Code128(BC_CODE128_B);
case BC_CODE128_B:
- return FX_NEW CBC_Code128(BC_CODE128_B);
+ return new CBC_Code128(BC_CODE128_B);
case BC_CODE128_C:
- return FX_NEW CBC_Code128(BC_CODE128_C);
+ return new CBC_Code128(BC_CODE128_C);
case BC_EAN8:
- return FX_NEW CBC_EAN8();
+ return new CBC_EAN8();
case BC_UPCA:
- return FX_NEW CBC_UPCA();
+ return new CBC_UPCA();
case BC_EAN13:
- return FX_NEW CBC_EAN13();
+ return new CBC_EAN13();
case BC_QR_CODE:
- return FX_NEW CBC_QRCode();
+ return new CBC_QRCode();
case BC_PDF417:
- return FX_NEW CBC_PDF417I();
+ return new CBC_PDF417I();
case BC_DATAMATRIX:
- return FX_NEW CBC_DataMatrix();
+ return new CBC_DataMatrix();
case BC_UNKNOWN:
default:
return NULL;
@@ -368,7 +368,7 @@ CFX_WideString CFX_Barcode::Decode(CFX_DIBitmap* pBitmap, int32_t& errorCode) { return CFX_WideString();
}
IFX_Barcode* FX_Barcode_Create(BC_TYPE type) {
- CFX_Barcode* pBarcode = FX_NEW CFX_Barcode;
+ CFX_Barcode* pBarcode = new CFX_Barcode;
if (pBarcode->Crreate(type)) {
return pBarcode;
}
diff --git a/xfa/src/fwl/src/core/fwl_appimp.cpp b/xfa/src/fwl/src/core/fwl_appimp.cpp index f59032a6a4..d9d37e2f9e 100644 --- a/xfa/src/fwl/src/core/fwl_appimp.cpp +++ b/xfa/src/fwl/src/core/fwl_appimp.cpp @@ -11,7 +11,7 @@ #include "include/fwl_widgetmgrimp.h"
#include "include/fwl_appimp.h"
IFWL_App* IFWL_App::Create(IFWL_AdapterNative* pAdapter) {
- return (IFWL_App*)FX_NEW CFWL_AppImp(pAdapter);
+ return (IFWL_App*)new CFWL_AppImp(pAdapter);
}
CFWL_AppImp::CFWL_AppImp(IFWL_AdapterNative* pAdapter)
: m_pWidgetMgr(NULL), m_pThemeProvider(NULL) {
@@ -36,7 +36,7 @@ CFWL_AppImp::~CFWL_AppImp() { }
FWL_ERR CFWL_AppImp::Initialize() {
if (!m_pWidgetMgr) {
- m_pWidgetMgr = FX_NEW CFWL_WidgetMgr(m_pAdapterNative);
+ m_pWidgetMgr = new CFWL_WidgetMgr(m_pAdapterNative);
}
return FWL_ERR_Succeeded;
}
diff --git a/xfa/src/fwl/src/core/fwl_contentimp.cpp b/xfa/src/fwl/src/core/fwl_contentimp.cpp index 9a9f8ba2cd..b99b84dbbd 100644 --- a/xfa/src/fwl/src/core/fwl_contentimp.cpp +++ b/xfa/src/fwl/src/core/fwl_contentimp.cpp @@ -15,7 +15,7 @@ IFWL_Content* IFWL_Content::Create() { return new IFWL_Content;
}
FWL_ERR IFWL_Content::Initialize() {
- m_pData = FX_NEW CFWL_ContentImp;
+ m_pData = new CFWL_ContentImp;
((CFWL_ContentImp*)m_pData)->SetInterface(this);
return ((CFWL_ContentImp*)m_pData)->Initialize();
}
diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/src/core/fwl_formimp.cpp index b18cdb12b5..85139ca1a1 100644 --- a/xfa/src/fwl/src/core/fwl_formimp.cpp +++ b/xfa/src/fwl/src/core/fwl_formimp.cpp @@ -21,20 +21,20 @@ IFWL_Form* IFWL_Form::Create() { return new IFWL_Form;
}
FWL_ERR IFWL_Form::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_FormImp(pOuter);
+ m_pData = new CFWL_FormImp(pOuter);
((CFWL_FormImp*)m_pData)->SetInterface(this);
return ((CFWL_FormImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_Form::Initialize(CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_FormImp(properties, pOuter);
+ m_pData = new CFWL_FormImp(properties, pOuter);
((CFWL_FormImp*)m_pData)->SetInterface(this);
return ((CFWL_FormImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_Form::Initialize(CFWL_WidgetImpProperties& properties,
CFX_WideString* classname,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_FormImp(properties, pOuter);
+ m_pData = new CFWL_FormImp(properties, pOuter);
((CFWL_FormImp*)m_pData)->SetInterface(this);
((CFWL_FormImp*)m_pData)->SetPrivateData(this, classname, NULL);
return ((CFWL_FormImp*)m_pData)->Initialize();
@@ -152,7 +152,7 @@ FWL_ERR CFWL_FormImp::Initialize() { FWL_ERR_Indefinite);
RegisterForm();
RegisterEventTarget();
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_FormDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_FormDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_FormImp::Finalize() {
@@ -436,7 +436,7 @@ IFWL_Widget* CFWL_FormImp::DoModal() { _FWL_RETURN_VALUE_IF_FAIL(pThread, NULL);
IFWL_NoteDriver* pDriver = pThread->GetNoteDriver();
_FWL_RETURN_VALUE_IF_FAIL(pDriver, NULL);
- m_pNoteLoop = FX_NEW CFWL_NoteLoop(this);
+ m_pNoteLoop = new CFWL_NoteLoop(this);
pDriver->PushNoteLoop((IFWL_NoteLoop*)m_pNoteLoop);
m_bDoModalFlag = TRUE;
SetStates(FWL_WGTSTATE_Invisible, FALSE);
@@ -781,7 +781,7 @@ void CFWL_FormImp::ReSetSysBtn() { }
m_iSysBox = 0;
if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_CloseBox) {
- m_pCloseBox = FX_NEW CFWL_SysBtn;
+ m_pCloseBox = new CFWL_SysBtn;
if (m_bCustomizeLayout) {
CFWL_ThemeBackground param;
param.m_pWidget = m_pInterface;
@@ -795,7 +795,7 @@ void CFWL_FormImp::ReSetSysBtn() { m_iSysBox++;
}
if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_MaximizeBox) {
- m_pMaxBox = FX_NEW CFWL_SysBtn;
+ m_pMaxBox = new CFWL_SysBtn;
if (m_bCustomizeLayout) {
CFWL_ThemeBackground param;
param.m_pWidget = m_pInterface;
@@ -815,7 +815,7 @@ void CFWL_FormImp::ReSetSysBtn() { m_iSysBox++;
}
if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_MinimizeBox) {
- m_pMinBox = FX_NEW CFWL_SysBtn;
+ m_pMinBox = new CFWL_SysBtn;
if (m_bCustomizeLayout) {
CFWL_ThemeBackground param;
param.m_pWidget = m_pInterface;
diff --git a/xfa/src/fwl/src/core/fwl_gridimp.cpp b/xfa/src/fwl/src/core/fwl_gridimp.cpp index d6e011ab16..d7db6a6f11 100644 --- a/xfa/src/fwl/src/core/fwl_gridimp.cpp +++ b/xfa/src/fwl/src/core/fwl_gridimp.cpp @@ -15,12 +15,12 @@ IFWL_Grid* IFWL_Grid::Create() { return new IFWL_Grid;
}
FWL_ERR IFWL_Grid::Initialize() {
- m_pData = FX_NEW CFWL_GridImp;
+ m_pData = new CFWL_GridImp;
((CFWL_GridImp*)m_pData)->SetInterface(this);
return ((CFWL_GridImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_Grid::Initialize(CFWL_WidgetImpProperties& properties) {
- m_pData = FX_NEW CFWL_GridImp(properties);
+ m_pData = new CFWL_GridImp(properties);
((CFWL_GridImp*)m_pData)->SetInterface(this);
return ((CFWL_GridImp*)m_pData)->Initialize();
}
@@ -187,7 +187,7 @@ FX_DWORD CFWL_GridImp::GetClassID() const { FWL_ERR CFWL_GridImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_ContentImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_GridDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_GridDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_GridImp::Finalize() {
@@ -274,7 +274,7 @@ FWL_ERR CFWL_GridImp::InsertWidget(IFWL_Widget* pChild, int32_t nIndex) { _FWL_RETURN_VALUE_IF_FAIL(pChild, FWL_ERR_Indefinite);
CFWL_ContentImp::InsertWidget(pChild, nIndex);
if (!m_mapWidgetInfo.GetValueAt(pChild)) {
- CFWL_GridWidgetInfo* pInfo = FX_NEW CFWL_GridWidgetInfo;
+ CFWL_GridWidgetInfo* pInfo = new CFWL_GridWidgetInfo;
m_mapWidgetInfo.SetAt(pChild, pInfo);
m_Widgets.Add(pChild);
}
@@ -297,14 +297,14 @@ FWL_HGRIDCOLROW CFWL_GridImp::InsertColRow(FX_BOOL bColumn, int32_t nIndex) { if (nIndex < 0 || nIndex > m_Columns.GetSize()) {
nIndex = m_Columns.GetSize();
}
- CFWL_GridColRow* pColumn = FX_NEW CFWL_GridColRow;
+ CFWL_GridColRow* pColumn = new CFWL_GridColRow;
m_Columns.InsertAt(nIndex, pColumn, 1);
return (FWL_HGRIDCOLROW)pColumn;
}
if (nIndex < 0 || nIndex > m_Rows.GetSize()) {
nIndex = m_Rows.GetSize();
}
- CFWL_GridColRow* pRow = FX_NEW CFWL_GridColRow;
+ CFWL_GridColRow* pRow = new CFWL_GridColRow;
m_Rows.InsertAt(nIndex, pRow, 1);
return (FWL_HGRIDCOLROW)pRow;
}
diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp index 90abc1e275..2c3a79429e 100644 --- a/xfa/src/fwl/src/core/fwl_noteimp.cpp +++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp @@ -97,7 +97,7 @@ CFWL_NoteDriver::CFWL_NoteDriver() m_pHover(NULL),
m_pGrab(NULL),
m_hook(NULL) {
- m_pNoteLoop = FX_NEW CFWL_NoteLoop;
+ m_pNoteLoop = new CFWL_NoteLoop;
PushNoteLoop((IFWL_NoteLoop*)m_pNoteLoop);
}
CFWL_NoteDriver::~CFWL_NoteDriver() {
@@ -169,7 +169,7 @@ FWL_ERR CFWL_NoteDriver::RegisterEventTarget(IFWL_Widget* pListener, }
CFWL_EventTarget* value = NULL;
if (!m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (void*&)value)) {
- value = FX_NEW CFWL_EventTarget(this, pListener);
+ value = new CFWL_EventTarget(this, pListener);
m_eventTargets.SetAt((void*)(uintptr_t)dwkey, value);
}
value->SetEventSource(pEventSource, dwFilter);
@@ -912,7 +912,7 @@ CFWL_ToolTipContainer* CFWL_ToolTipContainer::s_pInstance = NULL; CFWL_ToolTipContainer::CFWL_ToolTipContainer()
: pCurTarget(NULL), m_pToolTipImp(NULL) {
- m_ToolTipDp = FX_NEW CFWL_CoreToopTipDP;
+ m_ToolTipDp = new CFWL_CoreToopTipDP;
m_ToolTipDp->m_nInitDelayTime = 0;
m_ToolTipDp->m_nAutoPopDelayTime = 2000;
}
@@ -931,7 +931,7 @@ CFWL_ToolTipContainer::~CFWL_ToolTipContainer() { // static
CFWL_ToolTipContainer* CFWL_ToolTipContainer::getInstance() {
if (!s_pInstance) {
- s_pInstance = FX_NEW CFWL_ToolTipContainer;
+ s_pInstance = new CFWL_ToolTipContainer;
}
return s_pInstance;
}
@@ -978,7 +978,7 @@ FX_BOOL CFWL_ToolTipContainer::ProcessEnter(CFWL_EvtMouse* pEvt, CFX_RectF rtTooltip;
rtTooltip.Set(150, 150, 100, 50);
prop.m_rtWidget = rtTooltip;
- m_pToolTipImp = FX_NEW CFWL_ToolTipImp(prop);
+ m_pToolTipImp = new CFWL_ToolTipImp(prop);
IFWL_ToolTip* pToolTip = IFWL_ToolTip::Create();
m_pToolTipImp->SetInterface(pToolTip);
((IFWL_TargetData*)pToolTip)->SetData(m_pToolTipImp);
diff --git a/xfa/src/fwl/src/core/fwl_panelimp.cpp b/xfa/src/fwl/src/core/fwl_panelimp.cpp index 54da08d600..bca581b03d 100644 --- a/xfa/src/fwl/src/core/fwl_panelimp.cpp +++ b/xfa/src/fwl/src/core/fwl_panelimp.cpp @@ -13,13 +13,13 @@ IFWL_Panel* IFWL_Panel::Create() { return new IFWL_Panel;
}
FWL_ERR IFWL_Panel::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_PanelImp(pOuter);
+ m_pData = new CFWL_PanelImp(pOuter);
((CFWL_PanelImp*)m_pData)->SetInterface(this);
return ((CFWL_PanelImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_Panel::Initialize(CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_PanelImp(properties, pOuter);
+ m_pData = new CFWL_PanelImp(properties, pOuter);
((CFWL_PanelImp*)m_pData)->SetInterface(this);
return ((CFWL_PanelImp*)m_pData)->Initialize();
}
@@ -142,13 +142,13 @@ IFWL_CustomPanel* IFWL_CustomPanel::Create() { return new IFWL_CustomPanel;
}
FWL_ERR IFWL_CustomPanel::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CustomPanelImp(pOuter);
+ m_pData = new CFWL_CustomPanelImp(pOuter);
((CFWL_CustomPanelImp*)m_pData)->SetInterface(this);
return ((CFWL_CustomPanelImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_CustomPanel::Initialize(CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CustomPanelImp(properties, pOuter);
+ m_pData = new CFWL_CustomPanelImp(properties, pOuter);
((CFWL_CustomPanelImp*)m_pData)->SetInterface(this);
return ((CFWL_CustomPanelImp*)m_pData)->Initialize();
}
diff --git a/xfa/src/fwl/src/core/fwl_threadimp.cpp b/xfa/src/fwl/src/core/fwl_threadimp.cpp index ca713346b8..98672f3abe 100644 --- a/xfa/src/fwl/src/core/fwl_threadimp.cpp +++ b/xfa/src/fwl/src/core/fwl_threadimp.cpp @@ -17,7 +17,7 @@ FWL_ERR CFWL_ControlThread::Run(FWL_HTHREAD hThread) { return FWL_ERR_Succeeded;
}
IFWL_Thread* IFWL_Thread::Create() {
- return (IFWL_Thread*)FX_NEW CFWL_Thread;
+ return (IFWL_Thread*)new CFWL_Thread;
}
CFWL_Thread::CFWL_Thread() {}
CFWL_Thread::~CFWL_Thread() {}
@@ -28,10 +28,10 @@ CFWL_ControlThread* CFWL_NoteThread::_assistantThreadHandler = NULL; FWL_HTHREAD CFWL_NoteThread::_assistantThread = NULL;
int32_t CFWL_NoteThread::_refCount = 0;
IFWL_NoteThread* IFWL_NoteThread::Create() {
- return (IFWL_NoteThread*)FX_NEW CFWL_NoteThread;
+ return (IFWL_NoteThread*)new CFWL_NoteThread;
}
CFWL_NoteThread::CFWL_NoteThread() : m_hThread(NULL) {
- m_pNoteDriver = FX_NEW CFWL_NoteDriver;
+ m_pNoteDriver = new CFWL_NoteDriver;
}
CFWL_NoteThread::~CFWL_NoteThread() {
if (m_hThread) {
diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp index e901dae199..d5246d31e7 100644 --- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp @@ -501,7 +501,7 @@ CFWL_WidgetImp::CFWL_WidgetImp(IFWL_Widget* pOuter) m_pOuter(pOuter),
m_pInterface(NULL),
m_iLock(0) {
- m_pProperties = FX_NEW CFWL_WidgetImpProperties;
+ m_pProperties = new CFWL_WidgetImpProperties;
m_pWidgetMgr = (CFWL_WidgetMgr*)FWL_GetWidgetMgr();
FXSYS_assert(m_pWidgetMgr != NULL);
}
@@ -515,7 +515,7 @@ CFWL_WidgetImp::CFWL_WidgetImp(const CFWL_WidgetImpProperties& properties, m_pInterface(NULL),
m_iLock(0) {
if (!m_pProperties) {
- m_pProperties = FX_NEW CFWL_WidgetImpProperties;
+ m_pProperties = new CFWL_WidgetImpProperties;
}
*m_pProperties = properties;
m_pWidgetMgr = (CFWL_WidgetMgr*)FWL_GetWidgetMgr();
@@ -1124,13 +1124,13 @@ IFWL_Custom::~IFWL_Custom() { }
}
FWL_ERR IFWL_Custom::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_Custom(pOuter);
+ m_pData = new CFWL_Custom(pOuter);
((CFWL_Custom*)m_pData)->SetInterface(this);
return ((CFWL_Custom*)m_pData)->Initialize();
}
FWL_ERR IFWL_Custom::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_Custom(properties, pOuter);
+ m_pData = new CFWL_Custom(properties, pOuter);
((CFWL_Custom*)m_pData)->SetInterface(this);
return ((CFWL_Custom*)m_pData)->Initialize();
}
diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp index 2719ff96ec..5671ff699a 100644 --- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp @@ -25,11 +25,11 @@ IFWL_WidgetMgr* FWL_GetWidgetMgr() { }
CFWL_WidgetMgr::CFWL_WidgetMgr(IFWL_AdapterNative* pAdapterNative)
: m_dwCapability(0) {
- m_pDelegate = FX_NEW CFWL_WidgetMgrDelegate(this);
+ m_pDelegate = new CFWL_WidgetMgrDelegate(this);
m_pAdapter =
pAdapterNative->GetWidgetMgr((IFWL_WidgetMgrDelegate*)m_pDelegate);
FXSYS_assert(m_pAdapter);
- CFWL_WidgetMgrItem* pRoot = FX_NEW CFWL_WidgetMgrItem;
+ CFWL_WidgetMgrItem* pRoot = new CFWL_WidgetMgrItem;
m_mapWidgetItem.SetAt(NULL, pRoot);
#if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_)
m_rtScreen.Reset();
@@ -236,7 +236,7 @@ void CFWL_WidgetMgr::AddWidget(IFWL_Widget* pWidget) { CFWL_WidgetMgrItem* pParentItem = GetWidgetMgrItem(NULL);
CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
if (!pItem) {
- pItem = FX_NEW CFWL_WidgetMgrItem;
+ pItem = new CFWL_WidgetMgrItem;
pItem->pWidget = pWidget;
m_mapWidgetItem.SetAt(pWidget, pItem);
}
@@ -259,7 +259,7 @@ void CFWL_WidgetMgr::InsertWidget(IFWL_Widget* pParent, int32_t nIndex) {
CFWL_WidgetMgrItem* pParentItem = GetWidgetMgrItem(pParent);
if (!pParentItem) {
- pParentItem = FX_NEW CFWL_WidgetMgrItem;
+ pParentItem = new CFWL_WidgetMgrItem;
pParentItem->pWidget = pParent;
m_mapWidgetItem.SetAt(pParent, pParentItem);
CFWL_WidgetMgrItem* pRoot = GetWidgetMgrItem(NULL);
@@ -268,7 +268,7 @@ void CFWL_WidgetMgr::InsertWidget(IFWL_Widget* pParent, }
CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pChild);
if (!pItem) {
- pItem = FX_NEW CFWL_WidgetMgrItem;
+ pItem = new CFWL_WidgetMgrItem;
pItem->pWidget = pChild;
m_mapWidgetItem.SetAt(pChild, pItem);
}
@@ -312,7 +312,7 @@ void CFWL_WidgetMgr::RemoveWidget(IFWL_Widget* pWidget) { void CFWL_WidgetMgr::SetOwner(IFWL_Widget* pOwner, IFWL_Widget* pOwned) {
CFWL_WidgetMgrItem* pParentItem = GetWidgetMgrItem(pOwner);
if (!pParentItem) {
- pParentItem = FX_NEW CFWL_WidgetMgrItem;
+ pParentItem = new CFWL_WidgetMgrItem;
pParentItem->pWidget = pOwner;
m_mapWidgetItem.SetAt(pOwner, pParentItem);
CFWL_WidgetMgrItem* pRoot = GetWidgetMgrItem(NULL);
@@ -321,7 +321,7 @@ void CFWL_WidgetMgr::SetOwner(IFWL_Widget* pOwner, IFWL_Widget* pOwned) { }
CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pOwned);
if (!pItem) {
- pItem = FX_NEW CFWL_WidgetMgrItem;
+ pItem = new CFWL_WidgetMgrItem;
pItem->pWidget = pOwned;
m_mapWidgetItem.SetAt(pOwned, pItem);
}
@@ -824,7 +824,7 @@ CFX_Graphics* CFWL_WidgetMgrDelegate::DrawWidgetBefore( }
CFWL_WidgetMgrItem* pItem = m_pWidgetMgr->GetWidgetMgrItem(pWidget);
if (!pItem->pOffscreen) {
- pItem->pOffscreen = FX_NEW CFX_Graphics;
+ pItem->pOffscreen = new CFX_Graphics;
CFX_RectF rect;
pWidget->GetWidgetRect(rect);
pItem->pOffscreen->Create((int32_t)rect.width, (int32_t)rect.height,
diff --git a/xfa/src/fwl/src/lightwidget/app.cpp b/xfa/src/fwl/src/lightwidget/app.cpp index 9441b8f2f4..58d41ca6c3 100644 --- a/xfa/src/fwl/src/lightwidget/app.cpp +++ b/xfa/src/fwl/src/lightwidget/app.cpp @@ -17,7 +17,7 @@ CFWL_App::~CFWL_App() { m_pAppImp->Release();
}
FWL_ERR CFWL_App::Initialize() {
- m_pThemeProvider = FX_NEW CFWL_Theme;
+ m_pThemeProvider = new CFWL_Theme;
m_pThemeProvider->Initialize();
m_pAppImp->SetThemeProvider((IFWL_ThemeProvider*)m_pThemeProvider);
return m_pAppImp->Initialize();
diff --git a/xfa/src/fwl/src/lightwidget/barcode.cpp b/xfa/src/fwl/src/lightwidget/barcode.cpp index f71a00d2ca..3c881b6254 100644 --- a/xfa/src/fwl/src/lightwidget/barcode.cpp +++ b/xfa/src/fwl/src/lightwidget/barcode.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_Barcode* CFWL_Barcode::Create() {
- return FX_NEW CFWL_Barcode;
+ return new CFWL_Barcode;
}
FWL_ERR CFWL_Barcode::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/caret.cpp b/xfa/src/fwl/src/lightwidget/caret.cpp index a09ce40ffb..b182be0879 100644 --- a/xfa/src/fwl/src/lightwidget/caret.cpp +++ b/xfa/src/fwl/src/lightwidget/caret.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_Caret* CFWL_Caret::Create() {
- return FX_NEW CFWL_Caret;
+ return new CFWL_Caret;
}
FWL_ERR CFWL_Caret::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/checkbox.cpp b/xfa/src/fwl/src/lightwidget/checkbox.cpp index 79d4886fdf..fe2a7595da 100644 --- a/xfa/src/fwl/src/lightwidget/checkbox.cpp +++ b/xfa/src/fwl/src/lightwidget/checkbox.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_CheckBox* CFWL_CheckBox::Create() {
- return FX_NEW CFWL_CheckBox;
+ return new CFWL_CheckBox;
}
FWL_ERR CFWL_CheckBox::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/src/lightwidget/combobox.cpp index aec2403ae3..e8ae65cf6c 100644 --- a/xfa/src/fwl/src/lightwidget/combobox.cpp +++ b/xfa/src/fwl/src/lightwidget/combobox.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_ComboBox* CFWL_ComboBox::Create() {
- return FX_NEW CFWL_ComboBox;
+ return new CFWL_ComboBox;
}
FWL_ERR CFWL_ComboBox::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
@@ -34,14 +34,14 @@ FWL_ERR CFWL_ComboBox::Initialize(const CFWL_WidgetProperties* pProperties) { return ret;
}
int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText) {
- CFWL_ComboBoxItem* pItem = FX_NEW CFWL_ComboBoxItem;
+ CFWL_ComboBoxItem* pItem = new CFWL_ComboBoxItem;
pItem->m_wsText = wsText;
pItem->m_dwStyles = 0;
return m_comboBoxData.m_arrItem.Add(pItem);
}
int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText,
CFX_DIBitmap* pIcon) {
- CFWL_ComboBoxItem* pItem = FX_NEW CFWL_ComboBoxItem;
+ CFWL_ComboBoxItem* pItem = new CFWL_ComboBoxItem;
pItem->m_wsText = wsText;
pItem->m_dwStyles = 0;
pItem->m_pDIB = pIcon;
diff --git a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp index 008a22179d..0770659f9b 100644 --- a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp +++ b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_DateTimePicker* CFWL_DateTimePicker::Create() {
- return FX_NEW CFWL_DateTimePicker;
+ return new CFWL_DateTimePicker;
}
FWL_ERR CFWL_DateTimePicker::Initialize(
const CFWL_WidgetProperties* pProperties) {
diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/src/lightwidget/edit.cpp index 8447d1494e..0edc533752 100644 --- a/xfa/src/fwl/src/lightwidget/edit.cpp +++ b/xfa/src/fwl/src/lightwidget/edit.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_Edit* CFWL_Edit::Create() {
- return FX_NEW CFWL_Edit;
+ return new CFWL_Edit;
}
FWL_ERR CFWL_Edit::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/src/lightwidget/listbox.cpp index 2bfd10c173..b45e0feed1 100644 --- a/xfa/src/fwl/src/lightwidget/listbox.cpp +++ b/xfa/src/fwl/src/lightwidget/listbox.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_ListBox* CFWL_ListBox::Create() {
- return FX_NEW CFWL_ListBox;
+ return new CFWL_ListBox;
}
FWL_ERR CFWL_ListBox::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
@@ -39,7 +39,7 @@ FWL_ERR CFWL_ListBox::AddDIBitmap(CFX_DIBitmap* pDIB, FWL_HLISTITEM hItem) { }
FWL_HLISTITEM CFWL_ListBox::AddString(const CFX_WideStringC& wsAdd,
FX_BOOL bSelect) {
- CFWL_ListItem* pItem = FX_NEW CFWL_ListItem;
+ CFWL_ListItem* pItem = new CFWL_ListItem;
pItem->m_dwStates = 0;
pItem->m_wsText = wsAdd;
pItem->m_dwStates = bSelect ? FWL_ITEMSTATE_LTB_Selected : 0;
diff --git a/xfa/src/fwl/src/lightwidget/picturebox.cpp b/xfa/src/fwl/src/lightwidget/picturebox.cpp index dd7fe16eef..80f46e5ccf 100644 --- a/xfa/src/fwl/src/lightwidget/picturebox.cpp +++ b/xfa/src/fwl/src/lightwidget/picturebox.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_PictureBox* CFWL_PictureBox::Create() {
- return FX_NEW CFWL_PictureBox;
+ return new CFWL_PictureBox;
}
FWL_ERR CFWL_PictureBox::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/pushbutton.cpp b/xfa/src/fwl/src/lightwidget/pushbutton.cpp index e0df77f502..7ca1a13c0d 100644 --- a/xfa/src/fwl/src/lightwidget/pushbutton.cpp +++ b/xfa/src/fwl/src/lightwidget/pushbutton.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_PushButton* CFWL_PushButton::Create() {
- return FX_NEW CFWL_PushButton;
+ return new CFWL_PushButton;
}
FWL_ERR CFWL_PushButton::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/scrollbar.cpp b/xfa/src/fwl/src/lightwidget/scrollbar.cpp index 6b4e326d2a..3594769c5f 100644 --- a/xfa/src/fwl/src/lightwidget/scrollbar.cpp +++ b/xfa/src/fwl/src/lightwidget/scrollbar.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_ScrollBar* CFWL_ScrollBar::Create() {
- return FX_NEW CFWL_ScrollBar;
+ return new CFWL_ScrollBar;
}
FWL_ERR CFWL_ScrollBar::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/theme.cpp b/xfa/src/fwl/src/lightwidget/theme.cpp index e8fb41de69..99157f3b74 100644 --- a/xfa/src/fwl/src/lightwidget/theme.cpp +++ b/xfa/src/fwl/src/lightwidget/theme.cpp @@ -89,18 +89,18 @@ FWL_ERR CFWL_Theme::Finalize() { return FWL_ERR_Succeeded;
}
CFWL_Theme::CFWL_Theme() {
- CFWL_FormTP* pFormTP = FX_NEW CFWL_FormTP;
- CFWL_PushButtonTP* pPushButtonTP = FX_NEW CFWL_PushButtonTP;
- CFWL_CheckBoxTP* pCheckBoxTP = FX_NEW CFWL_CheckBoxTP;
- CFWL_ListBoxTP* pListBoxTP = FX_NEW CFWL_ListBoxTP;
- CFWL_PictureBoxTP* pPictureBoxTP = FX_NEW CFWL_PictureBoxTP;
- CFWL_ScrollBarTP* pSrollBarTP = FX_NEW CFWL_ScrollBarTP;
- CFWL_EditTP* pEditTP = FX_NEW CFWL_EditTP;
- CFWL_ComboBoxTP* pComboBoxTP = FX_NEW CFWL_ComboBoxTP;
- CFWL_BarcodeTP* pBarcodeTP = FX_NEW CFWL_BarcodeTP;
- CFWL_DateTimePickerTP* pDateTimePickerTP = FX_NEW CFWL_DateTimePickerTP;
- CFWL_MonthCalendarTP* pMonthCalendarTP = FX_NEW CFWL_MonthCalendarTP;
- CFWL_CaretTP* pCaretTP = FX_NEW CFWL_CaretTP;
+ CFWL_FormTP* pFormTP = new CFWL_FormTP;
+ CFWL_PushButtonTP* pPushButtonTP = new CFWL_PushButtonTP;
+ CFWL_CheckBoxTP* pCheckBoxTP = new CFWL_CheckBoxTP;
+ CFWL_ListBoxTP* pListBoxTP = new CFWL_ListBoxTP;
+ CFWL_PictureBoxTP* pPictureBoxTP = new CFWL_PictureBoxTP;
+ CFWL_ScrollBarTP* pSrollBarTP = new CFWL_ScrollBarTP;
+ CFWL_EditTP* pEditTP = new CFWL_EditTP;
+ CFWL_ComboBoxTP* pComboBoxTP = new CFWL_ComboBoxTP;
+ CFWL_BarcodeTP* pBarcodeTP = new CFWL_BarcodeTP;
+ CFWL_DateTimePickerTP* pDateTimePickerTP = new CFWL_DateTimePickerTP;
+ CFWL_MonthCalendarTP* pMonthCalendarTP = new CFWL_MonthCalendarTP;
+ CFWL_CaretTP* pCaretTP = new CFWL_CaretTP;
m_arrThemes.Add(pFormTP);
m_arrThemes.Add(pPushButtonTP);
m_arrThemes.Add(pCheckBoxTP);
diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp index 1864c288fc..42ceeaceee 100644 --- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp +++ b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp @@ -12,7 +12,7 @@ #include "../core/include/fwl_formimp.h"
#include "../core/include/fwl_threadimp.h"
CFWL_ToolTip* CFWL_ToolTip::Create() {
- return FX_NEW CFWL_ToolTip;
+ return new CFWL_ToolTip;
}
FWL_ERR CFWL_ToolTip::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/src/lightwidget/widget.cpp index 85bb710bd6..283aed0e2f 100644 --- a/xfa/src/fwl/src/lightwidget/widget.cpp +++ b/xfa/src/fwl/src/lightwidget/widget.cpp @@ -191,7 +191,7 @@ IFWL_WidgetDelegate* CFWL_Widget::SetDelegate(IFWL_WidgetDelegate* pDelegate) { }
CFWL_Widget::CFWL_Widget()
: m_pImp(NULL), m_pDelegate(NULL), m_pProperties(NULL) {
- m_pProperties = FX_NEW CFWL_WidgetProperties;
+ m_pProperties = new CFWL_WidgetProperties;
m_pWidgetMgr = (CFWL_WidgetMgr*)FWL_GetWidgetMgr();
FXSYS_assert(m_pWidgetMgr != NULL);
}
diff --git a/xfa/src/fwl/src/theme/checkboxtp.cpp b/xfa/src/fwl/src/theme/checkboxtp.cpp index d86f1886a6..e488918ee3 100644 --- a/xfa/src/fwl/src/theme/checkboxtp.cpp +++ b/xfa/src/fwl/src/theme/checkboxtp.cpp @@ -14,7 +14,7 @@ #define CHECKBOX_COLOR_BOXRB2 (ArgbEncode(255, 255, 255, 255))
#define CHECKBOX_FXGE_CoordinatesAdjust
CFWL_CheckBoxTP::CFWL_CheckBoxTP() : m_pCheckPath(NULL) {
- m_pThemeData = FX_NEW CKBThemeData;
+ m_pThemeData = new CKBThemeData;
SetThemeData(0);
}
CFWL_CheckBoxTP::~CFWL_CheckBoxTP() {
@@ -456,7 +456,7 @@ void CFWL_CheckBoxTP::SetThemeData(FX_DWORD dwID) { }
void CFWL_CheckBoxTP::initCheckPath(FX_FLOAT fCheckLen) {
if (!m_pCheckPath) {
- m_pCheckPath = FX_NEW CFX_Path;
+ m_pCheckPath = new CFX_Path;
m_pCheckPath->Create();
FX_FLOAT fWidth = CHECKBOX_SIZE_SIGNPATH;
FX_FLOAT fHeight = -CHECKBOX_SIZE_SIGNPATH;
diff --git a/xfa/src/fwl/src/theme/datetimepickertp.cpp b/xfa/src/fwl/src/theme/datetimepickertp.cpp index 70d31255b6..aac8cae71f 100644 --- a/xfa/src/fwl/src/theme/datetimepickertp.cpp +++ b/xfa/src/fwl/src/theme/datetimepickertp.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_DateTimePickerTP::CFWL_DateTimePickerTP() {
- m_pThemeData = FX_NEW DTPThemeData;
+ m_pThemeData = new DTPThemeData;
initThemeData();
}
CFWL_DateTimePickerTP::~CFWL_DateTimePickerTP() {
diff --git a/xfa/src/fwl/src/theme/formtp.cpp b/xfa/src/fwl/src/theme/formtp.cpp index 6bb372d127..217de374ce 100644 --- a/xfa/src/fwl/src/theme/formtp.cpp +++ b/xfa/src/fwl/src/theme/formtp.cpp @@ -16,7 +16,7 @@ #define FWLTHEME_FORMBTN_Span 2
#define FWLTHEME_FORMBTN_Size 21
CFWL_FormTP::CFWL_FormTP() : m_pActiveBitmap(NULL), m_pDeactivebitmap(NULL) {
- m_pThemeData = FX_NEW SBThemeData;
+ m_pThemeData = new SBThemeData;
SetThemeData(0);
m_rtDisLBorder.Reset();
m_rtDisRBorder.Reset();
@@ -840,7 +840,7 @@ void CFWL_FormTP::InitCaption(FX_BOOL bActive) { delete m_pActiveBitmap;
m_pActiveBitmap = NULL;
}
- m_pActiveBitmap = FX_NEW CFX_DIBitmap;
+ m_pActiveBitmap = new CFX_DIBitmap;
m_pActiveBitmap->Create(1, FWLTHEME_CAPACITY_CYCaption, FXDIB_Argb);
dev.Attach(m_pActiveBitmap);
gs.Create(&dev);
@@ -865,7 +865,7 @@ void CFWL_FormTP::InitCaption(FX_BOOL bActive) { delete m_pDeactivebitmap;
m_pDeactivebitmap = NULL;
}
- m_pDeactivebitmap = FX_NEW CFX_DIBitmap;
+ m_pDeactivebitmap = new CFX_DIBitmap;
m_pDeactivebitmap->Create(1, FWLTHEME_CAPACITY_CYCaption, FXDIB_Argb);
dev.Attach(m_pDeactivebitmap);
gs.Create(&dev);
diff --git a/xfa/src/fwl/src/theme/monthcalendartp.cpp b/xfa/src/fwl/src/theme/monthcalendartp.cpp index 67586f1b80..13f9251820 100644 --- a/xfa/src/fwl/src/theme/monthcalendartp.cpp +++ b/xfa/src/fwl/src/theme/monthcalendartp.cpp @@ -49,7 +49,7 @@ #define FWL_MC_WIDTH 200
#define FWL_MC_HEIGHT 160
CFWL_MonthCalendarTP::CFWL_MonthCalendarTP() {
- m_pThemeData = FX_NEW MCThemeData;
+ m_pThemeData = new MCThemeData;
SetThemeData(0);
}
CFWL_MonthCalendarTP::~CFWL_MonthCalendarTP() {
diff --git a/xfa/src/fwl/src/theme/pushbuttontp.cpp b/xfa/src/fwl/src/theme/pushbuttontp.cpp index 5820113f3b..db77f3ef27 100644 --- a/xfa/src/fwl/src/theme/pushbuttontp.cpp +++ b/xfa/src/fwl/src/theme/pushbuttontp.cpp @@ -7,7 +7,7 @@ #include "../../../foxitlib.h"
#define PUSHBUTTON_SIZE_Corner 2
CFWL_PushButtonTP::CFWL_PushButtonTP() {
- m_pThemeData = FX_NEW PBThemeData;
+ m_pThemeData = new PBThemeData;
SetThemeData(0);
}
CFWL_PushButtonTP::~CFWL_PushButtonTP() {
diff --git a/xfa/src/fwl/src/theme/scrollbartp.cpp b/xfa/src/fwl/src/theme/scrollbartp.cpp index bc9f41913c..e0ad6a1531 100644 --- a/xfa/src/fwl/src/theme/scrollbartp.cpp +++ b/xfa/src/fwl/src/theme/scrollbartp.cpp @@ -7,7 +7,7 @@ #include "../../../foxitlib.h"
#define FWL_SCROLL_PawLen 12.5f
CFWL_ScrollBarTP::CFWL_ScrollBarTP() {
- m_pThemeData = FX_NEW SBThemeData;
+ m_pThemeData = new SBThemeData;
SetThemeData(0);
}
CFWL_ScrollBarTP::~CFWL_ScrollBarTP() {
diff --git a/xfa/src/fwl/src/theme/widgettp.cpp b/xfa/src/fwl/src/theme/widgettp.cpp index 8d421b6209..bd21b4e761 100644 --- a/xfa/src/fwl/src/theme/widgettp.cpp +++ b/xfa/src/fwl/src/theme/widgettp.cpp @@ -665,7 +665,7 @@ CFWL_ArrowData::CFWL_ArrowData() : m_pColorData(NULL) { CFWL_FontManager* FWL_GetFontManager() {
static CFWL_FontManager* _fontManager = NULL;
if (_fontManager == NULL) {
- _fontManager = FX_NEW CFWL_FontManager;
+ _fontManager = new CFWL_FontManager;
}
return _fontManager;
}
@@ -740,7 +740,7 @@ IFX_Font* CFWL_FontManager::FindFont(const CFX_WideStringC& wsFontFamily, return data->GetFont();
}
}
- CFWL_FontData* fontData = FX_NEW CFWL_FontData;
+ CFWL_FontData* fontData = new CFWL_FontData;
if (!fontData->LoadFont(wsFontFamily, dwFontStyles, wCodePage)) {
delete fontData;
return NULL;
@@ -767,7 +767,7 @@ FX_DWORD FWL_MakeThemeID(FX_DWORD dwLayout, FX_DWORD dwColor) { CFWL_ArrowData* CFWL_ArrowData::m_pInstance = NULL;
CFWL_ArrowData* CFWL_ArrowData::GetInstance() {
if (!m_pInstance) {
- m_pInstance = FX_NEW CFWL_ArrowData;
+ m_pInstance = new CFWL_ArrowData;
}
return m_pInstance;
}
@@ -788,7 +788,7 @@ CFWL_ArrowData::~CFWL_ArrowData() { }
void CFWL_ArrowData::SetColorData(FX_DWORD dwID) {
if (!m_pColorData) {
- m_pColorData = FX_NEW CColorData;
+ m_pColorData = new CColorData;
}
if (dwID) {
m_pColorData->clrBorder[0] = ArgbEncode(255, 142, 153, 125);
|