diff options
Diffstat (limited to 'fpdfsdk')
21 files changed, 138 insertions, 89 deletions
diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h index a8cd711e11..a842fd6284 100644 --- a/fpdfsdk/include/fxedit/fx_edit.h +++ b/fpdfsdk/include/fxedit/fx_edit.h @@ -7,6 +7,34 @@ #ifndef _FX_EDIT_H_ #define _FX_EDIT_H_ +#include "../../../core/include/fxcrt/fx_basic.h" +#include "../../../core/include/fxge/fx_dib.h" + +class CFX_RenderDevice; +class CPDF_Font; +class CPDF_Matrix; +class CPDF_PageObjects; +class CPDF_Point; +class CPDF_Rect; +class CPDF_TextObject; +class IFX_Edit; +class IFX_Edit_FontMap; +class IFX_Edit_Iterator; +class IFX_Edit_Notify; +class IFX_Edit_UndoItem; +class IFX_List; +class IFX_List_Notify; +class IFX_SystemHandler; +class IPDF_VariableText; +class IPDF_VariableText_Provider; +struct CPVT_Line; +struct CPVT_SecProps; +struct CPVT_Section; +struct CPVT_Word; +struct CPVT_WordPlace; +struct CPVT_WordProps; +struct CPVT_WordRange; + #define PVTWORD_STYLE_NORMAL 0x0000L #define PVTWORD_STYLE_HIGHLIGHT 0x0001L #define PVTWORD_STYLE_UNDERLINE 0x0002L @@ -32,15 +60,6 @@ #define DEFAULT_CHARSET 1 #endif -class IFX_Edit_FontMap; -class IFX_Edit_Notify; -class IFX_Edit_Iterator; -class IFX_Edit_UndoItem; -class IFX_Edit; -class IFX_List_Notify; -class IFX_List; -class IFX_SystemHandler; - class IFX_Edit_FontMap { public: diff --git a/fpdfsdk/include/fxedit/fxet_edit.h b/fpdfsdk/include/fxedit/fxet_edit.h index 4b627c99c8..8aa44a4bed 100644 --- a/fpdfsdk/include/fxedit/fxet_edit.h +++ b/fpdfsdk/include/fxedit/fxet_edit.h @@ -7,6 +7,7 @@ #ifndef _FXET_EDIT_H_ #define _FXET_EDIT_H_ +#include "../../../core/include/fpdfdoc/fpdf_vt.h" #include "fx_edit.h" class CFX_Edit_Page; diff --git a/fpdfsdk/include/fxedit/fxet_list.h b/fpdfsdk/include/fxedit/fxet_list.h index 5bf2069b42..6b634ffeec 100644 --- a/fpdfsdk/include/fxedit/fxet_list.h +++ b/fpdfsdk/include/fxedit/fxet_list.h @@ -7,6 +7,7 @@ #ifndef _FXET_LIST_H_ #define _FXET_LIST_H_ +#include "../../../core/include/fpdfapi/fpdf_parser.h" // For CPDF_Point. #include "fx_edit.h" class IFX_Edit; diff --git a/fpdfsdk/include/pdfwindow/IPDFWindow.h b/fpdfsdk/include/pdfwindow/IPDFWindow.h index 22f023d8c0..472737a2e3 100644 --- a/fpdfsdk/include/pdfwindow/IPDFWindow.h +++ b/fpdfsdk/include/pdfwindow/IPDFWindow.h @@ -7,22 +7,22 @@ #ifndef _IPDFWINDOW_H_ #define _IPDFWINDOW_H_ -#include "PWL_Wnd.h" -#include "PWL_EditCtrl.h" -#include "PWL_Edit.h" -#include "PWL_ListBox.h" -#include "PWL_ComboBox.h" #include "PWL_Button.h" -#include "PWL_SpecialButton.h" +#include "PWL_Caret.h" +#include "PWL_ComboBox.h" +#include "PWL_Edit.h" +#include "PWL_EditCtrl.h" +#include "PWL_FontMap.h" #include "PWL_Icon.h" +#include "PWL_IconList.h" #include "PWL_Label.h" +#include "PWL_ListBox.h" #include "PWL_ListCtrl.h" -#include "PWL_Caret.h" -#include "PWL_ScrollBar.h" #include "PWL_Note.h" -#include "PWL_IconList.h" -#include "PWL_FontMap.h" +#include "PWL_ScrollBar.h" #include "PWL_Signature.h" +#include "PWL_SpecialButton.h" #include "PWL_Utils.h" +#include "PWL_Wnd.h" #endif //_IPDFWINDOW_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_Button.h b/fpdfsdk/include/pdfwindow/PWL_Button.h index 8416c4de34..72adcf9546 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Button.h +++ b/fpdfsdk/include/pdfwindow/PWL_Button.h @@ -7,22 +7,21 @@ #ifndef _PWL_BUTTON_H_ #define _PWL_BUTTON_H_ -class PWL_CLASS CPWL_Button : public CPWL_Wnd +#include "PWL_Wnd.h" + +class PWL_CLASS CPWL_Button : public CPWL_Wnd { public: CPWL_Button(); virtual ~CPWL_Button(); -public: virtual CFX_ByteString GetClassName() const; virtual void OnCreate(PWL_CREATEPARAM & cp); - virtual FX_BOOL OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag); virtual FX_BOOL OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag); protected: - FX_BOOL m_bMouseDown; + FX_BOOL m_bMouseDown; }; -#endif // !defined(AFX_PWL_BUTTON_H__5A6080AA_33C5_4FC9_91FC_D9644C41120A__INCLUDED_) - +#endif diff --git a/fpdfsdk/include/pdfwindow/PWL_Caret.h b/fpdfsdk/include/pdfwindow/PWL_Caret.h index 600e5096a8..2dfef2ae92 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Caret.h +++ b/fpdfsdk/include/pdfwindow/PWL_Caret.h @@ -7,11 +7,13 @@ #ifndef _PWL_CARET_H_ #define _PWL_CARET_H_ +#include "PWL_Wnd.h" + struct PWL_CARET_INFO { public: PWL_CARET_INFO() : bVisible(FALSE), ptHead(0,0), ptFoot(0,0) - { + { } FX_BOOL bVisible; @@ -20,23 +22,21 @@ public: }; -class CPWL_Caret : public CPWL_Wnd +class CPWL_Caret : public CPWL_Wnd { public: CPWL_Caret(); virtual ~CPWL_Caret(); -public: + virtual CFX_ByteString GetClassName() const; virtual void GetThisAppearanceStream(CFX_ByteTextBuf & sAppStream); virtual void DrawThisAppearance(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device); 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); CFX_ByteString GetCaretAppearanceStream(const CPDF_Point & ptOffset); + void SetInvalidRect(CPDF_Rect rc) {m_rcInvalid = rc;} private: void GetCaretApp(CFX_ByteTextBuf & sAppStream,const CPDF_Point & ptOffset); @@ -46,13 +46,9 @@ private: CPDF_Point m_ptHead; CPDF_Point m_ptFoot; FX_FLOAT m_fWidth; - FX_INT32 m_nDelay; - -public: - void SetInvalidRect(CPDF_Rect rc) {m_rcInvalid = rc;} -private: + FX_INT32 m_nDelay; CPDF_Rect m_rcInvalid; }; -#endif // !defined(AFX_PWL_CARET_H__6A729612_4173_4B65_BCAB_7C6C850ECA47__INCLUDED_) +#endif diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h index 40523d70ed..0b86add467 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h +++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h @@ -7,6 +7,10 @@ #ifndef _PWL_COMBOBOX_H_ #define _PWL_COMBOBOX_H_ +#include "PWL_Edit.h" +#include "PWL_ListBox.h" +#include "PWL_Wnd.h" + class CPWL_CBEdit : public CPWL_Edit { public: diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h index 7a4caaa6ef..d00c311101 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Edit.h +++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h @@ -7,8 +7,12 @@ #ifndef _PWL_EDIT_H_ #define _PWL_EDIT_H_ -class IPWL_Filler_Notify; +#include "../../../core/include/fxcrt/fx_basic.h" +#include "PWL_EditCtrl.h" +#include "PWL_Wnd.h" + class CPWL_Edit; +class IPWL_Filler_Notify; class IPWL_SpellCheck; class IPWL_Filler_Notify diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h index c9d87b217c..e7336a19b1 100644 --- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h +++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h @@ -7,6 +7,17 @@ #ifndef _PWL_EDITCTRL_H_ #define _PWL_EDITCTRL_H_ +#include "../../../core/include/fxcrt/fx_string.h" +#include "../fxedit/fx_edit.h" +#include "PWL_Wnd.h" + +class CPVT_WordPlace; +class CPWL_Caret; +class CPWL_Edit; +class CPWL_EditCtrl; +class IFX_Edit; +class IPWL_Edit_Notify; + enum PWL_EDIT_ALIGNFORMAT_H { PEAH_LEFT = 0, @@ -16,17 +27,11 @@ enum PWL_EDIT_ALIGNFORMAT_H enum PWL_EDIT_ALIGNFORMAT_V { - PEAV_TOP = 0, + PEAV_TOP = 0, PEAV_CENTER, PEAV_BOTTOM }; -class IPWL_Edit_Notify; -class CPWL_EditCtrl; -class CPWL_Caret; -class IFX_Edit; -class CPWL_Edit; - class IPWL_Edit_Notify { public: diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/include/pdfwindow/PWL_FontMap.h index b3da533b3e..a7aac6d698 100644 --- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h +++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.h @@ -7,6 +7,11 @@ #ifndef _PWL_FONTMAP_H_ #define _PWL_FONTMAP_H_ +#include "../fxedit/fx_edit.h" + +class CPDF_Document; +class IFX_SystemHandler; + struct CPWL_FontMap_Data { CPDF_Font* pFont; @@ -53,7 +58,6 @@ struct CPWL_FontMap_Native #endif #endif -class IFX_SystemHandler; class PWL_CLASS CPWL_FontMap : public IFX_Edit_FontMap { public: diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h index 4a084fd541..08f3e4fd8b 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Icon.h +++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h @@ -7,6 +7,9 @@ #ifndef _PWL_ICON_H_ #define _PWL_ICON_H_ +#include "../../../core/include/fxcrt/fx_string.h" +#include "PWL_Wnd.h" + class PWL_CLASS CPWL_Image : public CPWL_Wnd { public: diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/include/pdfwindow/PWL_IconList.h index 6b3d577504..b85ba4955e 100644 --- a/fpdfsdk/include/pdfwindow/PWL_IconList.h +++ b/fpdfsdk/include/pdfwindow/PWL_IconList.h @@ -7,6 +7,10 @@ #ifndef _PWL_IconList_H_ #define _PWL_IconList_H_ +#include "../../../core/include/fxcrt/fx_string.h" +#include "PWL_ListCtrl.h" +#include "PWL_Wnd.h" + class IPWL_IconList_Notify; class CPWL_IconList_Item; class CPWL_IconList_Content; diff --git a/fpdfsdk/include/pdfwindow/PWL_Label.h b/fpdfsdk/include/pdfwindow/PWL_Label.h index 29ea51325a..811a3dae07 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Label.h +++ b/fpdfsdk/include/pdfwindow/PWL_Label.h @@ -7,6 +7,8 @@ #ifndef _PWL_LABEL_H_ #define _PWL_LABEL_H_ +#include "PWL_Wnd.h" + class IFX_Edit; class PWL_CLASS CPWL_Label : public CPWL_Wnd @@ -15,34 +17,28 @@ public: CPWL_Label(); virtual ~CPWL_Label(); -public: - virtual CFX_ByteString GetClassName() const; + virtual CFX_ByteString GetClassName() const; virtual void SetFontSize(FX_FLOAT fFontSize); virtual FX_FLOAT GetFontSize() const; -public: void SetText(FX_LPCWSTR csText); CFX_WideString GetText() const; - void SetLimitChar(FX_INT32 nLimitChar); void SetHorzScale(FX_INT32 nHorzScale); void SetCharSpace(FX_FLOAT fCharSpace); - - CPDF_Rect GetContentRect() const; + CPDF_Rect GetContentRect() const; FX_INT32 GetTotalWords(); - CFX_ByteString GetTextAppearanceStream(const CPDF_Point & ptOffset) const; protected: virtual void OnCreated(); virtual void DrawThisAppearance(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device); virtual void GetThisAppearanceStream(CFX_ByteTextBuf & sAppStream); - virtual void RePosChildWnd(); + virtual void RePosChildWnd(); private: void SetParamByFlag(); -private: IFX_Edit* m_pEdit; }; diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h index 7961579004..a31818f274 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h +++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h @@ -7,6 +7,9 @@ #ifndef _PWL_LISTBOX_H_ #define _PWL_LISTBOX_H_ +#include "../fxedit/fx_edit.h" +#include "PWL_Wnd.h" + class CPDF_ListCtrl; class CPWL_List_Notify; class CPWL_ListBox; diff --git a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h index 8997296f95..5a1f06045a 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h +++ b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h @@ -7,7 +7,7 @@ #ifndef _PWL_LISTCTRL_H_ #define _PWL_LISTCTRL_H_ -class CPWL_ListCtrl; +#include "PWL_Wnd.h" class CPWL_ListCtrl : public CPWL_Wnd { @@ -15,11 +15,9 @@ public: CPWL_ListCtrl(); virtual ~CPWL_ListCtrl(); -public: void SetScrollPos(const CPDF_Point& point); CPDF_Point GetScrollPos() const; CPDF_Rect GetScrollArea() const; - void SetItemSpace(FX_FLOAT fSpace); void SetTopSpace(FX_FLOAT fSpace); void SetBottomSpace(FX_FLOAT fSpace); @@ -27,21 +25,18 @@ public: void ResetContent(FX_INT32 nStart); FX_INT32 GetItemIndex(CPWL_Wnd* pItem); FX_FLOAT GetContentsHeight(FX_FLOAT fLimitWidth); - -protected: - virtual void RePosChildWnd(); - virtual void DrawChildAppearance(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device); - -public: CPDF_Point InToOut(const CPDF_Point& point) const; CPDF_Point OutToIn(const CPDF_Point& point) const; CPDF_Rect InToOut(const CPDF_Rect& rect) const; CPDF_Rect OutToIn(const CPDF_Rect& rect) const; +protected: + virtual void RePosChildWnd(); + virtual void DrawChildAppearance(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device); + private: void ResetAll(FX_BOOL bMove,FX_INT32 nStart); -private: CPDF_Rect m_rcContent; CPDF_Point m_ptScroll; FX_FLOAT m_fItemSpace; diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/include/pdfwindow/PWL_Note.h index 125271f48f..25290928db 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Note.h +++ b/fpdfsdk/include/pdfwindow/PWL_Note.h @@ -7,23 +7,27 @@ #ifndef _PWL_NOTE_H_ #define _PWL_NOTE_H_ -class IPWL_NoteNotify; -class IPWL_NoteHandler; -class IPWL_NoteItem; -class CPWL_NoteItem; -class CPWL_Note; +#include "PWL_Button.h" +#include "PWL_Edit.h" +#include "PWL_ListCtrl.h" +#include "PWL_ScrollBar.h" +#include "PWL_Wnd.h" + class CPWL_Label; -class CPWL_Edit; -class CPWL_Note_Icon; +class CPWL_Note; +class CPWL_NoteItem; class CPWL_Note_CloseBox; -class CPWL_Note_LBBox; -class CPWL_Note_RBBox; +class CPWL_Note_Contents; class CPWL_Note_Edit; +class CPWL_Note_Icon; +class CPWL_Note_LBBox; class CPWL_Note_Options; -class CPWL_Note_Contents; +class CPWL_Note_RBBox; +class IPWL_NoteHandler; +class IPWL_NoteItem; +class IPWL_NoteNotify; class IPopup_Note; - class IPWL_NoteNotify { public: diff --git a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h index d256542b0e..dc1f18fce9 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h +++ b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h @@ -7,6 +7,8 @@ #ifndef _PWL_SCROLLBAR_H_ #define _PWL_SCROLLBAR_H_ +#include "PWL_Wnd.h" + class CPWL_SBButton; class CPWL_ScrollBar; diff --git a/fpdfsdk/include/pdfwindow/PWL_Signature.h b/fpdfsdk/include/pdfwindow/PWL_Signature.h index ec4479bbd3..6860d814c0 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Signature.h +++ b/fpdfsdk/include/pdfwindow/PWL_Signature.h @@ -7,9 +7,11 @@ #ifndef _PWL_SIGNATURE_H_ #define _PWL_SIGNATURE_H_ -class CPWL_Signature; +#include "PWL_Icon.h" +#include "PWL_Wnd.h" + +class CFX_DIBSource; class CPWL_Label; -class CPWL_Signature_Image; class CPWL_Signature_Image : public CPWL_Image { diff --git a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h index 656bb2e582..2df3d5d369 100644 --- a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h +++ b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h @@ -7,17 +7,14 @@ #ifndef _PWL_SPECIALBUTTON_H_ #define _PWL_SPECIALBUTTON_H_ -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 +#include "PWL_Button.h" -class PWL_CLASS CPWL_PushButton : public CPWL_Button +class PWL_CLASS CPWL_PushButton : public CPWL_Button { public: CPWL_PushButton(); virtual ~CPWL_PushButton(); -public: virtual CFX_ByteString GetClassName() const; virtual CPDF_Rect GetFocusRect() const; }; @@ -28,7 +25,6 @@ public: CPWL_CheckBox(); virtual ~CPWL_CheckBox(); -public: virtual CFX_ByteString GetClassName() const; virtual FX_BOOL OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag); virtual FX_BOOL OnChar(FX_WORD nChar, FX_DWORD nFlag); @@ -46,7 +42,6 @@ public: CPWL_RadioButton(); virtual ~CPWL_RadioButton(); -public: virtual CFX_ByteString GetClassName() const; virtual FX_BOOL OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag); virtual FX_BOOL OnChar(FX_WORD nChar, FX_DWORD nFlag); diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h index 489eb4a747..7f6c4ad97f 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Utils.h +++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h @@ -7,6 +7,14 @@ #ifndef _PWL_UTILS_H_ #define _PWL_UTILS_H_ +#include "../../../core/include/fpdfapi/fpdf_parser.h" // For CPDF_Point. +#include "../../../core/include/fpdfdoc/fpdf_vt.h" // For CPVT_WordRange. +#include "../fxedit/fx_edit.h" +#include "PWL_Wnd.h" + +class CFX_PathData; +class CPWL_Color; + template<class T> T PWL_MIN (const T & i, const T & j) { return ((i < j) ? i : j); } template<class T> T PWL_MAX (const T & i, const T & j) { return ((i > j) ? i : j); } diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h index 51a3058993..8b766ec984 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h +++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h @@ -7,15 +7,19 @@ #ifndef _PWL_WND_H_ #define _PWL_WND_H_ -class IPWL_Provider; -class CPWL_Wnd; +#include "../../../core/include/fxcrt/fx_basic.h" +#include "../../../core/include/fpdfdoc/fpdf_doc.h" +#include "../fx_systemhandler.h" + class CPWL_MsgControl; -class CPWL_Wnd; class CPWL_ScrollBar; class CPWL_Timer; class CPWL_TimerHandler; -class IPWL_SpellCheck; +class CPWL_Wnd; +class IFX_Edit_FontMap; class IFX_SystemHandler; +class IPWL_Provider; +class IPWL_SpellCheck; #ifdef FX_READER_DLL #ifdef PWL_EXPORT |