summaryrefslogtreecommitdiff
path: root/fpdfsdk/formfiller
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk/formfiller')
-rw-r--r--fpdfsdk/formfiller/cffl_checkbox.cpp4
-rw-r--r--fpdfsdk/formfiller/cffl_checkbox.h4
-rw-r--r--fpdfsdk/formfiller/cffl_combobox.cpp8
-rw-r--r--fpdfsdk/formfiller/cffl_combobox.h4
-rw-r--r--fpdfsdk/formfiller/cffl_formfiller.cpp6
-rw-r--r--fpdfsdk/formfiller/cffl_formfiller.h4
-rw-r--r--fpdfsdk/formfiller/cffl_listbox.cpp8
-rw-r--r--fpdfsdk/formfiller/cffl_listbox.h4
-rw-r--r--fpdfsdk/formfiller/cffl_pushbutton.cpp5
-rw-r--r--fpdfsdk/formfiller/cffl_pushbutton.h4
-rw-r--r--fpdfsdk/formfiller/cffl_radiobutton.cpp6
-rw-r--r--fpdfsdk/formfiller/cffl_radiobutton.h4
-rw-r--r--fpdfsdk/formfiller/cffl_textfield.cpp8
-rw-r--r--fpdfsdk/formfiller/cffl_textfield.h4
14 files changed, 35 insertions, 38 deletions
diff --git a/fpdfsdk/formfiller/cffl_checkbox.cpp b/fpdfsdk/formfiller/cffl_checkbox.cpp
index 9691f6dc6f..2863a56001 100644
--- a/fpdfsdk/formfiller/cffl_checkbox.cpp
+++ b/fpdfsdk/formfiller/cffl_checkbox.cpp
@@ -18,8 +18,8 @@ CFFL_CheckBox::CFFL_CheckBox(CPDFSDK_FormFillEnvironment* pApp,
CFFL_CheckBox::~CFFL_CheckBox() {}
-CPWL_Wnd* CFFL_CheckBox::NewPDFWindow(const PWL_CREATEPARAM& cp) {
- CPWL_CheckBox* pWnd = new CPWL_CheckBox();
+CPWL_Wnd* CFFL_CheckBox::NewPDFWindow(const CPWL_Wnd::CreateParams& cp) {
+ auto* pWnd = new CPWL_CheckBox();
pWnd->Create(cp);
pWnd->SetCheck(m_pWidget->IsChecked());
return pWnd;
diff --git a/fpdfsdk/formfiller/cffl_checkbox.h b/fpdfsdk/formfiller/cffl_checkbox.h
index f84fb3eb37..8ef3de6bca 100644
--- a/fpdfsdk/formfiller/cffl_checkbox.h
+++ b/fpdfsdk/formfiller/cffl_checkbox.h
@@ -16,8 +16,8 @@ class CFFL_CheckBox : public CFFL_Button {
CFFL_CheckBox(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Widget* pWidget);
~CFFL_CheckBox() override;
- // CFFL_Button
- CPWL_Wnd* NewPDFWindow(const PWL_CREATEPARAM& cp) override;
+ // CFFL_Button:
+ CPWL_Wnd* NewPDFWindow(const CPWL_Wnd::CreateParams& cp) override;
bool OnKeyDown(CPDFSDK_Annot* pAnnot,
uint32_t nKeyCode,
uint32_t nFlags) override;
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp
index 98f98b3ee2..aeb31f5b88 100644
--- a/fpdfsdk/formfiller/cffl_combobox.cpp
+++ b/fpdfsdk/formfiller/cffl_combobox.cpp
@@ -32,8 +32,8 @@ CFFL_ComboBox::~CFFL_ComboBox() {
DestroyWindows();
}
-PWL_CREATEPARAM CFFL_ComboBox::GetCreateParam() {
- PWL_CREATEPARAM cp = CFFL_TextObject::GetCreateParam();
+CPWL_Wnd::CreateParams CFFL_ComboBox::GetCreateParam() {
+ CPWL_Wnd::CreateParams cp = CFFL_TextObject::GetCreateParam();
if (m_pWidget->GetFieldFlags() & FIELDFLAG_EDIT)
cp.dwFlags |= PCBS_ALLOWCUSTOMTEXT;
@@ -42,8 +42,8 @@ PWL_CREATEPARAM CFFL_ComboBox::GetCreateParam() {
return cp;
}
-CPWL_Wnd* CFFL_ComboBox::NewPDFWindow(const PWL_CREATEPARAM& cp) {
- CPWL_ComboBox* pWnd = new CPWL_ComboBox();
+CPWL_Wnd* CFFL_ComboBox::NewPDFWindow(const CPWL_Wnd::CreateParams& cp) {
+ auto* pWnd = new CPWL_ComboBox();
pWnd->AttachFFLData(this);
pWnd->Create(cp);
diff --git a/fpdfsdk/formfiller/cffl_combobox.h b/fpdfsdk/formfiller/cffl_combobox.h
index 0f510bef20..7d5a38ef56 100644
--- a/fpdfsdk/formfiller/cffl_combobox.h
+++ b/fpdfsdk/formfiller/cffl_combobox.h
@@ -25,8 +25,8 @@ class CFFL_ComboBox : public CFFL_TextObject, public IPWL_FocusHandler {
~CFFL_ComboBox() override;
// CFFL_TextObject:
- PWL_CREATEPARAM GetCreateParam() override;
- CPWL_Wnd* NewPDFWindow(const PWL_CREATEPARAM& cp) override;
+ CPWL_Wnd::CreateParams GetCreateParam() override;
+ CPWL_Wnd* NewPDFWindow(const CPWL_Wnd::CreateParams& cp) override;
bool OnChar(CPDFSDK_Annot* pAnnot, uint32_t nChar, uint32_t nFlags) override;
bool IsDataChanged(CPDFSDK_PageView* pPageView) override;
void SaveData(CPDFSDK_PageView* pPageView) override;
diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
index e2a8c4e931..f405e3578d 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -299,8 +299,8 @@ bool CFFL_FormFiller::IsValid() const {
return m_bValid;
}
-PWL_CREATEPARAM CFFL_FormFiller::GetCreateParam() {
- PWL_CREATEPARAM cp;
+CPWL_Wnd::CreateParams CFFL_FormFiller::GetCreateParam() {
+ CPWL_Wnd::CreateParams cp;
cp.pParentWnd = nullptr;
cp.pProvider.Reset(this);
cp.rcRectWnd = GetPDFWindowRect();
@@ -356,7 +356,7 @@ CPWL_Wnd* CFFL_FormFiller::GetPDFWindow(CPDFSDK_PageView* pPageView,
return pWnd;
if (!found) {
- PWL_CREATEPARAM cp = GetCreateParam();
+ CPWL_Wnd::CreateParams cp = GetCreateParam();
cp.pAttachedWidget.Reset(m_pWidget.Get());
CFFL_PrivateData* pPrivateData = new CFFL_PrivateData;
diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h
index b5bf1c8197..b9af3897e4 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.h
+++ b/fpdfsdk/formfiller/cffl_formfiller.h
@@ -130,8 +130,8 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler {
void DestroyPDFWindow(CPDFSDK_PageView* pPageView);
void EscapeFiller(CPDFSDK_PageView* pPageView, bool bDestroyPDFWindow);
- virtual PWL_CREATEPARAM GetCreateParam();
- virtual CPWL_Wnd* NewPDFWindow(const PWL_CREATEPARAM& cp) = 0;
+ virtual CPWL_Wnd::CreateParams GetCreateParam();
+ virtual CPWL_Wnd* NewPDFWindow(const CPWL_Wnd::CreateParams& cp) = 0;
virtual CFX_FloatRect GetFocusBox(CPDFSDK_PageView* pPageView);
bool IsValid() const;
diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp
index a5851b0643..9dad11d3a0 100644
--- a/fpdfsdk/formfiller/cffl_listbox.cpp
+++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -22,8 +22,8 @@ CFFL_ListBox::CFFL_ListBox(CPDFSDK_FormFillEnvironment* pApp,
CFFL_ListBox::~CFFL_ListBox() {}
-PWL_CREATEPARAM CFFL_ListBox::GetCreateParam() {
- PWL_CREATEPARAM cp = CFFL_TextObject::GetCreateParam();
+CPWL_Wnd::CreateParams CFFL_ListBox::GetCreateParam() {
+ CPWL_Wnd::CreateParams cp = CFFL_TextObject::GetCreateParam();
uint32_t dwFieldFlag = m_pWidget->GetFieldFlags();
if (dwFieldFlag & FIELDFLAG_MULTISELECT)
cp.dwFlags |= PLBS_MULTIPLESEL;
@@ -37,8 +37,8 @@ PWL_CREATEPARAM CFFL_ListBox::GetCreateParam() {
return cp;
}
-CPWL_Wnd* CFFL_ListBox::NewPDFWindow(const PWL_CREATEPARAM& cp) {
- CPWL_ListBox* pWnd = new CPWL_ListBox();
+CPWL_Wnd* CFFL_ListBox::NewPDFWindow(const CPWL_Wnd::CreateParams& cp) {
+ auto* pWnd = new CPWL_ListBox();
pWnd->AttachFFLData(this);
pWnd->Create(cp);
pWnd->SetFillerNotify(m_pFormFillEnv->GetInteractiveFormFiller());
diff --git a/fpdfsdk/formfiller/cffl_listbox.h b/fpdfsdk/formfiller/cffl_listbox.h
index fc06e144a7..014865d567 100644
--- a/fpdfsdk/formfiller/cffl_listbox.h
+++ b/fpdfsdk/formfiller/cffl_listbox.h
@@ -20,8 +20,8 @@ class CFFL_ListBox : public CFFL_TextObject {
~CFFL_ListBox() override;
// CFFL_TextObject:
- PWL_CREATEPARAM GetCreateParam() override;
- CPWL_Wnd* NewPDFWindow(const PWL_CREATEPARAM& cp) override;
+ CPWL_Wnd::CreateParams GetCreateParam() override;
+ CPWL_Wnd* NewPDFWindow(const CPWL_Wnd::CreateParams& cp) override;
bool OnChar(CPDFSDK_Annot* pAnnot, uint32_t nChar, uint32_t nFlags) override;
bool IsDataChanged(CPDFSDK_PageView* pPageView) override;
void SaveData(CPDFSDK_PageView* pPageView) override;
diff --git a/fpdfsdk/formfiller/cffl_pushbutton.cpp b/fpdfsdk/formfiller/cffl_pushbutton.cpp
index f09a8f7d8d..7310da6761 100644
--- a/fpdfsdk/formfiller/cffl_pushbutton.cpp
+++ b/fpdfsdk/formfiller/cffl_pushbutton.cpp
@@ -15,9 +15,8 @@ CFFL_PushButton::CFFL_PushButton(CPDFSDK_FormFillEnvironment* pApp,
CFFL_PushButton::~CFFL_PushButton() {}
-CPWL_Wnd* CFFL_PushButton::NewPDFWindow(const PWL_CREATEPARAM& cp) {
- CPWL_PushButton* pWnd = new CPWL_PushButton();
+CPWL_Wnd* CFFL_PushButton::NewPDFWindow(const CPWL_Wnd::CreateParams& cp) {
+ auto* pWnd = new CPWL_PushButton();
pWnd->Create(cp);
-
return pWnd;
}
diff --git a/fpdfsdk/formfiller/cffl_pushbutton.h b/fpdfsdk/formfiller/cffl_pushbutton.h
index 81c0d628a0..7ee076764e 100644
--- a/fpdfsdk/formfiller/cffl_pushbutton.h
+++ b/fpdfsdk/formfiller/cffl_pushbutton.h
@@ -14,8 +14,8 @@ class CFFL_PushButton : public CFFL_Button {
CFFL_PushButton(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Widget* pWidget);
~CFFL_PushButton() override;
- // CFFL_Button
- CPWL_Wnd* NewPDFWindow(const PWL_CREATEPARAM& cp) override;
+ // CFFL_Button:
+ CPWL_Wnd* NewPDFWindow(const CPWL_Wnd::CreateParams& cp) override;
};
#endif // FPDFSDK_FORMFILLER_CFFL_PUSHBUTTON_H_
diff --git a/fpdfsdk/formfiller/cffl_radiobutton.cpp b/fpdfsdk/formfiller/cffl_radiobutton.cpp
index 6c8d5a3883..f8ada67ff3 100644
--- a/fpdfsdk/formfiller/cffl_radiobutton.cpp
+++ b/fpdfsdk/formfiller/cffl_radiobutton.cpp
@@ -18,12 +18,10 @@ CFFL_RadioButton::CFFL_RadioButton(CPDFSDK_FormFillEnvironment* pApp,
CFFL_RadioButton::~CFFL_RadioButton() {}
-CPWL_Wnd* CFFL_RadioButton::NewPDFWindow(const PWL_CREATEPARAM& cp) {
- CPWL_RadioButton* pWnd = new CPWL_RadioButton();
+CPWL_Wnd* CFFL_RadioButton::NewPDFWindow(const CPWL_Wnd::CreateParams& cp) {
+ auto* pWnd = new CPWL_RadioButton();
pWnd->Create(cp);
-
pWnd->SetCheck(m_pWidget->IsChecked());
-
return pWnd;
}
diff --git a/fpdfsdk/formfiller/cffl_radiobutton.h b/fpdfsdk/formfiller/cffl_radiobutton.h
index 981e2df62e..2838254708 100644
--- a/fpdfsdk/formfiller/cffl_radiobutton.h
+++ b/fpdfsdk/formfiller/cffl_radiobutton.h
@@ -16,8 +16,8 @@ class CFFL_RadioButton : public CFFL_Button {
CFFL_RadioButton(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Widget* pWidget);
~CFFL_RadioButton() override;
- // CFFL_Button
- CPWL_Wnd* NewPDFWindow(const PWL_CREATEPARAM& cp) override;
+ // CFFL_Button:
+ CPWL_Wnd* NewPDFWindow(const CPWL_Wnd::CreateParams& cp) override;
bool OnKeyDown(CPDFSDK_Annot* pAnnot,
uint32_t nKeyCode,
uint32_t nFlags) override;
diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp
index f6f768a049..8bf0825245 100644
--- a/fpdfsdk/formfiller/cffl_textfield.cpp
+++ b/fpdfsdk/formfiller/cffl_textfield.cpp
@@ -26,8 +26,8 @@ CFFL_TextField::~CFFL_TextField() {
DestroyWindows();
}
-PWL_CREATEPARAM CFFL_TextField::GetCreateParam() {
- PWL_CREATEPARAM cp = CFFL_TextObject::GetCreateParam();
+CPWL_Wnd::CreateParams CFFL_TextField::GetCreateParam() {
+ CPWL_Wnd::CreateParams cp = CFFL_TextObject::GetCreateParam();
int nFlags = m_pWidget->GetFieldFlags();
if (nFlags & FIELDFLAG_PASSWORD)
cp.dwFlags |= PES_PASSWORD;
@@ -67,8 +67,8 @@ PWL_CREATEPARAM CFFL_TextField::GetCreateParam() {
return cp;
}
-CPWL_Wnd* CFFL_TextField::NewPDFWindow(const PWL_CREATEPARAM& cp) {
- CPWL_Edit* pWnd = new CPWL_Edit();
+CPWL_Wnd* CFFL_TextField::NewPDFWindow(const CPWL_Wnd::CreateParams& cp) {
+ auto* pWnd = new CPWL_Edit();
pWnd->AttachFFLData(this);
pWnd->Create(cp);
pWnd->SetFillerNotify(m_pFormFillEnv->GetInteractiveFormFiller());
diff --git a/fpdfsdk/formfiller/cffl_textfield.h b/fpdfsdk/formfiller/cffl_textfield.h
index 429799840f..6893516142 100644
--- a/fpdfsdk/formfiller/cffl_textfield.h
+++ b/fpdfsdk/formfiller/cffl_textfield.h
@@ -30,8 +30,8 @@ class CFFL_TextField : public CFFL_TextObject, public IPWL_FocusHandler {
~CFFL_TextField() override;
// CFFL_TextObject:
- PWL_CREATEPARAM GetCreateParam() override;
- CPWL_Wnd* NewPDFWindow(const PWL_CREATEPARAM& cp) override;
+ CPWL_Wnd::CreateParams GetCreateParam() override;
+ CPWL_Wnd* NewPDFWindow(const CPWL_Wnd::CreateParams& cp) override;
bool OnChar(CPDFSDK_Annot* pAnnot, uint32_t nChar, uint32_t nFlags) override;
bool IsDataChanged(CPDFSDK_PageView* pPageView) override;
void SaveData(CPDFSDK_PageView* pPageView) override;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 07:27:20 +0000