summaryrefslogtreecommitdiff
path: root/fpdfsdk/include/pdfwindow
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-06-13 00:41:00 -0700
committerLei Zhang <thestig@chromium.org>2015-06-13 00:41:00 -0700
commit60f507ba36893edccb53aa13d7282144a1dd2499 (patch)
tree8855790710cffc564547e83ca5f755437a16088f /fpdfsdk/include/pdfwindow
parent4999f914be6c390bbc6d709c5b65d8955a827970 (diff)
downloadpdfium-60f507ba36893edccb53aa13d7282144a1dd2499.tar.xz
Merge to XFA: Cleanup: Get this rid of "this->" in fpdfsdk/
Also remove commented out code and trailing whitespaces. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1179653005. (cherry picked from commit eda202769e5c79eba1d2fb5090f6e9cf176e2d4a) Review URL: https://codereview.chromium.org/1187733002.
Diffstat (limited to 'fpdfsdk/include/pdfwindow')
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_ListBox.h21
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Wnd.h2
2 files changed, 11 insertions, 12 deletions
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
index bbb9f35125..97a4529af9 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
@@ -1,7 +1,7 @@
// 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 FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_
@@ -21,11 +21,11 @@ public:
CPWL_List_Notify(CPWL_ListBox * pList);
virtual ~CPWL_List_Notify();
- void IOnSetScrollInfoX(FX_FLOAT fPlateMin, FX_FLOAT fPlateMax,
- FX_FLOAT fContentMin, FX_FLOAT fContentMax,
+ void IOnSetScrollInfoX(FX_FLOAT fPlateMin, FX_FLOAT fPlateMax,
+ FX_FLOAT fContentMin, FX_FLOAT fContentMax,
FX_FLOAT fSmallStep, FX_FLOAT fBigStep){}
- void IOnSetScrollInfoY(FX_FLOAT fPlateMin, FX_FLOAT fPlateMax,
- FX_FLOAT fContentMin, FX_FLOAT fContentMax,
+ void IOnSetScrollInfoY(FX_FLOAT fPlateMin, FX_FLOAT fPlateMax,
+ FX_FLOAT fContentMin, FX_FLOAT fContentMax,
FX_FLOAT fSmallStep, FX_FLOAT fBigStep);
void IOnSetScrollPosX(FX_FLOAT fx){}
void IOnSetScrollPosY(FX_FLOAT fy);
@@ -34,7 +34,7 @@ public:
void IOnInvalidateRect(CPDF_Rect * pRect);
private:
- CPWL_ListBox* m_pList;
+ CPWL_ListBox* m_pList;
};
class PWL_CLASS CPWL_ListBox : public CPWL_Wnd
@@ -59,15 +59,14 @@ public:
virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0);
virtual void RePosChildWnd();
- virtual void SetText(const FX_WCHAR* csText,FX_BOOL bRefresh = TRUE);
- virtual CFX_WideString GetText() const;
+ virtual CFX_WideString GetText() const;
virtual CPDF_Rect GetFocusRect() const;
virtual void SetFontSize(FX_FLOAT fFontSize);
virtual FX_FLOAT GetFontSize() const;
void OnNotifySelChanged(FX_BOOL bKeyDown, FX_BOOL & bExit , FX_DWORD nFlag);
- void AddString(const FX_WCHAR* string);
+ void AddString(const FX_WCHAR* string);
void SetTopVisibleIndex(int32_t nItemIndex);
void ScrollToListItem(int32_t nItemIndex);
void ResetContent();
@@ -75,7 +74,7 @@ public:
void Select(int32_t nItemIndex);
void SetCaret(int32_t nItemIndex);
void SetHoverSel(FX_BOOL bHoverSel);
-
+
int32_t GetCount() const;
FX_BOOL IsMultipleSel() const;
int32_t GetCaretIndex() const;
@@ -83,7 +82,7 @@ public:
FX_BOOL IsItemSelected(int32_t nItemIndex) const;
int32_t GetTopVisibleIndex() const;
int32_t FindNext(int32_t nIndex,FX_WCHAR nChar) const;
- CPDF_Rect GetContentRect() const;
+ CPDF_Rect GetContentRect() const;
FX_FLOAT GetFirstHeight() const;
CPDF_Rect GetListRect() const;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
index 9f089e6fa4..e74dc88c5c 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -125,7 +125,7 @@ struct PWL_CLASS CPWL_Color
nColorType(COLORTYPE_RGB), fColor1(r/255.0f), fColor2(g/255.0f), fColor3(b/255.0f), fColor4(0)
{}
- void ConvertColorType(int32_t nColorType);
+ void ConvertColorType(int32_t other_nColorType);
/*
COLORTYPE_TRANSPARENT