summaryrefslogtreecommitdiff
path: root/xfa/fwl
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fwl')
-rw-r--r--xfa/fwl/basewidget/fwl_caretimp.h1
-rw-r--r--xfa/fwl/basewidget/fwl_editimp.cpp1
-rw-r--r--xfa/fwl/core/fwl_gridimp.cpp2
-rw-r--r--xfa/fwl/lightwidget/caret.cpp1
-rw-r--r--xfa/fwl/theme/carettp.cpp2
-rw-r--r--xfa/fwl/theme/checkboxtp.cpp2
-rw-r--r--xfa/fwl/theme/comboboxtp.cpp2
-rw-r--r--xfa/fwl/theme/edittp.cpp2
-rw-r--r--xfa/fwl/theme/formtp.cpp2
-rw-r--r--xfa/fwl/theme/listboxtp.cpp2
-rw-r--r--xfa/fwl/theme/monthcalendartp.cpp2
-rw-r--r--xfa/fwl/theme/pushbuttontp.cpp2
-rw-r--r--xfa/fwl/theme/scrollbartp.cpp2
-rw-r--r--xfa/fwl/theme/widgettp.cpp6
14 files changed, 27 insertions, 2 deletions
diff --git a/xfa/fwl/basewidget/fwl_caretimp.h b/xfa/fwl/basewidget/fwl_caretimp.h
index d123e15b58..dee4dd855d 100644
--- a/xfa/fwl/basewidget/fwl_caretimp.h
+++ b/xfa/fwl/basewidget/fwl_caretimp.h
@@ -8,6 +8,7 @@
#define XFA_FWL_BASEWIDGET_FWL_CARETIMP_H_
#include "xfa/fwl/core/fwl_widgetimp.h"
+#include "xfa/fxgraphics/cfx_color.h"
#include "xfa/include/fwl/core/fwl_timer.h"
class CFWL_WidgetImpProperties;
diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp
index 6975f50787..a0d707438e 100644
--- a/xfa/fwl/basewidget/fwl_editimp.cpp
+++ b/xfa/fwl/basewidget/fwl_editimp.cpp
@@ -21,6 +21,7 @@
#include "xfa/fwl/core/fwl_threadimp.h"
#include "xfa/fwl/core/fwl_widgetimp.h"
#include "xfa/fwl/core/fwl_widgetmgrimp.h"
+#include "xfa/fxgraphics/cfx_path.h"
#include "xfa/include/fwl/basewidget/fwl_caret.h"
#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
#include "xfa/include/fwl/core/fwl_theme.h"
diff --git a/xfa/fwl/core/fwl_gridimp.cpp b/xfa/fwl/core/fwl_gridimp.cpp
index b3b8d5aa8d..a898bea838 100644
--- a/xfa/fwl/core/fwl_gridimp.cpp
+++ b/xfa/fwl/core/fwl_gridimp.cpp
@@ -11,6 +11,8 @@
#include "xfa/fwl/core/fwl_targetimp.h"
#include "xfa/fwl/core/fwl_threadimp.h"
#include "xfa/fwl/core/fwl_widgetimp.h"
+#include "xfa/fxgraphics/cfx_color.h"
+#include "xfa/fxgraphics/cfx_path.h"
// static
IFWL_Grid* IFWL_Grid::Create(const CFWL_WidgetImpProperties& properties) {
diff --git a/xfa/fwl/lightwidget/caret.cpp b/xfa/fwl/lightwidget/caret.cpp
index 279ea2d6f9..b81c6c2b08 100644
--- a/xfa/fwl/lightwidget/caret.cpp
+++ b/xfa/fwl/lightwidget/caret.cpp
@@ -9,6 +9,7 @@
#include <memory>
#include "xfa/fwl/core/fwl_targetimp.h"
+#include "xfa/fxgraphics/cfx_color.h"
#include "xfa/include/fwl/basewidget/fwl_caret.h"
#include "xfa/include/fwl/lightwidget/edit.h"
diff --git a/xfa/fwl/theme/carettp.cpp b/xfa/fwl/theme/carettp.cpp
index 88b01d9f3d..7b165f9b68 100644
--- a/xfa/fwl/theme/carettp.cpp
+++ b/xfa/fwl/theme/carettp.cpp
@@ -6,6 +6,8 @@
#include "xfa/include/fwl/theme/carettp.h"
+#include "xfa/fxgraphics/cfx_color.h"
+#include "xfa/fxgraphics/cfx_path.h"
#include "xfa/include/fwl/basewidget/fwl_caret.h"
#include "xfa/include/fwl/core/fwl_widget.h"
diff --git a/xfa/fwl/theme/checkboxtp.cpp b/xfa/fwl/theme/checkboxtp.cpp
index b65a550936..b039609826 100644
--- a/xfa/fwl/theme/checkboxtp.cpp
+++ b/xfa/fwl/theme/checkboxtp.cpp
@@ -7,6 +7,8 @@
#include "xfa/include/fwl/theme/checkboxtp.h"
#include "xfa/fde/tto/fde_textout.h"
+#include "xfa/fxgraphics/cfx_color.h"
+#include "xfa/fxgraphics/cfx_path.h"
#include "xfa/include/fwl/basewidget/fwl_checkbox.h"
#include "xfa/include/fwl/core/fwl_widget.h"
diff --git a/xfa/fwl/theme/comboboxtp.cpp b/xfa/fwl/theme/comboboxtp.cpp
index 33be07d44c..c3824ec703 100644
--- a/xfa/fwl/theme/comboboxtp.cpp
+++ b/xfa/fwl/theme/comboboxtp.cpp
@@ -6,6 +6,8 @@
#include "xfa/include/fwl/theme/comboboxtp.h"
+#include "xfa/fxgraphics/cfx_color.h"
+#include "xfa/fxgraphics/cfx_path.h"
#include "xfa/include/fwl/basewidget/fwl_combobox.h"
#include "xfa/include/fwl/core/fwl_widget.h"
diff --git a/xfa/fwl/theme/edittp.cpp b/xfa/fwl/theme/edittp.cpp
index a206faffe8..61a28ef78a 100644
--- a/xfa/fwl/theme/edittp.cpp
+++ b/xfa/fwl/theme/edittp.cpp
@@ -6,6 +6,8 @@
#include "xfa/include/fwl/theme/edittp.h"
+#include "xfa/fxgraphics/cfx_color.h"
+#include "xfa/fxgraphics/cfx_path.h"
#include "xfa/include/fwl/basewidget/fwl_edit.h"
#include "xfa/include/fwl/core/fwl_widget.h"
diff --git a/xfa/fwl/theme/formtp.cpp b/xfa/fwl/theme/formtp.cpp
index 5f75535f3b..d07902d2c7 100644
--- a/xfa/fwl/theme/formtp.cpp
+++ b/xfa/fwl/theme/formtp.cpp
@@ -7,6 +7,8 @@
#include "xfa/include/fwl/theme/formtp.h"
#include "xfa/fde/tto/fde_textout.h"
+#include "xfa/fxgraphics/cfx_color.h"
+#include "xfa/fxgraphics/cfx_path.h"
#include "xfa/include/fwl/core/fwl_form.h"
#include "xfa/include/fwl/core/fwl_widget.h"
diff --git a/xfa/fwl/theme/listboxtp.cpp b/xfa/fwl/theme/listboxtp.cpp
index 8ffe669835..72979db02c 100644
--- a/xfa/fwl/theme/listboxtp.cpp
+++ b/xfa/fwl/theme/listboxtp.cpp
@@ -6,6 +6,8 @@
#include "xfa/include/fwl/theme/listboxtp.h"
+#include "xfa/fxgraphics/cfx_color.h"
+#include "xfa/fxgraphics/cfx_path.h"
#include "xfa/include/fwl/basewidget/fwl_listbox.h"
#include "xfa/include/fwl/core/fwl_widget.h"
diff --git a/xfa/fwl/theme/monthcalendartp.cpp b/xfa/fwl/theme/monthcalendartp.cpp
index 6ab99ae439..5a2f3afe4d 100644
--- a/xfa/fwl/theme/monthcalendartp.cpp
+++ b/xfa/fwl/theme/monthcalendartp.cpp
@@ -7,6 +7,8 @@
#include "xfa/include/fwl/theme/monthcalendartp.h"
#include "xfa/fde/tto/fde_textout.h"
+#include "xfa/fxgraphics/cfx_color.h"
+#include "xfa/fxgraphics/cfx_path.h"
#include "xfa/include/fwl/basewidget/fwl_monthcalendar.h"
#include "xfa/include/fwl/core/fwl_widget.h"
diff --git a/xfa/fwl/theme/pushbuttontp.cpp b/xfa/fwl/theme/pushbuttontp.cpp
index 76e0eab7dc..456199e877 100644
--- a/xfa/fwl/theme/pushbuttontp.cpp
+++ b/xfa/fwl/theme/pushbuttontp.cpp
@@ -6,6 +6,8 @@
#include "xfa/include/fwl/theme/pushbuttontp.h"
+#include "xfa/fxgraphics/cfx_color.h"
+#include "xfa/fxgraphics/cfx_path.h"
#include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
#include "xfa/include/fwl/core/fwl_widget.h"
diff --git a/xfa/fwl/theme/scrollbartp.cpp b/xfa/fwl/theme/scrollbartp.cpp
index 424ff549e5..7a794050cb 100644
--- a/xfa/fwl/theme/scrollbartp.cpp
+++ b/xfa/fwl/theme/scrollbartp.cpp
@@ -6,6 +6,8 @@
#include "xfa/include/fwl/theme/scrollbartp.h"
+#include "xfa/fxgraphics/cfx_color.h"
+#include "xfa/fxgraphics/cfx_path.h"
#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
#include "xfa/include/fwl/core/fwl_widget.h"
diff --git a/xfa/fwl/theme/widgettp.cpp b/xfa/fwl/theme/widgettp.cpp
index 04b67b3310..61b505f8d3 100644
--- a/xfa/fwl/theme/widgettp.cpp
+++ b/xfa/fwl/theme/widgettp.cpp
@@ -9,6 +9,9 @@
#include <algorithm>
#include "xfa/fde/tto/fde_textout.h"
+#include "xfa/fxgraphics/cfx_color.h"
+#include "xfa/fxgraphics/cfx_path.h"
+#include "xfa/fxgraphics/cfx_shading.h"
#include "xfa/include/fwl/core/fwl_widgetmgr.h"
static void FWL_SetChildThemeID(IFWL_Widget* pParent, FX_DWORD dwThemeID) {
@@ -451,8 +454,7 @@ void CFWL_WidgetTP::DrawAxialShading(CFX_Graphics* pGraphics,
CFX_PointF begPoint(fx1, fy1);
CFX_PointF endPoint(fx2, fy2);
- CFX_Shading shading;
- shading.CreateAxial(begPoint, endPoint, FALSE, FALSE, beginColor, endColor);
+ CFX_Shading shading(begPoint, endPoint, FALSE, FALSE, beginColor, endColor);
pGraphics->SaveGraphState();
CFX_Color color1(&shading);
pGraphics->SetFillColor(&color1);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 06:26:39 +0000