From e73c5ceb8176dfd92138780f640ac193f1c0ea30 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 25 Feb 2016 13:38:37 -0500 Subject: Remove include only fwl.h and IWYU. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1735833003 . --- BUILD.gn | 1 - xfa.gyp | 1 - xfa/include/foxitxfa.h | 1 - xfa/include/fwl/adapter/fwl_adapterthreadmgr.h | 1 + xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h | 4 ++ xfa/include/fwl/adapter/fwl_sdadapterimp.h | 12 ++-- xfa/include/fwl/basewidget/fwl_caret.h | 5 +- xfa/include/fwl/basewidget/fwl_checkbox.h | 8 +-- xfa/include/fwl/basewidget/fwl_datetimepicker.h | 13 ++-- xfa/include/fwl/basewidget/fwl_listbox.h | 11 +++- xfa/include/fwl/basewidget/fwl_monthcalendar.h | 9 ++- xfa/include/fwl/basewidget/fwl_picturebox.h | 7 +- xfa/include/fwl/basewidget/fwl_pushbutton.h | 8 +-- xfa/include/fwl/basewidget/fwl_scrollbar.h | 9 +-- xfa/include/fwl/core/fwl_app.h | 4 +- xfa/include/fwl/core/fwl_content.h | 4 +- xfa/include/fwl/core/fwl_grid.h | 6 +- xfa/include/fwl/core/fwl_note.h | 1 + xfa/include/fwl/core/fwl_panel.h | 6 +- xfa/include/fwl/core/fwl_target.h | 1 + xfa/include/fwl/core/fwl_theme.h | 10 +-- xfa/include/fwl/core/fwl_thread.h | 2 + xfa/include/fwl/core/fwl_widgetmgr.h | 12 ++-- xfa/include/fwl/fwl.h | 77 ---------------------- xfa/include/fwl/lightwidget/app.h | 2 + xfa/include/fwl/lightwidget/barcode.h | 5 +- xfa/include/fwl/lightwidget/caret.h | 6 +- xfa/include/fwl/lightwidget/checkbox.h | 8 +-- xfa/include/fwl/lightwidget/datetimepicker.h | 8 +-- xfa/include/fwl/lightwidget/listbox.h | 7 +- xfa/include/fwl/lightwidget/picturebox.h | 9 ++- xfa/include/fwl/lightwidget/pushbutton.h | 8 +-- xfa/include/fwl/lightwidget/scrollbar.h | 5 +- xfa/include/fwl/lightwidget/tooltipctrl.h | 8 +-- xfa/include/fwl/theme/checkboxtp.h | 1 + xfa/include/fwl/theme/listboxtp.h | 5 +- xfa/include/fwl/theme/monthcalendartp.h | 4 +- xfa/include/fwl/theme/pictureboxtp.h | 4 +- xfa/include/fwl/theme/pushbuttontp.h | 4 +- xfa/include/fwl/theme/scrollbartp.h | 4 +- xfa/include/fwl/theme/widgettp.h | 11 +++- xfa/include/fxfa/fxfa_objectacc.h | 7 +- xfa/src/fgas/include/fx_datetime.h | 2 + xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp | 4 +- xfa/src/fwl/src/basewidget/fwl_caretimp.cpp | 5 +- xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp | 5 +- xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp | 4 +- .../fwl/src/basewidget/fwl_datetimepickerimp.cpp | 5 +- xfa/src/fwl/src/basewidget/fwl_editimp.cpp | 6 +- xfa/src/fwl/src/basewidget/fwl_listboximp.cpp | 4 +- .../fwl/src/basewidget/fwl_monthcalendarimp.cpp | 6 +- xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp | 4 +- xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp | 4 +- xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp | 6 +- xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp | 7 +- xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp | 5 +- .../fwl/src/basewidget/include/fwl_barcodeimp.h | 10 +-- .../src/basewidget/include/fwl_datetimepickerimp.h | 5 ++ xfa/src/fwl/src/basewidget/include/fwl_editimp.h | 1 + .../fwl/src/basewidget/include/fwl_listboximp.h | 13 ++-- .../src/basewidget/include/fwl_monthcalendarimp.h | 1 + .../fwl/src/basewidget/include/fwl_scrollbarimp.h | 1 + .../fwl/src/basewidget/include/fwl_spinbuttonimp.h | 5 +- .../src/basewidget/include/fwl_tooltipctrlimp.h | 2 +- .../fwl/src/basewidget/include/fxmath_barcodeimp.h | 2 + xfa/src/fwl/src/core/fwl_appimp.cpp | 6 +- xfa/src/fwl/src/core/fwl_contentimp.cpp | 5 +- xfa/src/fwl/src/core/fwl_formimp.cpp | 6 +- xfa/src/fwl/src/core/fwl_noteimp.cpp | 7 +- xfa/src/fwl/src/core/fwl_panelimp.cpp | 7 +- xfa/src/fwl/src/core/fwl_sdadapterimp.cpp | 7 ++ xfa/src/fwl/src/core/fwl_timerimp.cpp | 5 ++ xfa/src/fwl/src/core/fwl_widgetimp.cpp | 13 +++- xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp | 8 ++- xfa/src/fwl/src/core/include/fwl_formimp.h | 1 + xfa/src/fwl/src/core/include/fwl_gridimp.h | 10 ++- xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h | 5 +- xfa/src/fwl/src/lightwidget/app.cpp | 7 ++ xfa/src/fwl/src/lightwidget/barcode.cpp | 2 + xfa/src/fwl/src/lightwidget/caret.cpp | 5 ++ xfa/src/fwl/src/lightwidget/checkbox.cpp | 3 + xfa/src/fwl/src/lightwidget/combobox.cpp | 4 ++ xfa/src/fwl/src/lightwidget/datetimepicker.cpp | 6 ++ xfa/src/fwl/src/lightwidget/edit.cpp | 3 + xfa/src/fwl/src/lightwidget/listbox.cpp | 2 + xfa/src/fwl/src/lightwidget/picturebox.cpp | 2 + xfa/src/fwl/src/lightwidget/pushbutton.cpp | 2 + xfa/src/fwl/src/lightwidget/scrollbar.cpp | 3 + xfa/src/fwl/src/lightwidget/theme.cpp | 14 ++++ xfa/src/fwl/src/lightwidget/tooltipctrl.cpp | 2 + xfa/src/fwl/src/lightwidget/widget.cpp | 4 ++ xfa/src/fwl/src/theme/barcodetp.cpp | 7 ++ xfa/src/fwl/src/theme/carettp.cpp | 6 ++ xfa/src/fwl/src/theme/checkboxtp.cpp | 6 ++ xfa/src/fwl/src/theme/comboboxtp.cpp | 6 ++ xfa/src/fwl/src/theme/datetimepickertp.cpp | 4 ++ xfa/src/fwl/src/theme/edittp.cpp | 6 ++ xfa/src/fwl/src/theme/formtp.cpp | 6 ++ xfa/src/fwl/src/theme/listboxtp.cpp | 6 ++ xfa/src/fwl/src/theme/monthcalendartp.cpp | 6 ++ xfa/src/fwl/src/theme/pictureboxtp.cpp | 6 ++ xfa/src/fwl/src/theme/pushbuttontp.cpp | 6 ++ xfa/src/fwl/src/theme/scrollbartp.cpp | 6 ++ xfa/src/fwl/src/theme/widgettp.cpp | 4 ++ xfa/src/fxfa/src/app/xfa_ffapp.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffapp.h | 19 ++++-- xfa/src/fxfa/src/app/xfa_ffbarcode.cpp | 5 +- xfa/src/fxfa/src/app/xfa_ffbarcode.h | 1 + xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp | 5 +- xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp | 7 +- xfa/src/fxfa/src/app/xfa_ffdoc.cpp | 4 +- xfa/src/fxfa/src/app/xfa_fffield.cpp | 7 +- xfa/src/fxfa/src/app/xfa_fffield.h | 4 ++ xfa/src/fxfa/src/app/xfa_ffimageedit.cpp | 5 +- xfa/src/fxfa/src/app/xfa_ffimageedit.h | 2 + xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp | 5 +- xfa/src/fxfa/src/app/xfa_ffpushbutton.h | 3 + xfa/src/fxfa/src/app/xfa_fftext.cpp | 4 +- xfa/src/fxfa/src/app/xfa_fftext.h | 3 + xfa/src/fxfa/src/app/xfa_fftextedit.cpp | 8 ++- xfa/src/fxfa/src/app/xfa_ffwidget.h | 2 + xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp | 1 + xfa/src/fxfa/src/app/xfa_fwltheme.cpp | 11 ++++ xfa/src/fxfa/src/app/xfa_fwltheme.h | 15 +++++ xfa/src/fxfa/src/common/fxfa_localevalue.h | 4 ++ xfa/src/fxfa/src/common/xfa_document.h | 1 + xfa/src/fxfa/src/common/xfa_localemgr.h | 10 ++- xfa/src/fxfa/src/common/xfa_object.h | 8 +-- xfa/src/fxfa/src/common/xfa_utils.h | 4 +- xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp | 1 + xfa/src/fxfa/src/parser/xfa_localevalue.cpp | 2 + xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp | 2 + xfa/src/fxfa/src/parser/xfa_utils_imp.cpp | 2 + 133 files changed, 537 insertions(+), 252 deletions(-) delete mode 100644 xfa/include/fwl/fwl.h diff --git a/BUILD.gn b/BUILD.gn index 6b7131f351..da6f244d47 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -808,7 +808,6 @@ if (pdf_enable_xfa) { "xfa/include/fwl/core/fwl_widget.h", "xfa/include/fwl/core/fwl_widgetdef.h", "xfa/include/fwl/core/fwl_widgetmgr.h", - "xfa/include/fwl/fwl.h", "xfa/include/fwl/lightwidget/app.h", "xfa/include/fwl/lightwidget/barcode.h", "xfa/include/fwl/lightwidget/caret.h", diff --git a/xfa.gyp b/xfa.gyp index 23dc24b644..3f438f3469 100644 --- a/xfa.gyp +++ b/xfa.gyp @@ -57,7 +57,6 @@ "xfa/include/fwl/core/fwl_widget.h", "xfa/include/fwl/core/fwl_widgetdef.h", "xfa/include/fwl/core/fwl_widgetmgr.h", - "xfa/include/fwl/fwl.h", "xfa/include/fwl/lightwidget/app.h", "xfa/include/fwl/lightwidget/barcode.h", "xfa/include/fwl/lightwidget/caret.h", diff --git a/xfa/include/foxitxfa.h b/xfa/include/foxitxfa.h index 8236a273a2..bdb72ed313 100644 --- a/xfa/include/foxitxfa.h +++ b/xfa/include/foxitxfa.h @@ -14,7 +14,6 @@ #include "core/include/fxcodec/fx_codec.h" #include "core/include/fxcrt/fx_ext.h" #include "core/include/fxge/fx_ge.h" -#include "xfa/include/fwl/fwl.h" #include "xfa/include/fxbarcode/BC_BarCode.h" #include "xfa/include/fxfa/fxfa.h" #include "xfa/include/fxgraphics/fx_graphics.h" diff --git a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h index edd6158fd1..7446853299 100644 --- a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h @@ -7,6 +7,7 @@ #ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERTHREADMGR_H_ #define XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERTHREADMGR_H_ +#include "core/include/fxcrt/fx_system.h" #include "xfa/include/fwl/core/fwl_error.h" #include "xfa/include/fwl/core/fwl_thread.h" diff --git a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h index ed9bd0fa80..454763a23b 100644 --- a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h @@ -7,6 +7,10 @@ #ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERWIDGETMGR_H_ #define XFA_INCLUDE_FWL_ADAPTER_FWL_ADAPTERWIDGETMGR_H_ +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxcrt/fx_system.h" +#include "xfa/include/fwl/core/fwl_error.h" + class IFWL_Widget; class IFWL_Menu; class IFWL_MenuDP; diff --git a/xfa/include/fwl/adapter/fwl_sdadapterimp.h b/xfa/include/fwl/adapter/fwl_sdadapterimp.h index 97125e5431..52cbb99c26 100644 --- a/xfa/include/fwl/adapter/fwl_sdadapterimp.h +++ b/xfa/include/fwl/adapter/fwl_sdadapterimp.h @@ -7,14 +7,9 @@ #ifndef XFA_INCLUDE_FWL_ADAPTER_FWL_SDADAPTERIMP_H_ #define XFA_INCLUDE_FWL_ADAPTER_FWL_SDADAPTERIMP_H_ -class IFWL_AdapterNative; -class IFWL_AdapterWidgetMgr; -class IFWL_AdapterThreadMgr; -class IFWL_AdapterTimerMgr; -class IFWL_WidgetMgrDelegate; -class CFWL_SDAdatperNative; -class CFWL_SDAdapterWidgetMgr; -class CFWL_SDAdapterTimerMgr; +#include "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h" +#include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h" + class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr { public: CFWL_SDAdapterWidgetMgr(); @@ -74,6 +69,7 @@ class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr { FX_FLOAT& r, FX_FLOAT& b); }; + class CFWL_SDAdapterThreadMgr : public IFWL_AdapterThreadMgr { public: CFWL_SDAdapterThreadMgr(); diff --git a/xfa/include/fwl/basewidget/fwl_caret.h b/xfa/include/fwl/basewidget/fwl_caret.h index 7b022e7816..d6144ae1e8 100644 --- a/xfa/include/fwl/basewidget/fwl_caret.h +++ b/xfa/include/fwl/basewidget/fwl_caret.h @@ -7,9 +7,8 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_CARET_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_CARET_H_ -class CFWL_WidgetImpProperties; -class IFWL_Widget; -class IFWL_Caret; +#include "xfa/include/fwl/core/fwl_widget.h" + #define FWL_CLASS_Caret L"FWL_CARET" #define FWL_CLASSHASH_Caret 671181879 #define FWL_STATE_CAT_HightLight 1 diff --git a/xfa/include/fwl/basewidget/fwl_checkbox.h b/xfa/include/fwl/basewidget/fwl_checkbox.h index 616fef5397..6979a1de38 100644 --- a/xfa/include/fwl/basewidget/fwl_checkbox.h +++ b/xfa/include/fwl/basewidget/fwl_checkbox.h @@ -7,10 +7,9 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_CHECKBOX_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_CHECKBOX_H_ -class CFWL_WidgetImpProperties; -class IFWL_Widget; -class IFWL_CheckBoxDP; -class IFWL_CheckBox; +#include "xfa/include/fwl/core/fwl_note.h" +#include "xfa/include/fwl/core/fwl_widget.h" + #define FWL_CLASS_CheckBox L"FWL_CHECKBOX" #define FWL_CLASSHASH_CheckBox 4107183823 #define FWL_STYLEEXT_CKB_Left (0L << 0) @@ -60,6 +59,7 @@ class IFWL_CheckBox; #define FWL_PARTSTATE_CKB_Mask2 (3L << 2) #define FWL_EVT_CKB_CheckStateChanged L"FWL_EVENT_CKB_CheckStateChanged" #define FWL_EVTHASH_CKB_CheckStateChanged 2503252963 + BEGIN_FWL_EVENT_DEF(CFWL_EvtCkbCheckStateChanged, FWL_EVTHASH_CKB_CheckStateChanged) END_FWL_EVENT_DEF diff --git a/xfa/include/fwl/basewidget/fwl_datetimepicker.h b/xfa/include/fwl/basewidget/fwl_datetimepicker.h index 5932991f6f..7cce00eadd 100644 --- a/xfa/include/fwl/basewidget/fwl_datetimepicker.h +++ b/xfa/include/fwl/basewidget/fwl_datetimepicker.h @@ -7,10 +7,9 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_DATETIMEPICKER_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_DATETIMEPICKER_H_ -class CFWL_WidgetImpProperties; -class IFWL_Widget; -class IFWL_DateTimePickerDP; -class IFWL_DateTimePicker; +#include "xfa/include/fwl/core/fwl_note.h" +#include "xfa/include/fwl/core/fwl_widget.h" + #define FWL_CLASS_DateTimePicker L"FWL_DATETIMEPICKER" #define FWL_CLASSHASH_DateTimePicker 3851176257 #define FWL_STYLEEXT_DTP_AllowEdit (1L << 0) @@ -47,21 +46,27 @@ class IFWL_DateTimePicker; #define FWL_EVTHASH_DTP_HoverChanged 686674750 #define FWL_EVT_DTP_SelectChanged L"FWL_EVENT_DTP_SelectChanged" #define FWL_EVTHASH_DTP_SelectChanged 1589616858 + BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpDropDown, FWL_EVTHASH_DTP_DropDown) END_FWL_EVENT_DEF + BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpCloseUp, FWL_EVTHASH_DTP_CloseUp) END_FWL_EVENT_DEF + BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpEditChanged, FWL_EVTHASH_DTP_EditChanged) CFX_WideString m_wsText; END_FWL_EVENT_DEF + BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpHoverChanged, FWL_EVTHASH_DTP_HoverChanged) int32_t hoverday; END_FWL_EVENT_DEF + BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpSelectChanged, FWL_EVTHASH_DTP_SelectChanged) int32_t iYear; int32_t iMonth; int32_t iDay; END_FWL_EVENT_DEF + class IFWL_DateTimePickerDP : public IFWL_DataProvider { public: virtual FWL_ERR GetToday(IFWL_Widget* pWidget, diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/include/fwl/basewidget/fwl_listbox.h index 7645c2526b..4cf5c654d4 100644 --- a/xfa/include/fwl/basewidget/fwl_listbox.h +++ b/xfa/include/fwl/basewidget/fwl_listbox.h @@ -7,10 +7,11 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_LISTBOX_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_LISTBOX_H_ -class CFWL_WidgetImpProperties; -class IFWL_Widget; +#include "xfa/include/fwl/core/fwl_note.h" +#include "xfa/include/fwl/core/fwl_widget.h" + class IFWL_ListBoxDP; -class IFWL_ListBox; + #define FWL_CLASS_ListBox L"FWL_LISTBOX" #define FWL_CLASSHASH_ListBox 1777358317 #define FWL_STYLEEXT_LTB_MultiSelection (1L << 0) @@ -49,20 +50,24 @@ class IFWL_ListBox; #define FWL_EVT_LTB_DrawItem L"FWL_EVENT_LTB_DrawItem" #define FWL_EVTHASH_LTB_SelChanged 1701781688 #define FWL_EVTHASH_LTB_DrawItem 1050853991 + BEGIN_FWL_EVENT_DEF(CFWL_EvtLtbSelChanged, FWL_EVTHASH_LTB_SelChanged) CFX_Int32Array iarraySels; END_FWL_EVENT_DEF + BEGIN_FWL_EVENT_DEF(CFWL_EvtLtbDrawItem, FWL_EVTHASH_LTB_DrawItem) CFX_Graphics* m_pGraphics; CFX_Matrix m_matrix; int32_t m_index; CFX_RectF m_rect; END_FWL_EVENT_DEF + typedef struct FWL_HLISTITEM_ { void* pData; } * FWL_HLISTITEM; struct FWL_ListBoxItemData { IFWL_ListBoxDP* pDataProvider; int32_t iIndex; }; + class IFWL_ListBoxDP : public IFWL_DataProvider { public: virtual int32_t CountItems(IFWL_Widget* pWidget) = 0; diff --git a/xfa/include/fwl/basewidget/fwl_monthcalendar.h b/xfa/include/fwl/basewidget/fwl_monthcalendar.h index 3053947180..a57b8151c2 100644 --- a/xfa/include/fwl/basewidget/fwl_monthcalendar.h +++ b/xfa/include/fwl/basewidget/fwl_monthcalendar.h @@ -7,8 +7,9 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_MONTHCALENDAR_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_MONTHCALENDAR_H_ -class IFWL_MonthCalendarDP; -class IFWL_MonthCalendar; +#include "xfa/include/fwl/core/fwl_note.h" +#include "xfa/include/fwl/core/fwl_widget.h" + #define FWL_CLASS_MonthCalendar L"FWL_MONTHCALENDAR" #define FWL_CLASSHASH_MonthCalendar 2733931374 #define FWL_STYLEEXT_MCD_MultiSelect (1L << 0) @@ -97,22 +98,26 @@ class IFWL_MonthCalendar; #define FWL_EVT_MCD_DateChanged L"FWL_EVENT_MCD_DateChanged" #define FWL_NOTEHASH_MCD_DATASELECTED 1085596932 #define FWL_EVTHASH_MCD_DateChanged 54212227 + BEGIN_FWL_EVENT_DEF(CFWL_Event_McdDateSelected, FWL_NOTEHASH_MCD_DATASELECTED) int32_t m_iStartDay; int32_t m_iEndDay; END_FWL_EVENT_DEF + BEGIN_FWL_EVENT_DEF(CFWL_EventMcdDateChanged, FWL_EVTHASH_MCD_DateChanged) int32_t m_iOldYear; int32_t m_iOldMonth; int32_t m_iStartDay; int32_t m_iEndDay; END_FWL_EVENT_DEF + class IFWL_MonthCalendarDP : public IFWL_DataProvider { public: virtual int32_t GetCurDay(IFWL_Widget* pWidget) = 0; virtual int32_t GetCurMonth(IFWL_Widget* pWidget) = 0; virtual int32_t GetCurYear(IFWL_Widget* pWidget) = 0; }; + class IFWL_MonthCalendar : public IFWL_Widget { public: static IFWL_MonthCalendar* Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/include/fwl/basewidget/fwl_picturebox.h b/xfa/include/fwl/basewidget/fwl_picturebox.h index 0b206c2d04..2a27da4912 100644 --- a/xfa/include/fwl/basewidget/fwl_picturebox.h +++ b/xfa/include/fwl/basewidget/fwl_picturebox.h @@ -7,10 +7,8 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_ -class CFWL_WidgetImpProperties; -class IFWL_Widget; -class IFWL_PictureBoxDP; -class IFWL_PictureBox; +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + #define FWL_CLASS_PictureBox L"FWL_PICTUREBOX" #define FWL_CLASSHASH_PictureBox 2974721741 #define FWL_STYLEEXT_PTB_Left 0L << 0 @@ -32,6 +30,7 @@ class IFWL_PictureBox; #define FWL_PART_PTB_Image 3 #define FWL_PARTSTATE_PTB_Normal (0L << 0) #define FWL_PARTSTATE_PTB_Disabled (1L << 0) + class IFWL_PictureBoxDP : public IFWL_DataProvider { public: virtual CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget) = 0; diff --git a/xfa/include/fwl/basewidget/fwl_pushbutton.h b/xfa/include/fwl/basewidget/fwl_pushbutton.h index 500cc0dcc1..3e5acd11b0 100644 --- a/xfa/include/fwl/basewidget/fwl_pushbutton.h +++ b/xfa/include/fwl/basewidget/fwl_pushbutton.h @@ -7,10 +7,9 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_PUSHBUTTON_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_PUSHBUTTON_H_ -class CFWL_WidgetImpProperties; -class IFWL_Widget; -class IFWL_PushButtonDP; -class IFWL_PushButton; +#include "xfa/include/fwl/core/fwl_theme.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + #define FWL_CLASS_PushButton L"FWL_PUSHBUTTON" #define FWL_CLASSHASH_PushButton 3521614244 #define FWL_STYLEEXT_PSB_Left (0L << 0) @@ -40,6 +39,7 @@ class IFWL_PushButton; #define FWL_PARTSTATE_PSB_Disabled (4L << 0) #define FWL_PARTSTATE_PSB_Focused (1L << 3) #define FWL_PARTSTATE_PSB_Mask (7L << 0) + class IFWL_PushButtonDP : public IFWL_DataProvider { public: virtual CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget) = 0; diff --git a/xfa/include/fwl/basewidget/fwl_scrollbar.h b/xfa/include/fwl/basewidget/fwl_scrollbar.h index 691ec8826c..6a6df77087 100644 --- a/xfa/include/fwl/basewidget/fwl_scrollbar.h +++ b/xfa/include/fwl/basewidget/fwl_scrollbar.h @@ -7,10 +7,8 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_SCROLLBAR_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_SCROLLBAR_H_ -class CFWL_WidgetImpProperties; -class IFWL_Widget; -class IFWL_ScrollBarDP; -class IFWL_ScrollBar; +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + #define FWL_CLASS_ScrollBar L"FWL_SCROLLBAR" #define FWL_CLASSHASH_ScrollBar 2826584844 #define FWL_STYLEEXT_SCB_Horz (0L << 0) @@ -33,6 +31,7 @@ class IFWL_ScrollBar; #define FWL_WGTHITTEST_SCB_UpperTrack FWL_WGTHITTEST_MAX + 4 #define FWL_WGTHITTEST_SCB_Thumb FWL_WGTHITTEST_MAX + 5 #define FWL_CAPACITY_SCB_Size FWL_WGTCAPACITY_MAX + enum FWL_SCBCODE { FWL_SCBCODE_None = 1, FWL_SCBCODE_Min, @@ -45,7 +44,9 @@ enum FWL_SCBCODE { FWL_SCBCODE_TrackPos, FWL_SCBCODE_EndScroll, }; + class IFWL_ScrollBarDP : public IFWL_DataProvider {}; + class IFWL_ScrollBar : public IFWL_Widget { public: static IFWL_ScrollBar* Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/include/fwl/core/fwl_app.h b/xfa/include/fwl/core/fwl_app.h index 9bfb519d88..ca771432db 100644 --- a/xfa/include/fwl/core/fwl_app.h +++ b/xfa/include/fwl/core/fwl_app.h @@ -7,7 +7,9 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_APP_H_ #define XFA_INCLUDE_FWL_CORE_FWL_APP_H_ -class IFWL_NoteThread; +#include "core/include/fxcrt/fx_string.h" +#include "xfa/include/fwl/core/fwl_thread.h" + class IFWL_AdapterNative; class IFWL_Widget; class IFWL_WidgetMgr; diff --git a/xfa/include/fwl/core/fwl_content.h b/xfa/include/fwl/core/fwl_content.h index c665469aec..3ffb1a8dec 100644 --- a/xfa/include/fwl/core/fwl_content.h +++ b/xfa/include/fwl/core/fwl_content.h @@ -7,8 +7,8 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_CONTENT_H_ #define XFA_INCLUDE_FWL_CORE_FWL_CONTENT_H_ -class IFWL_Widget; -class IFWL_Content; +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + class IFWL_Content : public IFWL_Widget { public: static IFWL_Content* Create(); diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h index 9e17e2c846..c5b443b2b0 100644 --- a/xfa/include/fwl/core/fwl_grid.h +++ b/xfa/include/fwl/core/fwl_grid.h @@ -7,11 +7,14 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_GRID_H_ #define XFA_INCLUDE_FWL_CORE_FWL_GRID_H_ +#include "xfa/include/fwl/core/fwl_content.h" + class IFWL_Widget; -class IFWL_Content; + #define FWL_CLASS_Grid L"FWL_GRID" #define FWL_CLASSHASH_Grid 3150298670 #define FWL_GRIDSTYLEEXT_ShowGridLines (1L << 0) + struct FWL_LAYOUTDATA { FX_FLOAT fWidth; FX_FLOAT fHeight; @@ -36,6 +39,7 @@ enum FWL_GRIDSIZE { FWL_GRIDSIZE_MaxWidth, FWL_GRIDSIZE_MaxHeight, }; + typedef struct FWL_HGRIDCOLROW_ { void* pData; } * FWL_HGRIDCOLROW; class IFWL_Grid : public IFWL_Content { public: diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h index f06dd20e39..5d74c1e451 100644 --- a/xfa/include/fwl/core/fwl_note.h +++ b/xfa/include/fwl/core/fwl_note.h @@ -7,6 +7,7 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_ #define XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_ +#include "xfa/include/fwl/core/fwl_error.h" #include "xfa/include/fxgraphics/fx_graphics.h" class IFWL_Target; diff --git a/xfa/include/fwl/core/fwl_panel.h b/xfa/include/fwl/core/fwl_panel.h index 94e01bca60..51e3d4caaa 100644 --- a/xfa/include/fwl/core/fwl_panel.h +++ b/xfa/include/fwl/core/fwl_panel.h @@ -7,10 +7,10 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_PANEL_H_ #define XFA_INCLUDE_FWL_CORE_FWL_PANEL_H_ -class IFWL_Widget; +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + class IFWL_Content; -class IFWL_Panel; -class IFWL_CustomPanel; + #define FWL_CLASS_Panel L"FWL_Panel" #define FWL_CLASSHASH_Panel 881567292 diff --git a/xfa/include/fwl/core/fwl_target.h b/xfa/include/fwl/core/fwl_target.h index 7eaf0b25f3..6572f8be33 100644 --- a/xfa/include/fwl/core/fwl_target.h +++ b/xfa/include/fwl/core/fwl_target.h @@ -8,6 +8,7 @@ #define XFA_INCLUDE_FWL_CORE_FWL_TARGET_H_ #include "core/include/fxcrt/fx_basic.h" +#include "xfa/include/fwl/core/fwl_error.h" // FWL contains three parallel inheritance hierarchies, which reference each // other via pointers as follows: diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h index 2700e3bd55..8f9f9a6c36 100644 --- a/xfa/include/fwl/core/fwl_theme.h +++ b/xfa/include/fwl/core/fwl_theme.h @@ -7,12 +7,11 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_THEME_H_ #define XFA_INCLUDE_FWL_CORE_FWL_THEME_H_ +#include "xfa/include/fwl/core/fwl_error.h" +#include "xfa/include/fxgraphics/fx_graphics.h" + class IFWL_Widget; -class CFWL_ThemePart; -class CFWL_ThemeBackground; -class CFWL_ThemeText; -class CFWL_ThemeElement; -class IFWL_ThemeProvider; + #define FWL_WGTCAPACITY_CXBorder 1 #define FWL_WGTCAPACITY_CYBorder 2 #define FWL_WGTCAPACITY_ScrollBarWidth 3 @@ -27,6 +26,7 @@ class IFWL_ThemeProvider; #define FWL_WGTCAPACITY_UIMargin 12 #define FWL_WGTCAPACITY_SpaceAboveBelow 13 #define FWL_WGTCAPACITY_MAX 65535 + class CFWL_ThemePart { public: CFWL_ThemePart() diff --git a/xfa/include/fwl/core/fwl_thread.h b/xfa/include/fwl/core/fwl_thread.h index d83c74f8c4..5b41c9cf8a 100644 --- a/xfa/include/fwl/core/fwl_thread.h +++ b/xfa/include/fwl/core/fwl_thread.h @@ -22,6 +22,8 @@ // CFWL_App --------------> IFWL_App CFWL_AppImp // +#include "xfa/include/fwl/core/fwl_error.h" + class CFWL_ThreadImp; class IFWL_NoteDriver; diff --git a/xfa/include/fwl/core/fwl_widgetmgr.h b/xfa/include/fwl/core/fwl_widgetmgr.h index 2420f6927f..9486af5ef7 100644 --- a/xfa/include/fwl/core/fwl_widgetmgr.h +++ b/xfa/include/fwl/core/fwl_widgetmgr.h @@ -7,9 +7,13 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_WIDGETMGR_H_ #define XFA_INCLUDE_FWL_CORE_FWL_WIDGETMGR_H_ +#include "xfa/include/fwl/core/fwl_note.h" + class IFWL_Widget; -class IFWL_WidgetMgr; -class IFWL_WidgetMgrDelegate; + +#define FWL_WGTMGR_DisableThread 0x00000001 +#define FWL_WGTMGR_DisableForm 0x00000002 + enum FWL_WGTRELATION { FWL_WGTRELATION_Parent = 0, FWL_WGTRELATION_Owner, @@ -21,6 +25,7 @@ enum FWL_WGTRELATION { FWL_WGTRELATION_LastChild, FWL_WGTRELATION_SystemForm }; + class IFWL_WidgetMgr { public: virtual ~IFWL_WidgetMgr() {} @@ -37,8 +42,7 @@ class IFWL_WidgetMgr { }; IFWL_WidgetMgr* FWL_GetWidgetMgr(); FX_BOOL FWL_WidgetIsChild(IFWL_Widget* parent, IFWL_Widget* find); -#define FWL_WGTMGR_DisableThread 0x00000001 -#define FWL_WGTMGR_DisableForm 0x00000002 + class IFWL_WidgetMgrDelegate { public: virtual ~IFWL_WidgetMgrDelegate() {} diff --git a/xfa/include/fwl/fwl.h b/xfa/include/fwl/fwl.h deleted file mode 100644 index 32048ce86f..0000000000 --- a/xfa/include/fwl/fwl.h +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -// TODO(thestig): Remove this file and do IWYU. - -#ifndef XFA_INCLUDE_FWL_FWL_H_ -#define XFA_INCLUDE_FWL_FWL_H_ - -#include "xfa/include/fwl/adapter/fwl_adapternative.h" -#include "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h" -#include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h" -#include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h" -#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h" -#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_menu.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/include/fwl/basewidget/fwl_spinbutton.h" -#include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h" -#include "xfa/include/fwl/basewidget/fxmath_barcode.h" -#include "xfa/include/fwl/core/fwl_app.h" -#include "xfa/include/fwl/core/fwl_content.h" -#include "xfa/include/fwl/core/fwl_error.h" -#include "xfa/include/fwl/core/fwl_form.h" -#include "xfa/include/fwl/core/fwl_grid.h" -#include "xfa/include/fwl/core/fwl_note.h" -#include "xfa/include/fwl/core/fwl_panel.h" -#include "xfa/include/fwl/core/fwl_target.h" -#include "xfa/include/fwl/core/fwl_theme.h" -#include "xfa/include/fwl/core/fwl_thread.h" -#include "xfa/include/fwl/core/fwl_timer.h" -#include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/include/fwl/core/fwl_widgetdef.h" -#include "xfa/include/fwl/core/fwl_widgetmgr.h" -#include "xfa/include/fwl/lightwidget/app.h" -#include "xfa/include/fwl/lightwidget/barcode.h" -#include "xfa/include/fwl/lightwidget/caret.h" -#include "xfa/include/fwl/lightwidget/checkbox.h" -#include "xfa/include/fwl/lightwidget/combobox.h" -#include "xfa/include/fwl/lightwidget/datetimepicker.h" -#include "xfa/include/fwl/lightwidget/edit.h" -#include "xfa/include/fwl/lightwidget/listbox.h" -#include "xfa/include/fwl/lightwidget/picturebox.h" -#include "xfa/include/fwl/lightwidget/pushbutton.h" -#include "xfa/include/fwl/lightwidget/scrollbar.h" -#include "xfa/include/fwl/lightwidget/theme.h" -#include "xfa/include/fwl/lightwidget/tooltipctrl.h" -#include "xfa/include/fwl/lightwidget/widget.h" -#include "xfa/include/fwl/theme/barcodetp.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/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/include/fwl/theme/utils.h" -#include "xfa/include/fwl/theme/widgettp.h" -#include "xfa/include/fwl/theme/widgettp.h" - -#endif // XFA_INCLUDE_FWL_FWL_H_ diff --git a/xfa/include/fwl/lightwidget/app.h b/xfa/include/fwl/lightwidget/app.h index 1049e8abcd..ce0c0df287 100644 --- a/xfa/include/fwl/lightwidget/app.h +++ b/xfa/include/fwl/lightwidget/app.h @@ -7,6 +7,8 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_APP_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_APP_H_ +#include "xfa/include/fwl/core/fwl_error.h" + class CFWL_Theme; class IFWL_App; diff --git a/xfa/include/fwl/lightwidget/barcode.h b/xfa/include/fwl/lightwidget/barcode.h index 04e27a12c9..2dec2a8806 100644 --- a/xfa/include/fwl/lightwidget/barcode.h +++ b/xfa/include/fwl/lightwidget/barcode.h @@ -7,12 +7,13 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_ +#include "xfa/include/fwl/basewidget/fwl_barcode.h" +#include "xfa/include/fwl/core/fwl_error.h" #include "xfa/include/fwl/lightwidget/edit.h" +#include "xfa/include/fxbarcode/BC_BarCode.h" class CFWL_Widget; class CFWL_WidgetProperties; -class IFWL_BarcodeDP; -class CFWL_BarcodeDP; class CFWL_Barcode : public CFWL_Edit { public: diff --git a/xfa/include/fwl/lightwidget/caret.h b/xfa/include/fwl/lightwidget/caret.h index db7e09d188..be11be1cf5 100644 --- a/xfa/include/fwl/lightwidget/caret.h +++ b/xfa/include/fwl/lightwidget/caret.h @@ -7,9 +7,9 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_CARET_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_CARET_H_ -class CFWL_Widget; -class CFWL_WidgetProperties; -class CFWL_Caret; +#include "xfa/include/fwl/core/fwl_error.h" +#include "xfa/include/fwl/lightwidget/widget.h" + class CFWL_Caret : public CFWL_Widget { public: static CFWL_Caret* Create(); diff --git a/xfa/include/fwl/lightwidget/checkbox.h b/xfa/include/fwl/lightwidget/checkbox.h index c357de9f81..3780badce2 100644 --- a/xfa/include/fwl/lightwidget/checkbox.h +++ b/xfa/include/fwl/lightwidget/checkbox.h @@ -7,11 +7,9 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_CHECKBOX_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_CHECKBOX_H_ -class CFWL_Widget; -class CFWL_WidgetProperties; -class IFWL_CheckBoxDP; -class CFWL_CheckBox; -class CFWL_CheckBoxDP; +#include "xfa/include/fwl/basewidget/fwl_checkbox.h" +#include "xfa/include/fwl/lightwidget/widget.h" + class CFWL_CheckBox : public CFWL_Widget { public: static CFWL_CheckBox* Create(); diff --git a/xfa/include/fwl/lightwidget/datetimepicker.h b/xfa/include/fwl/lightwidget/datetimepicker.h index e29e51879b..22048f37f6 100644 --- a/xfa/include/fwl/lightwidget/datetimepicker.h +++ b/xfa/include/fwl/lightwidget/datetimepicker.h @@ -7,11 +7,9 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_DATETIMEPICKER_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_DATETIMEPICKER_H_ -class CFWL_Widget; -class CFWL_WidgetProperties; -class IFWL_DateTimePickerDP; -class CFWL_DateTimePicker; -class CFWL_DateTimePickerDP; +#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h" +#include "xfa/include/fwl/lightwidget/widget.h" + class CFWL_DateTimePicker : public CFWL_Widget { public: static CFWL_DateTimePicker* Create(); diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h index b30f0f6739..008f17055f 100644 --- a/xfa/include/fwl/lightwidget/listbox.h +++ b/xfa/include/fwl/lightwidget/listbox.h @@ -10,12 +10,11 @@ #include #include +#include "xfa/include/fwl/basewidget/fwl_listbox.h" +#include "xfa/include/fwl/core/fwl_error.h" +#include "xfa/include/fwl/core/fwl_widget.h" #include "xfa/include/fwl/lightwidget/widget.h" -class CFWL_Widget; -class CFWL_WidgetProperties; -class IFWL_ListBoxDP; -class CFWL_ListBox; class CFWL_ListItem; class CFWL_ListBox : public CFWL_Widget { diff --git a/xfa/include/fwl/lightwidget/picturebox.h b/xfa/include/fwl/lightwidget/picturebox.h index bd994ac1e8..5a21176241 100644 --- a/xfa/include/fwl/lightwidget/picturebox.h +++ b/xfa/include/fwl/lightwidget/picturebox.h @@ -7,11 +7,10 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_PICTUREBOX_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_PICTUREBOX_H_ -class CFWL_Widget; -class CFWL_WidgetProperties; -class IFWL_PictureBoxDP; -class CFWL_PictureBox; -class CFWL_PictureBoxDP; +#include "xfa/include/fwl/basewidget/fwl_picturebox.h" +#include "xfa/include/fwl/core/fwl_error.h" +#include "xfa/include/fwl/lightwidget/widget.h" + class CFWL_PictureBox : public CFWL_Widget { public: static CFWL_PictureBox* Create(); diff --git a/xfa/include/fwl/lightwidget/pushbutton.h b/xfa/include/fwl/lightwidget/pushbutton.h index 709a52710a..d8f5760911 100644 --- a/xfa/include/fwl/lightwidget/pushbutton.h +++ b/xfa/include/fwl/lightwidget/pushbutton.h @@ -7,11 +7,9 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_PUSHBUTTON_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_PUSHBUTTON_H_ -class CFWL_Widget; -class CFWL_WidgetProperties; -class IFWL_PushButtonDP; -class CFWL_PushButton; -class CFWL_PushButtonDP; +#include "xfa/include/fwl/basewidget/fwl_pushbutton.h" +#include "xfa/include/fwl/lightwidget/widget.h" + class CFWL_PushButton : public CFWL_Widget { public: static CFWL_PushButton* Create(); diff --git a/xfa/include/fwl/lightwidget/scrollbar.h b/xfa/include/fwl/lightwidget/scrollbar.h index e835bdeb5a..d78e8bec63 100644 --- a/xfa/include/fwl/lightwidget/scrollbar.h +++ b/xfa/include/fwl/lightwidget/scrollbar.h @@ -7,9 +7,8 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_SCROLLBAR_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_SCROLLBAR_H_ -class CFWL_Widget; -class CFWL_WidgetProperties; -class CFWL_ScrollBar; +#include "xfa/include/fwl/lightwidget/widget.h" + class CFWL_ScrollBar : public CFWL_Widget { public: static CFWL_ScrollBar* Create(); diff --git a/xfa/include/fwl/lightwidget/tooltipctrl.h b/xfa/include/fwl/lightwidget/tooltipctrl.h index 9b92f35242..c446fe47aa 100644 --- a/xfa/include/fwl/lightwidget/tooltipctrl.h +++ b/xfa/include/fwl/lightwidget/tooltipctrl.h @@ -7,11 +7,9 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIPCTRL_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIPCTRL_H_ -class CFWL_Widget; -class CFWL_WidgetProperties; -class IFWL_ToolTipDP; -class CFWL_ToolTip; -class CFWL_ToolTipDP; +#include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h" +#include "xfa/include/fwl/lightwidget/widget.h" + class CFWL_ToolTip : public CFWL_Widget { public: static CFWL_ToolTip* Create(); diff --git a/xfa/include/fwl/theme/checkboxtp.h b/xfa/include/fwl/theme/checkboxtp.h index 6db6f561a1..4208897db6 100644 --- a/xfa/include/fwl/theme/checkboxtp.h +++ b/xfa/include/fwl/theme/checkboxtp.h @@ -7,6 +7,7 @@ #ifndef XFA_INCLUDE_FWL_THEME_CHECKBOXTP_H_ #define XFA_INCLUDE_FWL_THEME_CHECKBOXTP_H_ +#include "xfa/include/fwl/theme/utils.h" #include "xfa/include/fwl/theme/widgettp.h" class CFWL_CheckBoxTP : public CFWL_WidgetTP { diff --git a/xfa/include/fwl/theme/listboxtp.h b/xfa/include/fwl/theme/listboxtp.h index efab981a0d..8b689814ff 100644 --- a/xfa/include/fwl/theme/listboxtp.h +++ b/xfa/include/fwl/theme/listboxtp.h @@ -7,9 +7,8 @@ #ifndef XFA_INCLUDE_FWL_THEME_LISTBOXTP_H_ #define XFA_INCLUDE_FWL_THEME_LISTBOXTP_H_ -class CFWL_WidgetTP; -class CFWL_ScrollBarTP; -class CFWL_ListBoxTP; +#include "xfa/include/fwl/theme/widgettp.h" + class CFWL_ListBoxTP : public CFWL_WidgetTP { public: CFWL_ListBoxTP(); diff --git a/xfa/include/fwl/theme/monthcalendartp.h b/xfa/include/fwl/theme/monthcalendartp.h index da9fadbcaf..cf7f1e70b1 100644 --- a/xfa/include/fwl/theme/monthcalendartp.h +++ b/xfa/include/fwl/theme/monthcalendartp.h @@ -7,8 +7,8 @@ #ifndef XFA_INCLUDE_FWL_THEME_MONTHCALENDARTP_H_ #define XFA_INCLUDE_FWL_THEME_MONTHCALENDARTP_H_ -class CFWL_WidgetTP; -class CFWL_MonthCalendarTP; +#include "xfa/include/fwl/theme/widgettp.h" + class CFWL_MonthCalendarTP : public CFWL_WidgetTP { public: CFWL_MonthCalendarTP(); diff --git a/xfa/include/fwl/theme/pictureboxtp.h b/xfa/include/fwl/theme/pictureboxtp.h index 7621d3b8f8..8879890649 100644 --- a/xfa/include/fwl/theme/pictureboxtp.h +++ b/xfa/include/fwl/theme/pictureboxtp.h @@ -7,8 +7,8 @@ #ifndef XFA_INCLUDE_FWL_THEME_PICTUREBOXTP_H_ #define XFA_INCLUDE_FWL_THEME_PICTUREBOXTP_H_ -class CFWL_WidgetTP; -class CFWL_PictureBoxTP; +#include "xfa/include/fwl/theme/widgettp.h" + class CFWL_PictureBoxTP : public CFWL_WidgetTP { public: CFWL_PictureBoxTP(); diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h index 43fcca7073..0b8cc4acf2 100644 --- a/xfa/include/fwl/theme/pushbuttontp.h +++ b/xfa/include/fwl/theme/pushbuttontp.h @@ -7,8 +7,8 @@ #ifndef XFA_INCLUDE_FWL_THEME_PUSHBUTTONTP_H_ #define XFA_INCLUDE_FWL_THEME_PUSHBUTTONTP_H_ -class CFWL_WidgetTP; -class CFWL_PushButtonTP; +#include "xfa/include/fwl/theme/widgettp.h" + class CFWL_PushButtonTP : public CFWL_WidgetTP { public: CFWL_PushButtonTP(); diff --git a/xfa/include/fwl/theme/scrollbartp.h b/xfa/include/fwl/theme/scrollbartp.h index e9bd200827..5cfcaea95d 100644 --- a/xfa/include/fwl/theme/scrollbartp.h +++ b/xfa/include/fwl/theme/scrollbartp.h @@ -7,8 +7,8 @@ #ifndef XFA_INCLUDE_FWL_THEME_SCROLLBARTP_H_ #define XFA_INCLUDE_FWL_THEME_SCROLLBARTP_H_ -class CFWL_WidgetTP; -class CFWL_ScrollBarTP; +#include "xfa/include/fwl/theme/widgettp.h" + class CFWL_ScrollBarTP : public CFWL_WidgetTP { public: CFWL_ScrollBarTP(); diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h index 404ca51547..e7dee4d8be 100644 --- a/xfa/include/fwl/theme/widgettp.h +++ b/xfa/include/fwl/theme/widgettp.h @@ -10,16 +10,23 @@ #include #include +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxcrt/fx_system.h" +#include "xfa/include/fwl/core/fwl_error.h" +#include "xfa/include/fwl/core/fwl_theme.h" +#include "xfa/include/fwl/core/fwl_widget.h" +#include "xfa/include/fwl/theme/utils.h" + class IFWL_ThemeProvider; class IFWL_Widget; class IFDE_TextOut; class IFX_Font; class IFX_FontMgr; +class CFWL_ArrowData; + #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ class IFX_FontSourceEnum; #endif -class CFWL_WidgetTP; -class CFWL_ArrowData; class CFWL_WidgetTP { public: diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h index 426ad73791..b471b5707b 100644 --- a/xfa/include/fxfa/fxfa_objectacc.h +++ b/xfa/include/fxfa/fxfa_objectacc.h @@ -7,13 +7,11 @@ #ifndef XFA_INCLUDE_FXFA_FXFA_OBJECTACC_H_ #define XFA_INCLUDE_FXFA_FXFA_OBJECTACC_H_ -#include "core/include/fxge/fx_dib.h" // For FX_ARGB. +#include "core/include/fxge/fx_dib.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" class CXFA_Node; class IFX_Locale; -class CXFA_Data; -class CXFA_Font; -class CXFA_Fill; class CXFA_Margin; class CXFA_Caption; class CXFA_Para; @@ -59,7 +57,6 @@ inline FX_BOOL XFA_IsSpace(FX_WCHAR c) { inline FX_BOOL XFA_IsDigit(FX_WCHAR c) { return c >= '0' && c <= '9'; } -typedef CFX_ArrayTemplate CXFA_NodeArray; typedef CFX_ArrayTemplate CXFA_ObjArray; class CXFA_Data { 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 +#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 +#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 +#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 #include +#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 -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(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 +#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(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 #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 +#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 +#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 +#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 +#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 +#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 #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 #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 #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 +#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 +#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 #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 +#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 +#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& streams); @@ -19,11 +32,7 @@ class CXFA_FileRead : public IFX_FileRead { protected: CFX_ObjectArray 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 +#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_NodeArray; typedef CFX_StackTemplate CXFA_NodeStack; typedef CXFA_PtrSetTemplate 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 +#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; -- cgit v1.2.3