Index: fpdfsdk/include/pdfwindow/PWL_Edit.h |
diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h |
index 97147a964dbb93a4efa2c0c3f49e8b5d3b87a7cc..50e1ebee3c56a9858f97aea2e88eba1aeb17bfe0 100644 |
--- a/fpdfsdk/include/pdfwindow/PWL_Edit.h |
+++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h |
@@ -21,11 +21,11 @@ public: |
virtual ~IPWL_Filler_Notify() { } |
virtual void QueryWherePopup(void* pPrivateData, FX_FLOAT fPopupMin,FX_FLOAT fPopupMax, |
int32_t & nRet, FX_FLOAT & fPopupRet) = 0; //nRet: (0:bottom 1:top) |
- 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) = 0; |
- virtual void OnAfterKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, FX_BOOL & bExit, FX_DWORD nFlag) = 0; |
+ bool bKeyDown, bool & bRC, bool & bExit, FX_DWORD nFlag) = 0; |
+ virtual void OnAfterKeyStroke(bool bEditOrList, void* pPrivateData, bool & bExit, FX_DWORD nFlag) = 0; |
}; |
class PWL_CLASS CPWL_Edit : public CPWL_EditCtrl, public IFX_Edit_OprNotify |
@@ -44,35 +44,35 @@ public: |
virtual void GetThisAppearanceStream(CFX_ByteTextBuf & sAppStream); |
virtual void DrawThisAppearance(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device); |
- virtual FX_BOOL OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag); |
- virtual FX_BOOL OnLButtonDblClk(const CPDF_Point & point, FX_DWORD nFlag); |
- virtual FX_BOOL OnRButtonUp(const CPDF_Point & point, FX_DWORD nFlag); |
- virtual FX_BOOL OnMouseWheel(short zDelta, const CPDF_Point & point, FX_DWORD nFlag); |
+ virtual bool OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag); |
+ virtual bool OnLButtonDblClk(const CPDF_Point & point, FX_DWORD nFlag); |
+ virtual bool OnRButtonUp(const CPDF_Point & point, FX_DWORD nFlag); |
+ virtual bool OnMouseWheel(short zDelta, const CPDF_Point & point, FX_DWORD nFlag); |
- virtual FX_BOOL OnKeyDown(FX_WORD nChar, FX_DWORD nFlag); |
- virtual FX_BOOL OnChar(FX_WORD nChar, FX_DWORD nFlag); |
+ virtual bool OnKeyDown(FX_WORD nChar, FX_DWORD nFlag); |
+ virtual bool OnChar(FX_WORD nChar, FX_DWORD nFlag); |
virtual CPDF_Rect GetFocusRect() const; |
public: |
- void SetAlignFormatH(PWL_EDIT_ALIGNFORMAT_H nFormat = PEAH_LEFT, FX_BOOL bPaint = TRUE); //0:left 1:right 2:middle |
- void SetAlignFormatV(PWL_EDIT_ALIGNFORMAT_V nFormat = PEAV_TOP, FX_BOOL bPaint = TRUE); //0:top 1:bottom 2:center |
+ void SetAlignFormatH(PWL_EDIT_ALIGNFORMAT_H nFormat = PEAH_LEFT, bool bPaint = true); //0:left 1:right 2:middle |
+ void SetAlignFormatV(PWL_EDIT_ALIGNFORMAT_V nFormat = PEAV_TOP, bool bPaint = true); //0:top 1:bottom 2:center |
void SetCharArray(int32_t nCharArray); |
void SetLimitChar(int32_t nLimitChar); |
- void SetHorzScale(int32_t nHorzScale, FX_BOOL bPaint = TRUE); |
- void SetCharSpace(FX_FLOAT fCharSpace, FX_BOOL bPaint = TRUE); |
+ void SetHorzScale(int32_t nHorzScale, bool bPaint = true); |
+ void SetCharSpace(FX_FLOAT fCharSpace, bool bPaint = true); |
- void SetLineLeading(FX_FLOAT fLineLeading, FX_BOOL bPaint = TRUE); |
+ void SetLineLeading(FX_FLOAT fLineLeading, bool bPaint = true); |
- void EnableSpellCheck(FX_BOOL bEnabled); |
+ void EnableSpellCheck(bool bEnabled); |
- FX_BOOL CanSelectAll() const; |
- FX_BOOL CanClear() const; |
- FX_BOOL CanCopy() const; |
- FX_BOOL CanCut() const; |
- FX_BOOL CanPaste() const; |
+ bool CanSelectAll() const; |
+ bool CanClear() const; |
+ bool CanCopy() const; |
+ bool CanCut() const; |
+ bool CanPaste() const; |
virtual void CopyText(); |
virtual void PasteText(); |
@@ -85,7 +85,7 @@ public: |
CFX_ByteString GetCaretAppearanceStream(const CPDF_Point & ptOffset) const; |
CFX_ByteString GetSelectAppearanceStream(const CPDF_Point & ptOffset) const; |
- FX_BOOL IsTextFull() const; |
+ bool IsTextFull() const; |
static FX_FLOAT GetCharArrayAutoFontSize(CPDF_Font* pFont, const CPDF_Rect& rcPlate, int32_t nCharArray); |
@@ -112,8 +112,8 @@ protected: |
private: |
CPVT_WordRange GetSelectWordRange() const; |
- virtual void ShowVScrollBar(FX_BOOL bShow); |
- FX_BOOL IsVScrollBarVisible() const; |
+ virtual void ShowVScrollBar(bool bShow); |
+ bool IsVScrollBarVisible() const; |
void SetParamByFlag(); |
FX_FLOAT GetCharArrayAutoFontSize(int32_t nCharArray); |
@@ -123,15 +123,15 @@ private: |
CPVT_WordRange GetLatinWordsRange(const CPDF_Point & point) const; |
CPVT_WordRange GetLatinWordsRange(const CPVT_WordPlace & place) const; |
CPVT_WordRange GetArabicWordsRange(const CPVT_WordPlace & place) const; |
- CPVT_WordRange GetSameWordsRange(const CPVT_WordPlace & place, FX_BOOL bLatin, FX_BOOL bArabic) const; |
+ CPVT_WordRange GetSameWordsRange(const CPVT_WordPlace & place, bool bLatin, bool bArabic) const; |
void AjustArabicWords(const CPVT_WordRange& wr); |
public: |
- FX_BOOL IsProceedtoOnChar(FX_WORD nKeyCode, FX_DWORD nFlag); |
+ bool IsProceedtoOnChar(FX_WORD nKeyCode, FX_DWORD nFlag); |
private: |
IPWL_Filler_Notify* m_pFillerNotify; |
IPWL_SpellCheck* m_pSpellCheck; |
- FX_BOOL m_bFocus; |
+ bool m_bFocus; |
CPDF_Rect m_rcOldWindow; |
public: |
void AttachFFLData(void* pData) {m_pFormFiller = pData;} |