summaryrefslogtreecommitdiff
path: root/xfa/src/fwl/src/lightwidget
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/src/fwl/src/lightwidget')
-rw-r--r--xfa/src/fwl/src/lightwidget/app.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/barcode.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/caret.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/checkbox.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/combobox.cpp6
-rw-r--r--xfa/src/fwl/src/lightwidget/datetimepicker.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/edit.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/listbox.cpp4
-rw-r--r--xfa/src/fwl/src/lightwidget/picturebox.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/pushbutton.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/scrollbar.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/theme.cpp24
-rw-r--r--xfa/src/fwl/src/lightwidget/tooltipctrl.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/widget.cpp2
14 files changed, 28 insertions, 28 deletions
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);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 22:41:11 +0000