summaryrefslogtreecommitdiff
path: root/fpdfsdk/pdfwindow
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk/pdfwindow')
-rw-r--r--fpdfsdk/pdfwindow/PWL_Button.cpp4
-rw-r--r--fpdfsdk/pdfwindow/PWL_Button.h4
-rw-r--r--fpdfsdk/pdfwindow/PWL_ComboBox.cpp16
-rw-r--r--fpdfsdk/pdfwindow/PWL_ComboBox.h16
-rw-r--r--fpdfsdk/pdfwindow/PWL_Edit.cpp14
-rw-r--r--fpdfsdk/pdfwindow/PWL_Edit.h20
-rw-r--r--fpdfsdk/pdfwindow/PWL_EditCtrl.cpp12
-rw-r--r--fpdfsdk/pdfwindow/PWL_EditCtrl.h12
-rw-r--r--fpdfsdk/pdfwindow/PWL_Icon.cpp2
-rw-r--r--fpdfsdk/pdfwindow/PWL_IconList.cpp12
-rw-r--r--fpdfsdk/pdfwindow/PWL_IconList.h12
-rw-r--r--fpdfsdk/pdfwindow/PWL_ListBox.cpp16
-rw-r--r--fpdfsdk/pdfwindow/PWL_ListBox.h16
-rw-r--r--fpdfsdk/pdfwindow/PWL_Note.cpp24
-rw-r--r--fpdfsdk/pdfwindow/PWL_Note.h24
-rw-r--r--fpdfsdk/pdfwindow/PWL_ScrollBar.cpp12
-rw-r--r--fpdfsdk/pdfwindow/PWL_ScrollBar.h12
-rw-r--r--fpdfsdk/pdfwindow/PWL_SpecialButton.cpp8
-rw-r--r--fpdfsdk/pdfwindow/PWL_SpecialButton.h8
-rw-r--r--fpdfsdk/pdfwindow/PWL_Utils.h2
-rw-r--r--fpdfsdk/pdfwindow/PWL_Wnd.cpp22
-rw-r--r--fpdfsdk/pdfwindow/PWL_Wnd.h44
22 files changed, 156 insertions, 156 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_Button.cpp b/fpdfsdk/pdfwindow/PWL_Button.cpp
index 851b5541f1..baf9ef0f26 100644
--- a/fpdfsdk/pdfwindow/PWL_Button.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Button.cpp
@@ -21,7 +21,7 @@ void CPWL_Button::OnCreate(PWL_CREATEPARAM& cp) {
}
FX_BOOL CPWL_Button::OnLButtonDown(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CPWL_Wnd::OnLButtonDown(point, nFlag);
m_bMouseDown = TRUE;
@@ -30,7 +30,7 @@ FX_BOOL CPWL_Button::OnLButtonDown(const CFX_FloatPoint& point,
return TRUE;
}
-FX_BOOL CPWL_Button::OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) {
+FX_BOOL CPWL_Button::OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) {
CPWL_Wnd::OnLButtonUp(point, nFlag);
ReleaseCapture();
diff --git a/fpdfsdk/pdfwindow/PWL_Button.h b/fpdfsdk/pdfwindow/PWL_Button.h
index 1fffa36d41..809b0614ca 100644
--- a/fpdfsdk/pdfwindow/PWL_Button.h
+++ b/fpdfsdk/pdfwindow/PWL_Button.h
@@ -17,8 +17,8 @@ class CPWL_Button : public CPWL_Wnd {
// CPWL_Wnd
CFX_ByteString GetClassName() const override;
void OnCreate(PWL_CREATEPARAM& cp) override;
- FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+ FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) override;
protected:
FX_BOOL m_bMouseDown;
diff --git a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
index 1428e6bf1a..c07233f499 100644
--- a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
@@ -22,7 +22,7 @@
#define IsFloatEqual(fa, fb) IsFloatZero((fa) - (fb))
FX_BOOL CPWL_CBListBox::OnLButtonUp(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CPWL_Wnd::OnLButtonUp(point, nFlag);
if (m_bMouseDown) {
@@ -47,7 +47,7 @@ FX_BOOL CPWL_CBListBox::OnLButtonUp(const CFX_FloatPoint& point,
FX_BOOL CPWL_CBListBox::OnKeyDownWithExit(uint16_t nChar,
FX_BOOL& bExit,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (!m_pList)
return FALSE;
@@ -93,7 +93,7 @@ FX_BOOL CPWL_CBListBox::OnKeyDownWithExit(uint16_t nChar,
FX_BOOL CPWL_CBListBox::OnCharWithExit(uint16_t nChar,
FX_BOOL& bExit,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (!m_pList)
return FALSE;
@@ -178,7 +178,7 @@ void CPWL_CBButton::DrawThisAppearance(CFX_RenderDevice* pDevice,
}
FX_BOOL CPWL_CBButton::OnLButtonDown(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CPWL_Wnd::OnLButtonDown(point, nFlag);
SetCapture();
@@ -192,7 +192,7 @@ FX_BOOL CPWL_CBButton::OnLButtonDown(const CFX_FloatPoint& point,
}
FX_BOOL CPWL_CBButton::OnLButtonUp(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CPWL_Wnd::OnLButtonUp(point, nFlag);
ReleaseCapture();
@@ -517,7 +517,7 @@ void CPWL_ComboBox::SetPopup(FX_BOOL bPopup) {
}
}
-FX_BOOL CPWL_ComboBox::OnKeyDown(uint16_t nChar, FX_DWORD nFlag) {
+FX_BOOL CPWL_ComboBox::OnKeyDown(uint16_t nChar, uint32_t nFlag) {
if (!m_pList)
return FALSE;
if (!m_pEdit)
@@ -576,7 +576,7 @@ FX_BOOL CPWL_ComboBox::OnKeyDown(uint16_t nChar, FX_DWORD nFlag) {
return FALSE;
}
-FX_BOOL CPWL_ComboBox::OnChar(uint16_t nChar, FX_DWORD nFlag) {
+FX_BOOL CPWL_ComboBox::OnChar(uint16_t nChar, uint32_t nFlag) {
if (!m_pList)
return FALSE;
@@ -603,7 +603,7 @@ FX_BOOL CPWL_ComboBox::OnChar(uint16_t nChar, FX_DWORD nFlag) {
}
void CPWL_ComboBox::OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam,
intptr_t lParam) {
switch (msg) {
diff --git a/fpdfsdk/pdfwindow/PWL_ComboBox.h b/fpdfsdk/pdfwindow/PWL_ComboBox.h
index 6d376e1895..02f9d1380a 100644
--- a/fpdfsdk/pdfwindow/PWL_ComboBox.h
+++ b/fpdfsdk/pdfwindow/PWL_ComboBox.h
@@ -23,10 +23,10 @@ class CPWL_CBListBox : public CPWL_ListBox {
~CPWL_CBListBox() override {}
// CPWL_ListBox
- FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+ FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) override;
- FX_BOOL OnKeyDownWithExit(uint16_t nChar, FX_BOOL& bExit, FX_DWORD nFlag);
- FX_BOOL OnCharWithExit(uint16_t nChar, FX_BOOL& bExit, FX_DWORD nFlag);
+ FX_BOOL OnKeyDownWithExit(uint16_t nChar, FX_BOOL& bExit, uint32_t nFlag);
+ FX_BOOL OnCharWithExit(uint16_t nChar, FX_BOOL& bExit, uint32_t nFlag);
};
#define PWL_COMBOBOX_BUTTON_WIDTH 13
@@ -40,8 +40,8 @@ class CPWL_CBButton : public CPWL_Wnd {
void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override;
void DrawThisAppearance(CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device) override;
- FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+ FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) override;
};
class CPWL_ComboBox : public CPWL_Wnd {
@@ -54,10 +54,10 @@ class CPWL_ComboBox : public CPWL_Wnd {
// CPWL_Wnd:
CFX_ByteString GetClassName() const override;
void OnCreate(PWL_CREATEPARAM& cp) override;
- FX_BOOL OnKeyDown(uint16_t nChar, FX_DWORD nFlag) override;
- FX_BOOL OnChar(uint16_t nChar, FX_DWORD nFlag) override;
+ FX_BOOL OnKeyDown(uint16_t nChar, uint32_t nFlag) override;
+ FX_BOOL OnChar(uint16_t nChar, uint32_t nFlag) override;
void OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam = 0,
intptr_t lParam = 0) override;
void CreateChildWnd(const PWL_CREATEPARAM& cp) override;
diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp
index b75c72f149..f53f263470 100644
--- a/fpdfsdk/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp
@@ -467,7 +467,7 @@ void CPWL_Edit::DrawThisAppearance(CFX_RenderDevice* pDevice,
}
}
-FX_BOOL CPWL_Edit::OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) {
+FX_BOOL CPWL_Edit::OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) {
CPWL_Wnd::OnLButtonDown(point, nFlag);
if (HasFlag(PES_TEXTOVERFLOW) || ClientHitTest(point)) {
@@ -484,7 +484,7 @@ FX_BOOL CPWL_Edit::OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) {
}
FX_BOOL CPWL_Edit::OnLButtonDblClk(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CPWL_Wnd::OnLButtonDblClk(point, nFlag);
if (HasFlag(PES_TEXTOVERFLOW) || ClientHitTest(point)) {
@@ -503,7 +503,7 @@ FX_BOOL CPWL_Edit::OnLButtonDblClk(const CFX_FloatPoint& point,
#define WM_PWLEDIT_SELECTALL 0x07
#define WM_PWLEDIT_SUGGEST 0x08
-FX_BOOL CPWL_Edit::OnRButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) {
+FX_BOOL CPWL_Edit::OnRButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) {
if (m_bMouseDown)
return FALSE;
@@ -862,7 +862,7 @@ void CPWL_Edit::EnableSpellCheck(FX_BOOL bEnabled) {
RemoveFlag(PES_SPELLCHECK);
}
-FX_BOOL CPWL_Edit::OnKeyDown(uint16_t nChar, FX_DWORD nFlag) {
+FX_BOOL CPWL_Edit::OnKeyDown(uint16_t nChar, uint32_t nFlag) {
if (m_bMouseDown)
return TRUE;
@@ -903,7 +903,7 @@ FX_BOOL CPWL_Edit::OnKeyDown(uint16_t nChar, FX_DWORD nFlag) {
*If the event is swallowed, implementation may do other unexpected things, which
*is not the control means to do.
*/
-FX_BOOL CPWL_Edit::IsProceedtoOnChar(uint16_t nKeyCode, FX_DWORD nFlag) {
+FX_BOOL CPWL_Edit::IsProceedtoOnChar(uint16_t nKeyCode, uint32_t nFlag) {
FX_BOOL bCtrl = IsCTRLpressed(nFlag);
FX_BOOL bAlt = IsALTpressed(nFlag);
if (bCtrl && !bAlt) {
@@ -931,7 +931,7 @@ FX_BOOL CPWL_Edit::IsProceedtoOnChar(uint16_t nKeyCode, FX_DWORD nFlag) {
}
}
-FX_BOOL CPWL_Edit::OnChar(uint16_t nChar, FX_DWORD nFlag) {
+FX_BOOL CPWL_Edit::OnChar(uint16_t nChar, uint32_t nFlag) {
if (m_bMouseDown)
return TRUE;
@@ -983,7 +983,7 @@ FX_BOOL CPWL_Edit::OnChar(uint16_t nChar, FX_DWORD nFlag) {
FX_BOOL CPWL_Edit::OnMouseWheel(short zDelta,
const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (HasFlag(PES_MULTILINE)) {
CFX_FloatPoint ptScroll = GetScrollPos();
diff --git a/fpdfsdk/pdfwindow/PWL_Edit.h b/fpdfsdk/pdfwindow/PWL_Edit.h
index 025cf2bf59..58793e3395 100644
--- a/fpdfsdk/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/pdfwindow/PWL_Edit.h
@@ -31,14 +31,14 @@ class IPWL_Filler_Notify {
FX_BOOL bKeyDown,
FX_BOOL& bRC,
FX_BOOL& bExit,
- FX_DWORD nFlag) = 0;
+ uint32_t nFlag) = 0;
#ifdef PDF_ENABLE_XFA
virtual void OnPopupPreOpen(void* pPrivateData,
FX_BOOL& bExit,
- FX_DWORD nFlag) = 0;
+ uint32_t nFlag) = 0;
virtual void OnPopupPostOpen(void* pPrivateData,
FX_BOOL& bExit,
- FX_DWORD nFlag) = 0;
+ uint32_t nFlag) = 0;
#endif // PDF_ENABLE_XFA
};
@@ -56,14 +56,14 @@ class CPWL_Edit : public CPWL_EditCtrl, public IFX_Edit_OprNotify {
void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override;
void DrawThisAppearance(CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device) override;
- FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnLButtonDblClk(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnRButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+ FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnLButtonDblClk(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnRButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) override;
FX_BOOL OnMouseWheel(short zDelta,
const CFX_FloatPoint& point,
- FX_DWORD nFlag) override;
- FX_BOOL OnKeyDown(uint16_t nChar, FX_DWORD nFlag) override;
- FX_BOOL OnChar(uint16_t nChar, FX_DWORD nFlag) override;
+ uint32_t nFlag) override;
+ FX_BOOL OnKeyDown(uint16_t nChar, uint32_t nFlag) override;
+ FX_BOOL OnChar(uint16_t nChar, uint32_t nFlag) override;
CFX_FloatRect GetFocusRect() const override;
void OnSetFocus() override;
void OnKillFocus() override;
@@ -154,7 +154,7 @@ class CPWL_Edit : public CPWL_EditCtrl, public IFX_Edit_OprNotify {
FX_BOOL bArabic) const;
public:
- FX_BOOL IsProceedtoOnChar(uint16_t nKeyCode, FX_DWORD nFlag);
+ FX_BOOL IsProceedtoOnChar(uint16_t nKeyCode, uint32_t nFlag);
private:
IPWL_Filler_Notify* m_pFillerNotify;
diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
index 865495a463..fe9dab98e0 100644
--- a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
+++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
@@ -72,7 +72,7 @@ void CPWL_EditCtrl::RePosChildWnd() {
}
void CPWL_EditCtrl::OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam,
intptr_t lParam) {
CPWL_Wnd::OnNotify(pWnd, msg, wParam, lParam);
@@ -142,7 +142,7 @@ FX_FLOAT CPWL_EditCtrl::GetFontSize() const {
return m_pEdit->GetFontSize();
}
-FX_BOOL CPWL_EditCtrl::OnKeyDown(uint16_t nChar, FX_DWORD nFlag) {
+FX_BOOL CPWL_EditCtrl::OnKeyDown(uint16_t nChar, uint32_t nFlag) {
if (m_bMouseDown)
return TRUE;
@@ -217,7 +217,7 @@ FX_BOOL CPWL_EditCtrl::OnKeyDown(uint16_t nChar, FX_DWORD nFlag) {
return bRet;
}
-FX_BOOL CPWL_EditCtrl::OnChar(uint16_t nChar, FX_DWORD nFlag) {
+FX_BOOL CPWL_EditCtrl::OnChar(uint16_t nChar, uint32_t nFlag) {
if (m_bMouseDown)
return TRUE;
@@ -292,7 +292,7 @@ FX_BOOL CPWL_EditCtrl::OnChar(uint16_t nChar, FX_DWORD nFlag) {
}
FX_BOOL CPWL_EditCtrl::OnLButtonDown(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CPWL_Wnd::OnLButtonDown(point, nFlag);
if (ClientHitTest(point)) {
@@ -309,7 +309,7 @@ FX_BOOL CPWL_EditCtrl::OnLButtonDown(const CFX_FloatPoint& point,
}
FX_BOOL CPWL_EditCtrl::OnLButtonUp(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CPWL_Wnd::OnLButtonUp(point, nFlag);
if (m_bMouseDown) {
@@ -325,7 +325,7 @@ FX_BOOL CPWL_EditCtrl::OnLButtonUp(const CFX_FloatPoint& point,
}
FX_BOOL CPWL_EditCtrl::OnMouseMove(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CPWL_Wnd::OnMouseMove(point, nFlag);
if (m_bMouseDown)
diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/pdfwindow/PWL_EditCtrl.h
index a61705648d..6d35ce9537 100644
--- a/fpdfsdk/pdfwindow/PWL_EditCtrl.h
+++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.h
@@ -103,13 +103,13 @@ class CPWL_EditCtrl : public CPWL_Wnd, public IFX_Edit_Notify {
// CPWL_Wnd
void OnCreate(PWL_CREATEPARAM& cp) override;
void OnCreated() override;
- FX_BOOL OnKeyDown(uint16_t nChar, FX_DWORD nFlag) override;
- FX_BOOL OnChar(uint16_t nChar, FX_DWORD nFlag) override;
- FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnMouseMove(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+ FX_BOOL OnKeyDown(uint16_t nChar, uint32_t nFlag) override;
+ FX_BOOL OnChar(uint16_t nChar, uint32_t nFlag) override;
+ FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnMouseMove(const CFX_FloatPoint& point, uint32_t nFlag) override;
void OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam = 0,
intptr_t lParam = 0) override;
void CreateChildWnd(const PWL_CREATEPARAM& cp) override;
diff --git a/fpdfsdk/pdfwindow/PWL_Icon.cpp b/fpdfsdk/pdfwindow/PWL_Icon.cpp
index fb75665ef6..560f8e0e32 100644
--- a/fpdfsdk/pdfwindow/PWL_Icon.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Icon.cpp
@@ -133,7 +133,7 @@ void CPWL_Icon::GetIconPosition(FX_FLOAT& fLeft, FX_FLOAT& fBottom) {
CPDF_Array* pA =
m_pIconFit->GetDict() ? m_pIconFit->GetDict()->GetArrayBy("A") : NULL;
if (pA) {
- FX_DWORD dwCount = pA->GetCount();
+ uint32_t dwCount = pA->GetCount();
if (dwCount > 0)
fLeft = pA->GetNumberAt(0);
if (dwCount > 1)
diff --git a/fpdfsdk/pdfwindow/PWL_IconList.cpp b/fpdfsdk/pdfwindow/PWL_IconList.cpp
index a61bded33b..951b6821f4 100644
--- a/fpdfsdk/pdfwindow/PWL_IconList.cpp
+++ b/fpdfsdk/pdfwindow/PWL_IconList.cpp
@@ -165,7 +165,7 @@ void CPWL_IconList_Content::CreateChildWnd(const PWL_CREATEPARAM& cp) {
}
FX_BOOL CPWL_IconList_Content::OnLButtonDown(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
SetFocus();
SetCapture();
@@ -179,7 +179,7 @@ FX_BOOL CPWL_IconList_Content::OnLButtonDown(const CFX_FloatPoint& point,
}
FX_BOOL CPWL_IconList_Content::OnLButtonUp(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
m_bMouseDown = FALSE;
ReleaseCapture();
@@ -187,7 +187,7 @@ FX_BOOL CPWL_IconList_Content::OnLButtonUp(const CFX_FloatPoint& point,
}
FX_BOOL CPWL_IconList_Content::OnMouseMove(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (m_bMouseDown) {
int32_t nItemIndex = FindItemIndex(point);
SetSelect(nItemIndex);
@@ -197,7 +197,7 @@ FX_BOOL CPWL_IconList_Content::OnMouseMove(const CFX_FloatPoint& point,
return TRUE;
}
-FX_BOOL CPWL_IconList_Content::OnKeyDown(uint16_t nChar, FX_DWORD nFlag) {
+FX_BOOL CPWL_IconList_Content::OnKeyDown(uint16_t nChar, uint32_t nFlag) {
switch (nChar) {
case FWL_VKEY_Up:
if (m_nSelectIndex > 0) {
@@ -375,7 +375,7 @@ void CPWL_IconList::OnCreated() {
}
void CPWL_IconList::OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam,
intptr_t lParam) {
CPWL_Wnd::OnNotify(pWnd, msg, wParam, lParam);
@@ -464,7 +464,7 @@ void CPWL_IconList::SetIconFillColor(const CPWL_Color& color) {
FX_BOOL CPWL_IconList::OnMouseWheel(short zDelta,
const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CFX_FloatPoint ptScroll = m_pListContent->GetScrollPos();
CFX_FloatRect rcScroll = m_pListContent->GetScrollArea();
CFX_FloatRect rcContents = m_pListContent->GetClientRect();
diff --git a/fpdfsdk/pdfwindow/PWL_IconList.h b/fpdfsdk/pdfwindow/PWL_IconList.h
index b9fb2e5c34..53648d47e0 100644
--- a/fpdfsdk/pdfwindow/PWL_IconList.h
+++ b/fpdfsdk/pdfwindow/PWL_IconList.h
@@ -75,10 +75,10 @@ class CPWL_IconList_Content : public CPWL_ListCtrl {
protected:
// CPWL_ListCtrl
void CreateChildWnd(const PWL_CREATEPARAM& cp) override;
- FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnMouseMove(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnKeyDown(uint16_t nChar, FX_DWORD nFlag) override;
+ FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnMouseMove(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnKeyDown(uint16_t nChar, uint32_t nFlag) override;
private:
CPWL_IconList_Item* GetListItem(int32_t nItemIndex) const;
@@ -112,12 +112,12 @@ class CPWL_IconList : public CPWL_Wnd {
// CPWL_Wnd
FX_BOOL OnMouseWheel(short zDelta,
const CFX_FloatPoint& point,
- FX_DWORD nFlag) override;
+ uint32_t nFlag) override;
void OnCreated() override;
void RePosChildWnd() override;
void CreateChildWnd(const PWL_CREATEPARAM& cp) override;
void OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam = 0,
intptr_t lParam = 0) override;
diff --git a/fpdfsdk/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/pdfwindow/PWL_ListBox.cpp
index 244796b81a..d39d8419a6 100644
--- a/fpdfsdk/pdfwindow/PWL_ListBox.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ListBox.cpp
@@ -203,7 +203,7 @@ void CPWL_ListBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
}
}
-FX_BOOL CPWL_ListBox::OnKeyDown(uint16_t nChar, FX_DWORD nFlag) {
+FX_BOOL CPWL_ListBox::OnKeyDown(uint16_t nChar, uint32_t nFlag) {
CPWL_Wnd::OnKeyDown(nChar, nFlag);
if (!m_pList)
@@ -250,7 +250,7 @@ FX_BOOL CPWL_ListBox::OnKeyDown(uint16_t nChar, FX_DWORD nFlag) {
return TRUE;
}
-FX_BOOL CPWL_ListBox::OnChar(uint16_t nChar, FX_DWORD nFlag) {
+FX_BOOL CPWL_ListBox::OnChar(uint16_t nChar, uint32_t nFlag) {
CPWL_Wnd::OnChar(nChar, nFlag);
if (!m_pList)
@@ -266,7 +266,7 @@ FX_BOOL CPWL_ListBox::OnChar(uint16_t nChar, FX_DWORD nFlag) {
}
FX_BOOL CPWL_ListBox::OnLButtonDown(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CPWL_Wnd::OnLButtonDown(point, nFlag);
if (ClientHitTest(point)) {
@@ -281,7 +281,7 @@ FX_BOOL CPWL_ListBox::OnLButtonDown(const CFX_FloatPoint& point,
return TRUE;
}
-FX_BOOL CPWL_ListBox::OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) {
+FX_BOOL CPWL_ListBox::OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) {
CPWL_Wnd::OnLButtonUp(point, nFlag);
if (m_bMouseDown) {
@@ -299,7 +299,7 @@ void CPWL_ListBox::SetHoverSel(FX_BOOL bHoverSel) {
m_bHoverSel = bHoverSel;
}
-FX_BOOL CPWL_ListBox::OnMouseMove(const CFX_FloatPoint& point, FX_DWORD nFlag) {
+FX_BOOL CPWL_ListBox::OnMouseMove(const CFX_FloatPoint& point, uint32_t nFlag) {
CPWL_Wnd::OnMouseMove(point, nFlag);
if (m_bHoverSel && !IsCaptureMouse() && ClientHitTest(point)) {
@@ -316,7 +316,7 @@ FX_BOOL CPWL_ListBox::OnMouseMove(const CFX_FloatPoint& point, FX_DWORD nFlag) {
}
void CPWL_ListBox::OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam,
intptr_t lParam) {
CPWL_Wnd::OnNotify(pWnd, msg, wParam, lParam);
@@ -367,7 +367,7 @@ void CPWL_ListBox::RePosChildWnd() {
void CPWL_ListBox::OnNotifySelChanged(FX_BOOL bKeyDown,
FX_BOOL& bExit,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (!m_pFillerNotify)
return;
@@ -517,7 +517,7 @@ CFX_FloatRect CPWL_ListBox::GetListRect() const {
FX_BOOL CPWL_ListBox::OnMouseWheel(short zDelta,
const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (!m_pList)
return FALSE;
diff --git a/fpdfsdk/pdfwindow/PWL_ListBox.h b/fpdfsdk/pdfwindow/PWL_ListBox.h
index 067aa2f731..caee22578b 100644
--- a/fpdfsdk/pdfwindow/PWL_ListBox.h
+++ b/fpdfsdk/pdfwindow/PWL_ListBox.h
@@ -59,17 +59,17 @@ class CPWL_ListBox : public CPWL_Wnd {
void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override;
void DrawThisAppearance(CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device) override;
- FX_BOOL OnKeyDown(uint16_t nChar, FX_DWORD nFlag) override;
- FX_BOOL OnChar(uint16_t nChar, FX_DWORD nFlag) override;
- FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnMouseMove(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+ FX_BOOL OnKeyDown(uint16_t nChar, uint32_t nFlag) override;
+ FX_BOOL OnChar(uint16_t nChar, uint32_t nFlag) override;
+ FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnMouseMove(const CFX_FloatPoint& point, uint32_t nFlag) override;
FX_BOOL OnMouseWheel(short zDelta,
const CFX_FloatPoint& point,
- FX_DWORD nFlag) override;
+ uint32_t nFlag) override;
void KillFocus() override;
void OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam = 0,
intptr_t lParam = 0) override;
void RePosChildWnd() override;
@@ -79,7 +79,7 @@ class CPWL_ListBox : public CPWL_Wnd {
virtual CFX_WideString GetText() const;
- void OnNotifySelChanged(FX_BOOL bKeyDown, FX_BOOL& bExit, FX_DWORD nFlag);
+ void OnNotifySelChanged(FX_BOOL bKeyDown, FX_BOOL& bExit, uint32_t nFlag);
void AddString(const FX_WCHAR* str);
void SetTopVisibleIndex(int32_t nItemIndex);
diff --git a/fpdfsdk/pdfwindow/PWL_Note.cpp b/fpdfsdk/pdfwindow/PWL_Note.cpp
index a2ff7c4a7a..db7d1a5670 100644
--- a/fpdfsdk/pdfwindow/PWL_Note.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Note.cpp
@@ -152,7 +152,7 @@ void CPWL_Note_Edit::OnKillFocus() {
}
void CPWL_Note_Edit::OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam,
intptr_t lParam) {
if (m_bEnableNotify) {
@@ -333,7 +333,7 @@ void CPWL_Note_CloseBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
}
FX_BOOL CPWL_Note_CloseBox::OnLButtonDown(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
SetBorderStyle(PBS_INSET);
InvalidateRect(NULL);
@@ -343,7 +343,7 @@ FX_BOOL CPWL_Note_CloseBox::OnLButtonDown(const CFX_FloatPoint& point,
}
FX_BOOL CPWL_Note_CloseBox::OnLButtonUp(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
m_bMouseDown = FALSE;
SetBorderStyle(PBS_BEVELED);
@@ -466,7 +466,7 @@ IPWL_NoteItem* CPWL_Note_Contents::GetHitNoteItem(const CFX_FloatPoint& point) {
}
void CPWL_Note_Contents::OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam,
intptr_t lParam) {
switch (msg) {
@@ -527,7 +527,7 @@ void CPWL_Note_Contents::OnNotify(CPWL_Wnd* pWnd,
}
FX_BOOL CPWL_Note_Contents::OnLButtonDown(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (CPWL_Wnd::OnLButtonDown(point, nFlag))
return TRUE;
@@ -912,7 +912,7 @@ FX_FLOAT CPWL_NoteItem::GetItemRightMargin() {
}
FX_BOOL CPWL_NoteItem::OnLButtonDown(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (!m_pContents->WndHitTest(m_pContents->ParentToChild(point))) {
SetNoteFocus(FALSE);
}
@@ -923,7 +923,7 @@ FX_BOOL CPWL_NoteItem::OnLButtonDown(const CFX_FloatPoint& point,
}
FX_BOOL CPWL_NoteItem::OnRButtonUp(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (!m_pContents->WndHitTest(m_pContents->ParentToChild(point))) {
SetNoteFocus(FALSE);
PopupNoteItemMenu(point);
@@ -935,7 +935,7 @@ FX_BOOL CPWL_NoteItem::OnRButtonUp(const CFX_FloatPoint& point,
}
void CPWL_NoteItem::OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam,
intptr_t lParam) {
switch (msg) {
@@ -1302,7 +1302,7 @@ CFX_WideString CPWL_Note::GetAuthorName() const {
FX_BOOL CPWL_Note::OnMouseWheel(short zDelta,
const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CFX_FloatPoint ptScroll = m_pContents->GetScrollPos();
CFX_FloatRect rcScroll = m_pContents->GetScrollArea();
CFX_FloatRect rcContents = m_pContents->GetClientRect();
@@ -1337,7 +1337,7 @@ FX_BOOL CPWL_Note::OnMouseWheel(short zDelta,
}
void CPWL_Note::OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam,
intptr_t lParam) {
switch (msg) {
@@ -1462,7 +1462,7 @@ void CPWL_Note::SetBkColor(const CPWL_Color& color) {
m_pRBBox->SetTextColor(sTextColor);
}
-FX_BOOL CPWL_Note::OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) {
+FX_BOOL CPWL_Note::OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) {
if (m_pOptions->WndHitTest(m_pOptions->ParentToChild(point))) {
if (IPWL_NoteNotify* pNotify = GetNoteNotify()) {
int32_t x, y;
@@ -1479,7 +1479,7 @@ FX_BOOL CPWL_Note::OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) {
return CPWL_Wnd::OnLButtonDown(point, nFlag);
}
-FX_BOOL CPWL_Note::OnRButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) {
+FX_BOOL CPWL_Note::OnRButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) {
return CPWL_Wnd::OnRButtonUp(point, nFlag);
}
diff --git a/fpdfsdk/pdfwindow/PWL_Note.h b/fpdfsdk/pdfwindow/PWL_Note.h
index e8fdbb89f7..1068999134 100644
--- a/fpdfsdk/pdfwindow/PWL_Note.h
+++ b/fpdfsdk/pdfwindow/PWL_Note.h
@@ -104,8 +104,8 @@ class CPWL_Note_CloseBox : public CPWL_Button {
// CPWL_Button
void DrawThisAppearance(CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device) override;
- FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+ FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) override;
private:
FX_BOOL m_bMouseDown;
@@ -146,7 +146,7 @@ class CPWL_Note_Edit : public CPWL_Edit {
FX_FLOAT GetItemHeight(FX_FLOAT fLimitWidth) override;
void SetText(const FX_WCHAR* csText) override;
void OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam = 0,
intptr_t lParam = 0) override;
void RePosChildWnd() override;
@@ -203,10 +203,10 @@ class CPWL_Note_Contents : public CPWL_ListCtrl {
// CPWL_ListCtrl
CFX_ByteString GetClassName() const override;
void OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam = 0,
intptr_t lParam = 0) override;
- FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+ FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) override;
void CreateChildWnd(const PWL_CREATEPARAM& cp) override;
private:
@@ -253,13 +253,13 @@ class CPWL_NoteItem : public CPWL_Wnd, public IPWL_NoteItem {
protected:
// CPWL_Wnd
- FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnRButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+ FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnRButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) override;
CFX_ByteString GetClassName() const override;
void RePosChildWnd() override;
void CreateChildWnd(const PWL_CREATEPARAM& cp) override;
void OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam = 0,
intptr_t lParam = 0) override;
FX_FLOAT GetItemHeight(FX_FLOAT fLimitWidth) override;
@@ -316,15 +316,15 @@ class CPWL_Note : public CPWL_NoteItem {
FX_BOOL IsTopItem() const override { return TRUE; }
const CPWL_Note* GetNote() const override;
IPWL_NoteNotify* GetNoteNotify() const override;
- FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnRButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+ FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnRButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) override;
FX_BOOL OnMouseWheel(short zDelta,
const CFX_FloatPoint& point,
- FX_DWORD nFlag) override;
+ uint32_t nFlag) override;
void RePosChildWnd() override;
void CreateChildWnd(const PWL_CREATEPARAM& cp) override;
void OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam = 0,
intptr_t lParam = 0) override;
diff --git a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
index d87f6b5a36..9db2aea35b 100644
--- a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp
@@ -541,7 +541,7 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice,
}
FX_BOOL CPWL_SBButton::OnLButtonDown(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CPWL_Wnd::OnLButtonDown(point, nFlag);
if (CPWL_Wnd* pParent = GetParentWindow())
@@ -554,7 +554,7 @@ FX_BOOL CPWL_SBButton::OnLButtonDown(const CFX_FloatPoint& point,
}
FX_BOOL CPWL_SBButton::OnLButtonUp(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CPWL_Wnd::OnLButtonUp(point, nFlag);
if (CPWL_Wnd* pParent = GetParentWindow())
@@ -567,7 +567,7 @@ FX_BOOL CPWL_SBButton::OnLButtonUp(const CFX_FloatPoint& point,
}
FX_BOOL CPWL_SBButton::OnMouseMove(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CPWL_Wnd::OnMouseMove(point, nFlag);
if (CPWL_Wnd* pParent = GetParentWindow()) {
@@ -702,7 +702,7 @@ void CPWL_ScrollBar::DrawThisAppearance(CFX_RenderDevice* pDevice,
}
FX_BOOL CPWL_ScrollBar::OnLButtonDown(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CPWL_Wnd::OnLButtonDown(point, nFlag);
if (HasFlag(PWS_AUTOTRANSPARENT)) {
@@ -758,7 +758,7 @@ FX_BOOL CPWL_ScrollBar::OnLButtonDown(const CFX_FloatPoint& point,
}
FX_BOOL CPWL_ScrollBar::OnLButtonUp(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CPWL_Wnd::OnLButtonUp(point, nFlag);
if (HasFlag(PWS_AUTOTRANSPARENT)) {
@@ -775,7 +775,7 @@ FX_BOOL CPWL_ScrollBar::OnLButtonUp(const CFX_FloatPoint& point,
}
void CPWL_ScrollBar::OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam,
intptr_t lParam) {
CPWL_Wnd::OnNotify(pWnd, msg, wParam, lParam);
diff --git a/fpdfsdk/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/pdfwindow/PWL_ScrollBar.h
index 1603469ef5..c03b20dbbc 100644
--- a/fpdfsdk/pdfwindow/PWL_ScrollBar.h
+++ b/fpdfsdk/pdfwindow/PWL_ScrollBar.h
@@ -43,9 +43,9 @@ class CPWL_SBButton : public CPWL_Wnd {
void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override;
void DrawThisAppearance(CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device) override;
- FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnMouseMove(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+ FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnMouseMove(const CFX_FloatPoint& point, uint32_t nFlag) override;
protected:
PWL_SCROLLBAR_TYPE m_eScrollBarType;
@@ -101,10 +101,10 @@ class CPWL_ScrollBar : public CPWL_Wnd {
void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override;
void DrawThisAppearance(CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device) override;
- FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
+ FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) override;
void OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam = 0,
intptr_t lParam = 0) override;
void CreateChildWnd(const PWL_CREATEPARAM& cp) override;
diff --git a/fpdfsdk/pdfwindow/PWL_SpecialButton.cpp b/fpdfsdk/pdfwindow/PWL_SpecialButton.cpp
index e79865efcf..b0b944e5aa 100644
--- a/fpdfsdk/pdfwindow/PWL_SpecialButton.cpp
+++ b/fpdfsdk/pdfwindow/PWL_SpecialButton.cpp
@@ -38,7 +38,7 @@ bool CPWL_CheckBox::IsChecked() const {
}
FX_BOOL CPWL_CheckBox::OnLButtonUp(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (IsReadOnly())
return FALSE;
@@ -46,7 +46,7 @@ FX_BOOL CPWL_CheckBox::OnLButtonUp(const CFX_FloatPoint& point,
return TRUE;
}
-FX_BOOL CPWL_CheckBox::OnChar(uint16_t nChar, FX_DWORD nFlag) {
+FX_BOOL CPWL_CheckBox::OnChar(uint16_t nChar, uint32_t nFlag) {
SetCheck(!IsChecked());
return TRUE;
}
@@ -60,7 +60,7 @@ CFX_ByteString CPWL_RadioButton::GetClassName() const {
}
FX_BOOL CPWL_RadioButton::OnLButtonUp(const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (IsReadOnly())
return FALSE;
@@ -76,7 +76,7 @@ bool CPWL_RadioButton::IsChecked() const {
return m_bChecked;
}
-FX_BOOL CPWL_RadioButton::OnChar(uint16_t nChar, FX_DWORD nFlag) {
+FX_BOOL CPWL_RadioButton::OnChar(uint16_t nChar, uint32_t nFlag) {
SetCheck(TRUE);
return TRUE;
}
diff --git a/fpdfsdk/pdfwindow/PWL_SpecialButton.h b/fpdfsdk/pdfwindow/PWL_SpecialButton.h
index 5aaf19b3a8..eaaba26c68 100644
--- a/fpdfsdk/pdfwindow/PWL_SpecialButton.h
+++ b/fpdfsdk/pdfwindow/PWL_SpecialButton.h
@@ -26,8 +26,8 @@ class CPWL_CheckBox : public CPWL_Button {
// CPWL_Button
CFX_ByteString GetClassName() const override;
- FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnChar(uint16_t nChar, FX_DWORD nFlag) override;
+ FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnChar(uint16_t nChar, uint32_t nFlag) override;
void SetCheck(bool bCheck);
bool IsChecked() const;
@@ -43,8 +43,8 @@ class CPWL_RadioButton : public CPWL_Button {
// CPWL_Button
CFX_ByteString GetClassName() const override;
- FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override;
- FX_BOOL OnChar(uint16_t nChar, FX_DWORD nFlag) override;
+ FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) override;
+ FX_BOOL OnChar(uint16_t nChar, uint32_t nFlag) override;
void SetCheck(bool bCheck);
bool IsChecked() const;
diff --git a/fpdfsdk/pdfwindow/PWL_Utils.h b/fpdfsdk/pdfwindow/PWL_Utils.h
index fed1528294..6917083661 100644
--- a/fpdfsdk/pdfwindow/PWL_Utils.h
+++ b/fpdfsdk/pdfwindow/PWL_Utils.h
@@ -27,7 +27,7 @@ T PWL_MAX(const T& i, const T& j) {
#define PWL_WIN2PDF(color) ((FX_FLOAT)((FX_FLOAT)color / 255.0f))
#define PWL_MAKEDWORD(low, high) \
- ((FX_DWORD)((uint16_t)(low) | (FX_DWORD)(((uint16_t)(high)) << 16)))
+ ((uint32_t)((uint16_t)(low) | (uint32_t)(((uint16_t)(high)) << 16)))
#define PWL_GETLOWWORD(dword) ((uint16_t)(dword))
#define PWL_GETHIGHWORD(dword) ((uint16_t)(dword >> 16))
diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.cpp b/fpdfsdk/pdfwindow/PWL_Wnd.cpp
index 66ad6317c3..cb0955cb5f 100644
--- a/fpdfsdk/pdfwindow/PWL_Wnd.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Wnd.cpp
@@ -407,7 +407,7 @@ void CPWL_Wnd::InvalidateRect(CFX_FloatRect* pRect) {
}
#define PWL_IMPLEMENT_KEY_METHOD(key_method_name) \
- FX_BOOL CPWL_Wnd::key_method_name(uint16_t nChar, FX_DWORD nFlag) { \
+ FX_BOOL CPWL_Wnd::key_method_name(uint16_t nChar, uint32_t nFlag) { \
if (IsValid() && IsVisible() && IsEnabled()) { \
if (IsWndCaptureKeyboard(this)) { \
for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) { \
@@ -424,7 +424,7 @@ void CPWL_Wnd::InvalidateRect(CFX_FloatRect* pRect) {
#define PWL_IMPLEMENT_MOUSE_METHOD(mouse_method_name) \
FX_BOOL CPWL_Wnd::mouse_method_name(const CFX_FloatPoint& point, \
- FX_DWORD nFlag) { \
+ uint32_t nFlag) { \
if (IsValid() && IsVisible() && IsEnabled()) { \
if (IsWndCaptureMouse(this)) { \
for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) { \
@@ -468,7 +468,7 @@ PWL_IMPLEMENT_MOUSE_METHOD(OnMouseMove)
FX_BOOL CPWL_Wnd::OnMouseWheel(short zDelta,
const CFX_FloatPoint& point,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (IsValid() && IsVisible() && IsEnabled()) {
SetCursor();
if (IsWndCaptureKeyboard(this)) {
@@ -501,7 +501,7 @@ void CPWL_Wnd::RemoveChild(CPWL_Wnd* pWnd) {
}
void CPWL_Wnd::OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam,
intptr_t lParam) {
switch (msg) {
@@ -549,15 +549,15 @@ CFX_FloatPoint CPWL_Wnd::GetCenterPoint() const {
(rcClient.top + rcClient.bottom) * 0.5f);
}
-FX_BOOL CPWL_Wnd::HasFlag(FX_DWORD dwFlags) const {
+FX_BOOL CPWL_Wnd::HasFlag(uint32_t dwFlags) const {
return (m_sPrivateParam.dwFlags & dwFlags) != 0;
}
-void CPWL_Wnd::RemoveFlag(FX_DWORD dwFlags) {
+void CPWL_Wnd::RemoveFlag(uint32_t dwFlags) {
m_sPrivateParam.dwFlags &= ~dwFlags;
}
-void CPWL_Wnd::AddFlag(FX_DWORD dwFlags) {
+void CPWL_Wnd::AddFlag(uint32_t dwFlags) {
m_sPrivateParam.dwFlags |= dwFlags;
}
@@ -1006,7 +1006,7 @@ void CPWL_Wnd::OnEnabled() {}
void CPWL_Wnd::OnDisabled() {}
-FX_BOOL CPWL_Wnd::IsCTRLpressed(FX_DWORD nFlag) const {
+FX_BOOL CPWL_Wnd::IsCTRLpressed(uint32_t nFlag) const {
if (IFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
return pSystemHandler->IsCTRLKeyDown(nFlag);
}
@@ -1014,7 +1014,7 @@ FX_BOOL CPWL_Wnd::IsCTRLpressed(FX_DWORD nFlag) const {
return FALSE;
}
-FX_BOOL CPWL_Wnd::IsSHIFTpressed(FX_DWORD nFlag) const {
+FX_BOOL CPWL_Wnd::IsSHIFTpressed(uint32_t nFlag) const {
if (IFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
return pSystemHandler->IsSHIFTKeyDown(nFlag);
}
@@ -1022,7 +1022,7 @@ FX_BOOL CPWL_Wnd::IsSHIFTpressed(FX_DWORD nFlag) const {
return FALSE;
}
-FX_BOOL CPWL_Wnd::IsALTpressed(FX_DWORD nFlag) const {
+FX_BOOL CPWL_Wnd::IsALTpressed(uint32_t nFlag) const {
if (IFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
return pSystemHandler->IsALTKeyDown(nFlag);
}
@@ -1030,7 +1030,7 @@ FX_BOOL CPWL_Wnd::IsALTpressed(FX_DWORD nFlag) const {
return FALSE;
}
-FX_BOOL CPWL_Wnd::IsINSERTpressed(FX_DWORD nFlag) const {
+FX_BOOL CPWL_Wnd::IsINSERTpressed(uint32_t nFlag) const {
if (IFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
return pSystemHandler->IsINSERTKeyDown(nFlag);
}
diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.h b/fpdfsdk/pdfwindow/PWL_Wnd.h
index 394e82d9a6..d07adba092 100644
--- a/fpdfsdk/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/pdfwindow/PWL_Wnd.h
@@ -233,7 +233,7 @@ struct PWL_CREATEPARAM {
IFX_Edit_FontMap* pFontMap; // required for text window
IPWL_Provider* pProvider; // required for self coordinate
IPWL_FocusHandler* pFocusHandler; // optional
- FX_DWORD dwFlags; // optional
+ uint32_t dwFlags; // optional
CPWL_Color sBackgroundColor; // optional
FX_HWND hAttachedWnd; // required for no-reader framework
IPWL_SpellCheck* pSpellCheck; // required for spellchecking
@@ -298,21 +298,21 @@ class CPWL_Wnd : public CPWL_TimerHandler {
void DrawAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device);
- virtual FX_BOOL OnKeyDown(uint16_t nChar, FX_DWORD nFlag);
- virtual FX_BOOL OnKeyUp(uint16_t nChar, FX_DWORD nFlag);
- virtual FX_BOOL OnChar(uint16_t nChar, FX_DWORD nFlag);
- virtual FX_BOOL OnLButtonDblClk(const CFX_FloatPoint& point, FX_DWORD nFlag);
- virtual FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag);
- virtual FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag);
- virtual FX_BOOL OnMButtonDblClk(const CFX_FloatPoint& point, FX_DWORD nFlag);
- virtual FX_BOOL OnMButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag);
- virtual FX_BOOL OnMButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag);
- virtual FX_BOOL OnRButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag);
- virtual FX_BOOL OnRButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag);
- virtual FX_BOOL OnMouseMove(const CFX_FloatPoint& point, FX_DWORD nFlag);
+ virtual FX_BOOL OnKeyDown(uint16_t nChar, uint32_t nFlag);
+ virtual FX_BOOL OnKeyUp(uint16_t nChar, uint32_t nFlag);
+ virtual FX_BOOL OnChar(uint16_t nChar, uint32_t nFlag);
+ virtual FX_BOOL OnLButtonDblClk(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual FX_BOOL OnMButtonDblClk(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual FX_BOOL OnMButtonDown(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual FX_BOOL OnMButtonUp(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual FX_BOOL OnRButtonDown(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual FX_BOOL OnRButtonUp(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual FX_BOOL OnMouseMove(const CFX_FloatPoint& point, uint32_t nFlag);
virtual FX_BOOL OnMouseWheel(short zDelta,
const CFX_FloatPoint& point,
- FX_DWORD nFlag);
+ uint32_t nFlag);
virtual void SetFocus();
virtual void KillFocus();
@@ -320,7 +320,7 @@ class CPWL_Wnd : public CPWL_TimerHandler {
void ReleaseCapture();
virtual void OnNotify(CPWL_Wnd* pWnd,
- FX_DWORD msg,
+ uint32_t msg,
intptr_t wParam = 0,
intptr_t lParam = 0);
virtual void SetTextColor(const CPWL_Color& color);
@@ -348,9 +348,9 @@ class CPWL_Wnd : public CPWL_TimerHandler {
CFX_FloatPoint GetCenterPoint() const;
int32_t GetBorderWidth() const;
FX_BOOL IsVisible() const { return m_bVisible; }
- FX_BOOL HasFlag(FX_DWORD dwFlags) const;
- void AddFlag(FX_DWORD dwFlags);
- void RemoveFlag(FX_DWORD dwFlags);
+ FX_BOOL HasFlag(uint32_t dwFlags) const;
+ void AddFlag(uint32_t dwFlags);
+ void RemoveFlag(uint32_t dwFlags);
const CFX_FloatRect& GetClipRect() const;
CPWL_Wnd* GetParentWindow() const;
int32_t GetBorderStyle() const;
@@ -434,10 +434,10 @@ class CPWL_Wnd : public CPWL_TimerHandler {
FX_BOOL IsWndCaptureKeyboard(const CPWL_Wnd* pWnd) const;
const CPWL_Wnd* GetRootWnd() const;
- FX_BOOL IsCTRLpressed(FX_DWORD nFlag) const;
- FX_BOOL IsSHIFTpressed(FX_DWORD nFlag) const;
- FX_BOOL IsALTpressed(FX_DWORD nFlag) const;
- FX_BOOL IsINSERTpressed(FX_DWORD nFlag) const;
+ FX_BOOL IsCTRLpressed(uint32_t nFlag) const;
+ FX_BOOL IsSHIFTpressed(uint32_t nFlag) const;
+ FX_BOOL IsALTpressed(uint32_t nFlag) const;
+ FX_BOOL IsINSERTpressed(uint32_t nFlag) const;
private:
void AddChild(CPWL_Wnd* pWnd);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 19:19:52 +0000