diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-13 16:43:37 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-14 14:14:51 +0000 |
commit | 812e96c2b4c5908a1979da5e27cdcecda0d1dfc9 (patch) | |
tree | f0b0607f6b757eb22237527215094bd87b5d03ba /fpdfsdk/pdfwindow | |
parent | 893822aa5b6254591f8e80fbffcbb4fa6ad849aa (diff) | |
download | pdfium-812e96c2b4c5908a1979da5e27cdcecda0d1dfc9.tar.xz |
Replace FX_CHAR and FX_WCHAR with underlying types.
Change-Id: I96e0a20d66b9184d22f64d8e4ce0dadd5a78c1e8
Reviewed-on: https://pdfium-review.googlesource.com/2967
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk/pdfwindow')
-rw-r--r-- | fpdfsdk/pdfwindow/PWL_Icon.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/pdfwindow/PWL_Icon.h | 2 | ||||
-rw-r--r-- | fpdfsdk/pdfwindow/PWL_ListBox.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/pdfwindow/PWL_ListBox.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_Icon.cpp b/fpdfsdk/pdfwindow/PWL_Icon.cpp index b0d0c7686d..4ce63299e4 100644 --- a/fpdfsdk/pdfwindow/PWL_Icon.cpp +++ b/fpdfsdk/pdfwindow/PWL_Icon.cpp @@ -96,7 +96,7 @@ CFX_ByteString CPWL_Image::GetImageAlias() { return CFX_ByteString(); } -void CPWL_Image::SetImageAlias(const FX_CHAR* sImageAlias) { +void CPWL_Image::SetImageAlias(const char* sImageAlias) { m_sImageAlias = sImageAlias; } diff --git a/fpdfsdk/pdfwindow/PWL_Icon.h b/fpdfsdk/pdfwindow/PWL_Icon.h index 4b62db4c99..bdcae9f7bd 100644 --- a/fpdfsdk/pdfwindow/PWL_Icon.h +++ b/fpdfsdk/pdfwindow/PWL_Icon.h @@ -26,7 +26,7 @@ class CPWL_Image : public CPWL_Wnd { void GetImageSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight); CFX_Matrix GetImageMatrix(); CFX_ByteString GetImageAlias(); - void SetImageAlias(const FX_CHAR* sImageAlias); + void SetImageAlias(const char* sImageAlias); protected: CPDF_Stream* m_pPDFStream; diff --git a/fpdfsdk/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/pdfwindow/PWL_ListBox.cpp index ed96e203fd..18b45b5c3f 100644 --- a/fpdfsdk/pdfwindow/PWL_ListBox.cpp +++ b/fpdfsdk/pdfwindow/PWL_ListBox.cpp @@ -428,7 +428,7 @@ int32_t CPWL_ListBox::GetCount() const { return m_pList->GetCount(); } -int32_t CPWL_ListBox::FindNext(int32_t nIndex, FX_WCHAR nChar) const { +int32_t CPWL_ListBox::FindNext(int32_t nIndex, wchar_t nChar) const { return m_pList->FindNext(nIndex, nChar); } diff --git a/fpdfsdk/pdfwindow/PWL_ListBox.h b/fpdfsdk/pdfwindow/PWL_ListBox.h index f9108a17de..fa78b37bcb 100644 --- a/fpdfsdk/pdfwindow/PWL_ListBox.h +++ b/fpdfsdk/pdfwindow/PWL_ListBox.h @@ -92,7 +92,7 @@ class CPWL_ListBox : public CPWL_Wnd { int32_t GetCurSel() const; bool IsItemSelected(int32_t nItemIndex) const; int32_t GetTopVisibleIndex() const; - int32_t FindNext(int32_t nIndex, FX_WCHAR nChar) const; + int32_t FindNext(int32_t nIndex, wchar_t nChar) const; CFX_FloatRect GetContentRect() const; FX_FLOAT GetFirstHeight() const; CFX_FloatRect GetListRect() const; |