Cleanup FWL default values part II.

xfa/fwl/core/cfwl_edit.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 XFA_FWL_CORE_CFWL_EDIT_H_
 #define XFA_FWL_CORE_CFWL_EDIT_H_
 
 #include <deque>
@@ skipping 61 matching lines @@
   void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) override;
   void SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) override;
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnProcessEvent(CFWL_Event* pEvent) override;
   void OnDrawWidget(CFX_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix) override;
 
   virtual void SetText(const CFX_WideString& wsText);
 
   int32_t GetTextLength() const;
-  CFX_WideString GetText(int32_t nStart = 0, int32_t nCount = -1) const;
+  CFX_WideString GetText() const;
   void ClearText();
 
-  void AddSelRange(int32_t nStart, int32_t nCount = -1);
+  void AddSelRange(int32_t nStart);
   int32_t CountSelRanges() const;
   int32_t GetSelRange(int32_t nIndex, int32_t& nStart) const;
   void ClearSelections();
   int32_t GetLimit() const;
   void SetLimit(int32_t nLimit);
   void SetAliasChar(FX_WCHAR wAlias);
   bool Copy(CFX_WideString& wsCopy);
   bool Cut(CFX_WideString& wsCut);
   bool Paste(const CFX_WideString& wsPaste);
   bool Redo(const IFDE_TxtEdtDoRecord* pRecord);
   bool Undo(const IFDE_TxtEdtDoRecord* pRecord);
   bool Undo();
   bool Redo();
   bool CanUndo();
   bool CanRedo();
 
   void SetOuter(CFWL_Widget* pOuter);
 
-  void On_CaretChanged(CFDE_TxtEdtEngine* pEdit,
-                       int32_t nPage,
-                       bool bVisible = true);
-  void On_TextChanged(CFDE_TxtEdtEngine* pEdit,
-                      FDE_TXTEDT_TEXTCHANGE_INFO& ChangeInfo);
-  void On_SelChanged(CFDE_TxtEdtEngine* pEdit);
-  bool On_PageLoad(CFDE_TxtEdtEngine* pEdit,
-                   int32_t nPageIndex,
-                   int32_t nPurpose);
-  bool On_PageUnload(CFDE_TxtEdtEngine* pEdit,
-                     int32_t nPageIndex,
-                     int32_t nPurpose);
-  void On_AddDoRecord(CFDE_TxtEdtEngine* pEdit, IFDE_TxtEdtDoRecord* pRecord);
-  bool On_Validate(CFDE_TxtEdtEngine* pEdit, CFX_WideString& wsText);
+  void On_CaretChanged();

[Tom Sepez, 2016/12/07 17:33:32]

nit: can we lose the _ in these names?

[dsinclair, 2016/12/07 18:28:49]

Done.

+  void On_TextChanged(FDE_TXTEDT_TEXTCHANGE_INFO& ChangeInfo);
+  void On_SelChanged();
+  bool On_PageLoad(int32_t nPageIndex);
+  bool On_PageUnload(int32_t nPageIndex);
+  void On_AddDoRecord(IFDE_TxtEdtDoRecord* pRecord);
+  bool On_Validate(CFX_WideString& wsText);
   void SetScrollOffset(FX_FLOAT fScrollOffset);
 
  protected:
   void ShowCaret(CFX_RectF* pRect);
   void HideCaret(CFX_RectF* pRect);
   const CFX_RectF& GetRTClient() const { return m_rtClient; }
   CFDE_TxtEdtEngine* GetTxtEdtEngine() { return &m_EdtEngine; }
 
  private:
   void DrawTextBk(CFX_Graphics* pGraphics,
                   IFWL_ThemeProvider* pTheme,
-                  const CFX_Matrix* pMatrix = nullptr);
+                  const CFX_Matrix* pMatrix);
   void DrawContent(CFX_Graphics* pGraphics,
                    IFWL_ThemeProvider* pTheme,
-                   const CFX_Matrix* pMatrix = nullptr);
+                   const CFX_Matrix* pMatrix);
+  void DrawSpellCheck(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix);
+
   void UpdateEditEngine();
   void UpdateEditParams();
   void UpdateEditLayout();
   bool UpdateOffset();
   bool UpdateOffset(CFWL_ScrollBar* pScrollBar, FX_FLOAT fPosChanged);
   void UpdateVAlignment();
   void UpdateCaret();
   CFWL_ScrollBar* UpdateScroll();
   void Layout();
   void LayoutScrollBar();
   void DeviceToEngine(CFX_PointF& pt);
-  void InitScrollBar(bool bVert = true);
+  void InitVerticalScrollBar();
+  void InitHorizontalScrollBar();
   void InitEngine();
+  void InitCaret();
   bool ValidateNumberChar(FX_WCHAR cNum);
-  void InitCaret();
   void ClearRecord();
   bool IsShowScrollBar(bool bVert);
   bool IsContentHeightOverflow();
   int32_t AddDoRecord(IFDE_TxtEdtDoRecord* pRecord);
   void ProcessInsertError(int32_t iError);
-
-  void DrawSpellCheck(CFX_Graphics* pGraphics,
-                      const CFX_Matrix* pMatrix = nullptr);
   void AddSpellCheckObj(CFX_Path& PathData,
                         int32_t nStart,
                         int32_t nCount,
                         FX_FLOAT fOffSetX,
                         FX_FLOAT fOffSetY);
+
   void DoButtonDown(CFWL_MsgMouse* pMsg);
   void OnFocusChanged(CFWL_Message* pMsg, bool bSet);
   void OnLButtonDown(CFWL_MsgMouse* pMsg);
   void OnLButtonUp(CFWL_MsgMouse* pMsg);
   void OnButtonDblClk(CFWL_MsgMouse* pMsg);
   void OnMouseMove(CFWL_MsgMouse* pMsg);
   void OnKeyDown(CFWL_MsgKey* pMsg);
   void OnChar(CFWL_MsgKey* pMsg);
   bool OnScroll(CFWL_ScrollBar* pScrollBar, FWL_SCBCODE dwCode, FX_FLOAT fPos);
 
@@ skipping 14 matching lines @@
   std::unique_ptr<CFWL_ScrollBar> m_pHorzScrollBar;
   std::unique_ptr<CFWL_Caret> m_pCaret;
   CFX_WideString m_wsCache;
   CFX_WideString m_wsFont;
   std::deque<std::unique_ptr<IFDE_TxtEdtDoRecord>> m_DoRecords;
   int32_t m_iCurRecord;
   int32_t m_iMaxRecord;
 };
 
 #endif  // XFA_FWL_CORE_CFWL_EDIT_H_