diff options
Diffstat (limited to 'fpdfsdk/include')
21 files changed, 64 insertions, 64 deletions
diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h index eb82bda2f4..e65e5fc9ee 100644 --- a/fpdfsdk/include/formfiller/FFL_FormFiller.h +++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h @@ -26,12 +26,12 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { virtual void OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, FX_DWORD dwFlags); virtual void OnDrawDeactive(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, FX_DWORD dwFlags); virtual void OnCreate(CPDFSDK_Annot* pAnnot); @@ -84,7 +84,7 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { IFX_SystemHandler* GetSystemHandler() const override; // IPWL_Provider - CPDF_Matrix GetWindowMatrix(void* pAttachedData) override; + CFX_Matrix GetWindowMatrix(void* pAttachedData) override; CFX_WideString LoadPopupMenuString(int nIndex) override; virtual void GetActionData(CPDFSDK_PageView* pPageView, @@ -103,7 +103,7 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { virtual CPWL_Wnd* ResetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bRestoreValue); - CPDF_Matrix GetCurMatrix(); + CFX_Matrix GetCurMatrix(); CPDF_Rect FFLtoPWL(const CPDF_Rect& rect); CPDF_Rect PWLtoFFL(const CPDF_Rect& rect); @@ -178,12 +178,12 @@ class CFFL_Button : public CFFL_FormFiller { void OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, FX_DWORD dwFlags) override; void OnDrawDeactive(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, FX_DWORD dwFlags) override; protected: diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h index 3eb4a4689a..9051a72e53 100644 --- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h +++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h @@ -27,7 +27,7 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { virtual void OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, FX_DWORD dwFlags); virtual void OnCreate(CPDFSDK_Annot* pAnnot); diff --git a/fpdfsdk/include/formfiller/FFL_PushButton.h b/fpdfsdk/include/formfiller/FFL_PushButton.h index 1bab968c88..13d60855b9 100644 --- a/fpdfsdk/include/formfiller/FFL_PushButton.h +++ b/fpdfsdk/include/formfiller/FFL_PushButton.h @@ -21,7 +21,7 @@ class CFFL_PushButton : public CFFL_Button { void OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, FX_DWORD dwFlags) override; }; diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h index 53efa63fc5..c5a48ab529 100644 --- a/fpdfsdk/include/fsdk_annothandler.h +++ b/fpdfsdk/include/fsdk_annothandler.h @@ -18,7 +18,7 @@ class CPDFDoc_Environment; class CPDFSDK_Annot; class CPDFSDK_PageView; class CPDF_Annot; -class CPDF_Matrix; +class CFX_Matrix; class CPDF_Point; class CPDF_Rect; @@ -49,13 +49,13 @@ class IPDFSDK_AnnotHandler { virtual void OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, FX_DWORD dwFlags) = 0; virtual void OnDrawSleep(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CPDF_Rect& rcWindow, FX_DWORD dwFlags) = 0; @@ -142,12 +142,12 @@ class CPDFSDK_BFAnnotHandler : public IPDFSDK_AnnotHandler { void OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, FX_DWORD dwFlags) override; void OnDrawSleep(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CPDF_Rect& rcWindow, FX_DWORD dwFlags) override {} void OnCreate(CPDFSDK_Annot* pAnnot) override; @@ -236,7 +236,7 @@ class CPDFSDK_AnnotHandlerMgr { virtual void Annot_OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, FX_DWORD dwFlags); virtual void Annot_OnMouseEnter(CPDFSDK_PageView* pPageView, diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h index f747f8576b..a3bd8341c2 100644 --- a/fpdfsdk/include/fsdk_baseannot.h +++ b/fpdfsdk/include/fsdk_baseannot.h @@ -22,7 +22,7 @@ class CPDFSDK_PageView; class CPDF_Annot; class CPDF_Page; class CPDF_Rect; -class CPDF_Matrix; +class CFX_Matrix; class CPDF_RenderOptions; class CFX_RenderDevice; @@ -86,7 +86,7 @@ class CPDFSDK_Annot { virtual CPDF_Rect GetRect() const { return CPDF_Rect(); } virtual void Annot_OnDraw(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, CPDF_RenderOptions* pOptions) {} UnderlyingPageType* GetUnderlyingPage(); @@ -120,7 +120,7 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot { CPDF_Rect GetRect() const override; CPDF_Annot* GetPDFAnnot() const override; void Annot_OnDraw(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, CPDF_RenderOptions* pOptions) override; CPDF_Dictionary* GetAnnotDict() const; @@ -183,18 +183,18 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot { virtual FX_BOOL IsAppearanceValid(); virtual FX_BOOL IsAppearanceValid(CPDF_Annot::AppearanceMode mode); virtual void DrawAppearance(CFX_RenderDevice* pDevice, - const CPDF_Matrix* pUser2Device, + const CFX_Matrix* pUser2Device, CPDF_Annot::AppearanceMode mode, const CPDF_RenderOptions* pOptions); void DrawBorder(CFX_RenderDevice* pDevice, - const CPDF_Matrix* pUser2Device, + const CFX_Matrix* pUser2Device, const CPDF_RenderOptions* pOptions); void ClearCachedAP(); void WriteAppearance(const CFX_ByteString& sAPType, const CPDF_Rect& rcBBox, - const CPDF_Matrix& matrix, + const CFX_Matrix& matrix, const CFX_ByteString& sContents, const CFX_ByteString& sAPState = ""); diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index b908efa488..20cb7ce652 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -148,7 +148,7 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot { CFX_ByteString GetBackgroundAppStream() const; CFX_ByteString GetBorderAppStream() const; - CPDF_Matrix GetMatrix() const; + CFX_Matrix GetMatrix() const; CPWL_Color GetTextPWLColor() const; CPWL_Color GetBorderPWLColor() const; @@ -160,7 +160,7 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot { public: FX_BOOL IsWidgetAppearanceValid(CPDF_Annot::AppearanceMode mode); void DrawAppearance(CFX_RenderDevice* pDevice, - const CPDF_Matrix* pUser2Device, + const CFX_Matrix* pUser2Device, CPDF_Annot::AppearanceMode mode, const CPDF_RenderOptions* pOptions) override; diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index a4385be318..409b49f6a9 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -295,7 +295,7 @@ class CPDFSDK_PageView final { CPDFSDK_PageView(CPDFSDK_Document* pSDKDoc, UnderlyingPageType* page); ~CPDFSDK_PageView(); void PageView_OnDraw(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, CPDF_RenderOptions* pOptions); const CPDF_Annot* GetPDFAnnotAtPoint(FX_FLOAT pageX, FX_FLOAT pageY); CPDFSDK_Annot* GetFXAnnotAtPoint(FX_FLOAT pageX, FX_FLOAT pageY); @@ -333,7 +333,7 @@ class CPDFSDK_PageView final { const CPDF_Point& point, int nFlag); bool IsValidAnnot(const CPDF_Annot* p) const; - void GetCurrentMatrix(CPDF_Matrix& matrix) { matrix = m_curMatrix; } + void GetCurrentMatrix(CFX_Matrix& matrix) { matrix = m_curMatrix; } void UpdateRects(CFX_RectArray& rects); void UpdateView(CPDFSDK_Annot* pAnnot); const std::vector<CPDFSDK_Annot*>& GetAnnotList() const { @@ -352,7 +352,7 @@ class CPDFSDK_PageView final { void PageView_OnHighlightFormFields(CFX_RenderDevice* pDevice, CPDFSDK_Widget* pWidget); - CPDF_Matrix m_curMatrix; + CFX_Matrix m_curMatrix; UnderlyingPageType* m_page; nonstd::unique_ptr<CPDF_AnnotList> m_pAnnotList; std::vector<CPDFSDK_Annot*> m_fxAnnotArray; diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h index d4788cdfb4..a8f5bba870 100644 --- a/fpdfsdk/include/fxedit/fx_edit.h +++ b/fpdfsdk/include/fxedit/fx_edit.h @@ -13,7 +13,7 @@ class CFX_RenderDevice; class CPDF_Font; -class CPDF_Matrix; +class CFX_Matrix; class CPDF_PageObjects; class CPDF_Point; class CPDF_TextObject; @@ -435,7 +435,7 @@ class IFX_Edit { const CPDF_Point& ptOffset, const CPVT_WordRange* pRange = NULL); static void DrawEdit(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, IFX_Edit* pEdit, FX_COLORREF crTextFill, FX_COLORREF crTextStroke, @@ -445,14 +445,14 @@ class IFX_Edit { IFX_SystemHandler* pSystemHandler, void* pFFLData); static void DrawUnderline(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, IFX_Edit* pEdit, FX_COLORREF color, const CPDF_Rect& rcClip, const CPDF_Point& ptOffset, const CPVT_WordRange* pRange); static void DrawRichEdit(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, IFX_Edit* pEdit, const CPDF_Rect& rcClip, const CPDF_Point& ptOffset, diff --git a/fpdfsdk/include/pdfwindow/PWL_Caret.h b/fpdfsdk/include/pdfwindow/PWL_Caret.h index 0fe4e89c2e..c2a2caf979 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Caret.h +++ b/fpdfsdk/include/pdfwindow/PWL_Caret.h @@ -27,7 +27,7 @@ class CPWL_Caret : public CPWL_Wnd { CFX_ByteString GetClassName() const override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; void InvalidateRect(CPDF_Rect* pRect = NULL) override; void SetVisible(FX_BOOL bVisible) override {} void TimerProc() override; diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h index 9edb02c964..9860483aca 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h +++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h @@ -39,7 +39,7 @@ class CPWL_CBButton : public CPWL_Wnd { // CPWL_Wnd void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override; FX_BOOL OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override; }; diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h index 829fc2dcda..09ab2ef187 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Edit.h +++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h @@ -48,7 +48,7 @@ class CPWL_Edit : public CPWL_EditCtrl, public IFX_Edit_OprNotify { CPDF_Rect GetClientRect() const override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override; FX_BOOL OnLButtonDblClk(const CPDF_Point& point, FX_DWORD nFlag) override; FX_BOOL OnRButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override; diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h index 8c60c7be52..0d2596f83b 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Icon.h +++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h @@ -24,7 +24,7 @@ class CPWL_Image : public CPWL_Wnd { public: void SetPDFStream(CPDF_Stream* pStream); void GetImageSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight); - CPDF_Matrix GetImageMatrix(); + CFX_Matrix GetImageMatrix(); CFX_ByteString GetImageAlias(); void SetImageAlias(const FX_CHAR* sImageAlias); diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/include/pdfwindow/PWL_IconList.h index c25f3b1994..0a21bbe8b9 100644 --- a/fpdfsdk/include/pdfwindow/PWL_IconList.h +++ b/fpdfsdk/include/pdfwindow/PWL_IconList.h @@ -43,7 +43,7 @@ class CPWL_IconList_Item : public CPWL_Wnd { void RePosChildWnd() override; FX_FLOAT GetItemHeight(FX_FLOAT fLimitWidth) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; void OnEnabled() override; void OnDisabled() override; diff --git a/fpdfsdk/include/pdfwindow/PWL_Label.h b/fpdfsdk/include/pdfwindow/PWL_Label.h index 0504bb3e0b..aba84fbf79 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Label.h +++ b/fpdfsdk/include/pdfwindow/PWL_Label.h @@ -32,7 +32,7 @@ class CPWL_Label : public CPWL_Wnd { FX_FLOAT GetFontSize() const override; void OnCreated() override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void RePosChildWnd() override; diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h index 9d5827cd26..807f11ef30 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h +++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h @@ -59,7 +59,7 @@ class CPWL_ListBox : public CPWL_Wnd { void OnDestroy() override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; FX_BOOL OnKeyDown(FX_WORD nChar, FX_DWORD nFlag) override; FX_BOOL OnChar(FX_WORD nChar, FX_DWORD nFlag) override; FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override; diff --git a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h index dbaffc5b58..4c96d436c8 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h +++ b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h @@ -33,7 +33,7 @@ class CPWL_ListCtrl : public CPWL_Wnd { // CPWL_Wnd void RePosChildWnd() override; void DrawChildAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; private: void ResetAll(FX_BOOL bMove, int32_t nStart); diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/include/pdfwindow/PWL_Note.h index b25d989ec7..0edb1e3437 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Note.h +++ b/fpdfsdk/include/pdfwindow/PWL_Note.h @@ -89,7 +89,7 @@ class CPWL_Note_Icon : public CPWL_Wnd { protected: // CPWL_Wnd void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; private: int32_t m_nType; @@ -103,7 +103,7 @@ class CPWL_Note_CloseBox : public CPWL_Button { protected: // CPWL_Button void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override; FX_BOOL OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override; @@ -119,7 +119,7 @@ class CPWL_Note_LBBox : public CPWL_Wnd { protected: // CPWL_Wnd void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; }; class CPWL_Note_RBBox : public CPWL_Wnd { @@ -130,7 +130,7 @@ class CPWL_Note_RBBox : public CPWL_Wnd { protected: // CPWL_Wnd void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; }; class CPWL_Note_Edit : public CPWL_Edit { @@ -173,7 +173,7 @@ class CPWL_Note_Options : public CPWL_Wnd { void RePosChildWnd() override; void CreateChildWnd(const PWL_CREATEPARAM& cp) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; void SetTextColor(const CPWL_Color& color) override; private: diff --git a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h index b91d467daa..891079e39e 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h +++ b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h @@ -42,7 +42,7 @@ class CPWL_SBButton : public CPWL_Wnd { void OnCreate(PWL_CREATEPARAM& cp) override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override; FX_BOOL OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override; FX_BOOL OnMouseMove(const CPDF_Point& point, FX_DWORD nFlag) override; @@ -100,7 +100,7 @@ class CPWL_ScrollBar : public CPWL_Wnd { void RePosChildWnd() override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override; FX_BOOL OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override; void OnNotify(CPWL_Wnd* pWnd, diff --git a/fpdfsdk/include/pdfwindow/PWL_Signature.h b/fpdfsdk/include/pdfwindow/PWL_Signature.h index 009dd87592..0dbd906f20 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Signature.h +++ b/fpdfsdk/include/pdfwindow/PWL_Signature.h @@ -24,7 +24,7 @@ class CPWL_Signature_Image : public CPWL_Image { protected: // CPWL_Image void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void GetScale(FX_FLOAT& fHScale, FX_FLOAT& fVScale) override; @@ -51,7 +51,7 @@ class CPWL_Signature : public CPWL_Wnd { void RePosChildWnd() override; void CreateChildWnd(const PWL_CREATEPARAM& cp) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; private: diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h index 9658341162..56f7a27350 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Utils.h +++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h @@ -193,27 +193,27 @@ class CPWL_Utils { static CFX_ByteString GetDropButtonAppStream(const CPDF_Rect& rcBBox); static void DrawFillRect(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CPDF_Rect& rect, const CPWL_Color& color, int32_t nTransparancy); static void DrawFillRect(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CPDF_Rect& rect, const FX_COLORREF& color); static void DrawStrokeRect(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CPDF_Rect& rect, const FX_COLORREF& color, FX_FLOAT fWidth); static void DrawStrokeLine(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CPDF_Point& ptMoveTo, const CPDF_Point& ptLineTo, const FX_COLORREF& color, FX_FLOAT fWidth); static void DrawBorder(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CPDF_Rect& rect, FX_FLOAT fWidth, const CPWL_Color& color, @@ -223,12 +223,12 @@ class CPWL_Utils { const CPWL_Dash& dash, int32_t nTransparancy); static void DrawFillArea(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CPDF_Point* pPts, int32_t nCount, const FX_COLORREF& color); static void DrawShadow(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, FX_BOOL bVertical, FX_BOOL bHorizontal, CPDF_Rect rect, @@ -236,7 +236,7 @@ class CPWL_Utils { int32_t nStartGray, int32_t nEndGray); static void DrawEditSpellCheck(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, IFX_Edit* pEdit, const CPDF_Rect& rcClip, const CPDF_Point& ptOffset, @@ -292,7 +292,7 @@ class CPWL_Utils { const CPWL_Color& crFill, const CPWL_Color& crStroke = PWL_DEFAULT_BLACKCOLOR); static void DrawIconAppStream(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, int32_t nType, const CPDF_Rect& rect, const CPWL_Color& crFill, diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h index 37ddefbbce..91baafa03d 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h +++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h @@ -179,7 +179,7 @@ class IPWL_Provider { virtual ~IPWL_Provider() {} // get a matrix which map user space to CWnd client space - virtual CPDF_Matrix GetWindowMatrix(void* pAttachedData) = 0; + virtual CFX_Matrix GetWindowMatrix(void* pAttachedData) = 0; /* 0 L"&Undo\tCtrl+Z" @@ -247,7 +247,7 @@ struct PWL_CREATEPARAM { CPWL_Wnd* pParentWnd; // ignore CPWL_MsgControl* pMsgControl; // ignore int32_t eCursorType; // ignore - CPDF_Matrix mtChild; // ignore + CFX_Matrix mtChild; // ignore }; class CPWL_Timer { @@ -293,7 +293,7 @@ class CPWL_Wnd : public CPWL_TimerHandler { virtual void InvalidateRect(CPDF_Rect* pRect = NULL); void GetAppearanceStream(CFX_ByteString& sAppStream); - void DrawAppearance(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device); + void DrawAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device); virtual FX_BOOL OnKeyDown(FX_WORD nChar, FX_DWORD nFlag); virtual FX_BOOL OnKeyUp(FX_WORD nChar, FX_DWORD nFlag); @@ -378,10 +378,10 @@ class CPWL_Wnd : public CPWL_TimerHandler { int32_t GetTransparency(); void SetTransparency(int32_t nTransparency); - CPDF_Matrix GetChildToRoot() const; - CPDF_Matrix GetChildMatrix() const; - void SetChildMatrix(const CPDF_Matrix& mt); - CPDF_Matrix GetWindowMatrix() const; + CFX_Matrix GetChildToRoot() const; + CFX_Matrix GetChildMatrix() const; + void SetChildMatrix(const CFX_Matrix& mt); + CFX_Matrix GetWindowMatrix() const; virtual CPDF_Point ChildToParent(const CPDF_Point& point) const; virtual CPDF_Rect ChildToParent(const CPDF_Rect& rect) const; @@ -408,9 +408,9 @@ class CPWL_Wnd : public CPWL_TimerHandler { virtual void GetChildAppearanceStream(CFX_ByteTextBuf& sAppStream); virtual void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device); + CFX_Matrix* pUser2Device); virtual void DrawChildAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device); + CFX_Matrix* pUser2Device); virtual void OnCreate(PWL_CREATEPARAM& cp); virtual void OnCreated(); |