Remove duplicated charset definitions

fpdfsdk/pdfwindow/PWL_EditCtrl.cpp

 // 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
 
 #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
 
 #include "core/fpdfdoc/include/cpvt_section.h"
 #include "core/fpdfdoc/include/cpvt_word.h"

[dsinclair, 2016/09/19 13:04:53]

Include fx_font.h?

[npm, 2016/09/19 14:08:32]

Done.

 #include "fpdfsdk/fxedit/include/fxet_edit.h"
 #include "fpdfsdk/pdfwindow/PWL_Caret.h"
 #include "fpdfsdk/pdfwindow/PWL_FontMap.h"
 #include "fpdfsdk/pdfwindow/PWL_ScrollBar.h"
 #include "fpdfsdk/pdfwindow/PWL_Utils.h"
 #include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 #include "public/fpdf_fwlevent.h"
 
 CPWL_EditCtrl::CPWL_EditCtrl()
     : m_pEdit(new CFX_Edit),
       m_pEditCaret(nullptr),
       m_bMouseDown(FALSE),
-      m_nCharSet(DEFAULT_CHARSET),
+      m_nCharSet(FXFONT_DEFAULT_CHARSET),
       m_nCodePage(0) {}
 
 CPWL_EditCtrl::~CPWL_EditCtrl() {}
 
 void CPWL_EditCtrl::OnCreate(PWL_CREATEPARAM& cp) {
   cp.eCursorType = FXCT_VBEAM;
 }
 
 void CPWL_EditCtrl::OnCreated() {
   SetFontSize(GetCreationParam().fFontSize);
@@ skipping 435 matching lines @@
 void CPWL_EditCtrl::CopyText() {}
 
 void CPWL_EditCtrl::PasteText() {}
 
 void CPWL_EditCtrl::CutText() {}
 
 void CPWL_EditCtrl::ShowVScrollBar(FX_BOOL bShow) {}
 
 void CPWL_EditCtrl::InsertText(const CFX_WideString& wsText) {
   if (!IsReadOnly())
-    m_pEdit->InsertText(wsText, DEFAULT_CHARSET);
+    m_pEdit->InsertText(wsText, FXFONT_DEFAULT_CHARSET);
 }
 
 void CPWL_EditCtrl::InsertWord(uint16_t word, int32_t nCharset) {
   if (!IsReadOnly())
     m_pEdit->InsertWord(word, nCharset);
 }
 
 void CPWL_EditCtrl::InsertReturn() {
   if (!IsReadOnly())
     m_pEdit->InsertReturn();
@@ skipping 70 matching lines @@
 void CPWL_EditCtrl::IOnCaretChange(const CPVT_SecProps& secProps,
                                    const CPVT_WordProps& wordProps) {}
 
 void CPWL_EditCtrl::IOnContentChange(const CFX_FloatRect& rcContent) {}
 
 void CPWL_EditCtrl::IOnInvalidateRect(CFX_FloatRect* pRect) {
   InvalidateRect(pRect);
 }
 
 int32_t CPWL_EditCtrl::GetCharSet() const {
-  return m_nCharSet < 0 ? DEFAULT_CHARSET : m_nCharSet;
+  return m_nCharSet < 0 ? FXFONT_DEFAULT_CHARSET : m_nCharSet;
 }
 
 void CPWL_EditCtrl::GetTextRange(const CFX_FloatRect& rect,
                                  int32_t& nStartChar,
                                  int32_t& nEndChar) const {
   nStartChar = m_pEdit->WordPlaceToWordIndex(
       m_pEdit->SearchWordPlace(CFX_FloatPoint(rect.left, rect.top)));
   nEndChar = m_pEdit->WordPlaceToWordIndex(
       m_pEdit->SearchWordPlace(CFX_FloatPoint(rect.right, rect.bottom)));
 }
 
 CFX_WideString CPWL_EditCtrl::GetText(int32_t& nStartChar,
                                       int32_t& nEndChar) const {
   CPVT_WordPlace wpStart = m_pEdit->WordIndexToWordPlace(nStartChar);
   CPVT_WordPlace wpEnd = m_pEdit->WordIndexToWordPlace(nEndChar);
   return m_pEdit->GetRangeText(CPVT_WordRange(wpStart, wpEnd));
 }
 
 void CPWL_EditCtrl::SetReadyToInput() {
   if (m_bMouseDown) {
     ReleaseCapture();
     m_bMouseDown = FALSE;
   }
 }