diff options
| author | npm <npm@chromium.org> | 2016-09-19 07:24:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-19 07:24:33 -0700 |
| commit | ea3c3be83dae12ef682c68fc7cf906d790fd9f84 (patch) | |
| tree | cdaca6bc4a4b9de627e45b90c64d4bd197fd8940 /fpdfsdk/pdfwindow/PWL_EditCtrl.cpp | |
| parent | 2f8568ef91156d2deb8411c427fbb52f880ccc34 (diff) | |
| download | pdfium-ea3c3be83dae12ef682c68fc7cf906d790fd9f84.tar.xz | |
Remove duplicated charset definitions, and move them to fx_font.h
PWL_FontMap does not need its own charset definitions. fx_edit.h does
not need to define DEFAULT_CHARSET. XFA have their own definitions.
They look different in that most are MAC or MSWin charset definitions.
So they are left untouched. public/fpdf_sysfontinfo.h duplicate ones
were left untouched due to being in public folder.
Review-Url: https://codereview.chromium.org/2347313002
Diffstat (limited to 'fpdfsdk/pdfwindow/PWL_EditCtrl.cpp')
| -rw-r--r-- | fpdfsdk/pdfwindow/PWL_EditCtrl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp index 9d8b16a53c..2ec88cb15e 100644 --- a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp +++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp @@ -8,6 +8,7 @@ #include "core/fpdfdoc/include/cpvt_section.h" #include "core/fpdfdoc/include/cpvt_word.h" +#include "core/fxge/include/fx_font.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/pdfwindow/PWL_Caret.h" #include "fpdfsdk/pdfwindow/PWL_FontMap.h" @@ -20,7 +21,7 @@ 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() {} @@ -476,7 +477,7 @@ 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) { @@ -567,7 +568,7 @@ void CPWL_EditCtrl::IOnInvalidateRect(CFX_FloatRect* 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, |