From a6d9f0edce07194f551db4c38bb427fbf7d550cf Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Sat, 13 Jun 2015 00:48:38 -0700 Subject: Remove trailing whitespaces in fpdfsdk, XFA edition. Review URL: https://codereview.chromium.org/1185843005. --- fpdfsdk/include/pdfwindow/IPDFWindow.h | 2 +- fpdfsdk/include/pdfwindow/PWL_Button.h | 2 +- fpdfsdk/include/pdfwindow/PWL_Caret.h | 4 +- fpdfsdk/include/pdfwindow/PWL_ComboBox.h | 14 ++--- fpdfsdk/include/pdfwindow/PWL_Edit.h | 20 +++---- fpdfsdk/include/pdfwindow/PWL_EditCtrl.h | 26 ++++----- fpdfsdk/include/pdfwindow/PWL_FontMap.h | 6 +- fpdfsdk/include/pdfwindow/PWL_Icon.h | 6 +- fpdfsdk/include/pdfwindow/PWL_IconList.h | 6 +- fpdfsdk/include/pdfwindow/PWL_Label.h | 2 +- fpdfsdk/include/pdfwindow/PWL_ListCtrl.h | 2 +- fpdfsdk/include/pdfwindow/PWL_Note.h | 14 ++--- fpdfsdk/include/pdfwindow/PWL_ScrollBar.h | 18 +++--- fpdfsdk/include/pdfwindow/PWL_Signature.h | 2 +- fpdfsdk/include/pdfwindow/PWL_SpecialButton.h | 2 +- fpdfsdk/include/pdfwindow/PWL_Utils.h | 18 +++--- fpdfsdk/include/pdfwindow/PWL_Wnd.h | 82 +++++++++++++-------------- 17 files changed, 113 insertions(+), 113 deletions(-) (limited to 'fpdfsdk/include/pdfwindow') diff --git a/fpdfsdk/include/pdfwindow/IPDFWindow.h b/fpdfsdk/include/pdfwindow/IPDFWindow.h index 0191cac639..2774f70e7c 100644 --- a/fpdfsdk/include/pdfwindow/IPDFWindow.h +++ b/fpdfsdk/include/pdfwindow/IPDFWindow.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_IPDFWINDOW_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_Button.h b/fpdfsdk/include/pdfwindow/PWL_Button.h index 9141cf047c..2bf2eea865 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Button.h +++ b/fpdfsdk/include/pdfwindow/PWL_Button.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_BUTTON_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_Caret.h b/fpdfsdk/include/pdfwindow/PWL_Caret.h index 8efbf79341..6838bc49e7 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Caret.h +++ b/fpdfsdk/include/pdfwindow/PWL_Caret.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_CARET_H_ @@ -34,7 +34,7 @@ public: virtual void InvalidateRect(CPDF_Rect * pRect = NULL); virtual void SetVisible(FX_BOOL bVisible) {} virtual void TimerProc(); - void SetCaret(FX_BOOL bVisible, const CPDF_Point & ptHead, const CPDF_Point & ptFoot); + void SetCaret(FX_BOOL bVisible, const CPDF_Point & ptHead, const CPDF_Point & ptFoot); CFX_ByteString GetCaretAppearanceStream(const CPDF_Point & ptOffset); void SetInvalidRect(CPDF_Rect rc) {m_rcInvalid = rc;} diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h index b82330c6b9..3f8604fb62 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h +++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.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_COMBOBOX_H_ @@ -48,7 +48,7 @@ public: }; -class PWL_CLASS CPWL_ComboBox : public CPWL_Wnd +class PWL_CLASS CPWL_ComboBox : public CPWL_Wnd { public: CPWL_ComboBox(); @@ -58,7 +58,7 @@ public: virtual CFX_ByteString GetClassName() const; virtual void OnCreate(PWL_CREATEPARAM & cp); - virtual FX_BOOL OnKeyDown(FX_WORD nChar, FX_DWORD nFlag); + virtual FX_BOOL OnKeyDown(FX_WORD nChar, FX_DWORD nFlag); virtual FX_BOOL OnChar(FX_WORD nChar, FX_DWORD nFlag); virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0); @@ -67,13 +67,13 @@ public: virtual void RePosChildWnd(); virtual CPDF_Rect GetFocusRect() const; - + virtual void SetFocus(); virtual void KillFocus(); FX_BOOL IsModified() const; -public: +public: void SetFillerNotify(IPWL_Filler_Notify* pNotify); CFX_WideString GetText() const; @@ -91,13 +91,13 @@ public: void SetSelectText(); -private: +private: void CreateEdit(const PWL_CREATEPARAM & cp); void CreateButton(const PWL_CREATEPARAM & cp); void CreateListBox(const PWL_CREATEPARAM & cp); void SetPopup(FX_BOOL bPopup); - + private: CPWL_CBEdit* m_pEdit; CPWL_CBButton* m_pButton; diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h index 81500e90ad..6b31b9230d 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Edit.h +++ b/fpdfsdk/include/pdfwindow/PWL_Edit.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_EDIT_H_ @@ -19,10 +19,10 @@ class IPWL_Filler_Notify { public: virtual ~IPWL_Filler_Notify() { } - virtual void QueryWherePopup(void* pPrivateData, FX_FLOAT fPopupMin,FX_FLOAT fPopupMax, + virtual void QueryWherePopup(void* pPrivateData, FX_FLOAT fPopupMin,FX_FLOAT fPopupMax, int32_t & nRet, FX_FLOAT & fPopupRet) = 0; //nRet: (0:bottom 1:top) virtual void OnBeforeKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, int32_t nKeyCode, - CFX_WideString & strChange, const CFX_WideString& strChangeEx, + CFX_WideString & strChange, const CFX_WideString& strChangeEx, int nSelStart, int nSelEnd, FX_BOOL bKeyDown, FX_BOOL & bRC, FX_BOOL & bExit, FX_DWORD nFlag) = 0; virtual void OnAfterKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, FX_BOOL & bExit, FX_DWORD nFlag) = 0; @@ -57,8 +57,8 @@ public: virtual CPDF_Rect GetFocusRect() const; -public: - void SetAlignFormatH(PWL_EDIT_ALIGNFORMAT_H nFormat = PEAH_LEFT, FX_BOOL bPaint = TRUE); //0:left 1:right 2:middle +public: + void SetAlignFormatH(PWL_EDIT_ALIGNFORMAT_H nFormat = PEAH_LEFT, FX_BOOL bPaint = TRUE); //0:left 1:right 2:middle void SetAlignFormatV(PWL_EDIT_ALIGNFORMAT_V nFormat = PEAV_TOP, FX_BOOL bPaint = TRUE); //0:top 1:bottom 2:center void SetCharArray(int32_t nCharArray); @@ -85,18 +85,18 @@ public: void ReplaceSel(const FX_WCHAR* csText); CFX_ByteString GetTextAppearanceStream(const CPDF_Point & ptOffset) const; - CFX_ByteString GetCaretAppearanceStream(const CPDF_Point & ptOffset) const; + CFX_ByteString GetCaretAppearanceStream(const CPDF_Point & ptOffset) const; CFX_ByteString GetSelectAppearanceStream(const CPDF_Point & ptOffset) const; - FX_BOOL IsTextFull() const; + FX_BOOL IsTextFull() const; static FX_FLOAT GetCharArrayAutoFontSize(CPDF_Font* pFont, const CPDF_Rect& rcPlate, int32_t nCharArray); void SetFillerNotify(IPWL_Filler_Notify* pNotify) {m_pFillerNotify = pNotify;} - void GeneratePageObjects(CPDF_PageObjects* pPageObjects, + void GeneratePageObjects(CPDF_PageObjects* pPageObjects, const CPDF_Point& ptOffset, CFX_ArrayTemplate& ObjArray); - void GeneratePageObjects(CPDF_PageObjects* pPageObjects, + void GeneratePageObjects(CPDF_PageObjects* pPageObjects, const CPDF_Point& ptOffset); protected: @@ -113,7 +113,7 @@ protected: virtual void OnInsertText(const CPVT_WordPlace& place, const CPVT_WordPlace& oldplace); virtual void OnAddUndo(IFX_Edit_UndoItem* pUndoItem); -private: +private: CPVT_WordRange GetSelectWordRange() const; virtual void ShowVScrollBar(FX_BOOL bShow); FX_BOOL IsVScrollBarVisible() const; diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h index bfa1868b9e..9b088b1162 100644 --- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h +++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.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_EDITCTRL_H_ @@ -70,16 +70,16 @@ public: virtual FX_BOOL OnKeyDown(FX_WORD nChar, FX_DWORD nFlag); virtual FX_BOOL OnChar(FX_WORD nChar, FX_DWORD nFlag); - virtual FX_BOOL OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag); - virtual FX_BOOL OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag); + virtual FX_BOOL OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag); + virtual FX_BOOL OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag); virtual FX_BOOL OnMouseMove(const CPDF_Point & point, FX_DWORD nFlag); virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0); virtual void CreateChildWnd(const PWL_CREATEPARAM & cp); - virtual void RePosChildWnd(); + virtual void RePosChildWnd(); virtual void SetFontSize(FX_FLOAT fFontSize); virtual FX_FLOAT GetFontSize() const; - + public: virtual void SetText(const FX_WCHAR* csText); @@ -105,11 +105,11 @@ public: void Paint(); - void EnableRefresh(FX_BOOL bRefresh); + void EnableRefresh(FX_BOOL bRefresh); CPDF_Point GetScrollPos() const; void SetScrollPos(const CPDF_Point& point); - void SetEditNotify(IPWL_Edit_Notify* pNotify) {m_pEditNotify = pNotify;} + void SetEditNotify(IPWL_Edit_Notify* pNotify) {m_pEditNotify = pNotify;} void SetCharSet(uint8_t nCharSet){m_nCharSet = nCharSet;} int32_t GetCharSet() const; @@ -142,15 +142,15 @@ protected: protected: void GetCaretInfo(CPDF_Point & ptHead, CPDF_Point & ptFoot) const; void SetCaret(FX_BOOL bVisible, const CPDF_Point & ptHead, const CPDF_Point & ptFoot); - + void SetEditCaret(FX_BOOL bVisible); protected: - virtual void IOnSetScrollInfoX(FX_FLOAT fPlateMin, FX_FLOAT fPlateMax, - FX_FLOAT fContentMin, FX_FLOAT fContentMax, + virtual void IOnSetScrollInfoX(FX_FLOAT fPlateMin, FX_FLOAT fPlateMax, + FX_FLOAT fContentMin, FX_FLOAT fContentMax, FX_FLOAT fSmallStep, FX_FLOAT fBigStep){} - virtual void IOnSetScrollInfoY(FX_FLOAT fPlateMin, FX_FLOAT fPlateMax, - FX_FLOAT fContentMin, FX_FLOAT fContentMax, + virtual void IOnSetScrollInfoY(FX_FLOAT fPlateMin, FX_FLOAT fPlateMax, + FX_FLOAT fContentMin, FX_FLOAT fContentMax, FX_FLOAT fSmallStep, FX_FLOAT fBigStep); virtual void IOnSetScrollPosX(FX_FLOAT fx){} virtual void IOnSetScrollPosY(FX_FLOAT fy); @@ -166,7 +166,7 @@ protected: IFX_Edit* m_pEdit; CPWL_Caret* m_pEditCaret; FX_BOOL m_bMouseDown; - IPWL_Edit_Notify* m_pEditNotify; + IPWL_Edit_Notify* m_pEditNotify; private: int32_t m_nCharSet; diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/include/pdfwindow/PWL_FontMap.h index f83575b66f..d32cc93078 100644 --- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h +++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.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_FONTMAP_H_ @@ -85,9 +85,9 @@ public: static CFX_ByteString GetDefaultFontByCharset(int32_t nCharset); CPDF_Font* AddFontToDocument(CPDF_Document* pDoc, CFX_ByteString& sFontName, uint8_t nCharset); - static FX_BOOL IsStandardFont(const CFX_ByteString& sFontName); + static FX_BOOL IsStandardFont(const CFX_ByteString& sFontName); CPDF_Font* AddStandardFont(CPDF_Document* pDoc, CFX_ByteString& sFontName); - CPDF_Font* AddSystemFont(CPDF_Document* pDoc, CFX_ByteString& sFontName, + CPDF_Font* AddSystemFont(CPDF_Document* pDoc, CFX_ByteString& sFontName, uint8_t nCharset); protected: diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h index 1a2adf6469..44a5c0cbaf 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Icon.h +++ b/fpdfsdk/include/pdfwindow/PWL_Icon.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_ICON_H_ @@ -23,7 +23,7 @@ public: virtual CPDF_Stream * GetPDFStream(); public: - void SetPDFStream(CPDF_Stream* pStream); + void SetPDFStream(CPDF_Stream* pStream); void GetImageSize(FX_FLOAT & fWidth,FX_FLOAT & fHeight); CPDF_Matrix GetImageMatrix(); CFX_ByteString GetImageAlias(); @@ -34,7 +34,7 @@ protected: CFX_ByteString m_sImageAlias; }; -class PWL_CLASS CPWL_Icon : public CPWL_Image +class PWL_CLASS CPWL_Icon : public CPWL_Image { public: CPWL_Icon(); diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/include/pdfwindow/PWL_IconList.h index 74438c2afd..2f6b323773 100644 --- a/fpdfsdk/include/pdfwindow/PWL_IconList.h +++ b/fpdfsdk/include/pdfwindow/PWL_IconList.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_ICONLIST_H_ @@ -86,7 +86,7 @@ private: CPWL_IconList_Item* GetListItem(int32_t nItemIndex) const; void SelectItem(int32_t nItemIndex, FX_BOOL bSelect); int32_t FindItemIndex(const CPDF_Point& point); - + FX_BOOL m_nSelectIndex; IPWL_IconList_Notify* m_pNotify; FX_BOOL m_bEnableNotify; @@ -117,7 +117,7 @@ protected: virtual void OnCreated(); virtual void RePosChildWnd(); virtual void CreateChildWnd(const PWL_CREATEPARAM & cp); - + virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0); private: diff --git a/fpdfsdk/include/pdfwindow/PWL_Label.h b/fpdfsdk/include/pdfwindow/PWL_Label.h index 6d9754dd80..7f28189199 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Label.h +++ b/fpdfsdk/include/pdfwindow/PWL_Label.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_LABEL_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h index 56a1fbf919..c107a0cf5e 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h +++ b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.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_LISTCTRL_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/include/pdfwindow/PWL_Note.h index ee6ec6ff02..a60eba30dd 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Note.h +++ b/fpdfsdk/include/pdfwindow/PWL_Note.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_NOTE_H_ @@ -70,7 +70,7 @@ public: virtual IPWL_NoteItem* GetSubItems(int32_t index) const = 0; virtual void DeleteSubItem(IPWL_NoteItem* pNoteItem) = 0; virtual void SetFocus() = 0; - + virtual IPWL_NoteItem* GetParentItem() const = 0; virtual void* GetPrivateData() const = 0; virtual CFX_WideString GetAuthorName() const = 0; @@ -151,7 +151,7 @@ protected: virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0); virtual void RePosChildWnd(); virtual void OnSetFocus(); - virtual void OnKillFocus(); + virtual void OnKillFocus(); private: FX_BOOL m_bEnableNotify; @@ -213,7 +213,7 @@ private: CPWL_Note_Edit* m_pEdit; }; -class PWL_CLASS CPWL_NoteItem : public CPWL_Wnd, public IPWL_NoteItem +class PWL_CLASS CPWL_NoteItem : public CPWL_Wnd, public IPWL_NoteItem { public: CPWL_NoteItem(); @@ -269,7 +269,7 @@ public: void SetNoteFocus(FX_BOOL bLast); void OnContentsValidate(); - + void OnCreateNoteItem(); protected: @@ -320,7 +320,7 @@ public: CFX_WideString GetReplyString() const; void SetReplyString(const CFX_WideString& string); - //0-normal / 1-caption / 2-leftbottom corner / 3-rightbottom corner / 4-close / 5-options + //0-normal / 1-caption / 2-leftbottom corner / 3-rightbottom corner / 4-close / 5-options int32_t NoteHitTest(const CPDF_Point& point) const; CPDF_Rect GetCaptionRect() const {return m_rcCaption;} IPopup_Note* GetPopupNote() const {return m_pPopupNote;} @@ -346,7 +346,7 @@ private: CPWL_Note_CloseBox* m_pCloseBox; CPWL_Note_LBBox* m_pLBBox; CPWL_Note_RBBox* m_pRBBox; - CPWL_ScrollBar* m_pContentsBar; + CPWL_ScrollBar* m_pContentsBar; CPWL_Note_Options* m_pOptions; IPWL_NoteNotify* m_pNoteNotify; FX_BOOL m_bResizing; diff --git a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h index bf92399e88..0390222545 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h +++ b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.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_SCROLLBAR_H_ @@ -19,8 +19,8 @@ public: { } FX_FLOAT fContentMin; - FX_FLOAT fContentMax; - FX_FLOAT fPlateWidth; + FX_FLOAT fContentMax; + FX_FLOAT fPlateWidth; FX_FLOAT fBigStep; FX_FLOAT fSmallStep; }; @@ -38,7 +38,7 @@ enum PWL_SBBUTTON_TYPE PSBT_POS }; -class CPWL_SBButton : public CPWL_Wnd +class CPWL_SBButton : public CPWL_Wnd { public: CPWL_SBButton(PWL_SCROLLBAR_TYPE eScrollBarType,PWL_SBBUTTON_TYPE eButtonType); @@ -97,7 +97,7 @@ public: FX_FLOAT fSmallStep; }; -class CPWL_ScrollBar : public CPWL_Wnd +class CPWL_ScrollBar : public CPWL_Wnd { public: CPWL_ScrollBar(PWL_SCROLLBAR_TYPE sbType = SBT_HSCROLL); @@ -115,13 +115,13 @@ public: virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0); virtual void CreateChildWnd(const PWL_CREATEPARAM & cp); - - FX_FLOAT GetScrollBarWidth() const; + + FX_FLOAT GetScrollBarWidth() const; PWL_SCROLLBAR_TYPE GetScrollBarType() const {return m_sbType;}; void SetNotifyForever(FX_BOOL bForever) {m_bNotifyForever = bForever;} -protected: +protected: void SetScrollRange(FX_FLOAT fMin,FX_FLOAT fMax,FX_FLOAT fClientWidth); void SetScrollPos(FX_FLOAT fPos); void MovePosButton(FX_BOOL bRefresh); @@ -156,7 +156,7 @@ private: CPWL_SBButton* m_pMaxButton; CPWL_SBButton* m_pPosButton; PWL_SCROLL_PRIVATEDATA m_sData; - FX_BOOL m_bMouseDown; + FX_BOOL m_bMouseDown; FX_BOOL m_bMinOrMax; FX_BOOL m_bNotifyForever; FX_FLOAT m_nOldPos; diff --git a/fpdfsdk/include/pdfwindow/PWL_Signature.h b/fpdfsdk/include/pdfwindow/PWL_Signature.h index be5ec58d1f..c94527772e 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Signature.h +++ b/fpdfsdk/include/pdfwindow/PWL_Signature.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_SIGNATURE_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h index 9b4ffd2341..f6659dfb00 100644 --- a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h +++ b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.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_SPECIALBUTTON_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h index 9f121e80a8..2da0f42180 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Utils.h +++ b/fpdfsdk/include/pdfwindow/PWL_Utils.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_UTILS_H_ @@ -21,7 +21,7 @@ template T PWL_MAX (const T & i, const T & j) { return ((i > j) ? i : j #define PWL_PDF2WIN(color) (uint8_t(color*255)) #define PWL_WIN2PDF(color) ((FX_FLOAT)((FX_FLOAT)color/255.0f)) -#define PWL_MAKEDWORD(low,high) ((FX_DWORD)((FX_WORD)(low) | (FX_DWORD)(((FX_WORD)(high))<<16))) +#define PWL_MAKEDWORD(low,high) ((FX_DWORD)((FX_WORD)(low) | (FX_DWORD)(((FX_WORD)(high))<<16))) #define PWL_GETLOWWORD(dword) ((FX_WORD)(dword)) #define PWL_GETHIGHWORD(dword) ((FX_WORD)(dword>>16)) @@ -137,7 +137,7 @@ public: IFX_Edit_FontMap * pFontMap, CPDF_Stream * pIconStream, CPDF_IconFit & IconFit, - const CFX_WideString & sLabel, + const CFX_WideString & sLabel, const CPWL_Color & crText, FX_FLOAT fFontSize, int32_t nLayOut); @@ -148,7 +148,7 @@ public: int32_t nStyle, const CPWL_Color & crText); - static CFX_ByteString GetEditAppStream(IFX_Edit* pEdit, const CPDF_Point & ptOffset, const CPVT_WordRange * pRange = NULL, + static CFX_ByteString GetEditAppStream(IFX_Edit* pEdit, const CPDF_Point & ptOffset, const CPVT_WordRange * pRange = NULL, FX_BOOL bContinuous = TRUE, FX_WORD SubWord = 0); static CFX_ByteString GetEditSelAppStream(IFX_Edit* pEdit, const CPDF_Point & ptOffset, const CPVT_WordRange * pRange = NULL); @@ -177,13 +177,13 @@ public: static void DrawShadow(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device, FX_BOOL bVertical, FX_BOOL bHorizontal, CPDF_Rect rect, int32_t nTransparancy, int32_t nStartGray, int32_t nEndGray); - static void DrawEditSpellCheck(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device, IFX_Edit* pEdit, - const CPDF_Rect& rcClip, const CPDF_Point& ptOffset, const CPVT_WordRange* pRange, + static void DrawEditSpellCheck(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device, IFX_Edit* pEdit, + const CPDF_Rect& rcClip, const CPDF_Point& ptOffset, const CPVT_WordRange* pRange, IPWL_SpellCheck* pSpellCheck); public: static void ConvertCMYK2RGB(FX_FLOAT dC,FX_FLOAT dM,FX_FLOAT dY,FX_FLOAT dK,FX_FLOAT &dR,FX_FLOAT &dG,FX_FLOAT &dB); static void ConvertRGB2CMYK(FX_FLOAT dR,FX_FLOAT dG,FX_FLOAT dB,FX_FLOAT &dC,FX_FLOAT &dM,FX_FLOAT &dY,FX_FLOAT &dK); - + static void ConvertRGB2GRAY(FX_FLOAT dR,FX_FLOAT dG,FX_FLOAT dB,FX_FLOAT &dGray); static void ConvertGRAY2RGB(FX_FLOAT dGray,FX_FLOAT &dR,FX_FLOAT &dG,FX_FLOAT &dB); @@ -193,10 +193,10 @@ public: static void PWLColorToARGB(const CPWL_Color& color, int32_t& alpha, FX_FLOAT& red, FX_FLOAT& green, FX_FLOAT& blue); public: - static CFX_ByteString GetIconAppStream(int32_t nType, const CPDF_Rect& rect, const CPWL_Color& crFill, + static CFX_ByteString GetIconAppStream(int32_t nType, const CPDF_Rect& rect, const CPWL_Color& crFill, const CPWL_Color& crStroke = PWL_DEFAULT_BLACKCOLOR); static void DrawIconAppStream(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device, - int32_t nType, const CPDF_Rect & rect, const CPWL_Color& crFill, + int32_t nType, const CPDF_Rect & rect, const CPWL_Color& crFill, const CPWL_Color& crStroke, const int32_t nTransparancy); private: diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h index e74dc88c5c..3ef4e67620 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h +++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.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_WND_H_ @@ -24,7 +24,7 @@ class IPWL_SpellCheck; #ifdef FX_READER_DLL #ifdef PWL_EXPORT #define PWL_CLASS __declspec(dllexport) - #define PWL_FUNCTION PWL_CLASS + #define PWL_FUNCTION PWL_CLASS #else #define PWL_CLASS #define PWL_FUNCTION @@ -124,7 +124,7 @@ struct PWL_CLASS CPWL_Color CPWL_Color(int32_t r, int32_t g, int32_t b) : nColorType(COLORTYPE_RGB), fColor1(r/255.0f), fColor2(g/255.0f), fColor3(b/255.0f), fColor4(0) {} - + void ConvertColorType(int32_t other_nColorType); /* @@ -133,13 +133,13 @@ struct PWL_CLASS CPWL_Color COLORTYPE_CMYK COLORTYPE_GRAY */ - int32_t nColorType; + int32_t nColorType; FX_FLOAT fColor1,fColor2,fColor3,fColor4; }; inline FX_BOOL operator == (const CPWL_Color &c1, const CPWL_Color &c2) { - return c1.nColorType == c2.nColorType && + return c1.nColorType == c2.nColorType && c1.fColor1 - c2.fColor1 < 0.0001 && c1.fColor1 - c2.fColor1 > -0.0001 && c1.fColor2 - c2.fColor2 < 0.0001 && c1.fColor2 - c2.fColor2 > -0.0001 && c1.fColor3 - c2.fColor3 < 0.0001 && c1.fColor3 - c2.fColor3 > -0.0001 && @@ -174,7 +174,7 @@ class IPWL_SpellCheck public: virtual ~IPWL_SpellCheck() { } virtual FX_BOOL CheckWord(const FX_CHAR* sWord) = 0; - virtual void SuggestWords(const FX_CHAR* sWord, CFX_ByteStringArray & sSuggest) = 0; + virtual void SuggestWords(const FX_CHAR* sWord, CFX_ByteStringArray & sSuggest) = 0; }; class IPWL_Provider @@ -224,7 +224,7 @@ public: sTextStrokeColor(), nTransparency(255), fFontSize(PWL_DEFAULT_FONTSIZE), - sDash(3,0,0), + sDash(3,0,0), pAttachedData(NULL), pParentWnd(NULL), pMsgControl(NULL), @@ -233,7 +233,7 @@ public: { } - CPDF_Rect rcRectWnd; //required + CPDF_Rect rcRectWnd; //required IFX_SystemHandler* pSystemHandler; //required IFX_Edit_FontMap* pFontMap; //required for text window IPWL_Provider* pProvider; //required for self coordinate @@ -268,7 +268,7 @@ public: static void TimerProc(int32_t idEvent); private: - int32_t m_nTimerID; + int32_t m_nTimerID; CPWL_TimerHandler* m_pAttached; IFX_SystemHandler* m_pSystemHandler; }; @@ -296,7 +296,7 @@ public: virtual ~CPWL_Wnd(); void Create(const PWL_CREATEPARAM & cp); - virtual CFX_ByteString GetClassName() const; + virtual CFX_ByteString GetClassName() const; void Destroy(); void Move(const CPDF_Rect & rcNew,FX_BOOL bReset,FX_BOOL bRefresh); virtual void InvalidateRect(CPDF_Rect* pRect = NULL); @@ -341,13 +341,13 @@ public: virtual FX_BOOL IsModified() const {return FALSE;} - virtual void SetFontSize(FX_FLOAT fFontSize); + virtual void SetFontSize(FX_FLOAT fFontSize); - void SetBackgroundColor(const CPWL_Color & color); + void SetBackgroundColor(const CPWL_Color & color); void SetBorderColor(const CPWL_Color & color); void SetBorderWidth(int32_t nBorderWidth); void SetClipRect(const CPDF_Rect & rect); - void SetBorderStyle(int32_t eBorderStyle); + void SetBorderStyle(int32_t eBorderStyle); void SetBorderDash(const CPWL_Dash & sDash); CPDF_Rect GetOriginWindowRect() const; @@ -355,18 +355,18 @@ public: virtual CPDF_Rect GetClientRect() const; CPDF_Point GetCenterPoint() const; CPDF_Rect GetClientCenterSquare() const; - CPDF_Rect GetWindowCenterSquare() const; - int32_t GetBorderWidth() const; - FX_BOOL IsVisible() const {return m_bVisible;} + CPDF_Rect GetWindowCenterSquare() const; + int32_t GetBorderWidth() const; + FX_BOOL IsVisible() const {return m_bVisible;} FX_BOOL HasFlag(FX_DWORD dwFlags) const; void AddFlag(FX_DWORD dwFlags); void RemoveFlag(FX_DWORD dwFlags); - CPDF_Rect GetClipRect() const; - CPWL_Wnd* GetParentWindow() const; - int32_t GetBorderStyle() const; + CPDF_Rect GetClipRect() const; + CPWL_Wnd* GetParentWindow() const; + int32_t GetBorderStyle() const; CPWL_Dash GetBorderDash() const; void* GetAttachedData() const; - + FX_BOOL WndHitTest(const CPDF_Point & point) const; FX_BOOL ClientHitTest(const CPDF_Point & point) const; FX_BOOL IsCaptureMouse() const; @@ -380,7 +380,7 @@ public: IPWL_Provider* GetProvider() const; virtual IFX_SystemHandler* GetSystemHandler() const; IPWL_FocusHandler* GetFocusHandler() const; - + int32_t GetTransparency(); void SetTransparency(int32_t nTransparency); @@ -395,15 +395,15 @@ public: virtual CPDF_Rect ParentToChild(const CPDF_Rect& rect) const; //those methods only implemented by listctrl item - virtual FX_FLOAT GetItemHeight(FX_FLOAT fLimitWidth) {return 0;} - virtual FX_FLOAT GetItemLeftMargin() {return 0;} - virtual FX_FLOAT GetItemRightMargin() {return 0;} + virtual FX_FLOAT GetItemHeight(FX_FLOAT fLimitWidth) {return 0;} + virtual FX_FLOAT GetItemLeftMargin() {return 0;} + virtual FX_FLOAT GetItemRightMargin() {return 0;} void EnableWindow(FX_BOOL bEnable); FX_BOOL IsEnabled(); virtual void SetCursor(); -protected: +protected: virtual void CreateChildWnd(const PWL_CREATEPARAM & cp); virtual void RePosChildWnd(); void GetAppearanceStream(CFX_ByteTextBuf & sAppStream); @@ -424,20 +424,20 @@ protected: virtual void OnDisabled(); void SetNotifyFlag(FX_BOOL bNotifying = TRUE){m_bNotifying = bNotifying;}; - + FX_BOOL IsValid() const; - PWL_CREATEPARAM GetCreationParam() const; - FX_BOOL IsNotifying() const {return m_bNotifying;} - + PWL_CREATEPARAM GetCreationParam() const; + FX_BOOL IsNotifying() const {return m_bNotifying;} + void InvalidateRectMove(const CPDF_Rect & rcOld, const CPDF_Rect & rcNew); void PWLtoWnd(const CPDF_Point & point, int32_t& x, int32_t& y) const; - FX_RECT PWLtoWnd(const CPDF_Rect & rect) const; + FX_RECT PWLtoWnd(const CPDF_Rect & rect) const; FX_HWND GetAttachedHWnd() const; - + FX_BOOL IsWndCaptureMouse(const CPWL_Wnd * pWnd) const; - FX_BOOL IsWndCaptureKeyboard(const CPWL_Wnd * pWnd) const; - const CPWL_Wnd* GetRootWnd() const; + FX_BOOL IsWndCaptureKeyboard(const CPWL_Wnd * pWnd) const; + const CPWL_Wnd* GetRootWnd() const; FX_BOOL IsCTRLpressed(FX_DWORD nFlag) const; FX_BOOL IsSHIFTpressed(FX_DWORD nFlag) const; @@ -449,28 +449,28 @@ private: void RemoveChild(CPWL_Wnd * pWnd); void CreateScrollBar(const PWL_CREATEPARAM & cp); - void CreateVScrollBar(const PWL_CREATEPARAM & cp); + void CreateVScrollBar(const PWL_CREATEPARAM & cp); - void AjustStyle(); + void AjustStyle(); void CreateMsgControl(); void DestroyMsgControl(); - - CPWL_MsgControl* GetMsgControl() const; - + + CPWL_MsgControl* GetMsgControl() const; + protected: CFX_ArrayTemplate m_aChildren; private: PWL_CREATEPARAM m_sPrivateParam; - + CPWL_ScrollBar* m_pVScrollBar; CPDF_Rect m_rcWindow; CPDF_Rect m_rcClip; - FX_BOOL m_bCreated; + FX_BOOL m_bCreated; FX_BOOL m_bVisible; - FX_BOOL m_bNotifying; + FX_BOOL m_bNotifying; FX_BOOL m_bEnabled; }; -- cgit v1.2.3