Merge to XFA: Use override in more classes in fpdfsdk/

fpdfsdk/include/pdfwindow/PWL_ScrollBar.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_
 
 #include "PWL_Wnd.h"
@@ skipping 17 matching lines @@
 };
 
 enum PWL_SCROLLBAR_TYPE { SBT_HSCROLL, SBT_VSCROLL };
 
 enum PWL_SBBUTTON_TYPE { PSBT_MIN, PSBT_MAX, PSBT_POS };
 
 class CPWL_SBButton : public CPWL_Wnd {
  public:
   CPWL_SBButton(PWL_SCROLLBAR_TYPE eScrollBarType,
                 PWL_SBBUTTON_TYPE eButtonType);
-  virtual ~CPWL_SBButton();
+  ~CPWL_SBButton() override;
 
- public:
-  virtual CFX_ByteString GetClassName() const;
-  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);
+  // CPWL_Wnd
+  CFX_ByteString GetClassName() const override;
+  void OnCreate(PWL_CREATEPARAM& cp) override;
+  void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override;
+  void DrawThisAppearance(CFX_RenderDevice* pDevice,
+                          CPDF_Matrix* pUser2Device) override;
+  FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override;
+  FX_BOOL OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override;
+  FX_BOOL OnMouseMove(const CPDF_Point& point, FX_DWORD nFlag) override;
 
  protected:
   PWL_SCROLLBAR_TYPE m_eScrollBarType;
   PWL_SBBUTTON_TYPE m_eSBButtonType;
 
   FX_BOOL m_bMouseDown;
 };
 
 struct PWL_FLOATRANGE {
  public:
@@ skipping 26 matching lines @@
   PWL_FLOATRANGE ScrollRange;
   FX_FLOAT fClientWidth;
   FX_FLOAT fScrollPos;
   FX_FLOAT fBigStep;
   FX_FLOAT fSmallStep;
 };
 
 class CPWL_ScrollBar : public CPWL_Wnd {
  public:
   CPWL_ScrollBar(PWL_SCROLLBAR_TYPE sbType = SBT_HSCROLL);
-  virtual ~CPWL_ScrollBar();
+  ~CPWL_ScrollBar() override;
 
- public:
-  virtual CFX_ByteString GetClassName() const;
-  virtual void OnCreate(PWL_CREATEPARAM& cp);
-  virtual void RePosChildWnd();
-  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 void OnNotify(CPWL_Wnd* pWnd,
-                        FX_DWORD msg,
-                        intptr_t wParam = 0,
-                        intptr_t lParam = 0);
-
-  virtual void CreateChildWnd(const PWL_CREATEPARAM& cp);
+  // CPWL_Wnd
+  CFX_ByteString GetClassName() const override;
+  void OnCreate(PWL_CREATEPARAM& cp) override;
+  void RePosChildWnd() override;
+  void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override;
+  void DrawThisAppearance(CFX_RenderDevice* pDevice,
+                          CPDF_Matrix* pUser2Device) override;
+  FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override;
+  FX_BOOL OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override;
+  void OnNotify(CPWL_Wnd* pWnd,
+                FX_DWORD msg,
+                intptr_t wParam = 0,
+                intptr_t lParam = 0) override;
+  void CreateChildWnd(const PWL_CREATEPARAM& cp) override;
+  void TimerProc() override;
 
   FX_FLOAT GetScrollBarWidth() const;
   PWL_SCROLLBAR_TYPE GetScrollBarType() const { return m_sbType; };
 
   void SetNotifyForever(FX_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);
@@ skipping 12 matching lines @@
   void OnMaxButtonLBUp(const CPDF_Point& point);
   void OnMaxButtonMouseMove(const CPDF_Point& point);
 
   void OnPosButtonLBDown(const CPDF_Point& point);
   void OnPosButtonLBUp(const CPDF_Point& point);
   void OnPosButtonMouseMove(const CPDF_Point& point);
 
   FX_FLOAT TrueToFace(FX_FLOAT);
   FX_FLOAT FaceToTrue(FX_FLOAT);
 
-  virtual void TimerProc();
-
- private:
   PWL_SCROLLBAR_TYPE m_sbType;
   PWL_SCROLL_INFO m_OriginInfo;
   CPWL_SBButton* m_pMinButton;
   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;
   FX_FLOAT m_nOldPos;
   FX_FLOAT m_fOldPosButton;
 };
 
 #endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_