diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-04-19 12:46:53 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-19 17:08:38 +0000 |
| commit | f51a02a29e10fcc490ba28f44d43f50104f940ed (patch) | |
| tree | 354215ff5deeea419ce5a88b369535b5e4468a62 /fpdfsdk/pdfwindow/PWL_EditCtrl.cpp | |
| parent | 2a473dbecab2b47c513de9127a2cddf4c2800306 (diff) | |
| download | pdfium-f51a02a29e10fcc490ba28f44d43f50104f940ed.tar.xz | |
Cleanup codepage and charset definitions.
This Cl cleans up the unused defines in fx_codepage.h. The
FXFONT_CHARSET_ defines are replaced with fx_codepage defines, this
moves fx_codepage into core instead of xfa only. Static asserts are
added to verify the public/ charsets match the fx_codepage charsets.
Change-Id: Ie2f749e093de60a9a6743128a1fb087912e4cc96
Reviewed-on: https://pdfium-review.googlesource.com/4316
Commit-Queue: dsinclair <dsinclair@chromium.org>
Commit-Queue: Nicolás Peña <npm@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'fpdfsdk/pdfwindow/PWL_EditCtrl.cpp')
| -rw-r--r-- | fpdfsdk/pdfwindow/PWL_EditCtrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp index 19daae1413..c149e80f14 100644 --- a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp +++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp @@ -21,7 +21,7 @@ CPWL_EditCtrl::CPWL_EditCtrl() : m_pEdit(new CFX_Edit), m_pEditCaret(nullptr), m_bMouseDown(false), - m_nCharSet(FXFONT_DEFAULT_CHARSET) {} + m_nCharSet(FX_CHARSET_Default) {} CPWL_EditCtrl::~CPWL_EditCtrl() {} @@ -472,7 +472,7 @@ void CPWL_EditCtrl::IOnInvalidateRect(CFX_FloatRect* pRect) { } int32_t CPWL_EditCtrl::GetCharSet() const { - return m_nCharSet < 0 ? FXFONT_DEFAULT_CHARSET : m_nCharSet; + return m_nCharSet < 0 ? FX_CHARSET_Default : m_nCharSet; } void CPWL_EditCtrl::SetReadyToInput() { |