From c909ce872d999a17ffd44afdc88caf2de43e6cba Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 8 Jan 2016 15:44:36 -0800 Subject: XFA: Remove many relative includes in xfa/ Also remove useless files. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1570743002 . --- xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp | 12 +++++----- xfa/src/fwl/src/basewidget/fwl_caretimp.cpp | 10 ++++---- xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp | 12 +++++----- xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp | 28 +++++++++++----------- .../fwl/src/basewidget/fwl_datetimepickerimp.cpp | 22 ++++++++--------- xfa/src/fwl/src/basewidget/fwl_editimp.cpp | 22 ++++++++--------- xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp | 14 +++++------ xfa/src/fwl/src/basewidget/fwl_listboximp.cpp | 14 +++++------ .../fwl/src/basewidget/fwl_monthcalendarimp.cpp | 10 ++++---- xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp | 10 ++++---- xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp | 10 ++++---- xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp | 10 ++++---- xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp | 10 ++++---- xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp | 14 +++++------ xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp | 4 ++-- xfa/src/fwl/src/core/fwl_appimp.cpp | 12 +++++----- xfa/src/fwl/src/core/fwl_contentimp.cpp | 14 +++++------ xfa/src/fwl/src/core/fwl_formimp.cpp | 18 +++++++------- xfa/src/fwl/src/core/fwl_gridimp.cpp | 14 +++++------ xfa/src/fwl/src/core/fwl_noteimp.cpp | 20 ++++++++-------- xfa/src/fwl/src/core/fwl_panelimp.cpp | 10 ++++---- xfa/src/fwl/src/core/fwl_sdadapterimp.cpp | 10 ++++---- xfa/src/fwl/src/core/fwl_targetimp.cpp | 4 ++-- xfa/src/fwl/src/core/fwl_threadimp.cpp | 10 ++++---- xfa/src/fwl/src/core/fwl_timerimp.cpp | 8 +++---- xfa/src/fwl/src/core/fwl_widgetimp.cpp | 14 +++++------ xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp | 14 +++++------ xfa/src/fwl/src/lightwidget/app.cpp | 2 +- xfa/src/fwl/src/lightwidget/barcode.cpp | 2 +- xfa/src/fwl/src/lightwidget/caret.cpp | 2 +- xfa/src/fwl/src/lightwidget/checkbox.cpp | 2 +- xfa/src/fwl/src/lightwidget/combobox.cpp | 2 +- xfa/src/fwl/src/lightwidget/datetimepicker.cpp | 2 +- xfa/src/fwl/src/lightwidget/edit.cpp | 2 +- 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 | 2 +- xfa/src/fwl/src/lightwidget/theme.cpp | 2 +- xfa/src/fwl/src/lightwidget/tooltipctrl.cpp | 14 +++++------ xfa/src/fwl/src/lightwidget/widget.cpp | 12 +++++----- xfa/src/fwl/src/theme/barcodetp.cpp | 2 +- xfa/src/fwl/src/theme/carettp.cpp | 2 +- xfa/src/fwl/src/theme/checkboxtp.cpp | 2 +- xfa/src/fwl/src/theme/comboboxtp.cpp | 2 +- xfa/src/fwl/src/theme/datetimepickertp.cpp | 2 +- xfa/src/fwl/src/theme/edittp.cpp | 2 +- xfa/src/fwl/src/theme/formtp.cpp | 2 +- xfa/src/fwl/src/theme/listboxtp.cpp | 2 +- xfa/src/fwl/src/theme/monthcalendartp.cpp | 2 +- xfa/src/fwl/src/theme/pictureboxtp.cpp | 2 +- xfa/src/fwl/src/theme/pushbuttontp.cpp | 2 +- xfa/src/fwl/src/theme/scrollbartp.cpp | 2 +- xfa/src/fwl/src/theme/widgettp.cpp | 2 +- 54 files changed, 213 insertions(+), 213 deletions(-) (limited to 'xfa/src/fwl') diff --git a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp index 02cd6a7b54..1961a938b0 100644 --- a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_editimp.h" -#include "include/fwl_barcodeimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h" // static IFWL_Barcode* IFWL_Barcode::Create(const CFWL_WidgetImpProperties& properties) { diff --git a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp index a7381e1ea6..44e691c5ed 100644 --- a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_caretimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_caretimp.h" // static IFWL_Caret* IFWL_Caret::Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp index 08f15e74f0..3df1f21391 100644 --- a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_widgetmgrimp.h" -#include "include/fwl_checkboximp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h" #define FWL_CKB_CaptionMargin 5 // static diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp index f1a80df790..e3e823aac5 100644 --- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp @@ -4,20 +4,20 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../../src/core/include/fwl_threadimp.h" -#include "../../src/core/include/fwl_appimp.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_panelimp.h" -#include "../core/include/fwl_formimp.h" -#include "../core/include/fwl_widgetmgrimp.h" -#include "include/fwl_scrollbarimp.h" -#include "include/fwl_editimp.h" -#include "include/fwl_listboximp.h" -#include "include/fwl_formproxyimp.h" -#include "include/fwl_comboboximp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.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_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" // static IFWL_ComboBox* IFWL_ComboBox::Create( diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp index 2eb7503476..57c2126e82 100644 --- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_panelimp.h" -#include "../core/include/fwl_formimp.h" -#include "../core/include/fwl_widgetmgrimp.h" -#include "include/fwl_formproxyimp.h" -#include "include/fwl_editimp.h" -#include "include/fwl_monthcalendarimp.h" -#include "include/fwl_datetimepickerimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.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 c9ce62ece7..9b652a79fc 100644 --- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_threadimp.h" -#include "../core/include/fwl_appimp.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_widgetmgrimp.h" -#include "include/fwl_caretimp.h" -#include "include/fwl_comboboximp.h" -#include "include/fwl_editimp.h" -#include "include/fwl_scrollbarimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.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_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.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" // static IFWL_Edit* IFWL_Edit::Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp index 20ec712537..9f7ff23449 100644 --- a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_panelimp.h" -#include "../core/include/fwl_formimp.h" -#include "include/fwl_formproxyimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" CFWL_FormProxyImp::CFWL_FormProxyImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter) diff --git a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp index 3ef6b443ce..9e42d56f74 100644 --- a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_scrollbarimp.h" -#include "include/fwl_listboximp.h" -#include "include/fwl_comboboximp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" #define FWL_LISTBOX_ItemTextMargin 2 diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp index 12ad6bd45a..3e038299a8 100644 --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_monthcalendarimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.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 8650b5545a..9567fc58d5 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_pictureboximp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h" // static IFWL_PictureBox* IFWL_PictureBox::Create( diff --git a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp index e775861749..d9346eab17 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_pushbuttonimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h" // static IFWL_PushButton* IFWL_PushButton::Create( diff --git a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp index f95aeee72c..ed2d22c25c 100644 --- a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_scrollbarimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.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 00e7dfdb98..c7c1cc66a9 100644 --- a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_spinbuttonimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.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 550d36af92..7e2cf5f1c1 100644 --- a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_panelimp.h" -#include "../core/include/fwl_formimp.h" -#include "include/fwl_tooltipctrlimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h" // static IFWL_ToolTip* IFWL_ToolTip::Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp index 3687f8df86..c4f31e4f3a 100644 --- a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fxmath_barcodeimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h" static CBC_CodeBase* FX_Barcode_CreateBarCodeEngineObject(BC_TYPE type) { switch (type) { case BC_CODE39: diff --git a/xfa/src/fwl/src/core/fwl_appimp.cpp b/xfa/src/fwl/src/core/fwl_appimp.cpp index 85d34e3690..9ea3e766a6 100644 --- a/xfa/src/fwl/src/core/fwl_appimp.cpp +++ b/xfa/src/fwl/src/core/fwl_appimp.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_widgetmgrimp.h" -#include "include/fwl_appimp.h" +#include "xfa/src/foxitlib.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_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" IFWL_App* IFWL_App::Create(IFWL_AdapterNative* pAdapter) { IFWL_App* pApp = new IFWL_App; diff --git a/xfa/src/fwl/src/core/fwl_contentimp.cpp b/xfa/src/fwl/src/core/fwl_contentimp.cpp index 753c59d843..ce323c74d2 100644 --- a/xfa/src/fwl/src/core/fwl_contentimp.cpp +++ b/xfa/src/fwl/src/core/fwl_contentimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_widgetimp.h" -#include "include/fwl_contentimp.h" -#include "include/fwl_widgetmgrimp.h" +#include "xfa/src/foxitlib.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_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_contentimp.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 bd2e5aa454..1627741dd7 100644 --- a/xfa/src/fwl/src/core/fwl_formimp.cpp +++ b/xfa/src/fwl/src/core/fwl_formimp.cpp @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_widgetimp.h" -#include "include/fwl_panelimp.h" -#include "include/fwl_formimp.h" -#include "include/fwl_widgetmgrimp.h" -#include "include/fwl_appimp.h" +#include "xfa/src/foxitlib.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_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" #define FWL_SYSBTNSIZE 21 diff --git a/xfa/src/fwl/src/core/fwl_gridimp.cpp b/xfa/src/fwl/src/core/fwl_gridimp.cpp index 4524e9e423..c16b8caffa 100644 --- a/xfa/src/fwl/src/core/fwl_gridimp.cpp +++ b/xfa/src/fwl/src/core/fwl_gridimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_widgetimp.h" -#include "include/fwl_contentimp.h" -#include "include/fwl_gridimp.h" +#include "xfa/src/foxitlib.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_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_contentimp.h" +#include "xfa/src/fwl/src/core/include/fwl_gridimp.h" // static IFWL_Grid* IFWL_Grid::Create(const CFWL_WidgetImpProperties& properties) { diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp index e4d68c72d8..7bdf90c07a 100644 --- a/xfa/src/fwl/src/core/fwl_noteimp.cpp +++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_widgetimp.h" -#include "include/fwl_widgetmgrimp.h" -#include "include/fwl_panelimp.h" -#include "include/fwl_formimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_appimp.h" -#include "../../src/basewidget/include/fwl_tooltipctrlimp.h" +#include "xfa/src/foxitlib.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" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.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_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.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 cdae399195..6c0ba87182 100644 --- a/xfa/src/fwl/src/core/fwl_panelimp.cpp +++ b/xfa/src/fwl/src/core/fwl_panelimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_widgetimp.h" -#include "include/fwl_panelimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.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 96776f2707..c26a62e0a6 100644 --- a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp +++ b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_widgetmgrimp.h" +#include "xfa/src/foxitlib.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_noteimp.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, diff --git a/xfa/src/fwl/src/core/fwl_targetimp.cpp b/xfa/src/fwl/src/core/fwl_targetimp.cpp index b72a6a7923..1e4f7094dc 100644 --- a/xfa/src/fwl/src/core/fwl_targetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_targetimp.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" FWL_ERR IFWL_Target::GetClassName(CFX_WideString& wsClass) const { return m_pImpl->GetClassName(wsClass); } diff --git a/xfa/src/fwl/src/core/fwl_threadimp.cpp b/xfa/src/fwl/src/core/fwl_threadimp.cpp index 6d399527b6..8b2ca37ed9 100644 --- a/xfa/src/fwl/src/core/fwl_threadimp.cpp +++ b/xfa/src/fwl/src/core/fwl_threadimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_appimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" void IFWL_Thread::Release() { delete m_pImpl; diff --git a/xfa/src/fwl/src/core/fwl_timerimp.cpp b/xfa/src/fwl/src/core/fwl_timerimp.cpp index 8793e411ca..71dc66f796 100644 --- a/xfa/src/fwl/src/core/fwl_timerimp.cpp +++ b/xfa/src/fwl/src/core/fwl_timerimp.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_appimp.h" +#include "xfa/src/foxitlib.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_appimp.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 c3c6e18744..88db9b30e2 100644 --- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_appimp.h" -#include "include/fwl_widgetmgrimp.h" -#include "include/fwl_widgetimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.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 2f3aa2aa2a..b8a13e9399 100644 --- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_widgetmgrimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_appimp.h" -#define FWL_NORMALMATRIX +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" + FX_BOOL FWL_UseOffscreen(IFWL_Widget* pWidget) { #if (_FX_OS_ == _FX_MACOSX_) return FALSE; diff --git a/xfa/src/fwl/src/lightwidget/app.cpp b/xfa/src/fwl/src/lightwidget/app.cpp index 293a258f6b..396259ba7f 100644 --- a/xfa/src/fwl/src/lightwidget/app.cpp +++ b/xfa/src/fwl/src/lightwidget/app.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.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 1868b12686..7cf73eff94 100644 --- a/xfa/src/fwl/src/lightwidget/barcode.cpp +++ b/xfa/src/fwl/src/lightwidget/barcode.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_Barcode* CFWL_Barcode::Create() { return new CFWL_Barcode; diff --git a/xfa/src/fwl/src/lightwidget/caret.cpp b/xfa/src/fwl/src/lightwidget/caret.cpp index dcf6852ec0..0268f0d97f 100644 --- a/xfa/src/fwl/src/lightwidget/caret.cpp +++ b/xfa/src/fwl/src/lightwidget/caret.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.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 ea72cb622d..9a34a1dae2 100644 --- a/xfa/src/fwl/src/lightwidget/checkbox.cpp +++ b/xfa/src/fwl/src/lightwidget/checkbox.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_CheckBox* CFWL_CheckBox::Create() { return new CFWL_CheckBox; diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/src/lightwidget/combobox.cpp index 5756a6d832..21ecde5486 100644 --- a/xfa/src/fwl/src/lightwidget/combobox.cpp +++ b/xfa/src/fwl/src/lightwidget/combobox.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_ComboBox* CFWL_ComboBox::Create() { return new CFWL_ComboBox; diff --git a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp index 1ceb4698e5..f12765e770 100644 --- a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp +++ b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_DateTimePicker* CFWL_DateTimePicker::Create() { return new CFWL_DateTimePicker; diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/src/lightwidget/edit.cpp index d16c57b964..f52859adcb 100644 --- a/xfa/src/fwl/src/lightwidget/edit.cpp +++ b/xfa/src/fwl/src/lightwidget/edit.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_Edit* CFWL_Edit::Create() { return new CFWL_Edit; diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/src/lightwidget/listbox.cpp index 541baf4fed..198e1fe142 100644 --- a/xfa/src/fwl/src/lightwidget/listbox.cpp +++ b/xfa/src/fwl/src/lightwidget/listbox.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_ListBox* CFWL_ListBox::Create() { return new CFWL_ListBox; diff --git a/xfa/src/fwl/src/lightwidget/picturebox.cpp b/xfa/src/fwl/src/lightwidget/picturebox.cpp index 33ca399c78..b050b80791 100644 --- a/xfa/src/fwl/src/lightwidget/picturebox.cpp +++ b/xfa/src/fwl/src/lightwidget/picturebox.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_PictureBox* CFWL_PictureBox::Create() { return new CFWL_PictureBox; diff --git a/xfa/src/fwl/src/lightwidget/pushbutton.cpp b/xfa/src/fwl/src/lightwidget/pushbutton.cpp index 9efe11cba1..16eaf1ce6c 100644 --- a/xfa/src/fwl/src/lightwidget/pushbutton.cpp +++ b/xfa/src/fwl/src/lightwidget/pushbutton.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_PushButton* CFWL_PushButton::Create() { return new CFWL_PushButton; diff --git a/xfa/src/fwl/src/lightwidget/scrollbar.cpp b/xfa/src/fwl/src/lightwidget/scrollbar.cpp index 6bca86c98c..3d99e10734 100644 --- a/xfa/src/fwl/src/lightwidget/scrollbar.cpp +++ b/xfa/src/fwl/src/lightwidget/scrollbar.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_ScrollBar* CFWL_ScrollBar::Create() { return new CFWL_ScrollBar; diff --git a/xfa/src/fwl/src/lightwidget/theme.cpp b/xfa/src/fwl/src/lightwidget/theme.cpp index 133062907b..2e8bfb58d1 100644 --- a/xfa/src/fwl/src/lightwidget/theme.cpp +++ b/xfa/src/fwl/src/lightwidget/theme.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" FX_BOOL CFWL_Theme::IsValidWidget(IFWL_Widget* pWidget) { return !!GetTheme(pWidget); } diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp index 908fe3d357..7a2b2033bb 100644 --- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp +++ b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp @@ -6,13 +6,13 @@ #include -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_panelimp.h" -#include "../core/include/fwl_formimp.h" -#include "../core/include/fwl_threadimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" CFWL_ToolTip* CFWL_ToolTip::Create() { return new CFWL_ToolTip; diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/src/lightwidget/widget.cpp index 6cb6fa77d9..76a90cc5c3 100644 --- a/xfa/src/fwl/src/lightwidget/widget.cpp +++ b/xfa/src/fwl/src/lightwidget/widget.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../../src/core/include/fwl_noteimp.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_widgetmgrimp.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_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" CFWL_WidgetImpProperties CFWL_WidgetProperties::MakeWidgetImpProperties( IFWL_DataProvider* pDataProvider) const { diff --git a/xfa/src/fwl/src/theme/barcodetp.cpp b/xfa/src/fwl/src/theme/barcodetp.cpp index 3257226033..fb0f993b90 100644 --- a/xfa/src/fwl/src/theme/barcodetp.cpp +++ b/xfa/src/fwl/src/theme/barcodetp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_BarcodeTP::CFWL_BarcodeTP() {} CFWL_BarcodeTP::~CFWL_BarcodeTP() {} FX_BOOL CFWL_BarcodeTP::IsValidWidget(IFWL_Widget* pWidget) { diff --git a/xfa/src/fwl/src/theme/carettp.cpp b/xfa/src/fwl/src/theme/carettp.cpp index 2271ee958b..cc7d751b75 100644 --- a/xfa/src/fwl/src/theme/carettp.cpp +++ b/xfa/src/fwl/src/theme/carettp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_CaretTP::CFWL_CaretTP() {} CFWL_CaretTP::~CFWL_CaretTP() {} FX_BOOL CFWL_CaretTP::IsValidWidget(IFWL_Widget* pWidget) { diff --git a/xfa/src/fwl/src/theme/checkboxtp.cpp b/xfa/src/fwl/src/theme/checkboxtp.cpp index 7fc0d1e41c..cb81a7f2cf 100644 --- a/xfa/src/fwl/src/theme/checkboxtp.cpp +++ b/xfa/src/fwl/src/theme/checkboxtp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #define CHECKBOX_SIZE_SIGNMARGIN 3 #define CHECKBOX_SIZE_SIGNBORDER 2 #define CHECKBOX_SIZE_SIGNPATH 100 diff --git a/xfa/src/fwl/src/theme/comboboxtp.cpp b/xfa/src/fwl/src/theme/comboboxtp.cpp index ab5947d3fa..efc02fa380 100644 --- a/xfa/src/fwl/src/theme/comboboxtp.cpp +++ b/xfa/src/fwl/src/theme/comboboxtp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.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 966fdd64d4..f579eca948 100644 --- a/xfa/src/fwl/src/theme/datetimepickertp.cpp +++ b/xfa/src/fwl/src/theme/datetimepickertp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.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 2aebc5dae0..c3a3892e39 100644 --- a/xfa/src/fwl/src/theme/edittp.cpp +++ b/xfa/src/fwl/src/theme/edittp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_EditTP::CFWL_EditTP() {} CFWL_EditTP::~CFWL_EditTP() {} FX_BOOL CFWL_EditTP::IsValidWidget(IFWL_Widget* pWidget) { diff --git a/xfa/src/fwl/src/theme/formtp.cpp b/xfa/src/fwl/src/theme/formtp.cpp index f7e3f4904c..635244deb3 100644 --- a/xfa/src/fwl/src/theme/formtp.cpp +++ b/xfa/src/fwl/src/theme/formtp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #define FWLTHEME_CAPACITY_CXFormBorder 3 #define FWLTHEME_CAPACITY_CYFormBorder 3 #define FWLTHEME_CAPACITY_CYNarrowCaption 18 diff --git a/xfa/src/fwl/src/theme/listboxtp.cpp b/xfa/src/fwl/src/theme/listboxtp.cpp index 3e19cf7697..f9e7ae6614 100644 --- a/xfa/src/fwl/src/theme/listboxtp.cpp +++ b/xfa/src/fwl/src/theme/listboxtp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_ListBoxTP::CFWL_ListBoxTP() {} CFWL_ListBoxTP::~CFWL_ListBoxTP() {} FX_BOOL CFWL_ListBoxTP::IsValidWidget(IFWL_Widget* pWidget) { diff --git a/xfa/src/fwl/src/theme/monthcalendartp.cpp b/xfa/src/fwl/src/theme/monthcalendartp.cpp index b3897a2d63..55ff787d51 100644 --- a/xfa/src/fwl/src/theme/monthcalendartp.cpp +++ b/xfa/src/fwl/src/theme/monthcalendartp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.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 diff --git a/xfa/src/fwl/src/theme/pictureboxtp.cpp b/xfa/src/fwl/src/theme/pictureboxtp.cpp index 122cb3e5fa..52c7e44cc5 100644 --- a/xfa/src/fwl/src/theme/pictureboxtp.cpp +++ b/xfa/src/fwl/src/theme/pictureboxtp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_PictureBoxTP::CFWL_PictureBoxTP() {} CFWL_PictureBoxTP::~CFWL_PictureBoxTP() {} FX_BOOL CFWL_PictureBoxTP::IsValidWidget(IFWL_Widget* pWidget) { diff --git a/xfa/src/fwl/src/theme/pushbuttontp.cpp b/xfa/src/fwl/src/theme/pushbuttontp.cpp index fe142d241f..267c4fe07f 100644 --- a/xfa/src/fwl/src/theme/pushbuttontp.cpp +++ b/xfa/src/fwl/src/theme/pushbuttontp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #define PUSHBUTTON_SIZE_Corner 2 CFWL_PushButtonTP::CFWL_PushButtonTP() { m_pThemeData = new PBThemeData; diff --git a/xfa/src/fwl/src/theme/scrollbartp.cpp b/xfa/src/fwl/src/theme/scrollbartp.cpp index caf5562e28..e9560ea443 100644 --- a/xfa/src/fwl/src/theme/scrollbartp.cpp +++ b/xfa/src/fwl/src/theme/scrollbartp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #define FWL_SCROLL_PawLen 12.5f CFWL_ScrollBarTP::CFWL_ScrollBarTP() { m_pThemeData = new SBThemeData; diff --git a/xfa/src/fwl/src/theme/widgettp.cpp b/xfa/src/fwl/src/theme/widgettp.cpp index 959746761e..7eaf6e881b 100644 --- a/xfa/src/fwl/src/theme/widgettp.cpp +++ b/xfa/src/fwl/src/theme/widgettp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" static void FWL_SetChildThemeID(IFWL_Widget* pParent, FX_DWORD dwThemeID) { IFWL_WidgetMgr* pWidgetMgr = FWL_GetWidgetMgr(); IFWL_Widget* pChild = -- cgit v1.2.3