From 4cf551577856f89103e162edc761def44ffb96fc Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 2 Nov 2016 14:37:54 -0700 Subject: Remove FX_BOOL from fpdfsdk. Review-Url: https://codereview.chromium.org/2453683011 --- fpdfsdk/pdfwindow/PWL_Wnd.h | 76 ++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'fpdfsdk/pdfwindow/PWL_Wnd.h') diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.h b/fpdfsdk/pdfwindow/PWL_Wnd.h index 8fd538f7c4..bba14f26bf 100644 --- a/fpdfsdk/pdfwindow/PWL_Wnd.h +++ b/fpdfsdk/pdfwindow/PWL_Wnd.h @@ -255,26 +255,26 @@ class CPWL_Wnd : public CPWL_TimerHandler { void InvalidateFocusHandler(IPWL_FocusHandler* handler); void InvalidateProvider(IPWL_Provider* provider); void Destroy(); - void Move(const CFX_FloatRect& rcNew, FX_BOOL bReset, FX_BOOL bRefresh); + void Move(const CFX_FloatRect& rcNew, bool bReset, bool bRefresh); virtual void InvalidateRect(CFX_FloatRect* pRect = nullptr); void DrawAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device); - virtual FX_BOOL OnKeyDown(uint16_t nChar, uint32_t nFlag); - virtual FX_BOOL OnKeyUp(uint16_t nChar, uint32_t nFlag); - virtual FX_BOOL OnChar(uint16_t nChar, uint32_t nFlag); - virtual FX_BOOL OnLButtonDblClk(const CFX_FloatPoint& point, uint32_t nFlag); - virtual FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag); - virtual FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag); - virtual FX_BOOL OnMButtonDblClk(const CFX_FloatPoint& point, uint32_t nFlag); - virtual FX_BOOL OnMButtonDown(const CFX_FloatPoint& point, uint32_t nFlag); - virtual FX_BOOL OnMButtonUp(const CFX_FloatPoint& point, uint32_t nFlag); - virtual FX_BOOL OnRButtonDown(const CFX_FloatPoint& point, uint32_t nFlag); - virtual FX_BOOL OnRButtonUp(const CFX_FloatPoint& point, uint32_t nFlag); - virtual FX_BOOL OnMouseMove(const CFX_FloatPoint& point, uint32_t nFlag); - virtual FX_BOOL OnMouseWheel(short zDelta, - const CFX_FloatPoint& point, - uint32_t nFlag); + virtual bool OnKeyDown(uint16_t nChar, uint32_t nFlag); + virtual bool OnKeyUp(uint16_t nChar, uint32_t nFlag); + virtual bool OnChar(uint16_t nChar, uint32_t nFlag); + virtual bool OnLButtonDblClk(const CFX_FloatPoint& point, uint32_t nFlag); + virtual bool OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag); + virtual bool OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag); + virtual bool OnMButtonDblClk(const CFX_FloatPoint& point, uint32_t nFlag); + virtual bool OnMButtonDown(const CFX_FloatPoint& point, uint32_t nFlag); + virtual bool OnMButtonUp(const CFX_FloatPoint& point, uint32_t nFlag); + virtual bool OnRButtonDown(const CFX_FloatPoint& point, uint32_t nFlag); + virtual bool OnRButtonUp(const CFX_FloatPoint& point, uint32_t nFlag); + virtual bool OnMouseMove(const CFX_FloatPoint& point, uint32_t nFlag); + virtual bool OnMouseWheel(short zDelta, + const CFX_FloatPoint& point, + uint32_t nFlag); virtual void SetFocus(); virtual void KillFocus(); @@ -287,7 +287,7 @@ class CPWL_Wnd : public CPWL_TimerHandler { intptr_t lParam = 0); virtual void SetTextColor(const CPWL_Color& color); virtual void SetTextStrokeColor(const CPWL_Color& color); - virtual void SetVisible(FX_BOOL bVisible); + virtual void SetVisible(bool bVisible); virtual CFX_FloatRect GetFocusRect() const; virtual CPWL_Color GetBackgroundColor() const; @@ -309,8 +309,8 @@ class CPWL_Wnd : public CPWL_TimerHandler { virtual CFX_FloatRect GetClientRect() const; CFX_FloatPoint GetCenterPoint() const; int32_t GetBorderWidth() const; - FX_BOOL IsVisible() const { return m_bVisible; } - FX_BOOL HasFlag(uint32_t dwFlags) const; + bool IsVisible() const { return m_bVisible; } + bool HasFlag(uint32_t dwFlags) const; void AddFlag(uint32_t dwFlags); void RemoveFlag(uint32_t dwFlags); const CFX_FloatRect& GetClipRect() const; @@ -319,13 +319,13 @@ class CPWL_Wnd : public CPWL_TimerHandler { const CPWL_Dash& GetBorderDash() const; void* GetAttachedData() const; - FX_BOOL WndHitTest(const CFX_FloatPoint& point) const; - FX_BOOL ClientHitTest(const CFX_FloatPoint& point) const; - FX_BOOL IsCaptureMouse() const; + bool WndHitTest(const CFX_FloatPoint& point) const; + bool ClientHitTest(const CFX_FloatPoint& point) const; + bool IsCaptureMouse() const; const CPWL_Wnd* GetFocused() const; - FX_BOOL IsFocused() const; - FX_BOOL IsReadOnly() const; + bool IsFocused() const; + bool IsReadOnly() const; CPWL_ScrollBar* GetVScrollBar() const; IPVT_FontMap* GetFontMap() const; @@ -350,8 +350,8 @@ class CPWL_Wnd : public CPWL_TimerHandler { virtual FX_FLOAT GetItemLeftMargin(); virtual FX_FLOAT GetItemRightMargin(); - void EnableWindow(FX_BOOL bEnable); - FX_BOOL IsEnabled(); + void EnableWindow(bool bEnable); + bool IsEnabled(); virtual void SetCursor(); protected: @@ -379,11 +379,11 @@ class CPWL_Wnd : public CPWL_TimerHandler { virtual void OnEnabled(); virtual void OnDisabled(); - void SetNotifyFlag(FX_BOOL bNotifying = TRUE) { m_bNotifying = bNotifying; } + void SetNotifyFlag(bool bNotifying = true) { m_bNotifying = bNotifying; } - FX_BOOL IsValid() const; + bool IsValid() const; const PWL_CREATEPARAM& GetCreationParam() const; - FX_BOOL IsNotifying() const { return m_bNotifying; } + bool IsNotifying() const { return m_bNotifying; } void InvalidateRectMove(const CFX_FloatRect& rcOld, const CFX_FloatRect& rcNew); @@ -391,13 +391,13 @@ class CPWL_Wnd : public CPWL_TimerHandler { void PWLtoWnd(const CFX_FloatPoint& point, int32_t& x, int32_t& y) const; FX_RECT PWLtoWnd(const CFX_FloatRect& rect) const; - FX_BOOL IsWndCaptureMouse(const CPWL_Wnd* pWnd) const; - FX_BOOL IsWndCaptureKeyboard(const CPWL_Wnd* pWnd) const; + bool IsWndCaptureMouse(const CPWL_Wnd* pWnd) const; + bool IsWndCaptureKeyboard(const CPWL_Wnd* pWnd) const; const CPWL_Wnd* GetRootWnd() const; - FX_BOOL IsCTRLpressed(uint32_t nFlag) const; - FX_BOOL IsSHIFTpressed(uint32_t nFlag) const; - FX_BOOL IsALTpressed(uint32_t nFlag) const; + bool IsCTRLpressed(uint32_t nFlag) const; + bool IsSHIFTpressed(uint32_t nFlag) const; + bool IsALTpressed(uint32_t nFlag) const; private: void AddChild(CPWL_Wnd* pWnd); @@ -423,10 +423,10 @@ class CPWL_Wnd : public CPWL_TimerHandler { CFX_FloatRect m_rcWindow; CFX_FloatRect m_rcClip; - FX_BOOL m_bCreated; - FX_BOOL m_bVisible; - FX_BOOL m_bNotifying; - FX_BOOL m_bEnabled; + bool m_bCreated; + bool m_bVisible; + bool m_bNotifying; + bool m_bEnabled; }; #endif // FPDFSDK_PDFWINDOW_PWL_WND_H_ -- cgit v1.2.3