From ff46aaf499edcf153ee2f57c7016587aa96dcfa0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Jul 2015 11:55:29 -0700 Subject: FX Bool considered harmful, part 3 Try to reland this patch after fixing underlying issues that caused it to be reverted. fx_system.h is the only manual edit. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1258093002 . --- fpdfsdk/include/pdfwindow/PWL_Note.h | 64 ++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'fpdfsdk/include/pdfwindow/PWL_Note.h') diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/include/pdfwindow/PWL_Note.h index a60eba30dd..b1e61c4aa4 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Note.h +++ b/fpdfsdk/include/pdfwindow/PWL_Note.h @@ -33,8 +33,8 @@ class IPWL_NoteNotify public: virtual ~IPWL_NoteNotify() { } virtual void OnNoteMove(const FX_RECT& rtWin) = 0; - virtual void OnNoteShow(FX_BOOL bShow) = 0; - virtual void OnNoteActivate(FX_BOOL bActive) = 0; + virtual void OnNoteShow(bool bShow) = 0; + virtual void OnNoteActivate(bool bActive) = 0; virtual void OnNoteClose() = 0; virtual void OnItemCreate(IPWL_NoteItem* pItem) = 0; virtual void OnItemDelete(IPWL_NoteItem* pItem) = 0; @@ -107,11 +107,11 @@ public: protected: virtual void DrawThisAppearance(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device); - virtual FX_BOOL OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag); - virtual FX_BOOL OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag); + virtual bool OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag); + virtual bool OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag); private: - FX_BOOL m_bMouseDown; + bool m_bMouseDown; }; class CPWL_Note_LBBox : public CPWL_Wnd @@ -140,7 +140,7 @@ public: CPWL_Note_Edit(); virtual ~CPWL_Note_Edit(); - void EnableNotify(FX_BOOL bEnable) {m_bEnableNotify = bEnable;} + void EnableNotify(bool bEnable) {m_bEnableNotify = bEnable;} virtual FX_FLOAT GetItemHeight(FX_FLOAT fLimitWidth); FX_FLOAT GetItemLeftMargin(); FX_FLOAT GetItemRightMargin(); @@ -154,9 +154,9 @@ protected: virtual void OnKillFocus(); private: - FX_BOOL m_bEnableNotify; + bool m_bEnableNotify; FX_FLOAT m_fOldItemHeight; - FX_BOOL m_bSizeChanged; + bool m_bSizeChanged; FX_FLOAT m_fOldMin; FX_FLOAT m_fOldMax; }; @@ -188,9 +188,9 @@ public: virtual CFX_ByteString GetClassName() const; virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0); - virtual FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag); + virtual bool OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag); - void SetEditFocus(FX_BOOL bLast); + void SetEditFocus(bool bLast); CPWL_Edit* GetEdit() const; public: @@ -203,8 +203,8 @@ public: IPWL_NoteItem* GetSubItems(int32_t index) const; virtual IPWL_NoteItem* GetHitNoteItem(const CPDF_Point& point); - void EnableRead(FX_BOOL bEnabled); - void EnableModify(FX_BOOL bEnabled); + void EnableRead(bool bEnabled); + void EnableModify(bool bEnabled); protected: virtual void CreateChildWnd(const PWL_CREATEPARAM & cp); @@ -231,7 +231,7 @@ public: virtual int32_t CountSubItems() const; virtual IPWL_NoteItem* GetSubItems(int32_t index) const; virtual void DeleteSubItem(IPWL_NoteItem* pNoteItem); - virtual void SetFocus(){SetNoteFocus(FALSE);} + virtual void SetFocus(){SetNoteFocus(false);} virtual IPWL_NoteItem* GetParentItem() const; virtual void* GetPrivateData() const; @@ -240,19 +240,19 @@ public: virtual CFX_WideString GetContents() const; virtual FX_SYSTEMTIME GetDateTime() const; virtual CFX_WideString GetSubjectName() const; - virtual FX_BOOL IsTopItem() const { return FALSE;} + virtual bool IsTopItem() const { return false;} virtual CPWL_Edit* GetEdit() const; public: - virtual FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag); - virtual FX_BOOL OnRButtonUp(const CPDF_Point & point, FX_DWORD nFlag); + virtual bool OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag); + virtual bool OnRButtonUp(const CPDF_Point & point, FX_DWORD nFlag); virtual CFX_ByteString GetClassName() const; virtual IPWL_NoteItem* GetHitNoteItem(const CPDF_Point& point); virtual IPWL_NoteItem* GetFocusedNoteItem() const; virtual void ResetSubjectName(int32_t nItemIndex); - void EnableRead(FX_BOOL bEnabled); - void EnableModify(FX_BOOL bEnabled); + void EnableRead(bool bEnabled); + void EnableModify(bool bEnabled); protected: virtual void RePosChildWnd(); @@ -267,7 +267,7 @@ public: CPWL_NoteItem* CreateNoteItem(); CPWL_NoteItem* GetParentNoteItem() const; - void SetNoteFocus(FX_BOOL bLast); + void SetNoteFocus(bool bLast); void OnContentsValidate(); void OnCreateNoteItem(); @@ -289,8 +289,8 @@ private: CFX_WideString m_sAuthor; FX_FLOAT m_fOldItemHeight; - FX_BOOL m_bSizeChanged; - FX_BOOL m_bAllowModify; + bool m_bSizeChanged; + bool m_bAllowModify; }; class PWL_CLASS CPWL_Note : public CPWL_NoteItem @@ -305,17 +305,17 @@ public: virtual CFX_WideString GetAuthorName() const; virtual void SetBkColor(const CPWL_Color& color); virtual void ResetSubjectName(int32_t nItemIndex){} - virtual FX_BOOL IsTopItem() const {return TRUE;} + virtual bool IsTopItem() const {return true;} virtual const CPWL_Note* GetNote() const; virtual IPWL_NoteNotify* GetNoteNotify() const; public: IPWL_NoteItem* Reply(); - void EnableNotify(FX_BOOL bEnabled); + void EnableNotify(bool bEnabled); void SetIconType(int32_t nType); void SetOptionsText(const CFX_WideString& sText); - void EnableRead(FX_BOOL bEnabled); - void EnableModify(FX_BOOL bEnabled); + void EnableRead(bool bEnabled); + void EnableModify(bool bEnabled); CFX_WideString GetReplyString() const; void SetReplyString(const CFX_WideString& string); @@ -326,9 +326,9 @@ public: IPopup_Note* GetPopupNote() const {return m_pPopupNote;} public: - virtual FX_BOOL OnLButtonDown(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 OnRButtonUp(const CPDF_Point & point, FX_DWORD nFlag); + virtual bool OnMouseWheel(short zDelta, const CPDF_Point & point, FX_DWORD nFlag); protected: virtual void RePosChildWnd(); @@ -336,9 +336,9 @@ protected: virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0); - FX_BOOL ResetScrollBar(); + bool ResetScrollBar(); void RePosNoteChildren(); - FX_BOOL ScrollBarShouldVisible(); + bool ScrollBarShouldVisible(); private: CPWL_Label* m_pAuthor; @@ -349,10 +349,10 @@ private: CPWL_ScrollBar* m_pContentsBar; CPWL_Note_Options* m_pOptions; IPWL_NoteNotify* m_pNoteNotify; - FX_BOOL m_bResizing; + bool m_bResizing; PWL_SCROLL_INFO m_OldScrollInfo; CPDF_Rect m_rcCaption; - FX_BOOL m_bEnalbleNotify; + bool m_bEnalbleNotify; IPopup_Note* m_pPopupNote; CFX_WideString m_sReplyString; }; -- cgit v1.2.3