summaryrefslogtreecommitdiff
path: root/xfa/src
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/src')
-rw-r--r--xfa/src/fgas/include/fx_datetime.h2
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp4
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_caretimp.cpp5
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp5
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp4
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp5
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_editimp.cpp6
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_listboximp.cpp4
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp6
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp4
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp4
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp6
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp7
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp5
-rw-r--r--xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h10
-rw-r--r--xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h5
-rw-r--r--xfa/src/fwl/src/basewidget/include/fwl_editimp.h1
-rw-r--r--xfa/src/fwl/src/basewidget/include/fwl_listboximp.h13
-rw-r--r--xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h1
-rw-r--r--xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h1
-rw-r--r--xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h5
-rw-r--r--xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h2
-rw-r--r--xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h2
-rw-r--r--xfa/src/fwl/src/core/fwl_appimp.cpp6
-rw-r--r--xfa/src/fwl/src/core/fwl_contentimp.cpp5
-rw-r--r--xfa/src/fwl/src/core/fwl_formimp.cpp6
-rw-r--r--xfa/src/fwl/src/core/fwl_noteimp.cpp7
-rw-r--r--xfa/src/fwl/src/core/fwl_panelimp.cpp7
-rw-r--r--xfa/src/fwl/src/core/fwl_sdadapterimp.cpp7
-rw-r--r--xfa/src/fwl/src/core/fwl_timerimp.cpp5
-rw-r--r--xfa/src/fwl/src/core/fwl_widgetimp.cpp13
-rw-r--r--xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp8
-rw-r--r--xfa/src/fwl/src/core/include/fwl_formimp.h1
-rw-r--r--xfa/src/fwl/src/core/include/fwl_gridimp.h10
-rw-r--r--xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h5
-rw-r--r--xfa/src/fwl/src/lightwidget/app.cpp7
-rw-r--r--xfa/src/fwl/src/lightwidget/barcode.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/caret.cpp5
-rw-r--r--xfa/src/fwl/src/lightwidget/checkbox.cpp3
-rw-r--r--xfa/src/fwl/src/lightwidget/combobox.cpp4
-rw-r--r--xfa/src/fwl/src/lightwidget/datetimepicker.cpp6
-rw-r--r--xfa/src/fwl/src/lightwidget/edit.cpp3
-rw-r--r--xfa/src/fwl/src/lightwidget/listbox.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/picturebox.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/pushbutton.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/scrollbar.cpp3
-rw-r--r--xfa/src/fwl/src/lightwidget/theme.cpp14
-rw-r--r--xfa/src/fwl/src/lightwidget/tooltipctrl.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/widget.cpp4
-rw-r--r--xfa/src/fwl/src/theme/barcodetp.cpp7
-rw-r--r--xfa/src/fwl/src/theme/carettp.cpp6
-rw-r--r--xfa/src/fwl/src/theme/checkboxtp.cpp6
-rw-r--r--xfa/src/fwl/src/theme/comboboxtp.cpp6
-rw-r--r--xfa/src/fwl/src/theme/datetimepickertp.cpp4
-rw-r--r--xfa/src/fwl/src/theme/edittp.cpp6
-rw-r--r--xfa/src/fwl/src/theme/formtp.cpp6
-rw-r--r--xfa/src/fwl/src/theme/listboxtp.cpp6
-rw-r--r--xfa/src/fwl/src/theme/monthcalendartp.cpp6
-rw-r--r--xfa/src/fwl/src/theme/pictureboxtp.cpp6
-rw-r--r--xfa/src/fwl/src/theme/pushbuttontp.cpp6
-rw-r--r--xfa/src/fwl/src/theme/scrollbartp.cpp6
-rw-r--r--xfa/src/fwl/src/theme/widgettp.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffapp.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffapp.h19
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffbarcode.cpp5
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffbarcode.h1
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp5
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp7
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffdoc.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_fffield.cpp7
-rw-r--r--xfa/src/fxfa/src/app/xfa_fffield.h4
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffimageedit.cpp5
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffimageedit.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp5
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffpushbutton.h3
-rw-r--r--xfa/src/fxfa/src/app/xfa_fftext.cpp4
-rw-r--r--xfa/src/fxfa/src/app/xfa_fftext.h3
-rw-r--r--xfa/src/fxfa/src/app/xfa_fftextedit.cpp8
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffwidget.h2
-rw-r--r--xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp1
-rw-r--r--xfa/src/fxfa/src/app/xfa_fwltheme.cpp11
-rw-r--r--xfa/src/fxfa/src/app/xfa_fwltheme.h15
-rw-r--r--xfa/src/fxfa/src/common/fxfa_localevalue.h4
-rw-r--r--xfa/src/fxfa/src/common/xfa_document.h1
-rw-r--r--xfa/src/fxfa/src/common/xfa_localemgr.h10
-rw-r--r--xfa/src/fxfa/src/common/xfa_object.h8
-rw-r--r--xfa/src/fxfa/src/common/xfa_utils.h4
-rw-r--r--xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp1
-rw-r--r--xfa/src/fxfa/src/parser/xfa_localevalue.cpp2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_utils_imp.cpp2
91 files changed, 405 insertions, 65 deletions
diff --git a/xfa/src/fgas/include/fx_datetime.h b/xfa/src/fgas/include/fx_datetime.h
index 99d1561b50..89b8a92d13 100644
--- a/xfa/src/fgas/include/fx_datetime.h
+++ b/xfa/src/fgas/include/fx_datetime.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FGAS_INCLUDE_FX_DATETIME_H_
#define XFA_SRC_FGAS_INCLUDE_FX_DATETIME_H_
+#include "core/include/fxcrt/fx_system.h"
+
class CFX_Unitime;
class CFX_DateTime;
typedef int64_t FX_UNITIME;
diff --git a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp
index d07dd300ab..159eaf1ba5 100644
--- a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp
@@ -4,8 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h"
+
+#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
diff --git a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp
index 62fb997a49..cda0efeb15 100644
--- a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp
@@ -4,8 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_caretimp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_caret.h"
+#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
diff --git a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp
index f6793df118..cf6d6d6a43 100644
--- a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp
@@ -4,10 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h"
+
#include <algorithm>
+#include "xfa/include/fwl/basewidget/fwl_checkbox.h"
+#include "xfa/include/fwl/core/fwl_theme.h"
#include "xfa/src/foxitlib.h"
-#include "xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
index 85e8416c76..cb414f540b 100644
--- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
@@ -4,8 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h"
+
+#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h"
diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp
index 8c957db965..6eca31c9ee 100644
--- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp
@@ -4,8 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_spinbutton.h"
+#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h"
@@ -15,6 +17,7 @@
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h"
+
#define FWL_DTP_WIDTH 100
#define FWL_DTP_HEIGHT 20
diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
index 0a5f6be6a5..38940f2e8d 100644
--- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
@@ -4,12 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h"
+
#include <algorithm>
+#include "xfa/include/fwl/basewidget/fwl_caret.h"
+#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
+#include "xfa/include/fwl/core/fwl_theme.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_caretimp.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h"
-#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h"
#include "xfa/src/fwl/src/core/include/fwl_appimp.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
diff --git a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp
index 71319ca06f..149d3fd0e3 100644
--- a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp
@@ -4,9 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h"
+
+#include "xfa/include/fwl/core/fwl_theme.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h"
-#include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp
index e9ac2af900..264c4b71ed 100644
--- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp
@@ -4,11 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_monthcalendar.h"
+#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+
#define MONTHCAL_HSEP_HEIGHT 1
#define MONTHCAL_VSEP_WIDTH 1
#define MONTHCAL_HMARGIN 3
diff --git a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp
index f19a5c3736..e04445acad 100644
--- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp
@@ -4,8 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h"
+
+#include "xfa/include/fwl/lightwidget/picturebox.h"
+#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
diff --git a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp
index 85f22ef2b0..f743db995e 100644
--- a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp
@@ -4,8 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
+#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
diff --git a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp
index b8d70a417a..04cdd901cd 100644
--- a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp
@@ -4,11 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
+#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+
#define FWL_SCROLLBAR_Elapse 500
#define FWL_SCROLLBAR_MinThumb 5
diff --git a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp
index ac6f0c9c1d..e3924290ca 100644
--- a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp
@@ -4,11 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_spinbutton.h"
+#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/include/fwl/core/fwl_timer.h"
+#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+
#define FWL_SPN_MinWidth 18
#define FWL_SPN_MinHeight 32
#define FWL_SPIN_Elapse 200
diff --git a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp
index 6d268879a6..c2155dd3b1 100644
--- a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp
@@ -4,8 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h"
+#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_formimp.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_panelimp.h"
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h b/xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h
index 64165be256..1425f6b3b5 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h
@@ -7,15 +7,14 @@
#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_BARCODEIMP_H_
#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_BARCODEIMP_H_
+#include "xfa/include/fwl/basewidget/fwl_barcode.h"
+#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
+#include "xfa/include/fwl/basewidget/fxmath_barcode.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h"
-class CFWL_WidgetImp;
class CFWL_WidgetImpProperties;
-class CFWL_WidgetImpDelegate;
-class IFWL_Widget;
-class CFWL_BarcodeEdit;
-class CFWL_BarcodeEditDelegate;
class CFWL_BarcodeImpDelegate;
+class IFWL_Widget;
#define XFA_BCS_NeedUpdate 0x0001
#define XFA_BCS_EncodeSuccess 0x0002
@@ -45,6 +44,7 @@ class CFWL_BarcodeImp : public CFWL_EditImp {
BC_TYPE m_type;
friend class CFWL_BarcodeImpDelegate;
};
+
class CFWL_BarcodeImpDelegate : public CFWL_EditImpDelegate {
public:
CFWL_BarcodeImpDelegate(CFWL_BarcodeImp* pOwner);
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h b/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h
index 1041672624..5405ed9b97 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h
@@ -9,6 +9,11 @@
#include <memory>
+#include "xfa/include/fwl/core/fwl_form.h"
+#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
+#include "xfa/include/fwl/basewidget/fwl_edit.h"
+#include "xfa/include/fwl/basewidget/fwl_monthcalendar.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h"
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
index d08d920856..67841eb748 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
@@ -10,6 +10,7 @@
#include <memory>
#include <vector>
+#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
#include "xfa/src/fee/include/ifde_txtedtengine.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_listboximp.h b/xfa/src/fwl/src/basewidget/include/fwl_listboximp.h
index 6f557a1ba0..fa1dd21a10 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_listboximp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_listboximp.h
@@ -9,13 +9,14 @@
#include <memory>
-class CFWL_WidgetImp;
-class CFWL_WidgetImpProperties;
-class CFWL_WidgetImpDelegate;
-class CFWL_ScrollBarImp;
-class IFWL_Widget;
-class CFWL_ListBoxImp;
+#include "xfa/include/fwl/basewidget/fwl_combobox.h"
+#include "xfa/include/fwl/basewidget/fwl_edit.h"
+#include "xfa/include/fwl/basewidget/fwl_listbox.h"
+#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
+#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+
class CFWL_ListBoxImpDelegate;
+
class CFWL_ListBoxImp : public CFWL_WidgetImp {
public:
CFWL_ListBoxImp(const CFWL_WidgetImpProperties& properties,
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h b/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h
index 607af804a5..5d1fd4c9cd 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h
@@ -7,6 +7,7 @@
#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_
#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_
+#include "xfa/src/fgas/include/fx_datetime.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
class CFWL_WidgetImpProperties;
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h b/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h
index 1b3e4f06cf..781075cefe 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h
@@ -7,6 +7,7 @@
#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_
#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_
+#include "xfa/include/fwl/core/fwl_timer.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
class CFWL_WidgetImpProperties;
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h b/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h
index 22d782baf3..c77905fb17 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h
@@ -7,13 +7,12 @@
#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_
#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_
+#include "xfa/include/fwl/core/fwl_timer.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
class CFWL_WidgetImpProperties;
-class IFWL_Widget;
-class IFWL_Timer;
-class CFWL_SpinButtonImp;
class CFWL_SpinButtonImpDelegate;
+
class CFWL_SpinButtonImp : public CFWL_WidgetImp, public IFWL_Timer {
public:
CFWL_SpinButtonImp(const CFWL_WidgetImpProperties& properties,
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h b/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h
index c383fbf005..21a11e373d 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h
@@ -7,12 +7,12 @@
#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_TOOLTIPCTRLIMP_H_
#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_TOOLTIPCTRLIMP_H_
+#include "xfa/include/fwl/core/fwl_timer.h"
#include "xfa/src/fwl/src/core/include/fwl_formimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
class CFWL_WidgetImpProperties;
class IFWL_Widget;
-class IFWL_Timer;
class CFWL_ToolTipImpDelegate;
class CFWL_ToolTipImp : public CFWL_FormImp {
diff --git a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h b/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
index c93b2a72c8..86f7245542 100644
--- a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FXMATH_BARCODEIMP_H_
#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FXMATH_BARCODEIMP_H_
+#include "xfa/include/fwl/basewidget/fxmath_barcode.h"
+
class CFX_Barcode : public IFX_Barcode {
public:
CFX_Barcode();
diff --git a/xfa/src/fwl/src/core/fwl_appimp.cpp b/xfa/src/fwl/src/core/fwl_appimp.cpp
index 1dd66e152f..a518bc58d0 100644
--- a/xfa/src/fwl/src/core/fwl_appimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_appimp.cpp
@@ -4,8 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_appimp.h"
+
+#include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h"
+#include "xfa/include/fwl/core/fwl_app.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
+#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
diff --git a/xfa/src/fwl/src/core/fwl_contentimp.cpp b/xfa/src/fwl/src/core/fwl_contentimp.cpp
index 2d3eeed8c8..482cf12908 100644
--- a/xfa/src/fwl/src/core/fwl_contentimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_contentimp.cpp
@@ -4,13 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_contentimp.h"
+
+#include "xfa/include/fwl/core/fwl_content.h"
+#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h"
+
FWL_ERR IFWL_Content::InsertWidget(IFWL_Widget* pChild, int32_t nIndex) {
return static_cast<CFWL_ContentImp*>(GetImpl())->InsertWidget(pChild, nIndex);
}
diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/src/core/fwl_formimp.cpp
index de254c774d..f30db2af06 100644
--- a/xfa/src/fwl/src/core/fwl_formimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_formimp.cpp
@@ -4,10 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fwl/src/core/include/fwl_formimp.h"
+
+#include "xfa/include/fwl/core/fwl_app.h"
+#include "xfa/include/fwl/core/fwl_content.h"
+#include "xfa/include/fwl/core/fwl_theme.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h"
#include "xfa/src/fwl/src/core/include/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_formimp.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_panelimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp
index 2dd90a7a3d..72479b077b 100644
--- a/xfa/src/fwl/src/core/fwl_noteimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp
@@ -4,16 +4,21 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h"
+#include "xfa/include/fwl/core/fwl_app.h"
+#include "xfa/include/fwl/core/fwl_grid.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h"
#include "xfa/src/fwl/src/core/include/fwl_appimp.h"
#include "xfa/src/fwl/src/core/include/fwl_formimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_panelimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h"
+
CFWL_NoteLoop::CFWL_NoteLoop(CFWL_WidgetImp* pForm)
: m_pForm(pForm), m_bContinueModal(TRUE) {}
FX_BOOL CFWL_NoteLoop::PreProcessMessage(CFWL_Message* pMessage) {
diff --git a/xfa/src/fwl/src/core/fwl_panelimp.cpp b/xfa/src/fwl/src/core/fwl_panelimp.cpp
index dadff4c1ba..44563f77d1 100644
--- a/xfa/src/fwl/src/core/fwl_panelimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_panelimp.cpp
@@ -4,11 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fwl/src/core/include/fwl_panelimp.h"
+
+#include "xfa/include/fwl/core/fwl_content.h"
+#include "xfa/include/fwl/core/fwl_grid.h"
+#include "xfa/include/fwl/core/fwl_panel.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_panelimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h"
// static
IFWL_Panel* IFWL_Panel::Create(CFWL_WidgetImpProperties& properties,
diff --git a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp
index 9a1d07b464..999f5a6cdf 100644
--- a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp
@@ -4,13 +4,20 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "core/include/fxcrt/fx_system.h"
+#include "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h"
+#include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h"
+#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h"
+#include "xfa/include/fwl/core/fwl_app.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h"
+
CFWL_SDAdapterWidgetMgr::CFWL_SDAdapterWidgetMgr() {}
CFWL_SDAdapterWidgetMgr::~CFWL_SDAdapterWidgetMgr() {}
+
FWL_ERR CFWL_SDAdapterWidgetMgr::CreateWidget(IFWL_Widget* pWidget,
IFWL_Widget* pParent) {
return FWL_ERR_Succeeded;
diff --git a/xfa/src/fwl/src/core/fwl_timerimp.cpp b/xfa/src/fwl/src/core/fwl_timerimp.cpp
index 945a7e39cb..bf7925c63d 100644
--- a/xfa/src/fwl/src/core/fwl_timerimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_timerimp.cpp
@@ -4,10 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/adapter/fwl_adapternative.h"
+#include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
+#include "xfa/include/fwl/core/fwl_app.h"
+#include "xfa/include/fwl/core/fwl_timer.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_appimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
+
FWL_HTIMER FWL_StartTimer(IFWL_Timer* pTimer,
FX_DWORD dwElapse,
FX_BOOL bImmediately) {
diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp
index e53b6a43a4..01d4d06376 100644
--- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp
@@ -4,15 +4,26 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
+
#include <algorithm>
+#include "xfa/include/fwl/adapter/fwl_adapternative.h"
+#include "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h"
+#include "xfa/include/fwl/basewidget/fwl_combobox.h"
+#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
+#include "xfa/include/fwl/basewidget/fwl_menu.h"
+#include "xfa/include/fwl/core/fwl_app.h"
+#include "xfa/include/fwl/core/fwl_content.h"
+#include "xfa/include/fwl/core/fwl_form.h"
+#include "xfa/include/fwl/core/fwl_theme.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_appimp.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h"
+
FWL_ERR IFWL_Widget::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {
return static_cast<CFWL_WidgetImp*>(GetImpl())
->GetWidgetRect(rect, bAutoSize);
diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
index 9464776a68..7255569500 100644
--- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
@@ -4,12 +4,18 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h"
+
+#include "xfa/include/fwl/adapter/fwl_adapternative.h"
+#include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h"
+#include "xfa/include/fwl/core/fwl_app.h"
+#include "xfa/include/fwl/core/fwl_form.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_appimp.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
FX_BOOL FWL_UseOffscreen(IFWL_Widget* pWidget) {
#if (_FX_OS_ == _FX_MACOSX_)
diff --git a/xfa/src/fwl/src/core/include/fwl_formimp.h b/xfa/src/fwl/src/core/include/fwl_formimp.h
index 0326603b8a..25a5ebedb4 100644
--- a/xfa/src/fwl/src/core/include/fwl_formimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_formimp.h
@@ -7,6 +7,7 @@
#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_FORMIMP_H_
#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_FORMIMP_H_
+#include "xfa/include/fwl/core/fwl_form.h"
#include "xfa/src/fwl/src/core/include/fwl_panelimp.h"
#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h"
diff --git a/xfa/src/fwl/src/core/include/fwl_gridimp.h b/xfa/src/fwl/src/core/include/fwl_gridimp.h
index 2ee22183af..f2e4e74bb0 100644
--- a/xfa/src/fwl/src/core/include/fwl_gridimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_gridimp.h
@@ -7,12 +7,10 @@
#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_GRIDIMP_H_
#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_GRIDIMP_H_
-class CFWL_Content;
-class IFWL_Widget;
-class CFWL_GridLength;
-class CFWL_GridColRow;
-class CFWL_GridWidgetInfo;
-class CFWL_GridImp;
+#include "xfa/include/fwl/core/fwl_app.h"
+#include "xfa/include/fwl/core/fwl_content.h"
+#include "xfa/include/fwl/core/fwl_grid.h"
+
class CFWL_GridLength {
public:
CFWL_GridLength() : fLength(0), eUnit(FWL_GRIDUNIT_Fixed) {}
diff --git a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
index cb6b6b3c15..c1c07d8b36 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
@@ -7,13 +7,14 @@
#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETMGRIMP_H_
#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETMGRIMP_H_
+#include "xfa/include/fwl/core/fwl_widgetmgr.h"
+
class CFWL_TargetImp;
class IFWL_Widget;
class IFWL_AdapterWidgetMgr;
-class CFWL_WidgetMgrItem;
-class CFWL_WidgetMgr;
class CFWL_WidgetMgrDelegate;
class IFWL_AdapterNative;
+
class CFWL_WidgetMgrItem {
public:
CFWL_WidgetMgrItem()
diff --git a/xfa/src/fwl/src/lightwidget/app.cpp b/xfa/src/fwl/src/lightwidget/app.cpp
index b0647b6b2c..1ec6f162e3 100644
--- a/xfa/src/fwl/src/lightwidget/app.cpp
+++ b/xfa/src/fwl/src/lightwidget/app.cpp
@@ -4,7 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/lightwidget/app.h"
+
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "xfa/include/fwl/core/fwl_app.h"
+#include "xfa/include/fwl/core/fwl_error.h"
+#include "xfa/include/fwl/lightwidget/theme.h"
#include "xfa/src/foxitlib.h"
+
CFWL_App::CFWL_App() : m_pIface(IFWL_App::Create(nullptr)), m_pTheme(nullptr) {}
CFWL_App::~CFWL_App() {
if (m_pTheme) {
diff --git a/xfa/src/fwl/src/lightwidget/barcode.cpp b/xfa/src/fwl/src/lightwidget/barcode.cpp
index efeeef481e..68b2f81545 100644
--- a/xfa/src/fwl/src/lightwidget/barcode.cpp
+++ b/xfa/src/fwl/src/lightwidget/barcode.cpp
@@ -4,6 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/lightwidget/barcode.h"
+
#include <memory>
#include "xfa/src/foxitlib.h"
diff --git a/xfa/src/fwl/src/lightwidget/caret.cpp b/xfa/src/fwl/src/lightwidget/caret.cpp
index f68d11ddc7..a7a7702ab6 100644
--- a/xfa/src/fwl/src/lightwidget/caret.cpp
+++ b/xfa/src/fwl/src/lightwidget/caret.cpp
@@ -4,9 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/lightwidget/caret.h"
+
#include <memory>
+#include "xfa/include/fwl/basewidget/fwl_caret.h"
+#include "xfa/include/fwl/lightwidget/edit.h"
#include "xfa/src/foxitlib.h"
+#include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
CFWL_Caret* CFWL_Caret::Create() {
return new CFWL_Caret;
diff --git a/xfa/src/fwl/src/lightwidget/checkbox.cpp b/xfa/src/fwl/src/lightwidget/checkbox.cpp
index 7207af3eb8..f2e24121d9 100644
--- a/xfa/src/fwl/src/lightwidget/checkbox.cpp
+++ b/xfa/src/fwl/src/lightwidget/checkbox.cpp
@@ -4,8 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/lightwidget/checkbox.h"
+
#include <memory>
+#include "xfa/include/fwl/core/fwl_error.h"
#include "xfa/src/foxitlib.h"
CFWL_CheckBox* CFWL_CheckBox::Create() {
diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/src/lightwidget/combobox.cpp
index e6c0160b34..1d5844b56d 100644
--- a/xfa/src/fwl/src/lightwidget/combobox.cpp
+++ b/xfa/src/fwl/src/lightwidget/combobox.cpp
@@ -4,8 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/lightwidget/combobox.h"
+
#include <utility>
+#include "xfa/include/fwl/core/fwl_error.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
#include "xfa/src/foxitlib.h"
CFWL_ComboBox* CFWL_ComboBox::Create() {
diff --git a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp
index c61f96ad3e..2f01ec04b8 100644
--- a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp
+++ b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp
@@ -4,8 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/lightwidget/datetimepicker.h"
+
#include <memory>
+#include "xfa/include/fwl/core/fwl_error.h"
+#include "xfa/include/fwl/core/fwl_note.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
+#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
#include "xfa/src/foxitlib.h"
CFWL_DateTimePicker* CFWL_DateTimePicker::Create() {
diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/src/lightwidget/edit.cpp
index f7667cb3a9..661428622d 100644
--- a/xfa/src/fwl/src/lightwidget/edit.cpp
+++ b/xfa/src/fwl/src/lightwidget/edit.cpp
@@ -4,8 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/lightwidget/edit.h"
+
#include <memory>
+#include "xfa/include/fwl/basewidget/fwl_edit.h"
#include "xfa/src/foxitlib.h"
CFWL_Edit* CFWL_Edit::Create() {
diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/src/lightwidget/listbox.cpp
index 4e6f4b8a47..9b8d105960 100644
--- a/xfa/src/fwl/src/lightwidget/listbox.cpp
+++ b/xfa/src/fwl/src/lightwidget/listbox.cpp
@@ -4,6 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/lightwidget/listbox.h"
+
#include <memory>
#include "third_party/base/stl_util.h"
diff --git a/xfa/src/fwl/src/lightwidget/picturebox.cpp b/xfa/src/fwl/src/lightwidget/picturebox.cpp
index 0d77242ab0..7fcba77b9e 100644
--- a/xfa/src/fwl/src/lightwidget/picturebox.cpp
+++ b/xfa/src/fwl/src/lightwidget/picturebox.cpp
@@ -4,6 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/lightwidget/picturebox.h"
+
#include <memory>
#include "xfa/src/foxitlib.h"
diff --git a/xfa/src/fwl/src/lightwidget/pushbutton.cpp b/xfa/src/fwl/src/lightwidget/pushbutton.cpp
index bd0a4b22d1..5a7b981062 100644
--- a/xfa/src/fwl/src/lightwidget/pushbutton.cpp
+++ b/xfa/src/fwl/src/lightwidget/pushbutton.cpp
@@ -4,6 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/lightwidget/pushbutton.h"
+
#include <memory>
#include "xfa/src/foxitlib.h"
diff --git a/xfa/src/fwl/src/lightwidget/scrollbar.cpp b/xfa/src/fwl/src/lightwidget/scrollbar.cpp
index a5ccbc8781..0d8e15c673 100644
--- a/xfa/src/fwl/src/lightwidget/scrollbar.cpp
+++ b/xfa/src/fwl/src/lightwidget/scrollbar.cpp
@@ -4,8 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/lightwidget/scrollbar.h"
+
#include <memory>
+#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
#include "xfa/src/foxitlib.h"
CFWL_ScrollBar* CFWL_ScrollBar::Create() {
diff --git a/xfa/src/fwl/src/lightwidget/theme.cpp b/xfa/src/fwl/src/lightwidget/theme.cpp
index 8352ad807d..79c54df693 100644
--- a/xfa/src/fwl/src/lightwidget/theme.cpp
+++ b/xfa/src/fwl/src/lightwidget/theme.cpp
@@ -4,8 +4,22 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/lightwidget/theme.h"
+
#include <algorithm>
+#include "xfa/include/fwl/theme/barcodetp.h"
+#include "xfa/include/fwl/theme/carettp.h"
+#include "xfa/include/fwl/theme/checkboxtp.h"
+#include "xfa/include/fwl/theme/comboboxtp.h"
+#include "xfa/include/fwl/theme/datetimepickertp.h"
+#include "xfa/include/fwl/theme/edittp.h"
+#include "xfa/include/fwl/theme/formtp.h"
+#include "xfa/include/fwl/theme/listboxtp.h"
+#include "xfa/include/fwl/theme/monthcalendartp.h"
+#include "xfa/include/fwl/theme/pictureboxtp.h"
+#include "xfa/include/fwl/theme/pushbuttontp.h"
+#include "xfa/include/fwl/theme/scrollbartp.h"
#include "xfa/src/foxitlib.h"
CFWL_Theme::CFWL_Theme() {
diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp
index 21a5497f98..9891a3b04a 100644
--- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp
+++ b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp
@@ -4,6 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/lightwidget/tooltipctrl.h"
+
#include <memory>
#include "xfa/src/foxitlib.h"
diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/src/lightwidget/widget.cpp
index 412ff07d5a..896ff80be3 100644
--- a/xfa/src/fwl/src/lightwidget/widget.cpp
+++ b/xfa/src/fwl/src/lightwidget/widget.cpp
@@ -4,6 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/lightwidget/widget.h"
+
+#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/include/fwl/core/fwl_thread.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
#include "xfa/src/fwl/src/core/include/fwl_noteimp.h"
diff --git a/xfa/src/fwl/src/theme/barcodetp.cpp b/xfa/src/fwl/src/theme/barcodetp.cpp
index 4300785cdc..fbbdeb2267 100644
--- a/xfa/src/fwl/src/theme/barcodetp.cpp
+++ b/xfa/src/fwl/src/theme/barcodetp.cpp
@@ -4,9 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/theme/barcodetp.h"
+
#include "xfa/src/foxitlib.h"
+#include "xfa/include/fwl/basewidget/fwl_barcode.h"
+#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
+
CFWL_BarcodeTP::CFWL_BarcodeTP() {}
CFWL_BarcodeTP::~CFWL_BarcodeTP() {}
+
FX_BOOL CFWL_BarcodeTP::IsValidWidget(IFWL_Widget* pWidget) {
if (!pWidget)
return FALSE;
diff --git a/xfa/src/fwl/src/theme/carettp.cpp b/xfa/src/fwl/src/theme/carettp.cpp
index e54f2559f0..705d0e3880 100644
--- a/xfa/src/fwl/src/theme/carettp.cpp
+++ b/xfa/src/fwl/src/theme/carettp.cpp
@@ -4,9 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/theme/carettp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_caret.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
#include "xfa/src/foxitlib.h"
+
CFWL_CaretTP::CFWL_CaretTP() {}
CFWL_CaretTP::~CFWL_CaretTP() {}
+
FX_BOOL CFWL_CaretTP::IsValidWidget(IFWL_Widget* pWidget) {
if (!pWidget)
return FALSE;
diff --git a/xfa/src/fwl/src/theme/checkboxtp.cpp b/xfa/src/fwl/src/theme/checkboxtp.cpp
index 932dc245eb..3cc6f43622 100644
--- a/xfa/src/fwl/src/theme/checkboxtp.cpp
+++ b/xfa/src/fwl/src/theme/checkboxtp.cpp
@@ -4,7 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/theme/checkboxtp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_checkbox.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
#include "xfa/src/foxitlib.h"
+
#define CHECKBOX_SIZE_SIGNMARGIN 3
#define CHECKBOX_SIZE_SIGNBORDER 2
#define CHECKBOX_SIZE_SIGNPATH 100
@@ -13,6 +18,7 @@
#define CHECKBOX_COLOR_BOXRB1 (ArgbEncode(255, 241, 239, 226))
#define CHECKBOX_COLOR_BOXRB2 (ArgbEncode(255, 255, 255, 255))
#define CHECKBOX_FXGE_CoordinatesAdjust
+
CFWL_CheckBoxTP::CFWL_CheckBoxTP() : m_pCheckPath(NULL) {
m_pThemeData = new CKBThemeData;
SetThemeData(0);
diff --git a/xfa/src/fwl/src/theme/comboboxtp.cpp b/xfa/src/fwl/src/theme/comboboxtp.cpp
index b18e812b9d..e2de30db4d 100644
--- a/xfa/src/fwl/src/theme/comboboxtp.cpp
+++ b/xfa/src/fwl/src/theme/comboboxtp.cpp
@@ -4,8 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/theme/comboboxtp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_combobox.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
#include "xfa/src/foxitlib.h"
+
#define FWLTHEME_CAPACITY_ComboFormHandler 8.0f
+
CFWL_ComboBoxTP::CFWL_ComboBoxTP() {
m_dwThemeID = 0;
}
diff --git a/xfa/src/fwl/src/theme/datetimepickertp.cpp b/xfa/src/fwl/src/theme/datetimepickertp.cpp
index 0c63a7f155..ae8cee8f94 100644
--- a/xfa/src/fwl/src/theme/datetimepickertp.cpp
+++ b/xfa/src/fwl/src/theme/datetimepickertp.cpp
@@ -4,7 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/theme/datetimepickertp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
#include "xfa/src/foxitlib.h"
+
CFWL_DateTimePickerTP::CFWL_DateTimePickerTP() {
m_pThemeData = new DTPThemeData;
initThemeData();
diff --git a/xfa/src/fwl/src/theme/edittp.cpp b/xfa/src/fwl/src/theme/edittp.cpp
index 68ff6a387e..d1389376af 100644
--- a/xfa/src/fwl/src/theme/edittp.cpp
+++ b/xfa/src/fwl/src/theme/edittp.cpp
@@ -4,9 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/theme/edittp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_edit.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
#include "xfa/src/foxitlib.h"
+
CFWL_EditTP::CFWL_EditTP() {}
CFWL_EditTP::~CFWL_EditTP() {}
+
FX_BOOL CFWL_EditTP::IsValidWidget(IFWL_Widget* pWidget) {
if (!pWidget)
return FALSE;
diff --git a/xfa/src/fwl/src/theme/formtp.cpp b/xfa/src/fwl/src/theme/formtp.cpp
index f70b4a1a2a..c8f032d80e 100644
--- a/xfa/src/fwl/src/theme/formtp.cpp
+++ b/xfa/src/fwl/src/theme/formtp.cpp
@@ -4,7 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/theme/formtp.h"
+
+#include "xfa/include/fwl/core/fwl_form.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
#include "xfa/src/foxitlib.h"
+
#define FWLTHEME_CAPACITY_CXFormBorder 3
#define FWLTHEME_CAPACITY_CYFormBorder 3
#define FWLTHEME_CAPACITY_CYNarrowCaption 18
@@ -15,6 +20,7 @@
#define FWLTHEME_FORMBTN_Margin 5
#define FWLTHEME_FORMBTN_Span 2
#define FWLTHEME_FORMBTN_Size 21
+
CFWL_FormTP::CFWL_FormTP() : m_pActiveBitmap(NULL), m_pDeactivebitmap(NULL) {
m_pThemeData = new SBThemeData;
SetThemeData(0);
diff --git a/xfa/src/fwl/src/theme/listboxtp.cpp b/xfa/src/fwl/src/theme/listboxtp.cpp
index 4d440e4278..7d76700368 100644
--- a/xfa/src/fwl/src/theme/listboxtp.cpp
+++ b/xfa/src/fwl/src/theme/listboxtp.cpp
@@ -4,9 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/theme/listboxtp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_listbox.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
#include "xfa/src/foxitlib.h"
+
CFWL_ListBoxTP::CFWL_ListBoxTP() {}
CFWL_ListBoxTP::~CFWL_ListBoxTP() {}
+
FX_BOOL CFWL_ListBoxTP::IsValidWidget(IFWL_Widget* pWidget) {
if (!pWidget)
return FALSE;
diff --git a/xfa/src/fwl/src/theme/monthcalendartp.cpp b/xfa/src/fwl/src/theme/monthcalendartp.cpp
index 5cded3173e..f381421c8b 100644
--- a/xfa/src/fwl/src/theme/monthcalendartp.cpp
+++ b/xfa/src/fwl/src/theme/monthcalendartp.cpp
@@ -4,7 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/theme/monthcalendartp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_monthcalendar.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
#include "xfa/src/foxitlib.h"
+
#define FWL_THEMECAPACITY_MC_HEADER_WIDTH 200
#define FWL_THEMECAPACITY_MC_HEADER_HEIGHT 30
#define FWL_THEMECAPACITY_MC_HEADER_BTN_WIDTH 18
@@ -48,6 +53,7 @@
FWL_THEMECAPACITY_MC_DATES_CELL_WIDTH
#define FWL_MC_WIDTH 200
#define FWL_MC_HEIGHT 160
+
CFWL_MonthCalendarTP::CFWL_MonthCalendarTP() {
m_pThemeData = new MCThemeData;
SetThemeData(0);
diff --git a/xfa/src/fwl/src/theme/pictureboxtp.cpp b/xfa/src/fwl/src/theme/pictureboxtp.cpp
index ff1706545d..0a373bdcb1 100644
--- a/xfa/src/fwl/src/theme/pictureboxtp.cpp
+++ b/xfa/src/fwl/src/theme/pictureboxtp.cpp
@@ -4,9 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/theme/pictureboxtp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_picturebox.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
#include "xfa/src/foxitlib.h"
+
CFWL_PictureBoxTP::CFWL_PictureBoxTP() {}
CFWL_PictureBoxTP::~CFWL_PictureBoxTP() {}
+
FX_BOOL CFWL_PictureBoxTP::IsValidWidget(IFWL_Widget* pWidget) {
if (!pWidget)
return FALSE;
diff --git a/xfa/src/fwl/src/theme/pushbuttontp.cpp b/xfa/src/fwl/src/theme/pushbuttontp.cpp
index f2dc8995b1..63062562a8 100644
--- a/xfa/src/fwl/src/theme/pushbuttontp.cpp
+++ b/xfa/src/fwl/src/theme/pushbuttontp.cpp
@@ -4,8 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/theme/pushbuttontp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
#include "xfa/src/foxitlib.h"
+
#define PUSHBUTTON_SIZE_Corner 2
+
CFWL_PushButtonTP::CFWL_PushButtonTP() {
m_pThemeData = new PBThemeData;
SetThemeData(0);
diff --git a/xfa/src/fwl/src/theme/scrollbartp.cpp b/xfa/src/fwl/src/theme/scrollbartp.cpp
index a0457377b3..b0965f5557 100644
--- a/xfa/src/fwl/src/theme/scrollbartp.cpp
+++ b/xfa/src/fwl/src/theme/scrollbartp.cpp
@@ -4,8 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/theme/scrollbartp.h"
+
+#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
#include "xfa/src/foxitlib.h"
+
#define FWL_SCROLL_PawLen 12.5f
+
CFWL_ScrollBarTP::CFWL_ScrollBarTP() {
m_pThemeData = new SBThemeData;
SetThemeData(0);
diff --git a/xfa/src/fwl/src/theme/widgettp.cpp b/xfa/src/fwl/src/theme/widgettp.cpp
index ef69ec0334..10ed696aa0 100644
--- a/xfa/src/fwl/src/theme/widgettp.cpp
+++ b/xfa/src/fwl/src/theme/widgettp.cpp
@@ -4,9 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/theme/widgettp.h"
+
#include <algorithm>
+#include "xfa/include/fwl/core/fwl_widgetmgr.h"
#include "xfa/src/foxitlib.h"
+
static void FWL_SetChildThemeID(IFWL_Widget* pParent, FX_DWORD dwThemeID) {
IFWL_WidgetMgr* pWidgetMgr = FWL_GetWidgetMgr();
IFWL_Widget* pChild =
diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.cpp b/xfa/src/fxfa/src/app/xfa_ffapp.cpp
index 2e0ed7085b..ed16cb8629 100644
--- a/xfa/src/fxfa/src/app/xfa_ffapp.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffapp.cpp
@@ -4,10 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
+
#include <algorithm>
+#include "xfa/include/fwl/core/fwl_widgetmgr.h"
#include "xfa/src/foxitlib.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdochandler.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.h b/xfa/src/fxfa/src/app/xfa_ffapp.h
index 2b04782108..12d6c34abd 100644
--- a/xfa/src/fxfa/src/app/xfa_ffapp.h
+++ b/xfa/src/fxfa/src/app/xfa_ffapp.h
@@ -7,6 +7,19 @@
#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFAPP_H_
#define XFA_SRC_FXFA_SRC_APP_XFA_FFAPP_H_
+#include "core/include/fpdfapi/fpdf_objects.h"
+#include "xfa/include/fwl/adapter/fwl_adapternative.h"
+#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h"
+#include "xfa/include/fwl/core/fwl_app.h"
+#include "xfa/include/fxfa/fxfa.h"
+#include "xfa/src/fgas/include/fx_fnt.h"
+
+class CXFA_FWLAdapterWidgetMgr;
+class CXFA_FWLTheme;
+class CXFA_FFDocHandler;
+class CXFA_FFMenuHandler;
+class CXFA_FontMgr;
+
class CXFA_FileRead : public IFX_FileRead {
public:
explicit CXFA_FileRead(const CFX_ArrayTemplate<CPDF_Stream*>& streams);
@@ -19,11 +32,7 @@ class CXFA_FileRead : public IFX_FileRead {
protected:
CFX_ObjectArray<CPDF_StreamAcc> m_Data;
};
-class CXFA_FWLAdapterWidgetMgr;
-class CXFA_FWLTheme;
-class CXFA_FFDocHandler;
-class CXFA_FFMenuHandler;
-class CXFA_FontMgr;
+
class CXFA_FFApp : public IXFA_App, public IFWL_AdapterNative {
public:
CXFA_FFApp(IXFA_AppProvider* pProvider);
diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp
index 908b0664b0..c12852e4e4 100644
--- a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp
@@ -4,8 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h"
+
+#include "xfa/include/fwl/core/fwl_app.h"
+#include "xfa/include/fwl/lightwidget/barcode.h"
+#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_fffield.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
#include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.h b/xfa/src/fxfa/src/app/xfa_ffbarcode.h
index 5fac3e232d..bf740b11f7 100644
--- a/xfa/src/fxfa/src/app/xfa_ffbarcode.h
+++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.h
@@ -7,6 +7,7 @@
#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_
#define XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_
+#include "xfa/include/fxbarcode/BC_BarCode.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
#include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
index 0091aaac90..d0e36aa88d 100644
--- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
@@ -4,9 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h"
+
+#include "xfa/include/fwl/core/fwl_widgetmgr.h"
+#include "xfa/include/fwl/lightwidget/checkbox.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp
index 46907f4cdd..67b5cc3110 100644
--- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp
@@ -4,8 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h"
+
+#include "xfa/include/fwl/basewidget/fwl_edit.h"
+#include "xfa/include/fwl/core/fwl_app.h"
+#include "xfa/include/fwl/lightwidget/combobox.h"
+#include "xfa/include/fwl/lightwidget/listbox.h"
+#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
#include "xfa/src/fxfa/src/app/xfa_fffield.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
index 5cbd3c1ec1..b6f8c90371 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
@@ -4,9 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
+
+#include "xfa/include/fwl/core/fwl_note.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
#include "xfa/src/fxfa/src/app/xfa_ffnotify.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
diff --git a/xfa/src/fxfa/src/app/xfa_fffield.cpp b/xfa/src/fxfa/src/app/xfa_fffield.cpp
index 25ad6599f2..63fb9f07d8 100644
--- a/xfa/src/fxfa/src/app/xfa_fffield.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fffield.cpp
@@ -4,11 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fxfa/src/app/xfa_fffield.h"
+
+#include "xfa/include/fwl/basewidget/fwl_edit.h"
+#include "xfa/include/fwl/core/fwl_widgetmgr.h"
+#include "xfa/include/fwl/lightwidget/edit.h"
+#include "xfa/include/fwl/lightwidget/picturebox.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
#include "xfa/src/fxfa/src/app/xfa_fwltheme.h"
diff --git a/xfa/src/fxfa/src/app/xfa_fffield.h b/xfa/src/fxfa/src/app/xfa_fffield.h
index e168b147ce..4c6318e29c 100644
--- a/xfa/src/fxfa/src/app/xfa_fffield.h
+++ b/xfa/src/fxfa/src/app/xfa_fffield.h
@@ -7,6 +7,9 @@
#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_
#define XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_
+#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h"
+#include "xfa/include/fwl/core/fwl_widget.h"
+#include "xfa/include/fwl/lightwidget/widget.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
@@ -14,6 +17,7 @@
#define XFA_DEFAULTUI_HEIGHT 2.0f
class CXFA_TextLayout;
+
class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
public:
CXFA_FFField(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
index 634175acd9..8f3a838f4e 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
@@ -4,11 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h"
+
+#include "xfa/include/fwl/core/fwl_app.h"
+#include "xfa/include/fwl/lightwidget/picturebox.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.h b/xfa/src/fxfa/src/app/xfa_ffimageedit.h
index 09fc2e9c68..a433a74c0f 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimageedit.h
+++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGEEDIT_H_
#define XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGEEDIT_H_
+#include "xfa/src/fxfa/src/app/xfa_fffield.h"
+
class CXFA_FFImageEdit : public CXFA_FFField {
public:
CXFA_FFImageEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp
index 027f897f7a..3b5a462188 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp
@@ -4,11 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h"
+
+#include "xfa/include/fwl/core/fwl_widgetmgr.h"
+#include "xfa/include/fwl/lightwidget/pushbutton.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_fffield.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h"
#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.h b/xfa/src/fxfa/src/app/xfa_ffpushbutton.h
index e3761d142f..9e5d768265 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.h
+++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.h
@@ -7,10 +7,13 @@
#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFPUSHBUTTON_H_
#define XFA_SRC_FXFA_SRC_APP_XFA_FFPUSHBUTTON_H_
+#include "xfa/src/fxfa/src/app/xfa_fffield.h"
+
#define XFA_FWL_PSBSTYLEEXT_HiliteNone (0L << 0)
#define XFA_FWL_PSBSTYLEEXT_HiliteInverted (1L << 0)
#define XFA_FWL_PSBSTYLEEXT_HilitePush (2L << 0)
#define XFA_FWL_PSBSTYLEEXT_HiliteOutLine (4L << 0)
+
class CXFA_FFPushButton : public CXFA_FFField {
public:
CXFA_FFPushButton(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
diff --git a/xfa/src/fxfa/src/app/xfa_fftext.cpp b/xfa/src/fxfa/src/app/xfa_fftext.cpp
index 313022acd9..dffcfdf361 100644
--- a/xfa/src/fxfa/src/app/xfa_fftext.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fftext.cpp
@@ -4,12 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fxfa/src/app/xfa_fftext.h"
+
+#include "xfa/include/fwl/core/fwl_widgetdef.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_fftext.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
diff --git a/xfa/src/fxfa/src/app/xfa_fftext.h b/xfa/src/fxfa/src/app/xfa_fftext.h
index f4decf215e..7fd8d653b4 100644
--- a/xfa/src/fxfa/src/app/xfa_fftext.h
+++ b/xfa/src/fxfa/src/app/xfa_fftext.h
@@ -7,7 +7,10 @@
#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFTEXT_H_
#define XFA_SRC_FXFA_SRC_APP_XFA_FFTEXT_H_
+#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
+
class CXFA_TextLayout;
+
class CXFA_FFText : public CXFA_FFDraw {
public:
CXFA_FFText(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
index 350d4b0d90..cb907b5dff 100644
--- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
@@ -4,16 +4,22 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
+
+#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
+#include "xfa/include/fwl/basewidget/fwl_edit.h"
+#include "xfa/include/fwl/lightwidget/datetimepicker.h"
+#include "xfa/include/fwl/lightwidget/edit.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
#include "xfa/src/fxfa/src/app/xfa_fffield.h"
#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
+#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
CXFA_FFTextEdit::CXFA_FFTextEdit(CXFA_FFPageView* pPageView,
CXFA_WidgetAcc* pDataAcc)
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.h b/xfa/src/fxfa/src/app/xfa_ffwidget.h
index 2928adfb16..b08e795601 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidget.h
+++ b/xfa/src/fxfa/src/app/xfa_ffwidget.h
@@ -9,6 +9,8 @@
#include <vector>
+#include "core/include/fxcodec/fx_codec_def.h"
+#include "core/include/fxge/fx_ge.h"
#include "xfa/include/fxfa/fxfa.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
index c2873dc52d..0178a281e7 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
@@ -19,6 +19,7 @@
#include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
+#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
#include "xfa/src/fxfa/src/common/xfa_script.h"
static void XFA_FFDeleteCalcData(void* pData) {
diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp
index b683d64a7e..2d497a29b8 100644
--- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp
@@ -4,6 +4,17 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/include/fwl/basewidget/fwl_barcode.h"
+#include "xfa/include/fwl/basewidget/fwl_caret.h"
+#include "xfa/include/fwl/basewidget/fwl_checkbox.h"
+#include "xfa/include/fwl/basewidget/fwl_combobox.h"
+#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
+#include "xfa/include/fwl/basewidget/fwl_edit.h"
+#include "xfa/include/fwl/basewidget/fwl_listbox.h"
+#include "xfa/include/fwl/basewidget/fwl_monthcalendar.h"
+#include "xfa/include/fwl/basewidget/fwl_picturebox.h"
+#include "xfa/include/fwl/basewidget/fwl_pushbutton.h"
+#include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
#include "xfa/src/foxitlib.h"
#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.h b/xfa/src/fxfa/src/app/xfa_fwltheme.h
index eabde0481b..ed0b681f2a 100644
--- a/xfa/src/fxfa/src/app/xfa_fwltheme.h
+++ b/xfa/src/fxfa/src/app/xfa_fwltheme.h
@@ -7,6 +7,21 @@
#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FWLTHEME_H_
#define XFA_SRC_FXFA_SRC_APP_XFA_FWLTHEME_H_
+#include "xfa/include/fwl/core/fwl_target.h"
+#include "xfa/include/fwl/core/fwl_theme.h"
+#include "xfa/include/fwl/theme/barcodetp.h"
+#include "xfa/include/fwl/theme/carettp.h"
+#include "xfa/include/fwl/theme/checkboxtp.h"
+#include "xfa/include/fwl/theme/comboboxtp.h"
+#include "xfa/include/fwl/theme/datetimepickertp.h"
+#include "xfa/include/fwl/theme/edittp.h"
+#include "xfa/include/fwl/theme/listboxtp.h"
+#include "xfa/include/fwl/theme/monthcalendartp.h"
+#include "xfa/include/fwl/theme/pictureboxtp.h"
+#include "xfa/include/fwl/theme/pushbuttontp.h"
+#include "xfa/include/fwl/theme/scrollbartp.h"
+#include "xfa/include/fwl/theme/widgettp.h"
+
class CXFA_FWLTheme : public IFWL_ThemeProvider {
public:
CXFA_FWLTheme(CXFA_FFApp* pApp);
diff --git a/xfa/src/fxfa/src/common/fxfa_localevalue.h b/xfa/src/fxfa/src/common/fxfa_localevalue.h
index 39660ff665..a876d6968e 100644
--- a/xfa/src/fxfa/src/common/fxfa_localevalue.h
+++ b/xfa/src/fxfa/src/common/fxfa_localevalue.h
@@ -7,9 +7,12 @@
#ifndef XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALEVALUE_H_
#define XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALEVALUE_H_
+#include "xfa/include/fxfa/fxfa_objectacc.h"
+
class IFX_Locale;
class CFX_Unitime;
class CXFA_LocaleMgr;
+
#define XFA_VT_NULL 0
#define XFA_VT_BOOLEAN 1
#define XFA_VT_INTEGER 2
@@ -19,6 +22,7 @@ class CXFA_LocaleMgr;
#define XFA_VT_DATE 32
#define XFA_VT_TIME 64
#define XFA_VT_DATETIME 128
+
class CXFA_LocaleValue {
public:
CXFA_LocaleValue();
diff --git a/xfa/src/fxfa/src/common/xfa_document.h b/xfa/src/fxfa/src/common/xfa_document.h
index f75b350786..1e70791748 100644
--- a/xfa/src/fxfa/src/common/xfa_document.h
+++ b/xfa/src/fxfa/src/common/xfa_document.h
@@ -7,6 +7,7 @@
#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_
#define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_
+#include "xfa/include/fxfa/fxfa.h"
#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
#include "xfa/src/fxfa/src/common/xfa_object.h"
diff --git a/xfa/src/fxfa/src/common/xfa_localemgr.h b/xfa/src/fxfa/src/common/xfa_localemgr.h
index 6583ddb061..04ca87791f 100644
--- a/xfa/src/fxfa/src/common/xfa_localemgr.h
+++ b/xfa/src/fxfa/src/common/xfa_localemgr.h
@@ -7,10 +7,14 @@
#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_LOCALEMGR_H_
#define XFA_SRC_FXFA_SRC_COMMON_XFA_LOCALEMGR_H_
+#include "xfa/include/fxfa/fxfa_objectacc.h"
+#include "xfa/src/fgas/include/fx_datetime.h"
+#include "xfa/src/fgas/include/fx_locale.h"
+#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
+
class CXFA_Node;
class IFX_Locale;
-class IFX_LocaleMgr;
-class CXFA_LocaleMgr;
+
#define XFA_LANGID_zh_CN 0x0804
#define XFA_LANGID_zh_TW 0x0404
#define XFA_LANGID_zh_HK 0x0c04
@@ -26,6 +30,7 @@ class CXFA_LocaleMgr;
#define XFA_LANGID_pt_BR 0x0416
#define XFA_LANGID_nl_NL 0x0413
#define XFA_LANGID_ru_RU 0x0419
+
class CXFA_LocaleMgr : public IFX_LocaleMgr {
public:
CXFA_LocaleMgr(CXFA_Node* pLocaleSet, CFX_WideString wsDeflcid);
@@ -46,6 +51,7 @@ class CXFA_LocaleMgr : public IFX_LocaleMgr {
FX_WORD m_dwDeflcid;
FX_WORD m_dwLocaleFlags;
};
+
class IXFA_TimeZoneProvider {
public:
static IXFA_TimeZoneProvider* Create();
diff --git a/xfa/src/fxfa/src/common/xfa_object.h b/xfa/src/fxfa/src/common/xfa_object.h
index 7fcf94550d..0565dfd47a 100644
--- a/xfa/src/fxfa/src/common/xfa_object.h
+++ b/xfa/src/fxfa/src/common/xfa_object.h
@@ -7,16 +7,13 @@
#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_
#define XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_
+#include "xfa/src/fdp/include/fde_xml.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
-class CXFA_ArrayNodeList;
-class CXFA_AttachNodeList;
class CXFA_Document;
class CXFA_Node;
class CXFA_NodeList;
class CXFA_OrdinaryObject;
-class IXFA_Notify;
-class IXFA_ObjFactory;
enum XFA_OBJECTTYPE {
XFA_OBJECTTYPE_OrdinaryObject = 0x0,
@@ -89,6 +86,7 @@ class CXFA_Object {
CXFA_Document* const m_pDocument;
FX_DWORD m_uFlags;
};
+
#define XFA_NODEFILTER_Children 0x01
#define XFA_NODEFILTER_Properties 0x02
#define XFA_NODEFILTER_OneOfProperty 0x04
@@ -104,6 +102,8 @@ enum XFA_SOM_MESSAGETYPE {
XFA_SOM_FormatMessage,
XFA_SOM_MandatoryMessage
};
+
+typedef CFX_ArrayTemplate<CXFA_Node*> CXFA_NodeArray;
typedef CFX_StackTemplate<CXFA_Node*> CXFA_NodeStack;
typedef CXFA_PtrSetTemplate<CXFA_Node*> CXFA_NodeSet;
typedef void (*PD_CALLBACK_DUPLICATEDATA)(void*& pData);
diff --git a/xfa/src/fxfa/src/common/xfa_utils.h b/xfa/src/fxfa/src/common/xfa_utils.h
index 86d8ff652b..77eebc66ed 100644
--- a/xfa/src/fxfa/src/common/xfa_utils.h
+++ b/xfa/src/fxfa/src/common/xfa_utils.h
@@ -7,7 +7,9 @@
#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_
#define XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_
-#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
+#include "xfa/include/fxfa/fxfa_basic.h"
+
+class CXFA_LocaleValue;
FX_BOOL XFA_FDEExtension_ResolveNamespaceQualifier(
IFDE_XMLElement* pNode,
diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp
index 64ebfcae9a..132f8a39c2 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp
@@ -6,6 +6,7 @@
#include <time.h>
+#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h"
#define FINANCIAL_PRECISION 0.00000001
diff --git a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp
index 99ff2e94d0..2222d0cf9c 100644
--- a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp
@@ -5,6 +5,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -14,6 +15,7 @@
#include "xfa/src/fxfa/src/common/xfa_parser.h"
#include "xfa/src/fxfa/src/common/xfa_script.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
+
static const FX_DOUBLE fraction_scales[] = {0.1,
0.01,
0.001,
diff --git a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp
index 36702a8c37..9c3b5383dc 100644
--- a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp
@@ -5,6 +5,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -14,6 +15,7 @@
#include "xfa/src/fxfa/src/common/xfa_parser.h"
#include "xfa/src/fxfa/src/common/xfa_script.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
+
static FX_ARGB XFA_WStringToColor(const CFX_WideStringC& wsValue) {
uint8_t r = 0, g = 0, b = 0;
if (wsValue.GetLength() == 0) {
diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp
index 1ca7b64faa..4dbf3e0a60 100644
--- a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp
@@ -5,6 +5,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "xfa/src/foxitlib.h"
+#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
#include "xfa/src/fxfa/src/common/xfa_docdata.h"
#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
#include "xfa/src/fxfa/src/common/xfa_document.h"
@@ -14,6 +15,7 @@
#include "xfa/src/fxfa/src/common/xfa_parser.h"
#include "xfa/src/fxfa/src/common/xfa_script.h"
#include "xfa/src/fxfa/src/common/xfa_utils.h"
+
CXFA_Node* XFA_CreateUIChild(CXFA_Node* pNode, XFA_ELEMENT& eWidgetType) {
XFA_ELEMENT eType = pNode->GetClassID();
eWidgetType = eType;