Index: fpdfsdk/include/cpdfsdk_xfawidgethandler.h |
diff --git a/fpdfsdk/include/cpdfsdk_xfawidgethandler.h b/fpdfsdk/include/cpdfsdk_xfawidgethandler.h |
index c18a36f8b60d449e5580c5755b2966ddc5ceda46..2bf977951ca3af32748a6d15867c096988e83856 100644 |
--- a/fpdfsdk/include/cpdfsdk_xfawidgethandler.h |
+++ b/fpdfsdk/include/cpdfsdk_xfawidgethandler.h |
@@ -46,42 +46,42 @@ class CPDFSDK_XFAWidgetHandler : public IPDFSDK_AnnotHandler { |
void OnDelete(CPDFSDK_Annot* pAnnot) override; |
void OnRelease(CPDFSDK_Annot* pAnnot) override; |
void OnMouseEnter(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
+ CPDFSDK_Annot::ObservedPtr* pAnnot, |
uint32_t nFlag) override; |
void OnMouseExit(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
+ CPDFSDK_Annot::ObservedPtr* pAnnot, |
uint32_t nFlag) override; |
FX_BOOL OnLButtonDown(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
+ CPDFSDK_Annot::ObservedPtr* pAnnot, |
uint32_t nFlags, |
const CFX_FloatPoint& point) override; |
FX_BOOL OnLButtonUp(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
+ CPDFSDK_Annot::ObservedPtr* pAnnot, |
uint32_t nFlags, |
const CFX_FloatPoint& point) override; |
FX_BOOL OnLButtonDblClk(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
+ CPDFSDK_Annot::ObservedPtr* pAnnot, |
uint32_t nFlags, |
const CFX_FloatPoint& point) override; |
FX_BOOL OnMouseMove(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
+ CPDFSDK_Annot::ObservedPtr* pAnnot, |
uint32_t nFlags, |
const CFX_FloatPoint& point) override; |
FX_BOOL OnMouseWheel(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
+ CPDFSDK_Annot::ObservedPtr* pAnnot, |
uint32_t nFlags, |
short zDelta, |
const CFX_FloatPoint& point) override; |
FX_BOOL OnRButtonDown(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
+ CPDFSDK_Annot::ObservedPtr* pAnnot, |
uint32_t nFlags, |
const CFX_FloatPoint& point) override; |
FX_BOOL OnRButtonUp(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
+ CPDFSDK_Annot::ObservedPtr* pAnnot, |
uint32_t nFlags, |
const CFX_FloatPoint& point) override; |
FX_BOOL OnRButtonDblClk(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
+ CPDFSDK_Annot::ObservedPtr* pAnnot, |
uint32_t nFlags, |
const CFX_FloatPoint& point) override; |
FX_BOOL OnChar(CPDFSDK_Annot* pAnnot, |
@@ -91,10 +91,12 @@ class CPDFSDK_XFAWidgetHandler : public IPDFSDK_AnnotHandler { |
FX_BOOL OnKeyUp(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag) override; |
void OnDeSelected(CPDFSDK_Annot* pAnnot) override; |
void OnSelected(CPDFSDK_Annot* pAnnot) override; |
- FX_BOOL OnSetFocus(CPDFSDK_Annot* pAnnot, uint32_t nFlag) override; |
- FX_BOOL OnKillFocus(CPDFSDK_Annot* pAnnot, uint32_t nFlag) override; |
- FX_BOOL OnXFAChangedFocus(CPDFSDK_Annot* pOldAnnot, |
- CPDFSDK_Annot* pNewAnnot) override; |
+ FX_BOOL OnSetFocus(CPDFSDK_Annot::ObservedPtr* pAnnot, |
+ uint32_t nFlag) override; |
+ FX_BOOL OnKillFocus(CPDFSDK_Annot::ObservedPtr* pAnnot, |
+ uint32_t nFlag) override; |
+ FX_BOOL OnXFAChangedFocus(CPDFSDK_Annot::ObservedPtr* pOldAnnot, |
+ CPDFSDK_Annot::ObservedPtr* pNewAnnot) override; |
private: |
CXFA_FFWidgetHandler* GetXFAWidgetHandler(CPDFSDK_Annot* pAnnot); |