diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2016-03-08 08:51:21 -0500 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2016-03-08 08:51:21 -0500 |
| commit | a44cbb591ec1fb60d6da907db63b69d0b7bd0c39 (patch) | |
| tree | 4fdc70cca5d62af6c1fb2eb0c4977be0cbbfe8c6 | |
| parent | 9f7b5e1b5e0dfd7310a2eb9e586bc998f8ea11fa (diff) | |
| download | pdfium-a44cbb591ec1fb60d6da907db63b69d0b7bd0c39.tar.xz | |
Remove extraneous xfa/src/fwl/src include/ directories.
This CL collapses the xfa/src/fwl/src/core/include and
xfa/src/fwl/src/basewidget/include up one level.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1770273002 .
63 files changed, 318 insertions, 318 deletions
@@ -931,57 +931,57 @@ if (pdf_enable_xfa) { "xfa/src/fgas/src/xml/fx_sax_imp.cpp", "xfa/src/fgas/src/xml/fx_sax_imp.h", "xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_barcodeimp.h", "xfa/src/fwl/src/basewidget/fwl_caretimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_caretimp.h", "xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp", + "xfa/src/fwl/src/basewidget/fwl_checkboximp.h", "xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp", + "xfa/src/fwl/src/basewidget/fwl_comboboximp.h", "xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.h", "xfa/src/fwl/src/basewidget/fwl_editimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_editimp.h", "xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_formproxyimp.h", "xfa/src/fwl/src/basewidget/fwl_listboximp.cpp", + "xfa/src/fwl/src/basewidget/fwl_listboximp.h", "xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.h", "xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp", + "xfa/src/fwl/src/basewidget/fwl_pictureboximp.h", "xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.h", "xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h", "xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.h", "xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.h", "xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp", - "xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_caretimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h", - "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h", - "xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_editimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h", - "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h", - "xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h", - "xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h", + "xfa/src/fwl/src/basewidget/fxmath_barcodeimp.h", "xfa/src/fwl/src/core/fwl_appimp.cpp", + "xfa/src/fwl/src/core/fwl_appimp.h", "xfa/src/fwl/src/core/fwl_contentimp.cpp", + "xfa/src/fwl/src/core/fwl_contentimp.h", "xfa/src/fwl/src/core/fwl_formimp.cpp", + "xfa/src/fwl/src/core/fwl_formimp.h", "xfa/src/fwl/src/core/fwl_gridimp.cpp", + "xfa/src/fwl/src/core/fwl_gridimp.h", "xfa/src/fwl/src/core/fwl_noteimp.cpp", + "xfa/src/fwl/src/core/fwl_noteimp.h", "xfa/src/fwl/src/core/fwl_panelimp.cpp", + "xfa/src/fwl/src/core/fwl_panelimp.h", "xfa/src/fwl/src/core/fwl_sdadapterimp.cpp", "xfa/src/fwl/src/core/fwl_targetimp.cpp", + "xfa/src/fwl/src/core/fwl_targetimp.h", "xfa/src/fwl/src/core/fwl_threadimp.cpp", + "xfa/src/fwl/src/core/fwl_threadimp.h", "xfa/src/fwl/src/core/fwl_timerimp.cpp", "xfa/src/fwl/src/core/fwl_widgetimp.cpp", + "xfa/src/fwl/src/core/fwl_widgetimp.h", "xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp", - "xfa/src/fwl/src/core/include/fwl_appimp.h", - "xfa/src/fwl/src/core/include/fwl_contentimp.h", - "xfa/src/fwl/src/core/include/fwl_formimp.h", - "xfa/src/fwl/src/core/include/fwl_gridimp.h", - "xfa/src/fwl/src/core/include/fwl_noteimp.h", - "xfa/src/fwl/src/core/include/fwl_panelimp.h", - "xfa/src/fwl/src/core/include/fwl_targetimp.h", - "xfa/src/fwl/src/core/include/fwl_threadimp.h", - "xfa/src/fwl/src/core/include/fwl_widgetimp.h", - "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h", + "xfa/src/fwl/src/core/fwl_widgetmgrimp.h", "xfa/src/fwl/src/lightwidget/app.cpp", "xfa/src/fwl/src/lightwidget/barcode.cpp", "xfa/src/fwl/src/lightwidget/caret.cpp", @@ -205,57 +205,57 @@ "xfa/src/fgas/src/xml/fx_sax_imp.cpp", "xfa/src/fgas/src/xml/fx_sax_imp.h", "xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_barcodeimp.h", "xfa/src/fwl/src/basewidget/fwl_caretimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_caretimp.h", "xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp", + "xfa/src/fwl/src/basewidget/fwl_checkboximp.h", "xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp", + "xfa/src/fwl/src/basewidget/fwl_comboboximp.h", "xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.h", "xfa/src/fwl/src/basewidget/fwl_editimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_editimp.h", "xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_formproxyimp.h", "xfa/src/fwl/src/basewidget/fwl_listboximp.cpp", + "xfa/src/fwl/src/basewidget/fwl_listboximp.h", "xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.h", "xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp", + "xfa/src/fwl/src/basewidget/fwl_pictureboximp.h", "xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.h", "xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h", "xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.h", "xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp", + "xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.h", "xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp", - "xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_caretimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h", - "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h", - "xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_editimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h", - "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h", - "xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h", - "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h", - "xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h", + "xfa/src/fwl/src/basewidget/fxmath_barcodeimp.h", "xfa/src/fwl/src/core/fwl_appimp.cpp", + "xfa/src/fwl/src/core/fwl_appimp.h", "xfa/src/fwl/src/core/fwl_contentimp.cpp", + "xfa/src/fwl/src/core/fwl_contentimp.h", "xfa/src/fwl/src/core/fwl_formimp.cpp", + "xfa/src/fwl/src/core/fwl_formimp.h", "xfa/src/fwl/src/core/fwl_gridimp.cpp", + "xfa/src/fwl/src/core/fwl_gridimp.h", "xfa/src/fwl/src/core/fwl_noteimp.cpp", + "xfa/src/fwl/src/core/fwl_noteimp.h", "xfa/src/fwl/src/core/fwl_panelimp.cpp", + "xfa/src/fwl/src/core/fwl_panelimp.h", "xfa/src/fwl/src/core/fwl_sdadapterimp.cpp", "xfa/src/fwl/src/core/fwl_targetimp.cpp", + "xfa/src/fwl/src/core/fwl_targetimp.h", "xfa/src/fwl/src/core/fwl_threadimp.cpp", + "xfa/src/fwl/src/core/fwl_threadimp.h", "xfa/src/fwl/src/core/fwl_timerimp.cpp", "xfa/src/fwl/src/core/fwl_widgetimp.cpp", + "xfa/src/fwl/src/core/fwl_widgetimp.h", "xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp", - "xfa/src/fwl/src/core/include/fwl_appimp.h", - "xfa/src/fwl/src/core/include/fwl_contentimp.h", - "xfa/src/fwl/src/core/include/fwl_formimp.h", - "xfa/src/fwl/src/core/include/fwl_gridimp.h", - "xfa/src/fwl/src/core/include/fwl_noteimp.h", - "xfa/src/fwl/src/core/include/fwl_panelimp.h", - "xfa/src/fwl/src/core/include/fwl_targetimp.h", - "xfa/src/fwl/src/core/include/fwl_threadimp.h", - "xfa/src/fwl/src/core/include/fwl_widgetimp.h", - "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h", + "xfa/src/fwl/src/core/fwl_widgetmgrimp.h", "xfa/src/fwl/src/lightwidget/app.cpp", "xfa/src/fwl/src/lightwidget/barcode.cpp", "xfa/src/fwl/src/lightwidget/caret.cpp", diff --git a/xfa/include/fwl/basewidget/fwl_picturebox.h b/xfa/include/fwl/basewidget/fwl_picturebox.h index 2a27da4912..05336d062e 100644 --- a/xfa/include/fwl/basewidget/fwl_picturebox.h +++ b/xfa/include/fwl/basewidget/fwl_picturebox.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_ -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" #define FWL_CLASS_PictureBox L"FWL_PICTUREBOX" #define FWL_CLASSHASH_PictureBox 2974721741 diff --git a/xfa/include/fwl/basewidget/fwl_pushbutton.h b/xfa/include/fwl/basewidget/fwl_pushbutton.h index 3e5acd11b0..18eacd4426 100644 --- a/xfa/include/fwl/basewidget/fwl_pushbutton.h +++ b/xfa/include/fwl/basewidget/fwl_pushbutton.h @@ -8,7 +8,7 @@ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_PUSHBUTTON_H_ #include "xfa/include/fwl/core/fwl_theme.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" #define FWL_CLASS_PushButton L"FWL_PUSHBUTTON" #define FWL_CLASSHASH_PushButton 3521614244 diff --git a/xfa/include/fwl/basewidget/fwl_scrollbar.h b/xfa/include/fwl/basewidget/fwl_scrollbar.h index 6a6df77087..e742759873 100644 --- a/xfa/include/fwl/basewidget/fwl_scrollbar.h +++ b/xfa/include/fwl/basewidget/fwl_scrollbar.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_SCROLLBAR_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_SCROLLBAR_H_ -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" #define FWL_CLASS_ScrollBar L"FWL_SCROLLBAR" #define FWL_CLASSHASH_ScrollBar 2826584844 diff --git a/xfa/include/fwl/basewidget/fwl_spinbutton.h b/xfa/include/fwl/basewidget/fwl_spinbutton.h index 4d27fb4827..b227a0c312 100644 --- a/xfa/include/fwl/basewidget/fwl_spinbutton.h +++ b/xfa/include/fwl/basewidget/fwl_spinbutton.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_SPINBUTTON_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_SPINBUTTON_H_ -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" #define FWL_CLASS_SpinButton L"FWL_SPINBUTTON" #define FWL_CLASSHASH_SpinButton 3793043646 diff --git a/xfa/include/fwl/core/fwl_content.h b/xfa/include/fwl/core/fwl_content.h index 3ffb1a8dec..687392e101 100644 --- a/xfa/include/fwl/core/fwl_content.h +++ b/xfa/include/fwl/core/fwl_content.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_CONTENT_H_ #define XFA_INCLUDE_FWL_CORE_FWL_CONTENT_H_ -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class IFWL_Content : public IFWL_Widget { public: diff --git a/xfa/include/fwl/core/fwl_panel.h b/xfa/include/fwl/core/fwl_panel.h index 51e3d4caaa..6e785ba98d 100644 --- a/xfa/include/fwl/core/fwl_panel.h +++ b/xfa/include/fwl/core/fwl_panel.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_PANEL_H_ #define XFA_INCLUDE_FWL_CORE_FWL_PANEL_H_ -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class IFWL_Content; diff --git a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp index 839a4bf120..93bd2bee22 100644 --- a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_barcodeimp.h" #include "xfa/include/fwl/core/fwl_theme.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" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_editimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" // static IFWL_Barcode* IFWL_Barcode::Create(const CFWL_WidgetImpProperties& properties) { diff --git a/xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.h index 1425f6b3b5..9426a7f928 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h +++ b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.h @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_BARCODEIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_BARCODEIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_BARCODEIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_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" +#include "xfa/src/fwl/src/basewidget/fwl_editimp.h" class CFWL_WidgetImpProperties; class CFWL_BarcodeImpDelegate; @@ -51,4 +51,4 @@ class CFWL_BarcodeImpDelegate : public CFWL_EditImpDelegate { FWL_ERR OnProcessEvent(CFWL_Event* pEvent) override; }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_BARCODEIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_BARCODEIMP_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp index 559d4b69f1..e414b32630 100644 --- a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/basewidget/include/fwl_caretimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_caretimp.h" #include "xfa/include/fwl/basewidget/fwl_caret.h" #include "xfa/include/fwl/core/fwl_theme.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" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" // static IFWL_Caret* IFWL_Caret::Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h b/xfa/src/fwl/src/basewidget/fwl_caretimp.h index 867efe545c..ae334e944b 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h +++ b/xfa/src/fwl/src/basewidget/fwl_caretimp.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CARETIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CARETIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_CARETIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_CARETIMP_H_ #include "xfa/include/fwl/core/fwl_timer.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class CFWL_WidgetImpProperties; class IFWL_Widget; @@ -64,4 +64,4 @@ class CFWL_CaretImpDelegate : public CFWL_WidgetImpDelegate { CFWL_CaretImp* m_pOwner; }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CARETIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_CARETIMP_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp index 2165e20864..b167b6fff3 100644 --- a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h" +#include "xfa/src/fwl/src/basewidget/fwl_checkboximp.h" #include <algorithm> #include "xfa/include/fwl/basewidget/fwl_checkbox.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.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" -#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h" #define FWL_CKB_CaptionMargin 5 diff --git a/xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h b/xfa/src/fwl/src/basewidget/fwl_checkboximp.h index 3167f9466e..c1ce80dcda 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h +++ b/xfa/src/fwl/src/basewidget/fwl_checkboximp.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CHECKBOXIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CHECKBOXIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_CHECKBOXIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_CHECKBOXIMP_H_ -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class CFWL_WidgetImpProperties; class IFWL_Widget; @@ -61,4 +61,4 @@ class CFWL_CheckBoxImpDelegate : public CFWL_WidgetImpDelegate { CFWL_CheckBoxImp* m_pOwner; }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CHECKBOXIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_CHECKBOXIMP_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp index 2a33c6e720..d9f6220a1c 100644 --- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp @@ -4,22 +4,22 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" +#include "xfa/src/fwl/src/basewidget/fwl_comboboximp.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.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" -#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_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" +#include "xfa/src/fwl/src/basewidget/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_formproxyimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_listboximp.h" +#include "xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h" +#include "xfa/src/fwl/src/core/fwl_appimp.h" +#include "xfa/src/fwl/src/core/fwl_formimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h" // static IFWL_ComboBox* IFWL_ComboBox::Create( diff --git a/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h b/xfa/src/fwl/src/basewidget/fwl_comboboximp.h index 68514262a1..f215367491 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h +++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.h @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_COMBOBOXIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_COMBOBOXIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_COMBOBOXIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_COMBOBOXIMP_H_ #include <memory> -#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/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_listboximp.h" class CFWL_WidgetImp; class CFWL_WidgetImpProperties; @@ -234,4 +234,4 @@ class CFWL_ComboProxyImpDelegate : public CFWL_WidgetImpDelegate { CFWL_ComboBoxImp* m_pComboBox; }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_COMBOBOXIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_COMBOBOXIMP_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp index 19b6820dbf..fb04dd1cbe 100644 --- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp @@ -4,18 +4,18 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.h" #include "xfa/include/fwl/basewidget/fwl_spinbutton.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" -#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_widgetimp.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_formproxyimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.h" +#include "xfa/src/fwl/src/core/fwl_formimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h" #define FWL_DTP_WIDTH 100 #define FWL_DTP_HEIGHT 20 diff --git a/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.h index 48556aee7d..b1b7207104 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h +++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_DATETIMEPICKERIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_DATETIMEPICKERIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_DATETIMEPICKERIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_DATETIMEPICKERIMP_H_ #include <memory> @@ -14,8 +14,8 @@ #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" +#include "xfa/src/fwl/src/basewidget/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.h" class CFWL_WidgetImp; class CFWL_WidgetImpProperties; @@ -232,4 +232,4 @@ class CFWL_DateTimePickerImpDelegate : public CFWL_WidgetImpDelegate { void DisForm_OnFocusChanged(CFWL_Message* pMsg, FX_BOOL bSet = TRUE); }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_DATETIMEPICKERIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_DATETIMEPICKERIMP_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp index 66852d0815..8e876ed67d 100644 --- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_editimp.h" #include <algorithm> @@ -14,15 +14,15 @@ #include "xfa/src/fdp/include/fde_rdr.h" #include "xfa/src/fdp/include/fde_rdv.h" #include "xfa/src/fee/include/ifde_txtedtpage.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_scrollbarimp.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" +#include "xfa/src/fwl/src/basewidget/fwl_caretimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_comboboximp.h" +#include "xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h" +#include "xfa/src/fwl/src/core/fwl_appimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h" // static IFWL_Edit* IFWL_Edit::Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h b/xfa/src/fwl/src/basewidget/fwl_editimp.h index a19dd055d0..bec5c89f83 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.h @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_EDITIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_EDITIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_EDITIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_EDITIMP_H_ #include <memory> #include <vector> #include "xfa/include/fwl/basewidget/fwl_scrollbar.h" #include "xfa/src/fee/include/ifde_txtedtengine.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class CFWL_WidgetImpProperties; class CFWL_WidgetImpDelegate; @@ -205,4 +205,4 @@ class CFWL_EditImpDelegate : public CFWL_WidgetImpDelegate { CFWL_EditImp* m_pOwner; }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_EDITIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_EDITIMP_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp index 558866a1b4..5035a3ba30 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 "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_formproxyimp.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_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_formimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" CFWL_FormProxyImp::CFWL_FormProxyImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter) diff --git a/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.h index c26d65a227..6b7cc822ff 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h +++ b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_FORMPROXYIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_FORMPROXYIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_FORMPROXYIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_FORMPROXYIMP_H_ -#include "xfa/src/fwl/src/core/include/fwl_formimp.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_formimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class CFWL_WidgetImpProperties; class CFWL_FormProxyImpDelegate; @@ -39,4 +39,4 @@ class CFWL_FormProxyImpDelegate : public CFWL_WidgetImpDelegate { CFWL_FormProxyImp* m_pOwner; }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_FORMPROXYIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_FORMPROXYIMP_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp index f218e709da..dc7c33f2c6 100644 --- a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h" +#include "xfa/src/fwl/src/basewidget/fwl_listboximp.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.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" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_comboboximp.h" +#include "xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" #define FWL_LISTBOX_ItemTextMargin 2 diff --git a/xfa/src/fwl/src/basewidget/include/fwl_listboximp.h b/xfa/src/fwl/src/basewidget/fwl_listboximp.h index fa1dd21a10..ae86e7359c 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_listboximp.h +++ b/xfa/src/fwl/src/basewidget/fwl_listboximp.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_LISTBOXIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_LISTBOXIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_LISTBOXIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_LISTBOXIMP_H_ #include <memory> @@ -13,7 +13,7 @@ #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" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class CFWL_ListBoxImpDelegate; @@ -118,4 +118,4 @@ class CFWL_ListBoxImpDelegate : public CFWL_WidgetImpDelegate { CFWL_ListBoxImp* m_pOwner; }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_LISTBOXIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_LISTBOXIMP_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp index b3dea6ee7b..3a7589e319 100644 --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.h" #include <algorithm> #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.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" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" #define MONTHCAL_HSEP_HEIGHT 1 #define MONTHCAL_VSEP_WIDTH 1 diff --git a/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.h index 57db256baf..5832f2e35c 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_MONTHCALENDARIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_MONTHCALENDARIMP_H_ #include "xfa/src/fgas/include/fx_datetime.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class CFWL_WidgetImpProperties; class IFWL_Widget; @@ -240,4 +240,4 @@ class CFWL_MonthCalendarImpDelegate : public CFWL_WidgetImpDelegate { CFWL_MonthCalendarImp* m_pOwner; }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_MONTHCALENDARIMP_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp index 4bfae5369c..9e41143371 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h" +#include "xfa/src/fwl/src/basewidget/fwl_pictureboximp.h" #include "xfa/include/fwl/lightwidget/picturebox.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" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" // static IFWL_PictureBox* IFWL_PictureBox::Create( diff --git a/xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.h index a77f73dc98..aa2fa25799 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h +++ b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_PICTUREBOXIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_PICTUREBOXIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_PICTUREBOXIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_PICTUREBOXIMP_H_ -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class CFWL_WidgetImpProperties; class IFWL_Widget; @@ -50,4 +50,4 @@ class CFWL_PictureBoxImpDelegate : public CFWL_WidgetImpDelegate { CFWL_PictureBoxImp* m_pOwner; }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_PICTUREBOXIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_PICTUREBOXIMP_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp index 3abb22e2ab..a91fb0413e 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.h" #include "xfa/include/fwl/basewidget/fwl_pushbutton.h" #include "xfa/src/fdp/include/fde_tto.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" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" // static IFWL_PushButton* IFWL_PushButton::Create( diff --git a/xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.h index 73ee0fe899..96139e1385 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h +++ b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_PUSHBUTTONIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_PUSHBUTTONIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_PUSHBUTTONIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_PUSHBUTTONIMP_H_ -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class CFWL_WidgetImpProperties; class IFWL_Widget; @@ -62,4 +62,4 @@ class CFWL_PushButtonImpDelegate : public CFWL_WidgetImpDelegate { CFWL_PushButtonImp* m_pOwner; }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_PUSHBUTTONIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_PUSHBUTTONIMP_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp index 16271c93b8..81f4cad0a2 100644 --- a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h" #include "xfa/include/fwl/basewidget/fwl_scrollbar.h" #include "xfa/include/fwl/core/fwl_theme.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" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" #define FWL_SCROLLBAR_Elapse 500 #define FWL_SCROLLBAR_MinThumb 5 diff --git a/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h index 265c22d806..5bc3d0677f 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h +++ b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_SCROLLBARIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_SCROLLBARIMP_H_ #include "xfa/include/fwl/core/fwl_timer.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class CFWL_WidgetImpProperties; class IFWL_Widget; @@ -136,4 +136,4 @@ class CFWL_ScrollBarImpDelegate : public CFWL_WidgetImpDelegate { CFWL_ScrollBarImp* m_pOwner; }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_SCROLLBARIMP_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp index 5b914afc17..037e7ccf36 100644 --- a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp @@ -4,14 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h" +#include "xfa/src/fwl/src/basewidget/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/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" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" #define FWL_SPN_MinWidth 18 #define FWL_SPN_MinHeight 32 diff --git a/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.h index c77905fb17..6da9a603d3 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h +++ b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_SPINBUTTONIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_FWL_SPINBUTTONIMP_H_ #include "xfa/include/fwl/core/fwl_timer.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class CFWL_WidgetImpProperties; class CFWL_SpinButtonImpDelegate; @@ -66,4 +66,4 @@ class CFWL_SpinButtonImpDelegate : public CFWL_WidgetImpDelegate { CFWL_SpinButtonImp* m_pOwner; }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_SPINBUTTONIMP_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp index d58657b7ab..89efc42866 100644 --- a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h" +#include "xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.h" #include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.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_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_formimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" // static IFWL_ToolTip* IFWL_ToolTip::Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.h index e80f33ec9a..f72e57a68d 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h +++ b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_TOOLTIPCTRLIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_TOOLTIPCTRLIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FWL_TOOLTIPCTRLIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_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" +#include "xfa/src/fwl/src/core/fwl_formimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class CFWL_WidgetImpProperties; class IFWL_Widget; @@ -83,4 +83,4 @@ class CFWL_ToolTipImpDelegate : public CFWL_WidgetImpDelegate { CFWL_ToolTipImp* m_pOwner; }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_TOOLTIPCTRLIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FWL_TOOLTIPCTRLIMP_H_ diff --git a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp index 536d7d6d38..19aff16250 100644 --- a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h" +#include "xfa/src/fwl/src/basewidget/fxmath_barcodeimp.h" static CBC_CodeBase* FX_Barcode_CreateBarCodeEngineObject(BC_TYPE type) { switch (type) { diff --git a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.h index 86f7245542..1942d7ff64 100644 --- a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h +++ b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FXMATH_BARCODEIMP_H_ -#define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FXMATH_BARCODEIMP_H_ +#ifndef XFA_SRC_FWL_SRC_BASEWIDGET_FXMATH_BARCODEIMP_H_ +#define XFA_SRC_FWL_SRC_BASEWIDGET_FXMATH_BARCODEIMP_H_ #include "xfa/include/fwl/basewidget/fxmath_barcode.h" @@ -53,4 +53,4 @@ class CFX_Barcode : public IFX_Barcode { CBC_CodeBase* m_pBCEngine; }; -#endif // XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FXMATH_BARCODEIMP_H_ +#endif // XFA_SRC_FWL_SRC_BASEWIDGET_FXMATH_BARCODEIMP_H_ diff --git a/xfa/src/fwl/src/core/fwl_appimp.cpp b/xfa/src/fwl/src/core/fwl_appimp.cpp index c14f1859d3..9ee4d54310 100644 --- a/xfa/src/fwl/src/core/fwl_appimp.cpp +++ b/xfa/src/fwl/src/core/fwl_appimp.cpp @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/core/include/fwl_appimp.h" +#include "xfa/src/fwl/src/core/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/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/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h" IFWL_App* IFWL_App::Create(IFWL_AdapterNative* pAdapter) { IFWL_App* pApp = new IFWL_App; diff --git a/xfa/src/fwl/src/core/include/fwl_appimp.h b/xfa/src/fwl/src/core/fwl_appimp.h index d30c1b0aab..1a046ed738 100644 --- a/xfa/src/fwl/src/core/include/fwl_appimp.h +++ b/xfa/src/fwl/src/core/fwl_appimp.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_APPIMP_H_ -#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_APPIMP_H_ +#ifndef XFA_SRC_FWL_SRC_CORE_FWL_APPIMP_H_ +#define XFA_SRC_FWL_SRC_CORE_FWL_APPIMP_H_ #include <memory> -#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/fwl_threadimp.h" class CFWL_WidgetMgr; class IFWL_AdapterNative; @@ -35,4 +35,4 @@ class CFWL_AppImp : public CFWL_NoteThreadImp { IFWL_ThemeProvider* m_pThemeProvider; }; -#endif // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_APPIMP_H_ +#endif // XFA_SRC_FWL_SRC_CORE_FWL_APPIMP_H_ diff --git a/xfa/src/fwl/src/core/fwl_contentimp.cpp b/xfa/src/fwl/src/core/fwl_contentimp.cpp index df39d39630..e73f9cdd3e 100644 --- a/xfa/src/fwl/src/core/fwl_contentimp.cpp +++ b/xfa/src/fwl/src/core/fwl_contentimp.cpp @@ -4,14 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/core/include/fwl_contentimp.h" +#include "xfa/src/fwl/src/core/fwl_contentimp.h" #include "xfa/include/fwl/core/fwl_content.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" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h" FWL_ERR IFWL_Content::InsertWidget(IFWL_Widget* pChild, int32_t nIndex) { return static_cast<CFWL_ContentImp*>(GetImpl())->InsertWidget(pChild, nIndex); diff --git a/xfa/src/fwl/src/core/include/fwl_contentimp.h b/xfa/src/fwl/src/core/fwl_contentimp.h index a67d18da0a..3ad800c2a0 100644 --- a/xfa/src/fwl/src/core/include/fwl_contentimp.h +++ b/xfa/src/fwl/src/core/fwl_contentimp.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_CONTENTIMP_H_ -#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_CONTENTIMP_H_ +#ifndef XFA_SRC_FWL_SRC_CORE_FWL_CONTENTIMP_H_ +#define XFA_SRC_FWL_SRC_CORE_FWL_CONTENTIMP_H_ -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class IFWL_Widget; @@ -32,4 +32,4 @@ class CFWL_ContentImp : public CFWL_WidgetImp { FX_FLOAT m_fHeightMax; }; -#endif // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_CONTENTIMP_H_ +#endif // XFA_SRC_FWL_SRC_CORE_FWL_CONTENTIMP_H_ diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/src/core/fwl_formimp.cpp index df2f4db39a..2c4fe749a8 100644 --- a/xfa/src/fwl/src/core/fwl_formimp.cpp +++ b/xfa/src/fwl/src/core/fwl_formimp.cpp @@ -4,21 +4,21 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/fwl_formimp.h" #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.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/fdp/include/fde_tto.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_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" +#include "xfa/src/fwl/src/basewidget/fwl_formproxyimp.h" +#include "xfa/src/fwl/src/core/fwl_appimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h" #define FWL_SYSBTNSIZE 21 #define FWL_SYSBTNMARGIN 5 diff --git a/xfa/src/fwl/src/core/include/fwl_formimp.h b/xfa/src/fwl/src/core/fwl_formimp.h index 25a5ebedb4..c8875b0ee7 100644 --- a/xfa/src/fwl/src/core/include/fwl_formimp.h +++ b/xfa/src/fwl/src/core/fwl_formimp.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_FORMIMP_H_ -#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_FORMIMP_H_ +#ifndef XFA_SRC_FWL_SRC_CORE_FWL_FORMIMP_H_ +#define XFA_SRC_FWL_SRC_CORE_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" +#include "xfa/src/fwl/src/core/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class CFWL_NoteLoop; class CFWL_WidgetImpProperties; @@ -190,4 +190,4 @@ class CFWL_FormImpDelegate : public CFWL_WidgetImpDelegate { CFWL_FormImp* m_pOwner; }; -#endif // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_FORMIMP_H_ +#endif // XFA_SRC_FWL_SRC_CORE_FWL_FORMIMP_H_ diff --git a/xfa/src/fwl/src/core/fwl_gridimp.cpp b/xfa/src/fwl/src/core/fwl_gridimp.cpp index 4a2c52eaac..91e39b4dde 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 "xfa/src/fwl/src/core/include/fwl_gridimp.h" +#include "xfa/src/fwl/src/core/fwl_gridimp.h" -#include "xfa/src/fwl/src/core/include/fwl_contentimp.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/fwl_contentimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" // static IFWL_Grid* IFWL_Grid::Create(const CFWL_WidgetImpProperties& properties) { diff --git a/xfa/src/fwl/src/core/include/fwl_gridimp.h b/xfa/src/fwl/src/core/fwl_gridimp.h index 54f4e5046d..092b489cbb 100644 --- a/xfa/src/fwl/src/core/include/fwl_gridimp.h +++ b/xfa/src/fwl/src/core/fwl_gridimp.h @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_GRIDIMP_H_ -#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_GRIDIMP_H_ +#ifndef XFA_SRC_FWL_SRC_CORE_FWL_GRIDIMP_H_ +#define XFA_SRC_FWL_SRC_CORE_FWL_GRIDIMP_H_ #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/core/fwl_content.h" #include "xfa/include/fwl/core/fwl_grid.h" -#include "xfa/src/fwl/src/core/include/fwl_contentimp.h" +#include "xfa/src/fwl/src/core/fwl_contentimp.h" class CFWL_GridLength { public: @@ -194,4 +194,4 @@ class CFWL_GridImpDelegate : public CFWL_WidgetImpDelegate { CFWL_GridImp* m_pOwner; }; -#endif // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_GRIDIMP_H_ +#endif // XFA_SRC_FWL_SRC_CORE_FWL_GRIDIMP_H_ diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp index 0ddfaf8f25..a4ff5cfb5b 100644 --- a/xfa/src/fwl/src/core/fwl_noteimp.cpp +++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp @@ -4,21 +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/src/fwl/src/core/fwl_noteimp.h" #include "core/include/fxcrt/fx_ext.h" #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.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/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_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" +#include "xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.h" +#include "xfa/src/fwl/src/core/fwl_appimp.h" +#include "xfa/src/fwl/src/core/fwl_formimp.h" +#include "xfa/src/fwl/src/core/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h" CFWL_NoteLoop::CFWL_NoteLoop(CFWL_WidgetImp* pForm) : m_pForm(pForm), m_bContinueModal(TRUE) {} diff --git a/xfa/src/fwl/src/core/include/fwl_noteimp.h b/xfa/src/fwl/src/core/fwl_noteimp.h index eeb86b6026..d824208625 100644 --- a/xfa/src/fwl/src/core/include/fwl_noteimp.h +++ b/xfa/src/fwl/src/core/fwl_noteimp.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_NOTEIMP_H_ -#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_NOTEIMP_H_ +#ifndef XFA_SRC_FWL_SRC_CORE_FWL_NOTEIMP_H_ +#define XFA_SRC_FWL_SRC_CORE_FWL_NOTEIMP_H_ #include "xfa/include/fwl/core/fwl_note.h" @@ -154,4 +154,4 @@ class CFWL_ToolTipContainer { static CFWL_ToolTipContainer* s_pInstance; }; -#endif // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_NOTEIMP_H_ +#endif // XFA_SRC_FWL_SRC_CORE_FWL_NOTEIMP_H_ diff --git a/xfa/src/fwl/src/core/fwl_panelimp.cpp b/xfa/src/fwl/src/core/fwl_panelimp.cpp index 1b6c777ad2..f4d774e8fb 100644 --- a/xfa/src/fwl/src/core/fwl_panelimp.cpp +++ b/xfa/src/fwl/src/core/fwl_panelimp.cpp @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/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/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" -#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h" // static IFWL_Panel* IFWL_Panel::Create(CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/core/include/fwl_panelimp.h b/xfa/src/fwl/src/core/fwl_panelimp.h index 86a6a0f211..c6f6fdc03f 100644 --- a/xfa/src/fwl/src/core/include/fwl_panelimp.h +++ b/xfa/src/fwl/src/core/fwl_panelimp.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_PANELIMP_H_ -#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_PANELIMP_H_ +#ifndef XFA_SRC_FWL_SRC_CORE_FWL_PANELIMP_H_ +#define XFA_SRC_FWL_SRC_CORE_FWL_PANELIMP_H_ -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" class CFWL_WidgetImpProperties; class IFWL_Widget; @@ -29,4 +29,4 @@ class CFWL_PanelImp : public CFWL_WidgetImp { IFWL_Content* m_pContent; }; -#endif // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_PANELIMP_H_ +#endif // XFA_SRC_FWL_SRC_CORE_FWL_PANELIMP_H_ diff --git a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp index 4ece3e881f..020bd54749 100644 --- a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp +++ b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp @@ -10,10 +10,10 @@ #include "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h" #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h" #include "xfa/include/fwl/core/fwl_app.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/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h" CFWL_SDAdapterWidgetMgr::CFWL_SDAdapterWidgetMgr() {} CFWL_SDAdapterWidgetMgr::~CFWL_SDAdapterWidgetMgr() {} diff --git a/xfa/src/fwl/src/core/fwl_targetimp.cpp b/xfa/src/fwl/src/core/fwl_targetimp.cpp index 6898588515..57d39e3a9e 100644 --- a/xfa/src/fwl/src/core/fwl_targetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_targetimp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/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/include/fwl_targetimp.h b/xfa/src/fwl/src/core/fwl_targetimp.h index e9c9aeb099..0cc2729e27 100644 --- a/xfa/src/fwl/src/core/include/fwl_targetimp.h +++ b/xfa/src/fwl/src/core/fwl_targetimp.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_TARGETIMP_H_ -#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_TARGETIMP_H_ +#ifndef XFA_SRC_FWL_SRC_CORE_FWL_TARGETIMP_H_ +#define XFA_SRC_FWL_SRC_CORE_FWL_TARGETIMP_H_ #include "core/include/fxcrt/fx_basic.h" #include "xfa/include/fwl/core/fwl_target.h" @@ -24,4 +24,4 @@ class CFWL_TargetImp { CFWL_TargetImp(); }; -#endif // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_TARGETIMP_H_ +#endif // XFA_SRC_FWL_SRC_CORE_FWL_TARGETIMP_H_ diff --git a/xfa/src/fwl/src/core/fwl_threadimp.cpp b/xfa/src/fwl/src/core/fwl_threadimp.cpp index de48068a3c..2adb4af07c 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 "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/fwl_threadimp.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/fwl_appimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" void IFWL_Thread::Release() { delete m_pImpl; diff --git a/xfa/src/fwl/src/core/include/fwl_threadimp.h b/xfa/src/fwl/src/core/fwl_threadimp.h index 169de6a06d..ead224ae12 100644 --- a/xfa/src/fwl/src/core/include/fwl_threadimp.h +++ b/xfa/src/fwl/src/core/fwl_threadimp.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_THREADIMP_H_ -#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_THREADIMP_H_ +#ifndef XFA_SRC_FWL_SRC_CORE_FWL_THREADIMP_H_ +#define XFA_SRC_FWL_SRC_CORE_FWL_THREADIMP_H_ #include "xfa/include/fwl/core/fwl_thread.h" // For FWL_HTHREAD. @@ -37,4 +37,4 @@ class CFWL_NoteThreadImp : public CFWL_ThreadImp { CFWL_NoteDriver* const m_pNoteDriver; }; -#endif // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_THREADIMP_H_ +#endif // XFA_SRC_FWL_SRC_CORE_FWL_THREADIMP_H_ diff --git a/xfa/src/fwl/src/core/fwl_timerimp.cpp b/xfa/src/fwl/src/core/fwl_timerimp.cpp index 19ab582340..0aec1357a4 100644 --- a/xfa/src/fwl/src/core/fwl_timerimp.cpp +++ b/xfa/src/fwl/src/core/fwl_timerimp.cpp @@ -8,9 +8,9 @@ #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/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" +#include "xfa/src/fwl/src/core/fwl_appimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_threadimp.h" FWL_HTIMER FWL_StartTimer(IFWL_Timer* pTimer, FX_DWORD dwElapse, diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp index 7100f193c9..4e74d7b4f6 100644 --- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" #include <algorithm> @@ -19,11 +19,11 @@ #include "xfa/include/fwl/core/fwl_form.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.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/fwl_appimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h" FWL_ERR IFWL_Widget::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) { return static_cast<CFWL_WidgetImp*>(GetImpl()) diff --git a/xfa/src/fwl/src/core/include/fwl_widgetimp.h b/xfa/src/fwl/src/core/fwl_widgetimp.h index 65cd75e151..376294da13 100644 --- a/xfa/src/fwl/src/core/include/fwl_widgetimp.h +++ b/xfa/src/fwl/src/core/fwl_widgetimp.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETIMP_H_ -#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETIMP_H_ +#ifndef XFA_SRC_FWL_SRC_CORE_FWL_WIDGETIMP_H_ +#define XFA_SRC_FWL_SRC_CORE_FWL_WIDGETIMP_H_ #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" class CFWL_NoteThreadImp; class CFWL_WidgetImpProperties; @@ -159,4 +159,4 @@ class CFWL_WidgetImpDelegate : public IFWL_WidgetDelegate { const CFX_Matrix* pMatrix = NULL) override; }; -#endif // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETIMP_H_ +#endif // XFA_SRC_FWL_SRC_CORE_FWL_WIDGETIMP_H_ diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp index 9b6f695ee3..1237d9e0f8 100644 --- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/core/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/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/fwl_appimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/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_widgetmgrimp.h b/xfa/src/fwl/src/core/fwl_widgetmgrimp.h index 5c951777e8..ef72448531 100644 --- a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h +++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETMGRIMP_H_ -#define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETMGRIMP_H_ +#ifndef XFA_SRC_FWL_SRC_CORE_FWL_WIDGETMGRIMP_H_ +#define XFA_SRC_FWL_SRC_CORE_FWL_WIDGETMGRIMP_H_ #include "xfa/include/fwl/core/fwl_widgetmgr.h" @@ -167,4 +167,4 @@ class CFWL_WidgetMgrDelegate : public IFWL_WidgetMgrDelegate { CFWL_WidgetMgr* m_pWidgetMgr; }; -#endif // XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_WIDGETMGRIMP_H_ +#endif // XFA_SRC_FWL_SRC_CORE_FWL_WIDGETMGRIMP_H_ diff --git a/xfa/src/fwl/src/lightwidget/caret.cpp b/xfa/src/fwl/src/lightwidget/caret.cpp index d9c3363ae1..cd37a3fe1e 100644 --- a/xfa/src/fwl/src/lightwidget/caret.cpp +++ b/xfa/src/fwl/src/lightwidget/caret.cpp @@ -10,7 +10,7 @@ #include "xfa/include/fwl/basewidget/fwl_caret.h" #include "xfa/include/fwl/lightwidget/edit.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" CFWL_Caret* CFWL_Caret::Create() { return new CFWL_Caret; diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp index 05149709ef..71be73c433 100644 --- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp +++ b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp @@ -8,12 +8,12 @@ #include <memory> -#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/fwl_formimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.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 6603df7b57..dd2225637f 100644 --- a/xfa/src/fwl/src/lightwidget/widget.cpp +++ b/xfa/src/fwl/src/lightwidget/widget.cpp @@ -9,11 +9,11 @@ #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/include/fwl/core/fwl_thread.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/fwl/src/core/include/fwl_noteimp.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" -#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h" CFWL_WidgetImpProperties CFWL_WidgetProperties::MakeWidgetImpProperties( IFWL_DataProvider* pDataProvider) const { |