| Index: fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
|
| diff --git a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
|
| index 03902225453107c79ba034e67ed5c1a578380225..4735922039f5ffac3e07686a0059bfd1d7b07dcf 100644
|
| --- a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
|
| +++ b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
|
| @@ -49,15 +49,15 @@ public:
|
| virtual void OnCreate(PWL_CREATEPARAM & cp);
|
| 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 OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag);
|
| - virtual FX_BOOL OnMouseMove(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);
|
| + virtual bool OnMouseMove(const CPDF_Point & point, FX_DWORD nFlag);
|
|
|
| protected:
|
| PWL_SCROLLBAR_TYPE m_eScrollBarType;
|
| PWL_SBBUTTON_TYPE m_eSBButtonType;
|
|
|
| - FX_BOOL m_bMouseDown;
|
| + bool m_bMouseDown;
|
| };
|
|
|
| struct PWL_FLOATRANGE
|
| @@ -67,7 +67,7 @@ public:
|
| PWL_FLOATRANGE(FX_FLOAT min,FX_FLOAT max);
|
| void Default();
|
| void Set(FX_FLOAT min,FX_FLOAT max);
|
| - FX_BOOL In(FX_FLOAT x) const;
|
| + bool In(FX_FLOAT x) const;
|
| FX_FLOAT GetWidth() const;
|
|
|
| FX_FLOAT fMin,fMax;
|
| @@ -83,7 +83,7 @@ public:
|
| void SetClientWidth(FX_FLOAT width);
|
| void SetSmallStep(FX_FLOAT step);
|
| void SetBigStep(FX_FLOAT step);
|
| - FX_BOOL SetPos(FX_FLOAT pos);
|
| + bool SetPos(FX_FLOAT pos);
|
|
|
| void AddSmall();
|
| void SubSmall();
|
| @@ -110,8 +110,8 @@ 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 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);
|
| virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0);
|
|
|
| virtual void CreateChildWnd(const PWL_CREATEPARAM & cp);
|
| @@ -119,12 +119,12 @@ public:
|
| FX_FLOAT GetScrollBarWidth() const;
|
| PWL_SCROLLBAR_TYPE GetScrollBarType() const {return m_sbType;};
|
|
|
| - void SetNotifyForever(FX_BOOL bForever) {m_bNotifyForever = bForever;}
|
| + void SetNotifyForever(bool bForever) {m_bNotifyForever = bForever;}
|
|
|
| protected:
|
| void SetScrollRange(FX_FLOAT fMin,FX_FLOAT fMax,FX_FLOAT fClientWidth);
|
| void SetScrollPos(FX_FLOAT fPos);
|
| - void MovePosButton(FX_BOOL bRefresh);
|
| + void MovePosButton(bool bRefresh);
|
| void SetScrollStep(FX_FLOAT fBigStep,FX_FLOAT fSmallStep);
|
| void NotifyScrollWindow();
|
| CPDF_Rect GetScrollArea() const;
|
| @@ -156,9 +156,9 @@ private:
|
| CPWL_SBButton* m_pMaxButton;
|
| CPWL_SBButton* m_pPosButton;
|
| PWL_SCROLL_PRIVATEDATA m_sData;
|
| - FX_BOOL m_bMouseDown;
|
| - FX_BOOL m_bMinOrMax;
|
| - FX_BOOL m_bNotifyForever;
|
| + bool m_bMouseDown;
|
| + bool m_bMinOrMax;
|
| + bool m_bNotifyForever;
|
| FX_FLOAT m_nOldPos;
|
| FX_FLOAT m_fOldPosButton;
|
| };
|
|
|