summaryrefslogtreecommitdiff
path: root/xfa/fxfa/app
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fxfa/app')
-rw-r--r--xfa/fxfa/app/cxfa_ffarc.cpp2
-rw-r--r--xfa/fxfa/app/cxfa_ffarc.h2
-rw-r--r--xfa/fxfa/app/cxfa_ffbarcode.cpp2
-rw-r--r--xfa/fxfa/app/cxfa_ffbarcode.h2
-rw-r--r--xfa/fxfa/app/cxfa_ffcheckbutton.cpp4
-rw-r--r--xfa/fxfa/app/cxfa_ffcheckbutton.h4
-rw-r--r--xfa/fxfa/app/cxfa_ffcombobox.cpp2
-rw-r--r--xfa/fxfa/app/cxfa_ffcombobox.h2
-rw-r--r--xfa/fxfa/app/cxfa_ffexclgroup.cpp2
-rw-r--r--xfa/fxfa/app/cxfa_ffexclgroup.h2
-rw-r--r--xfa/fxfa/app/cxfa_fffield.cpp16
-rw-r--r--xfa/fxfa/app/cxfa_fffield.h10
-rw-r--r--xfa/fxfa/app/cxfa_ffimage.cpp2
-rw-r--r--xfa/fxfa/app/cxfa_ffimage.h2
-rw-r--r--xfa/fxfa/app/cxfa_ffimageedit.cpp4
-rw-r--r--xfa/fxfa/app/cxfa_ffimageedit.h4
-rw-r--r--xfa/fxfa/app/cxfa_ffline.cpp8
-rw-r--r--xfa/fxfa/app/cxfa_ffline.h2
-rw-r--r--xfa/fxfa/app/cxfa_fflistbox.cpp2
-rw-r--r--xfa/fxfa/app/cxfa_fflistbox.h2
-rw-r--r--xfa/fxfa/app/cxfa_ffpushbutton.cpp12
-rw-r--r--xfa/fxfa/app/cxfa_ffpushbutton.h6
-rw-r--r--xfa/fxfa/app/cxfa_ffrectangle.cpp2
-rw-r--r--xfa/fxfa/app/cxfa_ffrectangle.h2
-rw-r--r--xfa/fxfa/app/cxfa_ffsignature.cpp2
-rw-r--r--xfa/fxfa/app/cxfa_ffsignature.h2
-rw-r--r--xfa/fxfa/app/cxfa_fftext.cpp4
-rw-r--r--xfa/fxfa/app/cxfa_fftext.h2
-rw-r--r--xfa/fxfa/app/cxfa_fftextedit.cpp2
-rw-r--r--xfa/fxfa/app/cxfa_fftextedit.h2
-rw-r--r--xfa/fxfa/app/cxfa_fwltheme.cpp4
31 files changed, 58 insertions, 58 deletions
diff --git a/xfa/fxfa/app/cxfa_ffarc.cpp b/xfa/fxfa/app/cxfa_ffarc.cpp
index e2085480a5..1a12fb5f23 100644
--- a/xfa/fxfa/app/cxfa_ffarc.cpp
+++ b/xfa/fxfa/app/cxfa_ffarc.cpp
@@ -10,7 +10,7 @@ CXFA_FFArc::CXFA_FFArc(CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pDataAcc) {}
CXFA_FFArc::~CXFA_FFArc() {}
-void CXFA_FFArc::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFArc::RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) {
if (!IsMatchVisibleStatus(dwStatus))
diff --git a/xfa/fxfa/app/cxfa_ffarc.h b/xfa/fxfa/app/cxfa_ffarc.h
index 777ed6f3af..f1bc82f1d2 100644
--- a/xfa/fxfa/app/cxfa_ffarc.h
+++ b/xfa/fxfa/app/cxfa_ffarc.h
@@ -15,7 +15,7 @@ class CXFA_FFArc : public CXFA_FFDraw {
~CXFA_FFArc() override;
// CXFA_FFWidget
- void RenderWidget(CFX_Graphics* pGS,
+ void RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) override;
};
diff --git a/xfa/fxfa/app/cxfa_ffbarcode.cpp b/xfa/fxfa/app/cxfa_ffbarcode.cpp
index bd529d3eb2..7bbb60dd77 100644
--- a/xfa/fxfa/app/cxfa_ffbarcode.cpp
+++ b/xfa/fxfa/app/cxfa_ffbarcode.cpp
@@ -137,7 +137,7 @@ bool CXFA_FFBarcode::LoadWidget() {
return CXFA_FFField::LoadWidget();
}
-void CXFA_FFBarcode::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFBarcode::RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) {
if (!IsMatchVisibleStatus(dwStatus))
diff --git a/xfa/fxfa/app/cxfa_ffbarcode.h b/xfa/fxfa/app/cxfa_ffbarcode.h
index 11b678d98a..782aec39a1 100644
--- a/xfa/fxfa/app/cxfa_ffbarcode.h
+++ b/xfa/fxfa/app/cxfa_ffbarcode.h
@@ -92,7 +92,7 @@ class CXFA_FFBarcode : public CXFA_FFTextEdit {
// CXFA_FFTextEdit
bool LoadWidget() override;
- void RenderWidget(CFX_Graphics* pGS,
+ void RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) override;
void UpdateWidgetProperty() override;
diff --git a/xfa/fxfa/app/cxfa_ffcheckbutton.cpp b/xfa/fxfa/app/cxfa_ffcheckbutton.cpp
index b55daae21a..c3fd6b9157 100644
--- a/xfa/fxfa/app/cxfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/app/cxfa_ffcheckbutton.cpp
@@ -222,7 +222,7 @@ void CXFA_FFCheckButton::AddUIMargin(int32_t iCapPlacement) {
}
}
-void CXFA_FFCheckButton::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFCheckButton::RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) {
if (!IsMatchVisibleStatus(dwStatus))
@@ -339,7 +339,7 @@ void CXFA_FFCheckButton::OnProcessEvent(CFWL_Event* pEvent) {
m_pOldDelegate->OnProcessEvent(pEvent);
}
-void CXFA_FFCheckButton::OnDrawWidget(CFX_Graphics* pGraphics,
+void CXFA_FFCheckButton::OnDrawWidget(CXFA_Graphics* pGraphics,
const CFX_Matrix* pMatrix) {
m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix);
}
diff --git a/xfa/fxfa/app/cxfa_ffcheckbutton.h b/xfa/fxfa/app/cxfa_ffcheckbutton.h
index f92b50a692..f092abbcf8 100644
--- a/xfa/fxfa/app/cxfa_ffcheckbutton.h
+++ b/xfa/fxfa/app/cxfa_ffcheckbutton.h
@@ -16,7 +16,7 @@ class CXFA_FFCheckButton : public CXFA_FFField {
~CXFA_FFCheckButton() override;
// CXFA_FFField
- void RenderWidget(CFX_Graphics* pGS,
+ void RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) override;
@@ -27,7 +27,7 @@ class CXFA_FFCheckButton : public CXFA_FFField {
bool OnLButtonUp(uint32_t dwFlags, const CFX_PointF& point) override;
void OnProcessMessage(CFWL_Message* pMessage) override;
void OnProcessEvent(CFWL_Event* pEvent) override;
- void OnDrawWidget(CFX_Graphics* pGraphics,
+ void OnDrawWidget(CXFA_Graphics* pGraphics,
const CFX_Matrix* pMatrix = nullptr) override;
void SetFWLCheckState(XFA_CHECKSTATE eCheckState);
diff --git a/xfa/fxfa/app/cxfa_ffcombobox.cpp b/xfa/fxfa/app/cxfa_ffcombobox.cpp
index 91de16e9c3..c317c1d90f 100644
--- a/xfa/fxfa/app/cxfa_ffcombobox.cpp
+++ b/xfa/fxfa/app/cxfa_ffcombobox.cpp
@@ -354,7 +354,7 @@ void CXFA_FFComboBox::OnProcessEvent(CFWL_Event* pEvent) {
m_pOldDelegate->OnProcessEvent(pEvent);
}
-void CXFA_FFComboBox::OnDrawWidget(CFX_Graphics* pGraphics,
+void CXFA_FFComboBox::OnDrawWidget(CXFA_Graphics* pGraphics,
const CFX_Matrix* pMatrix) {
m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix);
}
diff --git a/xfa/fxfa/app/cxfa_ffcombobox.h b/xfa/fxfa/app/cxfa_ffcombobox.h
index 048521f5e0..de239b624a 100644
--- a/xfa/fxfa/app/cxfa_ffcombobox.h
+++ b/xfa/fxfa/app/cxfa_ffcombobox.h
@@ -39,7 +39,7 @@ class CXFA_FFComboBox : public CXFA_FFField {
// IFWL_WidgetDelegate
void OnProcessMessage(CFWL_Message* pMessage) override;
void OnProcessEvent(CFWL_Event* pEvent) override;
- void OnDrawWidget(CFX_Graphics* pGraphics,
+ void OnDrawWidget(CXFA_Graphics* pGraphics,
const CFX_Matrix* pMatrix = nullptr) override;
virtual void OpenDropDownList();
diff --git a/xfa/fxfa/app/cxfa_ffexclgroup.cpp b/xfa/fxfa/app/cxfa_ffexclgroup.cpp
index 60f0202120..c881a79468 100644
--- a/xfa/fxfa/app/cxfa_ffexclgroup.cpp
+++ b/xfa/fxfa/app/cxfa_ffexclgroup.cpp
@@ -16,7 +16,7 @@ CXFA_FFExclGroup::CXFA_FFExclGroup(CXFA_WidgetAcc* pDataAcc)
CXFA_FFExclGroup::~CXFA_FFExclGroup() {}
-void CXFA_FFExclGroup::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFExclGroup::RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) {
if (!IsMatchVisibleStatus(dwStatus))
diff --git a/xfa/fxfa/app/cxfa_ffexclgroup.h b/xfa/fxfa/app/cxfa_ffexclgroup.h
index 4b66b94712..3575ad38af 100644
--- a/xfa/fxfa/app/cxfa_ffexclgroup.h
+++ b/xfa/fxfa/app/cxfa_ffexclgroup.h
@@ -16,7 +16,7 @@ class CXFA_FFExclGroup : public CXFA_FFWidget {
~CXFA_FFExclGroup() override;
// CXFA_FFWidget
- void RenderWidget(CFX_Graphics* pGS,
+ void RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) override;
};
diff --git a/xfa/fxfa/app/cxfa_fffield.cpp b/xfa/fxfa/app/cxfa_fffield.cpp
index 09773b6737..bf98b99a8e 100644
--- a/xfa/fxfa/app/cxfa_fffield.cpp
+++ b/xfa/fxfa/app/cxfa_fffield.cpp
@@ -23,8 +23,8 @@
#include "xfa/fxfa/cxfa_ffpageview.h"
#include "xfa/fxfa/cxfa_ffwidget.h"
#include "xfa/fxfa/parser/cxfa_node.h"
-#include "xfa/fxgraphics/cfx_path.h"
#include "xfa/fxgraphics/cxfa_color.h"
+#include "xfa/fxgraphics/cxfa_path.h"
namespace {
@@ -57,7 +57,7 @@ CFX_RectF CXFA_FFField::GetBBox(uint32_t dwStatus, bool bDrawFocus) {
return rtBox;
}
-void CXFA_FFField::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFField::RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) {
if (!IsMatchVisibleStatus(dwStatus))
@@ -80,7 +80,7 @@ void CXFA_FFField::RenderWidget(CFX_Graphics* pGS,
&mt);
}
-void CXFA_FFField::DrawHighlight(CFX_Graphics* pGS,
+void CXFA_FFField::DrawHighlight(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus,
bool bEllipse) {
@@ -95,7 +95,7 @@ void CXFA_FFField::DrawHighlight(CFX_Graphics* pGS,
CXFA_FFDoc* pDoc = GetDoc();
CXFA_Color crHighlight(pDoc->GetDocEnvironment()->GetHighlightColor(pDoc));
pGS->SetFillColor(&crHighlight);
- CFX_Path path;
+ CXFA_Path path;
if (bEllipse)
path.AddEllipse(m_rtUI);
else
@@ -104,7 +104,7 @@ void CXFA_FFField::DrawHighlight(CFX_Graphics* pGS,
pGS->FillPath(&path, FXFILL_WINDING, pMatrix);
}
-void CXFA_FFField::DrawFocus(CFX_Graphics* pGS, CFX_Matrix* pMatrix) {
+void CXFA_FFField::DrawFocus(CXFA_Graphics* pGS, CFX_Matrix* pMatrix) {
if (!(m_dwStatus & XFA_WidgetStatus_Focused))
return;
@@ -115,7 +115,7 @@ void CXFA_FFField::DrawFocus(CFX_Graphics* pGS, CFX_Matrix* pMatrix) {
pGS->SetLineDash(0.0f, DashPattern, 2);
pGS->SetLineWidth(0, false);
- CFX_Path path;
+ CXFA_Path path;
path.AddRectangle(m_rtUI.left, m_rtUI.top, m_rtUI.width, m_rtUI.height);
pGS->StrokePath(&path, pMatrix);
}
@@ -605,7 +605,7 @@ void CXFA_FFField::LayoutCaption() {
m_rtCaption.height = fHeight;
}
-void CXFA_FFField::RenderCaption(CFX_Graphics* pGS, CFX_Matrix* pMatrix) {
+void CXFA_FFField::RenderCaption(CXFA_Graphics* pGS, CFX_Matrix* pMatrix) {
CXFA_TextLayout* pCapTextLayout = m_pDataAcc->GetCaptionTextLayout();
if (!pCapTextLayout)
return;
@@ -781,5 +781,5 @@ void CXFA_FFField::OnProcessEvent(CFWL_Event* pEvent) {
}
}
-void CXFA_FFField::OnDrawWidget(CFX_Graphics* pGraphics,
+void CXFA_FFField::OnDrawWidget(CXFA_Graphics* pGraphics,
const CFX_Matrix* pMatrix) {}
diff --git a/xfa/fxfa/app/cxfa_fffield.h b/xfa/fxfa/app/cxfa_fffield.h
index 3799eb39b7..d2eba09a62 100644
--- a/xfa/fxfa/app/cxfa_fffield.h
+++ b/xfa/fxfa/app/cxfa_fffield.h
@@ -24,7 +24,7 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
// CXFA_FFWidget
CFX_RectF GetBBox(uint32_t dwStatus, bool bDrawFocus = false) override;
- void RenderWidget(CFX_Graphics* pGS,
+ void RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) override;
bool IsLoaded() override;
@@ -55,7 +55,7 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
// IFWL_WidgetDelegate
void OnProcessMessage(CFWL_Message* pMessage) override;
void OnProcessEvent(CFWL_Event* pEvent) override;
- void OnDrawWidget(CFX_Graphics* pGraphics,
+ void OnDrawWidget(CXFA_Graphics* pGraphics,
const CFX_Matrix* pMatrix = nullptr) override;
void UpdateFWL();
@@ -69,18 +69,18 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
CFWL_Widget* GetNormalWidget() { return m_pNormalWidget.get(); }
CFX_PointF FWLToClient(const CFX_PointF& point);
void LayoutCaption();
- void RenderCaption(CFX_Graphics* pGS, CFX_Matrix* pMatrix);
+ void RenderCaption(CXFA_Graphics* pGS, CFX_Matrix* pMatrix);
int32_t CalculateOverride();
int32_t CalculateWidgetAcc(CXFA_WidgetAcc* pAcc);
bool ProcessCommittedData();
virtual bool CommitData();
virtual bool IsDataChanged();
- void DrawHighlight(CFX_Graphics* pGS,
+ void DrawHighlight(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus,
bool bEllipse);
- void DrawFocus(CFX_Graphics* pGS, CFX_Matrix* pMatrix);
+ void DrawFocus(CXFA_Graphics* pGS, CFX_Matrix* pMatrix);
void TranslateFWLMessage(CFWL_Message* pMessage);
void CapPlacement();
void CapTopBottomPlacement(CXFA_Caption caption,
diff --git a/xfa/fxfa/app/cxfa_ffimage.cpp b/xfa/fxfa/app/cxfa_ffimage.cpp
index f8a6668a91..cfcc9d6d7d 100644
--- a/xfa/fxfa/app/cxfa_ffimage.cpp
+++ b/xfa/fxfa/app/cxfa_ffimage.cpp
@@ -34,7 +34,7 @@ void CXFA_FFImage::UnloadWidget() {
GetDataAcc()->SetImageImage(nullptr);
}
-void CXFA_FFImage::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFImage::RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) {
if (!IsMatchVisibleStatus(dwStatus))
diff --git a/xfa/fxfa/app/cxfa_ffimage.h b/xfa/fxfa/app/cxfa_ffimage.h
index 1b22fce668..aaa5df4048 100644
--- a/xfa/fxfa/app/cxfa_ffimage.h
+++ b/xfa/fxfa/app/cxfa_ffimage.h
@@ -15,7 +15,7 @@ class CXFA_FFImage : public CXFA_FFDraw {
~CXFA_FFImage() override;
// CXFA_FFWidget
- void RenderWidget(CFX_Graphics* pGS,
+ void RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) override;
bool IsLoaded() override;
diff --git a/xfa/fxfa/app/cxfa_ffimageedit.cpp b/xfa/fxfa/app/cxfa_ffimageedit.cpp
index 0b0b6ec853..4019dd11d8 100644
--- a/xfa/fxfa/app/cxfa_ffimageedit.cpp
+++ b/xfa/fxfa/app/cxfa_ffimageedit.cpp
@@ -51,7 +51,7 @@ void CXFA_FFImageEdit::UnloadWidget() {
CXFA_FFField::UnloadWidget();
}
-void CXFA_FFImageEdit::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFImageEdit::RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) {
if (!IsMatchVisibleStatus(dwStatus))
@@ -137,7 +137,7 @@ void CXFA_FFImageEdit::OnProcessEvent(CFWL_Event* pEvent) {
m_pOldDelegate->OnProcessEvent(pEvent);
}
-void CXFA_FFImageEdit::OnDrawWidget(CFX_Graphics* pGraphics,
+void CXFA_FFImageEdit::OnDrawWidget(CXFA_Graphics* pGraphics,
const CFX_Matrix* pMatrix) {
m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix);
}
diff --git a/xfa/fxfa/app/cxfa_ffimageedit.h b/xfa/fxfa/app/cxfa_ffimageedit.h
index 81b45e8de0..c81af5eb08 100644
--- a/xfa/fxfa/app/cxfa_ffimageedit.h
+++ b/xfa/fxfa/app/cxfa_ffimageedit.h
@@ -15,7 +15,7 @@ class CXFA_FFImageEdit : public CXFA_FFField {
~CXFA_FFImageEdit() override;
// CXFA_FFField
- void RenderWidget(CFX_Graphics* pGS,
+ void RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) override;
bool LoadWidget() override;
@@ -23,7 +23,7 @@ class CXFA_FFImageEdit : public CXFA_FFField {
bool OnLButtonDown(uint32_t dwFlags, const CFX_PointF& point) override;
void OnProcessMessage(CFWL_Message* pMessage) override;
void OnProcessEvent(CFWL_Event* pEvent) override;
- void OnDrawWidget(CFX_Graphics* pGraphics,
+ void OnDrawWidget(CXFA_Graphics* pGraphics,
const CFX_Matrix* pMatrix = nullptr) override;
private:
diff --git a/xfa/fxfa/app/cxfa_ffline.cpp b/xfa/fxfa/app/cxfa_ffline.cpp
index dafa660a73..6c028dd340 100644
--- a/xfa/fxfa/app/cxfa_ffline.cpp
+++ b/xfa/fxfa/app/cxfa_ffline.cpp
@@ -6,9 +6,9 @@
#include "xfa/fxfa/app/cxfa_ffline.h"
-#include "xfa/fxgraphics/cfx_graphics.h"
-#include "xfa/fxgraphics/cfx_path.h"
#include "xfa/fxgraphics/cxfa_color.h"
+#include "xfa/fxgraphics/cxfa_graphics.h"
+#include "xfa/fxgraphics/cxfa_path.h"
CXFA_FFLine::CXFA_FFLine(CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pDataAcc) {}
@@ -47,7 +47,7 @@ void CXFA_FFLine::GetRectFromHand(CFX_RectF& rect,
}
}
-void CXFA_FFLine::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFLine::RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) {
if (!IsMatchVisibleStatus(dwStatus))
@@ -82,7 +82,7 @@ void CXFA_FFLine::RenderWidget(CFX_Graphics* pGS,
XFA_RectWidthoutMargin(rtLine, mgWidget);
GetRectFromHand(rtLine, lineObj.GetHand(), fLineWidth);
- CFX_Path linePath;
+ CXFA_Path linePath;
if (lineObj.GetSlope() && rtLine.right() > 0.0f && rtLine.bottom() > 0.0f)
linePath.AddLine(rtLine.TopRight(), rtLine.BottomLeft());
else
diff --git a/xfa/fxfa/app/cxfa_ffline.h b/xfa/fxfa/app/cxfa_ffline.h
index 6803e38285..7649f5a827 100644
--- a/xfa/fxfa/app/cxfa_ffline.h
+++ b/xfa/fxfa/app/cxfa_ffline.h
@@ -15,7 +15,7 @@ class CXFA_FFLine : public CXFA_FFDraw {
~CXFA_FFLine() override;
// CXFA_FFWidget
- void RenderWidget(CFX_Graphics* pGS,
+ void RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) override;
diff --git a/xfa/fxfa/app/cxfa_fflistbox.cpp b/xfa/fxfa/app/cxfa_fflistbox.cpp
index dd80325c34..cc9100b5db 100644
--- a/xfa/fxfa/app/cxfa_fflistbox.cpp
+++ b/xfa/fxfa/app/cxfa_fflistbox.cpp
@@ -204,7 +204,7 @@ void CXFA_FFListBox::OnProcessEvent(CFWL_Event* pEvent) {
m_pOldDelegate->OnProcessEvent(pEvent);
}
-void CXFA_FFListBox::OnDrawWidget(CFX_Graphics* pGraphics,
+void CXFA_FFListBox::OnDrawWidget(CXFA_Graphics* pGraphics,
const CFX_Matrix* pMatrix) {
m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix);
}
diff --git a/xfa/fxfa/app/cxfa_fflistbox.h b/xfa/fxfa/app/cxfa_fflistbox.h
index 6f090af63f..ac563cc86c 100644
--- a/xfa/fxfa/app/cxfa_fflistbox.h
+++ b/xfa/fxfa/app/cxfa_fflistbox.h
@@ -19,7 +19,7 @@ class CXFA_FFListBox : public CXFA_FFField {
bool OnKillFocus(CXFA_FFWidget* pNewWidget) override;
void OnProcessMessage(CFWL_Message* pMessage) override;
void OnProcessEvent(CFWL_Event* pEvent) override;
- void OnDrawWidget(CFX_Graphics* pGraphics,
+ void OnDrawWidget(CXFA_Graphics* pGraphics,
const CFX_Matrix* pMatrix = nullptr) override;
void OnSelectChanged(CFWL_Widget* pWidget);
diff --git a/xfa/fxfa/app/cxfa_ffpushbutton.cpp b/xfa/fxfa/app/cxfa_ffpushbutton.cpp
index 21e4b977a1..44ec0d42d0 100644
--- a/xfa/fxfa/app/cxfa_ffpushbutton.cpp
+++ b/xfa/fxfa/app/cxfa_ffpushbutton.cpp
@@ -18,8 +18,8 @@
#include "xfa/fxfa/cxfa_ffapp.h"
#include "xfa/fxfa/cxfa_ffpageview.h"
#include "xfa/fxfa/cxfa_ffwidget.h"
-#include "xfa/fxgraphics/cfx_path.h"
#include "xfa/fxgraphics/cxfa_color.h"
+#include "xfa/fxgraphics/cxfa_path.h"
CXFA_FFPushButton::CXFA_FFPushButton(CXFA_WidgetAcc* pDataAcc)
: CXFA_FFField(pDataAcc), m_pOldDelegate(nullptr) {}
@@ -28,7 +28,7 @@ CXFA_FFPushButton::~CXFA_FFPushButton() {
CXFA_FFPushButton::UnloadWidget();
}
-void CXFA_FFPushButton::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFPushButton::RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) {
if (!IsMatchVisibleStatus(dwStatus))
@@ -166,7 +166,7 @@ void CXFA_FFPushButton::LayoutHighlightCaption() {
m_pDownTextLayout->Layout(sz);
}
-void CXFA_FFPushButton::RenderHighlightCaption(CFX_Graphics* pGS,
+void CXFA_FFPushButton::RenderHighlightCaption(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix) {
CXFA_TextLayout* pCapTextLayout = m_pDataAcc->GetCaptionTextLayout();
CXFA_Caption caption = m_pDataAcc->GetCaption();
@@ -205,7 +205,7 @@ void CXFA_FFPushButton::OnProcessEvent(CFWL_Event* pEvent) {
CXFA_FFField::OnProcessEvent(pEvent);
}
-void CXFA_FFPushButton::OnDrawWidget(CFX_Graphics* pGraphics,
+void CXFA_FFPushButton::OnDrawWidget(CXFA_Graphics* pGraphics,
const CFX_Matrix* pMatrix) {
if (m_pNormalWidget->GetStylesEx() & XFA_FWL_PSBSTYLEEXT_HiliteInverted) {
if ((m_pNormalWidget->GetStates() & FWL_STATE_PSB_Pressed) &&
@@ -216,7 +216,7 @@ void CXFA_FFPushButton::OnDrawWidget(CFX_Graphics* pGraphics,
CXFA_Color cr(FXARGB_MAKE(128, 128, 255, 255));
pGraphics->SetFillColor(&cr);
- CFX_Path path;
+ CXFA_Path path;
path.AddRectangle(rtFill.left, rtFill.top, rtFill.width, rtFill.height);
pGraphics->FillPath(&path, FXFILL_WINDING, (CFX_Matrix*)pMatrix);
}
@@ -231,7 +231,7 @@ void CXFA_FFPushButton::OnDrawWidget(CFX_Graphics* pGraphics,
pGraphics->SetStrokeColor(&cr);
pGraphics->SetLineWidth(fLineWidth);
- CFX_Path path;
+ CXFA_Path path;
CFX_RectF rect = m_pNormalWidget->GetWidgetRect();
path.AddRectangle(0, 0, rect.width, rect.height);
pGraphics->StrokePath(&path, (CFX_Matrix*)pMatrix);
diff --git a/xfa/fxfa/app/cxfa_ffpushbutton.h b/xfa/fxfa/app/cxfa_ffpushbutton.h
index 797d92d970..e64ef706f3 100644
--- a/xfa/fxfa/app/cxfa_ffpushbutton.h
+++ b/xfa/fxfa/app/cxfa_ffpushbutton.h
@@ -24,7 +24,7 @@ class CXFA_FFPushButton : public CXFA_FFField {
~CXFA_FFPushButton() override;
// CXFA_FFField
- void RenderWidget(CFX_Graphics* pGS,
+ void RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) override;
bool LoadWidget() override;
@@ -33,13 +33,13 @@ class CXFA_FFPushButton : public CXFA_FFField {
void UpdateWidgetProperty() override;
void OnProcessMessage(CFWL_Message* pMessage) override;
void OnProcessEvent(CFWL_Event* pEvent) override;
- void OnDrawWidget(CFX_Graphics* pGraphics,
+ void OnDrawWidget(CXFA_Graphics* pGraphics,
const CFX_Matrix* pMatrix = nullptr) override;
private:
void LoadHighlightCaption();
void LayoutHighlightCaption();
- void RenderHighlightCaption(CFX_Graphics* pGS, CFX_Matrix* pMatrix);
+ void RenderHighlightCaption(CXFA_Graphics* pGS, CFX_Matrix* pMatrix);
float GetLineWidth();
FX_ARGB GetLineColor();
FX_ARGB GetFillColor();
diff --git a/xfa/fxfa/app/cxfa_ffrectangle.cpp b/xfa/fxfa/app/cxfa_ffrectangle.cpp
index bccf7404f2..89ae129cb1 100644
--- a/xfa/fxfa/app/cxfa_ffrectangle.cpp
+++ b/xfa/fxfa/app/cxfa_ffrectangle.cpp
@@ -11,7 +11,7 @@ CXFA_FFRectangle::CXFA_FFRectangle(CXFA_WidgetAcc* pDataAcc)
CXFA_FFRectangle::~CXFA_FFRectangle() {}
-void CXFA_FFRectangle::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFRectangle::RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) {
if (!IsMatchVisibleStatus(dwStatus))
diff --git a/xfa/fxfa/app/cxfa_ffrectangle.h b/xfa/fxfa/app/cxfa_ffrectangle.h
index 499f60007e..2ddb35dade 100644
--- a/xfa/fxfa/app/cxfa_ffrectangle.h
+++ b/xfa/fxfa/app/cxfa_ffrectangle.h
@@ -15,7 +15,7 @@ class CXFA_FFRectangle : public CXFA_FFDraw {
~CXFA_FFRectangle() override;
// CXFA_FFWidget
- void RenderWidget(CFX_Graphics* pGS,
+ void RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) override;
};
diff --git a/xfa/fxfa/app/cxfa_ffsignature.cpp b/xfa/fxfa/app/cxfa_ffsignature.cpp
index a5d33ad51c..0afe5cc86a 100644
--- a/xfa/fxfa/app/cxfa_ffsignature.cpp
+++ b/xfa/fxfa/app/cxfa_ffsignature.cpp
@@ -20,7 +20,7 @@ bool CXFA_FFSignature::LoadWidget() {
return CXFA_FFField::LoadWidget();
}
-void CXFA_FFSignature::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFSignature::RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) {
if (!IsMatchVisibleStatus(dwStatus))
diff --git a/xfa/fxfa/app/cxfa_ffsignature.h b/xfa/fxfa/app/cxfa_ffsignature.h
index 839cfaf5fc..8d2a33e21a 100644
--- a/xfa/fxfa/app/cxfa_ffsignature.h
+++ b/xfa/fxfa/app/cxfa_ffsignature.h
@@ -15,7 +15,7 @@ class CXFA_FFSignature final : public CXFA_FFField {
~CXFA_FFSignature() override;
// CXFA_FFField
- void RenderWidget(CFX_Graphics* pGS,
+ void RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) override;
bool LoadWidget() override;
diff --git a/xfa/fxfa/app/cxfa_fftext.cpp b/xfa/fxfa/app/cxfa_fftext.cpp
index b5224eaaed..3d90e6cd4e 100644
--- a/xfa/fxfa/app/cxfa_fftext.cpp
+++ b/xfa/fxfa/app/cxfa_fftext.cpp
@@ -17,13 +17,13 @@
#include "xfa/fxfa/cxfa_ffdoc.h"
#include "xfa/fxfa/cxfa_ffpageview.h"
#include "xfa/fxfa/cxfa_ffwidget.h"
-#include "xfa/fxgraphics/cfx_graphics.h"
+#include "xfa/fxgraphics/cxfa_graphics.h"
CXFA_FFText::CXFA_FFText(CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pDataAcc) {}
CXFA_FFText::~CXFA_FFText() {}
-void CXFA_FFText::RenderWidget(CFX_Graphics* pGS,
+void CXFA_FFText::RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) {
if (!IsMatchVisibleStatus(dwStatus))
diff --git a/xfa/fxfa/app/cxfa_fftext.h b/xfa/fxfa/app/cxfa_fftext.h
index 3fd48da2a9..df920f0266 100644
--- a/xfa/fxfa/app/cxfa_fftext.h
+++ b/xfa/fxfa/app/cxfa_fftext.h
@@ -19,7 +19,7 @@ class CXFA_FFText : public CXFA_FFDraw {
bool OnLButtonUp(uint32_t dwFlags, const CFX_PointF& point) override;
bool OnMouseMove(uint32_t dwFlags, const CFX_PointF& point) override;
FWL_WidgetHit OnHitTest(const CFX_PointF& point) override;
- void RenderWidget(CFX_Graphics* pGS,
+ void RenderWidget(CXFA_Graphics* pGS,
CFX_Matrix* pMatrix,
uint32_t dwStatus) override;
bool IsLoaded() override;
diff --git a/xfa/fxfa/app/cxfa_fftextedit.cpp b/xfa/fxfa/app/cxfa_fftextedit.cpp
index 7248abf908..0d211eb7b4 100644
--- a/xfa/fxfa/app/cxfa_fftextedit.cpp
+++ b/xfa/fxfa/app/cxfa_fftextedit.cpp
@@ -353,7 +353,7 @@ void CXFA_FFTextEdit::OnProcessEvent(CFWL_Event* pEvent) {
m_pOldDelegate->OnProcessEvent(pEvent);
}
-void CXFA_FFTextEdit::OnDrawWidget(CFX_Graphics* pGraphics,
+void CXFA_FFTextEdit::OnDrawWidget(CXFA_Graphics* pGraphics,
const CFX_Matrix* pMatrix) {
m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix);
}
diff --git a/xfa/fxfa/app/cxfa_fftextedit.h b/xfa/fxfa/app/cxfa_fftextedit.h
index fa0779ed2c..109a31a0de 100644
--- a/xfa/fxfa/app/cxfa_fftextedit.h
+++ b/xfa/fxfa/app/cxfa_fftextedit.h
@@ -33,7 +33,7 @@ class CXFA_FFTextEdit : public CXFA_FFField {
bool OnKillFocus(CXFA_FFWidget* pNewWidget) override;
void OnProcessMessage(CFWL_Message* pMessage) override;
void OnProcessEvent(CFWL_Event* pEvent) override;
- void OnDrawWidget(CFX_Graphics* pGraphics,
+ void OnDrawWidget(CXFA_Graphics* pGraphics,
const CFX_Matrix* pMatrix = nullptr) override;
void OnTextChanged(CFWL_Widget* pWidget,
diff --git a/xfa/fxfa/app/cxfa_fwltheme.cpp b/xfa/fxfa/app/cxfa_fwltheme.cpp
index fbcbd75b6e..5ad0873e19 100644
--- a/xfa/fxfa/app/cxfa_fwltheme.cpp
+++ b/xfa/fxfa/app/cxfa_fwltheme.cpp
@@ -105,7 +105,7 @@ void CXFA_FWLTheme::DrawText(CFWL_ThemeText* pParams) {
if (pParams->m_iPart == CFWL_Part::Caption)
m_pTextOut->SetTextColor(ArgbEncode(0xff, 0, 153, 255));
- CFX_Graphics* pGraphics = pParams->m_pGraphics;
+ CXFA_Graphics* pGraphics = pParams->m_pGraphics;
CFX_RenderDevice* pRenderDevice = pGraphics->GetRenderDevice();
if (!pRenderDevice)
return;
@@ -126,7 +126,7 @@ void CXFA_FWLTheme::DrawText(CFWL_ThemeText* pParams) {
return;
CXFA_WidgetAcc* pAcc = pWidget->GetDataAcc();
- CFX_Graphics* pGraphics = pParams->m_pGraphics;
+ CXFA_Graphics* pGraphics = pParams->m_pGraphics;
CFX_RenderDevice* pRenderDevice = pGraphics->GetRenderDevice();
if (!pRenderDevice)
return;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 18:41:54 +0000