| Index: fpdfsdk/include/formfiller/FFL_IFormFiller.h
 | 
| diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
 | 
| index e553723dc3dea38c30a66c47a8c11fbe2f6124a8..51b0279d0afa9a7e846c6576eba037c326adb7d9 100644
 | 
| --- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h
 | 
| +++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
 | 
| @@ -20,7 +20,7 @@ public:
 | 
|  	CFFL_IFormFiller(CPDFDoc_Environment* pApp);
 | 
|  	virtual ~CFFL_IFormFiller();
 | 
|  
 | 
| -	virtual FX_BOOL				Annot_HitTest(CPDFSDK_PageView* pPageView,CPDFSDK_Annot* pAnnot, CPDF_Point point);
 | 
| +	virtual bool				Annot_HitTest(CPDFSDK_PageView* pPageView,CPDFSDK_Annot* pAnnot, CPDF_Point point);
 | 
|  	virtual FX_RECT				GetViewBBox(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot);
 | 
|  	virtual void				OnDraw(CPDFSDK_PageView *pPageView, /*HDC hDC,*/ CPDFSDK_Annot* pAnnot,
 | 
|  									CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
 | 
| @@ -34,41 +34,41 @@ public:
 | 
|  	virtual void				OnMouseEnter(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlag);
 | 
|  	virtual void				OnMouseExit(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlag);
 | 
|  
 | 
| -	virtual FX_BOOL				OnLButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 | 
| -	virtual FX_BOOL				OnLButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 | 
| -	virtual FX_BOOL				OnLButtonDblClk(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 | 
| -	virtual FX_BOOL				OnMouseMove(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 | 
| -	virtual FX_BOOL				OnMouseWheel(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, short zDelta, const CPDF_Point& point);
 | 
| -	virtual FX_BOOL				OnRButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 | 
| -	virtual FX_BOOL				OnRButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 | 
| +	virtual bool				OnLButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 | 
| +	virtual bool				OnLButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 | 
| +	virtual bool				OnLButtonDblClk(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 | 
| +	virtual bool				OnMouseMove(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 | 
| +	virtual bool				OnMouseWheel(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, short zDelta, const CPDF_Point& point);
 | 
| +	virtual bool				OnRButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 | 
| +	virtual bool				OnRButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 | 
|  
 | 
| -	virtual FX_BOOL				OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, FX_UINT nFlags);
 | 
| -	virtual FX_BOOL				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
 | 
| +	virtual bool				OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, FX_UINT nFlags);
 | 
| +	virtual bool				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
 | 
|  
 | 
| -	virtual FX_BOOL				OnSetFocus(CPDFSDK_Annot* pAnnot,FX_UINT nFlag);
 | 
| -	virtual FX_BOOL				OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag);
 | 
| +	virtual bool				OnSetFocus(CPDFSDK_Annot* pAnnot,FX_UINT nFlag);
 | 
| +	virtual bool				OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag);
 | 
|  
 | 
|  	virtual void				QueryWherePopup(void* pPrivateData, FX_FLOAT fPopupMin,FX_FLOAT fPopupMax, int32_t & nRet, FX_FLOAT & fPopupRet);
 | 
| -	virtual void				OnBeforeKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, int32_t nKeyCode,
 | 
| +	virtual void				OnBeforeKeyStroke(bool bEditOrList, void* pPrivateData, int32_t nKeyCode,
 | 
|  										CFX_WideString & strChange, const CFX_WideString& strChangeEx,
 | 
|  										int nSelStart, int nSelEnd,
 | 
| -										FX_BOOL bKeyDown, FX_BOOL & bRC, FX_BOOL & bExit, FX_DWORD nFlag);
 | 
| -	virtual void				OnAfterKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, FX_BOOL & bExit, FX_DWORD nFlag) ;
 | 
| +										bool bKeyDown, bool & bRC, bool & bExit, FX_DWORD nFlag);
 | 
| +	virtual void				OnAfterKeyStroke(bool bEditOrList, void* pPrivateData, bool & bExit, FX_DWORD nFlag) ;
 | 
|  
 | 
| -	CFFL_FormFiller*			GetFormFiller(CPDFSDK_Annot* pAnnot, FX_BOOL bRegister);
 | 
| +	CFFL_FormFiller*			GetFormFiller(CPDFSDK_Annot* pAnnot, bool bRegister);
 | 
|  	void						RemoveFormFiller(CPDFSDK_Annot* pAnnot);
 | 
|  
 | 
| -	static FX_BOOL				IsVisible(CPDFSDK_Widget* pWidget);
 | 
| -	static FX_BOOL				IsReadOnly(CPDFSDK_Widget* pWidget);
 | 
| -	static FX_BOOL				IsFillingAllowed(CPDFSDK_Widget* pWidget);
 | 
| - 	static FX_BOOL				IsValidAnnot(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot);
 | 
| +	static bool				IsVisible(CPDFSDK_Widget* pWidget);
 | 
| +	static bool				IsReadOnly(CPDFSDK_Widget* pWidget);
 | 
| +	static bool				IsFillingAllowed(CPDFSDK_Widget* pWidget);
 | 
| + 	static bool				IsValidAnnot(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot);
 | 
|  
 | 
| -	void						OnKeyStrokeCommit(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bRC, FX_BOOL& bExit, FX_DWORD nFlag);
 | 
| -	void						OnValidate(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bRC, FX_BOOL& bExit, FX_DWORD nFlag);
 | 
| +	void						OnKeyStrokeCommit(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, bool& bRC, bool& bExit, FX_DWORD nFlag);
 | 
| +	void						OnValidate(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, bool& bRC, bool& bExit, FX_DWORD nFlag);
 | 
|  
 | 
| -	void						OnCalculate(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bExit, FX_DWORD nFlag);
 | 
| -	void						OnFormat(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bExit, FX_DWORD nFlag);
 | 
| -	void						OnButtonUp(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bReset, FX_BOOL& bExit,FX_UINT nFlag);
 | 
| +	void						OnCalculate(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, bool& bExit, FX_DWORD nFlag);
 | 
| +	void						OnFormat(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, bool& bExit, FX_DWORD nFlag);
 | 
| +	void						OnButtonUp(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, bool& bReset, bool& bExit,FX_UINT nFlag);
 | 
|  
 | 
|  private:
 | 
|      using CFFL_Widget2Filler = std::map<CPDFSDK_Annot*, CFFL_FormFiller*>;
 | 
| @@ -77,7 +77,7 @@ private:
 | 
|  
 | 
|      CPDFDoc_Environment* m_pApp;
 | 
|      CFFL_Widget2Filler m_Maps;
 | 
| -    FX_BOOL m_bNotifying;
 | 
| +    bool m_bNotifying;
 | 
|  };
 | 
|  
 | 
|  class CFFL_PrivateData
 | 
| 
 |