diff options
46 files changed, 30 insertions, 176 deletions
diff --git a/xfa/include/fwl/basewidget/fwl_barcode.h b/xfa/include/fwl/basewidget/fwl_barcode.h index f2b0b2a11a..ac54ab8d39 100644 --- a/xfa/include/fwl/basewidget/fwl_barcode.h +++ b/xfa/include/fwl/basewidget/fwl_barcode.h @@ -50,9 +50,8 @@ class IFWL_BarcodeDP : public IFWL_EditDP { class IFWL_Barcode : public IFWL_Edit {
public:
static IFWL_Barcode* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
void SetType(BC_TYPE type);
FX_BOOL IsProtectedType();
diff --git a/xfa/include/fwl/basewidget/fwl_caret.h b/xfa/include/fwl/basewidget/fwl_caret.h index 3b8fccbc33..547f1c9ba8 100644 --- a/xfa/include/fwl/basewidget/fwl_caret.h +++ b/xfa/include/fwl/basewidget/fwl_caret.h @@ -17,9 +17,10 @@ class IFWL_Caret; class IFWL_Caret : public IFWL_Widget {
public:
static IFWL_Caret* Create();
+
FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
FWL_ERR ShowCaret(FX_BOOL bFlag = TRUE);
FWL_ERR GetFrequency(FX_DWORD& elapse);
diff --git a/xfa/include/fwl/basewidget/fwl_checkbox.h b/xfa/include/fwl/basewidget/fwl_checkbox.h index 63cc75896a..989430acc1 100644 --- a/xfa/include/fwl/basewidget/fwl_checkbox.h +++ b/xfa/include/fwl/basewidget/fwl_checkbox.h @@ -71,9 +71,8 @@ class IFWL_CheckBoxDP : public IFWL_DataProvider { class IFWL_CheckBox : public IFWL_Widget {
public:
static IFWL_CheckBox* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
int32_t GetCheckState();
FWL_ERR SetCheckState(int32_t iCheck);
@@ -83,9 +82,8 @@ class IFWL_CheckBox : public IFWL_Widget { class IFWL_RadioButton : public IFWL_Widget {
public:
static IFWL_RadioButton* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
int32_t GetCheckState();
FWL_ERR SetCheckState(int32_t iCheck);
diff --git a/xfa/include/fwl/basewidget/fwl_combobox.h b/xfa/include/fwl/basewidget/fwl_combobox.h index cd7da3d5c8..c3311e5200 100644 --- a/xfa/include/fwl/basewidget/fwl_combobox.h +++ b/xfa/include/fwl/basewidget/fwl_combobox.h @@ -98,9 +98,8 @@ class IFWL_ComboBoxDP : public IFWL_ListBoxDP { class IFWL_ComboBox : public IFWL_Widget {
public:
static IFWL_ComboBox* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
int32_t GetCurSel();
FWL_ERR SetCurSel(int32_t iSel);
FWL_ERR SetEditText(const CFX_WideString& wsText);
diff --git a/xfa/include/fwl/basewidget/fwl_datetimepicker.h b/xfa/include/fwl/basewidget/fwl_datetimepicker.h index 04ae8d9bba..f311185d1d 100644 --- a/xfa/include/fwl/basewidget/fwl_datetimepicker.h +++ b/xfa/include/fwl/basewidget/fwl_datetimepicker.h @@ -71,9 +71,8 @@ class IFWL_DateTimePickerDP : public IFWL_DataProvider { class IFWL_DateTimePicker : public IFWL_Widget {
public:
static IFWL_DateTimePicker* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
FWL_ERR GetCurSel(int32_t& iYear, int32_t& iMonth, int32_t& iDay);
FWL_ERR SetCurSel(int32_t iYear, int32_t iMonth, int32_t iDay);
FWL_ERR SetEditText(const CFX_WideString& wsText);
diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h index 2be101e840..c804af7ae1 100644 --- a/xfa/include/fwl/basewidget/fwl_edit.h +++ b/xfa/include/fwl/basewidget/fwl_edit.h @@ -113,9 +113,8 @@ typedef struct _FWL_HEDTFIND { void* pData; } * FWL_HEDTFIND; class IFWL_Edit : public IFWL_Widget {
public:
static IFWL_Edit* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
FWL_ERR SetText(const CFX_WideString& wsText);
int32_t GetTextLength() const;
FWL_ERR GetText(CFX_WideString& wsText,
diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/include/fwl/basewidget/fwl_listbox.h index ba59af82dd..569e00ea0c 100644 --- a/xfa/include/fwl/basewidget/fwl_listbox.h +++ b/xfa/include/fwl/basewidget/fwl_listbox.h @@ -110,9 +110,8 @@ class IFWL_ListBoxCompare { class IFWL_ListBox : public IFWL_Widget {
public:
static IFWL_ListBox* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
int32_t CountSelItems();
FWL_HLISTITEM GetSelItem(int32_t nIndexSel);
int32_t GetSelIndex(int32_t nIndex);
diff --git a/xfa/include/fwl/basewidget/fwl_monthcalendar.h b/xfa/include/fwl/basewidget/fwl_monthcalendar.h index 084b7bb270..23bc0ea712 100644 --- a/xfa/include/fwl/basewidget/fwl_monthcalendar.h +++ b/xfa/include/fwl/basewidget/fwl_monthcalendar.h @@ -116,9 +116,8 @@ class IFWL_MonthCalendar : public IFWL_Widget { public:
static IFWL_MonthCalendar* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
int32_t CountSelect();
FX_BOOL GetSelect(int32_t& iYear,
int32_t& iMonth,
diff --git a/xfa/include/fwl/basewidget/fwl_picturebox.h b/xfa/include/fwl/basewidget/fwl_picturebox.h index 76389f65d2..7ca8f526d7 100644 --- a/xfa/include/fwl/basewidget/fwl_picturebox.h +++ b/xfa/include/fwl/basewidget/fwl_picturebox.h @@ -44,9 +44,8 @@ class IFWL_PictureBox : public IFWL_Widget { public:
static IFWL_PictureBox* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
protected:
IFWL_PictureBox();
diff --git a/xfa/include/fwl/basewidget/fwl_pushbutton.h b/xfa/include/fwl/basewidget/fwl_pushbutton.h index 223dc5a311..55a650e23e 100644 --- a/xfa/include/fwl/basewidget/fwl_pushbutton.h +++ b/xfa/include/fwl/basewidget/fwl_pushbutton.h @@ -46,9 +46,8 @@ class IFWL_PushButtonDP : public IFWL_DataProvider { class IFWL_PushButton : public IFWL_Widget {
public:
static IFWL_PushButton* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
protected:
IFWL_PushButton();
diff --git a/xfa/include/fwl/basewidget/fwl_scrollbar.h b/xfa/include/fwl/basewidget/fwl_scrollbar.h index f81dfc6907..1dd7dd2d5c 100644 --- a/xfa/include/fwl/basewidget/fwl_scrollbar.h +++ b/xfa/include/fwl/basewidget/fwl_scrollbar.h @@ -48,10 +48,8 @@ class IFWL_ScrollBarDP : public IFWL_DataProvider {}; class IFWL_ScrollBar : public IFWL_Widget {
public:
static IFWL_ScrollBar* Create();
-
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
FX_BOOL IsVertical();
FWL_ERR GetRange(FX_FLOAT& fMin, FX_FLOAT& fMax);
FWL_ERR SetRange(FX_FLOAT fMin, FX_FLOAT fMax);
diff --git a/xfa/include/fwl/basewidget/fwl_spinbutton.h b/xfa/include/fwl/basewidget/fwl_spinbutton.h index dad93a34c2..521cfca277 100644 --- a/xfa/include/fwl/basewidget/fwl_spinbutton.h +++ b/xfa/include/fwl/basewidget/fwl_spinbutton.h @@ -31,9 +31,8 @@ class IFWL_SpinButton : public IFWL_Widget { public:
static IFWL_SpinButton* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
FWL_ERR EnableButton(FX_BOOL bEnable, FX_BOOL bUp = TRUE);
FX_BOOL IsButtonEnable(FX_BOOL bUp = TRUE);
diff --git a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h index 835f9abf11..2dce69383f 100644 --- a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h +++ b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h @@ -32,9 +32,8 @@ class IFWL_ToolTipDP : public IFWL_DataProvider { class IFWL_ToolTip : public IFWL_Form {
public:
static IFWL_ToolTip* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
FWL_ERR SetAnchor(const CFX_RectF& rtAnchor);
FWL_ERR Show();
FWL_ERR Hide();
diff --git a/xfa/include/fwl/core/fwl_content.h b/xfa/include/fwl/core/fwl_content.h index 8669340343..64c4887053 100644 --- a/xfa/include/fwl/core/fwl_content.h +++ b/xfa/include/fwl/core/fwl_content.h @@ -11,7 +11,6 @@ class IFWL_Content; class IFWL_Content : public IFWL_Widget {
public:
static IFWL_Content* Create();
- FWL_ERR Initialize();
FWL_ERR InsertWidget(IFWL_Widget* pChild, int32_t nIndex = -1);
FWL_ERR RemoveWidget(IFWL_Widget* pWidget);
FWL_ERR RemoveAllWidgets();
diff --git a/xfa/include/fwl/core/fwl_form.h b/xfa/include/fwl/core/fwl_form.h index b06d5742e9..6d76c614d0 100644 --- a/xfa/include/fwl/core/fwl_form.h +++ b/xfa/include/fwl/core/fwl_form.h @@ -66,12 +66,9 @@ enum FWL_COMMANDID { class IFWL_Form : public IFWL_Panel {
public:
static IFWL_Form* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
- FWL_ERR Initialize(CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(CFWL_WidgetImpProperties& properties,
CFX_WideString* classname,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
FWL_FORMSIZE GetFormSize();
FWL_ERR SetFormSize(FWL_FORMSIZE eFormSize);
IFWL_Widget* DoModal();
diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h index 7126024ba7..a41ef4ed53 100644 --- a/xfa/include/fwl/core/fwl_grid.h +++ b/xfa/include/fwl/core/fwl_grid.h @@ -40,7 +40,6 @@ typedef struct _FWL_HGRIDCOLROW { void* pData; } * FWL_HGRIDCOLROW; class IFWL_Grid : public IFWL_Content {
public:
static IFWL_Grid* Create();
- FWL_ERR Initialize();
FWL_ERR Initialize(CFWL_WidgetImpProperties& properties);
FWL_HGRIDCOLROW InsertColRow(FX_BOOL bColumn, int32_t nIndex = -1);
diff --git a/xfa/include/fwl/core/fwl_panel.h b/xfa/include/fwl/core/fwl_panel.h index 51d1249d56..bea6675911 100644 --- a/xfa/include/fwl/core/fwl_panel.h +++ b/xfa/include/fwl/core/fwl_panel.h @@ -15,9 +15,7 @@ class IFWL_CustomPanel; class IFWL_Panel : public IFWL_Widget {
public:
static IFWL_Panel* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
- FWL_ERR Initialize(CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ FWL_ERR Initialize(CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter);
IFWL_Content* GetContent();
FWL_ERR SetContent(IFWL_Content* pContent);
@@ -27,9 +25,7 @@ class IFWL_Panel : public IFWL_Widget { class IFWL_CustomPanel : public IFWL_Widget {
public:
static IFWL_CustomPanel* Create();
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
- FWL_ERR Initialize(CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ FWL_ERR Initialize(CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter);
IFWL_Content* GetContent();
FWL_ERR SetContent(IFWL_Content* pContent);
FWL_ERR SetProxy(IFWL_Proxy* pProxy);
diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h index 4a9c794d28..f7ddb5cebd 100644 --- a/xfa/include/fwl/core/fwl_widget.h +++ b/xfa/include/fwl/core/fwl_widget.h @@ -93,10 +93,8 @@ class CFWL_WidgetImpProperties { class IFWL_Custom : public IFWL_Widget {
public:
static IFWL_Custom* Create();
-
- FWL_ERR Initialize(IFWL_Widget* pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter = NULL);
+ IFWL_Widget* pOuter);
FWL_ERR SetProxy(IFWL_Proxy* pProxy);
protected:
diff --git a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp index b0addafe13..c65a350645 100644 --- a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp @@ -15,12 +15,6 @@ IFWL_Barcode* IFWL_Barcode::Create() { }
IFWL_Barcode::IFWL_Barcode() {
}
-FWL_ERR IFWL_Barcode::Initialize(IFWL_Widget* pOuter) {
- CFWL_BarcodeImp* pBarcodeImpl = new CFWL_BarcodeImp(pOuter);
- SetImpl(pBarcodeImpl);
- pBarcodeImpl->SetInterface(this);
- return pBarcodeImpl->Initialize();
-}
FWL_ERR IFWL_Barcode::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
CFWL_BarcodeImp* pBarcodeImpl = new CFWL_BarcodeImp(properties, pOuter);
diff --git a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp index b18df4e13f..01fbb732cb 100644 --- a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp @@ -16,12 +16,6 @@ IFWL_CheckBox* IFWL_CheckBox::Create() { }
IFWL_CheckBox::IFWL_CheckBox() {
}
-FWL_ERR IFWL_CheckBox::Initialize(IFWL_Widget* pOuter) {
- CFWL_CheckBoxImp* pCheckBoxImpl = new CFWL_CheckBoxImp(pOuter);
- SetImpl(pCheckBoxImpl);
- pCheckBoxImpl->SetInterface(this);
- return pCheckBoxImpl->Initialize();
-}
FWL_ERR IFWL_CheckBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
CFWL_CheckBoxImp* pCheckBoxImpl = new CFWL_CheckBoxImp(properties, pOuter);
@@ -40,12 +34,6 @@ IFWL_RadioButton* IFWL_RadioButton::Create() { }
IFWL_RadioButton::IFWL_RadioButton() {
}
-FWL_ERR IFWL_RadioButton::Initialize(IFWL_Widget* pOuter) {
- CFWL_CheckBoxImp* pCheckBoxImpl = new CFWL_CheckBoxImp(pOuter);
- SetImpl(pCheckBoxImpl);
- pCheckBoxImpl->SetInterface(this);
- return pCheckBoxImpl->Initialize();
-}
FWL_ERR IFWL_RadioButton::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
CFWL_CheckBoxImp* pCheckBoxImpl = new CFWL_CheckBoxImp(properties, pOuter);
diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp index 75a240b104..9ea1f4a557 100644 --- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp @@ -23,12 +23,6 @@ IFWL_ComboBox* IFWL_ComboBox::Create() { }
IFWL_ComboBox::IFWL_ComboBox() {
}
-FWL_ERR IFWL_ComboBox::Initialize(IFWL_Widget* pOuter) {
- CFWL_ComboBoxImp* pComboBoxImpl = new CFWL_ComboBoxImp(pOuter);
- SetImpl(pComboBoxImpl);
- pComboBoxImpl->SetInterface(this);
- return pComboBoxImpl->Initialize();
-}
FWL_ERR IFWL_ComboBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
CFWL_ComboBoxImp* pComboBoxImpl = new CFWL_ComboBoxImp(properties, pOuter);
diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp index 55f86cf770..6abef37aa2 100644 --- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp @@ -48,13 +48,6 @@ FWL_ERR IFWL_DateTimeEdit::Initialize( }
IFWL_DateTimePicker::IFWL_DateTimePicker() {
}
-FWL_ERR IFWL_DateTimePicker::Initialize(IFWL_Widget* pOuter) {
- CFWL_DateTimePickerImp* pDateTimePickerImpl =
- new CFWL_DateTimePickerImp(pOuter);
- SetImpl(pDateTimePickerImpl);
- pDateTimePickerImpl->SetInterface(this);
- return pDateTimePickerImpl->Initialize();
-}
FWL_ERR IFWL_DateTimePicker::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp index f8f1f59039..9f0dfa058a 100644 --- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp @@ -19,12 +19,6 @@ IFWL_Edit* IFWL_Edit::Create() { }
IFWL_Edit::IFWL_Edit() {
}
-FWL_ERR IFWL_Edit::Initialize(IFWL_Widget* pOuter) {
- CFWL_EditImp* pEditImpl = new CFWL_EditImp(pOuter);
- SetImpl(pEditImpl);
- pEditImpl->SetInterface(this);
- return pEditImpl->Initialize();
-}
FWL_ERR IFWL_Edit::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
CFWL_EditImp* pEditImpl = new CFWL_EditImp(properties, pOuter);
diff --git a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp index 0b96555b03..10f09f97a7 100644 --- a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp @@ -16,12 +16,6 @@ IFWL_ListBox* IFWL_ListBox::Create() { }
IFWL_ListBox::IFWL_ListBox() {
}
-FWL_ERR IFWL_ListBox::Initialize(IFWL_Widget* pOuter) {
- CFWL_ListBoxImp* pListBoxImpl = new CFWL_ListBoxImp(pOuter);
- SetImpl(pListBoxImpl);
- pListBoxImpl->SetInterface(this);
- return pListBoxImpl->Initialize();
-}
FWL_ERR IFWL_ListBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
CFWL_ListBoxImp* pListBoxImpl = new CFWL_ListBoxImp(properties, pOuter);
diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp index 730c244fe1..7829105cc5 100644 --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp @@ -22,12 +22,6 @@ IFWL_MonthCalendar* IFWL_MonthCalendar::Create() { }
IFWL_MonthCalendar::IFWL_MonthCalendar() {
}
-FWL_ERR IFWL_MonthCalendar::Initialize(IFWL_Widget* pOuter) {
- CFWL_MonthCalendarImp* pMonthCalendarImpl = new CFWL_MonthCalendarImp(pOuter);
- SetImpl(pMonthCalendarImpl);
- pMonthCalendarImpl->SetInterface(this);
- return pMonthCalendarImpl->Initialize();
-}
FWL_ERR IFWL_MonthCalendar::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
diff --git a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp index c1b8d3e07d..c3d3192361 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp @@ -14,12 +14,6 @@ IFWL_PictureBox* IFWL_PictureBox::Create() { }
IFWL_PictureBox::IFWL_PictureBox() {
}
-FWL_ERR IFWL_PictureBox::Initialize(IFWL_Widget* pOuter) {
- CFWL_PictureBoxImp* pPictureBoxImpl = new CFWL_PictureBoxImp(pOuter);
- SetImpl(pPictureBoxImpl);
- pPictureBoxImpl->SetInterface(this);
- return pPictureBoxImpl->Initialize();
-}
FWL_ERR IFWL_PictureBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
CFWL_PictureBoxImp* pPictureBoxImpl =
diff --git a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp index c8f986d4f8..49719a91ac 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp @@ -12,12 +12,6 @@ IFWL_PushButton* IFWL_PushButton::Create() {
return new IFWL_PushButton;
}
-FWL_ERR IFWL_PushButton::Initialize(IFWL_Widget* pOuter) {
- CFWL_PushButtonImp* pPushButtonImpl = new CFWL_PushButtonImp(pOuter);
- SetImpl(pPushButtonImpl);
- pPushButtonImpl->SetInterface(this);
- return pPushButtonImpl->Initialize();
-}
FWL_ERR IFWL_PushButton::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
CFWL_PushButtonImp* pPushButtonImpl =
diff --git a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp index a3fc2b17e0..ec44d9c2de 100644 --- a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp @@ -16,12 +16,6 @@ IFWL_ScrollBar* IFWL_ScrollBar::Create() { }
IFWL_ScrollBar::IFWL_ScrollBar() {
}
-FWL_ERR IFWL_ScrollBar::Initialize(IFWL_Widget* pOuter) {
- CFWL_ScrollBarImp* pScrollBarImpl = new CFWL_ScrollBarImp(pOuter);
- SetImpl(pScrollBarImpl);
- pScrollBarImpl->SetInterface(this);
- return pScrollBarImpl->Initialize();
-}
FWL_ERR IFWL_ScrollBar::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
CFWL_ScrollBarImp* pScrollBarImpl = new CFWL_ScrollBarImp(properties, pOuter);
diff --git a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp index 382118fd43..cc87f51111 100644 --- a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp @@ -17,12 +17,6 @@ IFWL_SpinButton* IFWL_SpinButton::Create() { }
IFWL_SpinButton::IFWL_SpinButton() {
}
-FWL_ERR IFWL_SpinButton::Initialize(IFWL_Widget* pOuter) {
- CFWL_SpinButtonImp* pSpinButtonImpl = new CFWL_SpinButtonImp;
- SetImpl(pSpinButtonImpl);
- pSpinButtonImpl->SetInterface(this);
- return pSpinButtonImpl->Initialize();
-}
FWL_ERR IFWL_SpinButton::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
CFWL_SpinButtonImp* pSpinButtonImpl = new CFWL_SpinButtonImp(properties);
diff --git a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp index f9ae30fe7d..cbc27caf85 100644 --- a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp @@ -14,12 +14,6 @@ IFWL_ToolTip* IFWL_ToolTip::Create() {
return new IFWL_ToolTip;
}
-FWL_ERR IFWL_ToolTip::Initialize(IFWL_Widget* pOuter) {
- CFWL_ToolTipImp* pToolTipImpl = new CFWL_ToolTipImp(pOuter);
- SetImpl(pToolTipImpl);
- pToolTipImpl->SetInterface(this);
- return pToolTipImpl->Initialize();
-}
FWL_ERR IFWL_ToolTip::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
CFWL_ToolTipImp* pToolTipImpl = new CFWL_ToolTipImp(properties, pOuter);
diff --git a/xfa/src/fwl/src/core/fwl_contentimp.cpp b/xfa/src/fwl/src/core/fwl_contentimp.cpp index 97d736e087..986d7b0887 100644 --- a/xfa/src/fwl/src/core/fwl_contentimp.cpp +++ b/xfa/src/fwl/src/core/fwl_contentimp.cpp @@ -14,12 +14,6 @@ IFWL_Content* IFWL_Content::Create() {
return new IFWL_Content;
}
-FWL_ERR IFWL_Content::Initialize() {
- CFWL_ContentImp* pContentImpl = new CFWL_ContentImp;
- SetImpl(pContentImpl);
- pContentImpl->SetInterface(this);
- return pContentImpl->Initialize();
-}
FWL_ERR IFWL_Content::InsertWidget(IFWL_Widget* pChild, int32_t nIndex) {
return static_cast<CFWL_ContentImp*>(GetImpl())->InsertWidget(pChild, nIndex);
}
diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/src/core/fwl_formimp.cpp index 2e215c4080..21d810eeeb 100644 --- a/xfa/src/fwl/src/core/fwl_formimp.cpp +++ b/xfa/src/fwl/src/core/fwl_formimp.cpp @@ -20,19 +20,6 @@ IFWL_Form* IFWL_Form::Create() {
return new IFWL_Form;
}
-FWL_ERR IFWL_Form::Initialize(IFWL_Widget* pOuter) {
- CFWL_FormImp* pFormImpl = new CFWL_FormImp(pOuter);
- SetImpl(pFormImpl);
- pFormImpl->SetInterface(this);
- return pFormImpl->Initialize();
-}
-FWL_ERR IFWL_Form::Initialize(CFWL_WidgetImpProperties& properties,
- IFWL_Widget* pOuter) {
- CFWL_FormImp* pFormImpl = new CFWL_FormImp(properties, pOuter);
- SetImpl(pFormImpl);
- pFormImpl->SetInterface(this);
- return pFormImpl->Initialize();
-}
FWL_ERR IFWL_Form::Initialize(CFWL_WidgetImpProperties& properties,
CFX_WideString* classname,
IFWL_Widget* pOuter) {
diff --git a/xfa/src/fwl/src/core/fwl_gridimp.cpp b/xfa/src/fwl/src/core/fwl_gridimp.cpp index 433deabbb1..4928288542 100644 --- a/xfa/src/fwl/src/core/fwl_gridimp.cpp +++ b/xfa/src/fwl/src/core/fwl_gridimp.cpp @@ -14,12 +14,6 @@ IFWL_Grid* IFWL_Grid::Create() {
return new IFWL_Grid;
}
-FWL_ERR IFWL_Grid::Initialize() {
- CFWL_GridImp* pGridImpl = new CFWL_GridImp;
- SetImpl(pGridImpl);
- pGridImpl->SetInterface(this);
- return pGridImpl->Initialize();
-}
FWL_ERR IFWL_Grid::Initialize(CFWL_WidgetImpProperties& properties) {
CFWL_GridImp* pGridImpl = new CFWL_GridImp(properties);
SetImpl(pGridImpl);
diff --git a/xfa/src/fwl/src/core/fwl_panelimp.cpp b/xfa/src/fwl/src/core/fwl_panelimp.cpp index e127ff6096..591bfcb7d5 100644 --- a/xfa/src/fwl/src/core/fwl_panelimp.cpp +++ b/xfa/src/fwl/src/core/fwl_panelimp.cpp @@ -12,12 +12,6 @@ IFWL_Panel* IFWL_Panel::Create() {
return new IFWL_Panel;
}
-FWL_ERR IFWL_Panel::Initialize(IFWL_Widget* pOuter) {
- CFWL_PanelImp* pPanelImpl = new CFWL_PanelImp(pOuter);
- SetImpl(pPanelImpl);
- pPanelImpl->SetInterface(this);
- return pPanelImpl->Initialize();
-}
FWL_ERR IFWL_Panel::Initialize(CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
CFWL_PanelImp* pPanelImpl = new CFWL_PanelImp(properties, pOuter);
@@ -136,12 +130,6 @@ FWL_ERR CFWL_CustomPanelImp::SetProxy(IFWL_Proxy* pProxy) { IFWL_CustomPanel* IFWL_CustomPanel::Create() {
return new IFWL_CustomPanel;
}
-FWL_ERR IFWL_CustomPanel::Initialize(IFWL_Widget* pOuter) {
- CFWL_CustomPanelImp* pCustomPanelImpl = new CFWL_CustomPanelImp(pOuter);
- SetImpl(pCustomPanelImpl);
- pCustomPanelImpl->SetInterface(this);
- return pCustomPanelImpl->Initialize();
-}
FWL_ERR IFWL_CustomPanel::Initialize(CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
CFWL_CustomPanelImp* pCustomPanelImpl =
diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp index 78daae08a7..5a5fcab173 100644 --- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp @@ -1121,12 +1121,6 @@ IFWL_Custom* IFWL_Custom::Create() { }
IFWL_Custom::IFWL_Custom() {
}
-FWL_ERR IFWL_Custom::Initialize(IFWL_Widget* pOuter) {
- CFWL_Custom* pCustomImpl = new CFWL_Custom(pOuter);
- SetImpl(pCustomImpl);
- pCustomImpl->SetInterface(this);
- return pCustomImpl->Initialize();
-}
FWL_ERR IFWL_Custom::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
CFWL_Custom* pCustomImpl = new CFWL_Custom(properties, pOuter);
diff --git a/xfa/src/fwl/src/lightwidget/barcode.cpp b/xfa/src/fwl/src/lightwidget/barcode.cpp index 9721104c70..9c336ce81e 100644 --- a/xfa/src/fwl/src/lightwidget/barcode.cpp +++ b/xfa/src/fwl/src/lightwidget/barcode.cpp @@ -27,7 +27,7 @@ FWL_ERR CFWL_Barcode::Initialize(const CFWL_WidgetProperties* pProperties) { prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
m_pIface = IFWL_Barcode::Create();
- FWL_ERR ret = ((IFWL_Barcode*)m_pIface)->Initialize(prop);
+ FWL_ERR ret = ((IFWL_Barcode*)m_pIface)->Initialize(prop, nullptr);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
diff --git a/xfa/src/fwl/src/lightwidget/caret.cpp b/xfa/src/fwl/src/lightwidget/caret.cpp index 20af355b1c..d977772295 100644 --- a/xfa/src/fwl/src/lightwidget/caret.cpp +++ b/xfa/src/fwl/src/lightwidget/caret.cpp @@ -26,7 +26,7 @@ FWL_ERR CFWL_Caret::Initialize(const CFWL_WidgetProperties* pProperties) { prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
m_pIface = IFWL_Caret::Create();
- FWL_ERR ret = ((IFWL_Caret*)m_pIface)->Initialize(prop);
+ FWL_ERR ret = ((IFWL_Caret*)m_pIface)->Initialize(prop, nullptr);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
diff --git a/xfa/src/fwl/src/lightwidget/checkbox.cpp b/xfa/src/fwl/src/lightwidget/checkbox.cpp index 06513b7ca3..ef3f5b3171 100644 --- a/xfa/src/fwl/src/lightwidget/checkbox.cpp +++ b/xfa/src/fwl/src/lightwidget/checkbox.cpp @@ -27,7 +27,7 @@ FWL_ERR CFWL_CheckBox::Initialize(const CFWL_WidgetProperties* pProperties) { prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
m_pIface = IFWL_CheckBox::Create();
- FWL_ERR ret = ((IFWL_CheckBox*)m_pIface)->Initialize(prop);
+ FWL_ERR ret = ((IFWL_CheckBox*)m_pIface)->Initialize(prop, nullptr);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/src/lightwidget/combobox.cpp index aa6bb52788..dd5508b40b 100644 --- a/xfa/src/fwl/src/lightwidget/combobox.cpp +++ b/xfa/src/fwl/src/lightwidget/combobox.cpp @@ -27,7 +27,7 @@ FWL_ERR CFWL_ComboBox::Initialize(const CFWL_WidgetProperties* pProperties) { prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
m_pIface = IFWL_ComboBox::Create();
- FWL_ERR ret = ((IFWL_ComboBox*)m_pIface)->Initialize(prop);
+ FWL_ERR ret = ((IFWL_ComboBox*)m_pIface)->Initialize(prop, nullptr);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
diff --git a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp index b891f4cc00..84ddd5e3cb 100644 --- a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp +++ b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp @@ -28,7 +28,7 @@ FWL_ERR CFWL_DateTimePicker::Initialize( }
prop.m_rtWidget = m_pProperties->m_rtWidget;
m_pIface = IFWL_DateTimePicker::Create();
- FWL_ERR ret = ((IFWL_DateTimePicker*)m_pIface)->Initialize(prop);
+ FWL_ERR ret = ((IFWL_DateTimePicker*)m_pIface)->Initialize(prop, nullptr);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/src/lightwidget/edit.cpp index 0b14ae69b7..adfac0d1dc 100644 --- a/xfa/src/fwl/src/lightwidget/edit.cpp +++ b/xfa/src/fwl/src/lightwidget/edit.cpp @@ -26,7 +26,7 @@ FWL_ERR CFWL_Edit::Initialize(const CFWL_WidgetProperties* pProperties) { }
prop.m_rtWidget = m_pProperties->m_rtWidget;
m_pIface = IFWL_Edit::Create();
- FWL_ERR ret = ((IFWL_Edit*)m_pIface)->Initialize(prop);
+ FWL_ERR ret = ((IFWL_Edit*)m_pIface)->Initialize(prop, nullptr);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/src/lightwidget/listbox.cpp index 61e8231b0e..758ee36c0f 100644 --- a/xfa/src/fwl/src/lightwidget/listbox.cpp +++ b/xfa/src/fwl/src/lightwidget/listbox.cpp @@ -27,7 +27,7 @@ FWL_ERR CFWL_ListBox::Initialize(const CFWL_WidgetProperties* pProperties) { }
prop.m_rtWidget = m_pProperties->m_rtWidget;
m_pIface = IFWL_ListBox::Create();
- FWL_ERR ret = ((IFWL_ListBox*)m_pIface)->Initialize(prop);
+ FWL_ERR ret = ((IFWL_ListBox*)m_pIface)->Initialize(prop, nullptr);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
diff --git a/xfa/src/fwl/src/lightwidget/picturebox.cpp b/xfa/src/fwl/src/lightwidget/picturebox.cpp index 9a6c7d6d0f..bb339a82aa 100644 --- a/xfa/src/fwl/src/lightwidget/picturebox.cpp +++ b/xfa/src/fwl/src/lightwidget/picturebox.cpp @@ -27,7 +27,7 @@ FWL_ERR CFWL_PictureBox::Initialize(const CFWL_WidgetProperties* pProperties) { }
prop.m_rtWidget = m_pProperties->m_rtWidget;
m_pIface = IFWL_PictureBox::Create();
- FWL_ERR ret = ((IFWL_PictureBox*)m_pIface)->Initialize(prop);
+ FWL_ERR ret = ((IFWL_PictureBox*)m_pIface)->Initialize(prop, nullptr);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
diff --git a/xfa/src/fwl/src/lightwidget/pushbutton.cpp b/xfa/src/fwl/src/lightwidget/pushbutton.cpp index fb2e554f50..3344d37bfd 100644 --- a/xfa/src/fwl/src/lightwidget/pushbutton.cpp +++ b/xfa/src/fwl/src/lightwidget/pushbutton.cpp @@ -27,7 +27,7 @@ FWL_ERR CFWL_PushButton::Initialize(const CFWL_WidgetProperties* pProperties) { }
prop.m_rtWidget = m_pProperties->m_rtWidget;
m_pIface = IFWL_PushButton::Create();
- FWL_ERR ret = ((IFWL_PushButton*)m_pIface)->Initialize(prop);
+ FWL_ERR ret = ((IFWL_PushButton*)m_pIface)->Initialize(prop, nullptr);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
diff --git a/xfa/src/fwl/src/lightwidget/scrollbar.cpp b/xfa/src/fwl/src/lightwidget/scrollbar.cpp index 25df339d65..8bf47f840e 100644 --- a/xfa/src/fwl/src/lightwidget/scrollbar.cpp +++ b/xfa/src/fwl/src/lightwidget/scrollbar.cpp @@ -26,7 +26,7 @@ FWL_ERR CFWL_ScrollBar::Initialize(const CFWL_WidgetProperties* pProperties) { }
prop.m_rtWidget = m_pProperties->m_rtWidget;
m_pIface = IFWL_ScrollBar::Create();
- FWL_ERR ret = ((IFWL_ScrollBar*)m_pIface)->Initialize(prop);
+ FWL_ERR ret = ((IFWL_ScrollBar*)m_pIface)->Initialize(prop, nullptr);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp index 527f9aac9e..a167148b46 100644 --- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp +++ b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp @@ -33,7 +33,7 @@ FWL_ERR CFWL_ToolTip::Initialize(const CFWL_WidgetProperties* pProperties) { }
prop.m_rtWidget = m_pProperties->m_rtWidget;
m_pIface = IFWL_ToolTip::Create();
- FWL_ERR ret = ((IFWL_ToolTip*)m_pIface)->Initialize(prop);
+ FWL_ERR ret = ((IFWL_ToolTip*)m_pIface)->Initialize(prop, nullptr);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
|