| Index: fpdfsdk/include/javascript/IJavaScript.h
|
| diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h
|
| index 783b249ff625f995e6a034a286ecc51923c32dd3..37e12dccf856a2753c3fcccc470f034eabd39f1b 100644
|
| --- a/fpdfsdk/include/javascript/IJavaScript.h
|
| +++ b/fpdfsdk/include/javascript/IJavaScript.h
|
| @@ -19,8 +19,8 @@ class IFXJS_Context
|
| {
|
| public:
|
| virtual ~IFXJS_Context() { }
|
| - virtual FX_BOOL Compile(const CFX_WideString& script, CFX_WideString& info) = 0;
|
| - virtual FX_BOOL RunScript(const CFX_WideString& script, CFX_WideString& info) = 0;
|
| + virtual bool Compile(const CFX_WideString& script, CFX_WideString& info) = 0;
|
| + virtual bool RunScript(const CFX_WideString& script, CFX_WideString& info) = 0;
|
|
|
| virtual void OnApp_Init() = 0;
|
|
|
| @@ -36,32 +36,32 @@ public:
|
| virtual void OnPage_InView(CPDFSDK_Document* pTarget) = 0;
|
| virtual void OnPage_OutView(CPDFSDK_Document* pTarget) = 0;
|
|
|
| - virtual void OnField_MouseDown(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget) = 0;
|
| - virtual void OnField_MouseEnter(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget) = 0;
|
| - virtual void OnField_MouseExit(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget) = 0;
|
| - virtual void OnField_MouseUp(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget) = 0;
|
| - virtual void OnField_Focus(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget, const CFX_WideString& Value) = 0;
|
| - virtual void OnField_Blur(FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget, const CFX_WideString& Value) = 0;
|
| + virtual void OnField_MouseDown(bool bModifier, bool bShift, CPDF_FormField* pTarget) = 0;
|
| + virtual void OnField_MouseEnter(bool bModifier, bool bShift, CPDF_FormField* pTarget) = 0;
|
| + virtual void OnField_MouseExit(bool bModifier, bool bShift, CPDF_FormField* pTarget) = 0;
|
| + virtual void OnField_MouseUp(bool bModifier, bool bShift, CPDF_FormField* pTarget) = 0;
|
| + virtual void OnField_Focus(bool bModifier, bool bShift, CPDF_FormField* pTarget, const CFX_WideString& Value) = 0;
|
| + virtual void OnField_Blur(bool bModifier, bool bShift, CPDF_FormField* pTarget, const CFX_WideString& Value) = 0;
|
|
|
| - virtual void OnField_Calculate(CPDF_FormField* pSource, CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL& bRc) = 0;
|
| - virtual void OnField_Format(CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit) = 0;
|
| + virtual void OnField_Calculate(CPDF_FormField* pSource, CPDF_FormField* pTarget, CFX_WideString& Value, bool& bRc) = 0;
|
| + virtual void OnField_Format(CPDF_FormField* pTarget, CFX_WideString& Value, bool bWillCommit) = 0;
|
| virtual void OnField_Keystroke(CFX_WideString& strChange, const CFX_WideString& strChangeEx,
|
| - FX_BOOL KeyDown, FX_BOOL bModifier, int &nSelEnd,int &nSelStart, FX_BOOL bShift,
|
| - CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL bWillCommit,
|
| - FX_BOOL bFieldFull, FX_BOOL &bRc) = 0;
|
| - virtual void OnField_Validate(CFX_WideString& strChange, const CFX_WideString& strChangeEx, FX_BOOL bKeyDown,
|
| - FX_BOOL bModifier, FX_BOOL bShift, CPDF_FormField* pTarget, CFX_WideString& Value, FX_BOOL& bRc) = 0;
|
| -
|
| - virtual void OnScreen_Focus(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen) = 0;
|
| - virtual void OnScreen_Blur(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen) = 0;
|
| - virtual void OnScreen_Open(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen) = 0;
|
| - virtual void OnScreen_Close(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen) = 0;
|
| - virtual void OnScreen_MouseDown(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen) = 0;
|
| - virtual void OnScreen_MouseUp(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen) = 0;
|
| - virtual void OnScreen_MouseEnter(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen) = 0;
|
| - virtual void OnScreen_MouseExit(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen) = 0;
|
| - virtual void OnScreen_InView(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen) = 0;
|
| - virtual void OnScreen_OutView(FX_BOOL bModifier, FX_BOOL bShift, CPDFSDK_Annot* pScreen) = 0;
|
| + bool KeyDown, bool bModifier, int &nSelEnd,int &nSelStart, bool bShift,
|
| + CPDF_FormField* pTarget, CFX_WideString& Value, bool bWillCommit,
|
| + bool bFieldFull, bool &bRc) = 0;
|
| + virtual void OnField_Validate(CFX_WideString& strChange, const CFX_WideString& strChangeEx, bool bKeyDown,
|
| + bool bModifier, bool bShift, CPDF_FormField* pTarget, CFX_WideString& Value, bool& bRc) = 0;
|
| +
|
| + virtual void OnScreen_Focus(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen) = 0;
|
| + virtual void OnScreen_Blur(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen) = 0;
|
| + virtual void OnScreen_Open(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen) = 0;
|
| + virtual void OnScreen_Close(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen) = 0;
|
| + virtual void OnScreen_MouseDown(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen) = 0;
|
| + virtual void OnScreen_MouseUp(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen) = 0;
|
| + virtual void OnScreen_MouseEnter(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen) = 0;
|
| + virtual void OnScreen_MouseExit(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen) = 0;
|
| + virtual void OnScreen_InView(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen) = 0;
|
| + virtual void OnScreen_OutView(bool bModifier, bool bShift, CPDFSDK_Annot* pScreen) = 0;
|
|
|
| virtual void OnBookmark_MouseUp(CPDF_Bookmark* pBookMark) = 0;
|
| virtual void OnLink_MouseUp(CPDFSDK_Document* pTarget) = 0;
|
| @@ -71,7 +71,7 @@ public:
|
| virtual void OnConsole_Exec() = 0;
|
| virtual void OnExternal_Exec() = 0;
|
|
|
| - virtual void EnableMessageBox(FX_BOOL bEnable) = 0;
|
| + virtual void EnableMessageBox(bool bEnable) = 0;
|
| };
|
|
|
| class IFXJS_Runtime
|
| @@ -94,7 +94,7 @@ class CJS_GlobalData;
|
| class CJS_RuntimeFactory
|
| {
|
| public:
|
| - CJS_RuntimeFactory():m_bInit(FALSE),m_nRef(0),m_pGlobalData(NULL),m_nGlobalDataCount(0) {}
|
| + CJS_RuntimeFactory():m_bInit(false),m_nRef(0),m_pGlobalData(NULL),m_nGlobalDataCount(0) {}
|
| ~CJS_RuntimeFactory();
|
| IFXJS_Runtime* NewJSRuntime(CPDFDoc_Environment* pApp);
|
| void DeleteJSRuntime(IFXJS_Runtime* pRuntime);
|
| @@ -104,7 +104,7 @@ public:
|
| CJS_GlobalData* NewGlobalData(CPDFDoc_Environment* pApp);
|
| void ReleaseGlobalData();
|
| private:
|
| - FX_BOOL m_bInit;
|
| + bool m_bInit;
|
| int m_nRef;
|
| CJS_GlobalData* m_pGlobalData;
|
| int32_t m_nGlobalDataCount;
|
|
|