diff options
Diffstat (limited to 'xfa/src/fwl')
55 files changed, 17 insertions, 60 deletions
diff --git a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp index 159eaf1ba5..839a4bf120 100644 --- a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp @@ -7,7 +7,6 @@ #include "xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h" #include "xfa/include/fwl/core/fwl_theme.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp index cda0efeb15..559d4b69f1 100644 --- a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_caret.h" #include "xfa/include/fwl/core/fwl_theme.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp index 8240279fc3..2165e20864 100644 --- a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp @@ -11,11 +11,11 @@ #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/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.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 88add897b7..5fafb98d68 100644 --- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp index b5c59f35f6..19b6820dbf 100644 --- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp @@ -7,7 +7,6 @@ #include "xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h" #include "xfa/include/fwl/basewidget/fwl_spinbutton.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp index 39be5aa087..4cbf92ba7b 100644 --- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp @@ -13,7 +13,7 @@ #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_rdr.h" #include "xfa/src/fdp/include/fde_rdv.h" -#include "xfa/src/foxitlib.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" diff --git a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp index d70fd98f62..558866a1b4 100644 --- a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/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" diff --git a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp index 1f77f7ad94..f218e709da 100644 --- a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.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" diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp index ada2d6fcc1..b3dea6ee7b 100644 --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp @@ -11,7 +11,6 @@ #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/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp index ba349af8ba..4bfae5369c 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp @@ -7,7 +7,6 @@ #include "xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h" #include "xfa/include/fwl/lightwidget/picturebox.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp index 0a0cf816d6..3abb22e2ab 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_pushbutton.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp index 04cdd901cd..16271c93b8 100644 --- a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_scrollbar.h" #include "xfa/include/fwl/core/fwl_theme.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp index e3924290ca..5b914afc17 100644 --- a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp @@ -9,7 +9,6 @@ #include "xfa/include/fwl/basewidget/fwl_spinbutton.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/include/fwl/core/fwl_timer.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" diff --git a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp index c55d349f75..d58657b7ab 100644 --- a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp @@ -9,7 +9,6 @@ #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/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_formimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_panelimp.h" diff --git a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp index a79a1c1bf4..536d7d6d38 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 "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 a518bc58d0..c14f1859d3 100644 --- a/xfa/src/fwl/src/core/fwl_appimp.cpp +++ b/xfa/src/fwl/src/core/fwl_appimp.cpp @@ -9,7 +9,6 @@ #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h" #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" diff --git a/xfa/src/fwl/src/core/fwl_contentimp.cpp b/xfa/src/fwl/src/core/fwl_contentimp.cpp index 482cf12908..df39d39630 100644 --- a/xfa/src/fwl/src/core/fwl_contentimp.cpp +++ b/xfa/src/fwl/src/core/fwl_contentimp.cpp @@ -7,7 +7,6 @@ #include "xfa/src/fwl/src/core/include/fwl_contentimp.h" #include "xfa/include/fwl/core/fwl_content.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/src/core/fwl_formimp.cpp index 031efd2a28..df2f4db39a 100644 --- a/xfa/src/fwl/src/core/fwl_formimp.cpp +++ b/xfa/src/fwl/src/core/fwl_formimp.cpp @@ -11,7 +11,6 @@ #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/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" #include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" diff --git a/xfa/src/fwl/src/core/fwl_gridimp.cpp b/xfa/src/fwl/src/core/fwl_gridimp.cpp index b7d255ce32..4a2c52eaac 100644 --- a/xfa/src/fwl/src/core/fwl_gridimp.cpp +++ b/xfa/src/fwl/src/core/fwl_gridimp.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_contentimp.h" #include "xfa/src/fwl/src/core/include/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" diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp index 8de329a5cc..329d4c7936 100644 --- a/xfa/src/fwl/src/core/fwl_noteimp.cpp +++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp @@ -6,11 +6,11 @@ #include "xfa/src/fwl/src/core/include/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/foxitlib.h" #include "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h" #include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_formimp.h" diff --git a/xfa/src/fwl/src/core/fwl_panelimp.cpp b/xfa/src/fwl/src/core/fwl_panelimp.cpp index 44563f77d1..1b6c777ad2 100644 --- a/xfa/src/fwl/src/core/fwl_panelimp.cpp +++ b/xfa/src/fwl/src/core/fwl_panelimp.cpp @@ -9,7 +9,6 @@ #include "xfa/include/fwl/core/fwl_content.h" #include "xfa/include/fwl/core/fwl_grid.h" #include "xfa/include/fwl/core/fwl_panel.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" diff --git a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp index 999f5a6cdf..4ece3e881f 100644 --- a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp +++ b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h" + #include "core/include/fxcrt/fx_system.h" #include "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h" #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h" -#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h" #include "xfa/include/fwl/core/fwl_app.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" diff --git a/xfa/src/fwl/src/core/fwl_targetimp.cpp b/xfa/src/fwl/src/core/fwl_targetimp.cpp index 7933d4ec54..6898588515 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 "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 b63a3a4a33..de48068a3c 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/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_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" -#include "xfa/src/fwl/src/core/include/fwl_threadimp.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 bf7925c63d..19ab582340 100644 --- a/xfa/src/fwl/src/core/fwl_timerimp.cpp +++ b/xfa/src/fwl/src/core/fwl_timerimp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h" #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/core/fwl_timer.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp index 187bdab8fa..7100f193c9 100644 --- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp @@ -19,7 +19,6 @@ #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/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp index 7255569500..9b6f695ee3 100644 --- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp @@ -10,7 +10,6 @@ #include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h" #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/core/fwl_form.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" diff --git a/xfa/src/fwl/src/core/include/fwl_gridimp.h b/xfa/src/fwl/src/core/include/fwl_gridimp.h index f2e4e74bb0..54f4e5046d 100644 --- a/xfa/src/fwl/src/core/include/fwl_gridimp.h +++ b/xfa/src/fwl/src/core/include/fwl_gridimp.h @@ -10,6 +10,7 @@ #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" class CFWL_GridLength { public: @@ -19,6 +20,7 @@ class CFWL_GridLength { FX_FLOAT fLength; FWL_GRIDUNIT eUnit; }; + class CFWL_GridColRow { public: CFWL_GridColRow() @@ -33,6 +35,7 @@ class CFWL_GridColRow { FX_FLOAT m_fActualSize; FX_FLOAT m_fActualPos; }; + class CFWL_GridWidgetInfo { public: CFWL_GridWidgetInfo() @@ -67,6 +70,7 @@ class CFWL_GridWidgetInfo { FX_FLOAT m_fActualWidth; FX_FLOAT m_fActualHeight; }; + class CFWL_GridImp : public CFWL_ContentImp { public: CFWL_GridImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); @@ -178,6 +182,7 @@ class CFWL_GridImp : public CFWL_ContentImp { CFWL_GridLength m_Size[6]; friend class CFWL_GridImpDelegate; }; + class CFWL_GridImpDelegate : public CFWL_WidgetImpDelegate { public: CFWL_GridImpDelegate(CFWL_GridImp* pOwner); diff --git a/xfa/src/fwl/src/lightwidget/app.cpp b/xfa/src/fwl/src/lightwidget/app.cpp index 1ec6f162e3..31a39c17f0 100644 --- a/xfa/src/fwl/src/lightwidget/app.cpp +++ b/xfa/src/fwl/src/lightwidget/app.cpp @@ -10,7 +10,6 @@ #include "xfa/include/fwl/core/fwl_app.h" #include "xfa/include/fwl/core/fwl_error.h" #include "xfa/include/fwl/lightwidget/theme.h" -#include "xfa/src/foxitlib.h" CFWL_App::CFWL_App() : m_pIface(IFWL_App::Create(nullptr)), m_pTheme(nullptr) {} CFWL_App::~CFWL_App() { diff --git a/xfa/src/fwl/src/lightwidget/barcode.cpp b/xfa/src/fwl/src/lightwidget/barcode.cpp index 68b2f81545..4f05837352 100644 --- a/xfa/src/fwl/src/lightwidget/barcode.cpp +++ b/xfa/src/fwl/src/lightwidget/barcode.cpp @@ -8,8 +8,6 @@ #include <memory> -#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 a7a7702ab6..d9c3363ae1 100644 --- a/xfa/src/fwl/src/lightwidget/caret.cpp +++ b/xfa/src/fwl/src/lightwidget/caret.cpp @@ -10,7 +10,6 @@ #include "xfa/include/fwl/basewidget/fwl_caret.h" #include "xfa/include/fwl/lightwidget/edit.h" -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" CFWL_Caret* CFWL_Caret::Create() { diff --git a/xfa/src/fwl/src/lightwidget/checkbox.cpp b/xfa/src/fwl/src/lightwidget/checkbox.cpp index f2e24121d9..6b7a370973 100644 --- a/xfa/src/fwl/src/lightwidget/checkbox.cpp +++ b/xfa/src/fwl/src/lightwidget/checkbox.cpp @@ -9,7 +9,6 @@ #include <memory> #include "xfa/include/fwl/core/fwl_error.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 1d5844b56d..aadb0d5ab6 100644 --- a/xfa/src/fwl/src/lightwidget/combobox.cpp +++ b/xfa/src/fwl/src/lightwidget/combobox.cpp @@ -10,7 +10,6 @@ #include "xfa/include/fwl/core/fwl_error.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" CFWL_ComboBox* CFWL_ComboBox::Create() { return new CFWL_ComboBox; diff --git a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp index 2f01ec04b8..957ed87fed 100644 --- a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp +++ b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp @@ -12,7 +12,6 @@ #include "xfa/include/fwl/core/fwl_note.h" #include "xfa/include/fwl/core/fwl_widget.h" #include "xfa/include/fwl/basewidget/fwl_datetimepicker.h" -#include "xfa/src/foxitlib.h" CFWL_DateTimePicker* CFWL_DateTimePicker::Create() { return new CFWL_DateTimePicker; diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/src/lightwidget/edit.cpp index 58b4f49c4b..cf87ae031d 100644 --- a/xfa/src/fwl/src/lightwidget/edit.cpp +++ b/xfa/src/fwl/src/lightwidget/edit.cpp @@ -9,7 +9,6 @@ #include <memory> #include "xfa/include/fwl/basewidget/fwl_edit.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 9b8d105960..6a7a26cd1b 100644 --- a/xfa/src/fwl/src/lightwidget/listbox.cpp +++ b/xfa/src/fwl/src/lightwidget/listbox.cpp @@ -9,7 +9,6 @@ #include <memory> #include "third_party/base/stl_util.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 7fcba77b9e..e35741c3ac 100644 --- a/xfa/src/fwl/src/lightwidget/picturebox.cpp +++ b/xfa/src/fwl/src/lightwidget/picturebox.cpp @@ -8,8 +8,6 @@ #include <memory> -#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 5a7b981062..c9fb74e5f5 100644 --- a/xfa/src/fwl/src/lightwidget/pushbutton.cpp +++ b/xfa/src/fwl/src/lightwidget/pushbutton.cpp @@ -8,8 +8,6 @@ #include <memory> -#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 0d8e15c673..cc927e724e 100644 --- a/xfa/src/fwl/src/lightwidget/scrollbar.cpp +++ b/xfa/src/fwl/src/lightwidget/scrollbar.cpp @@ -9,7 +9,6 @@ #include <memory> #include "xfa/include/fwl/basewidget/fwl_scrollbar.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 79c54df693..fe9f55928b 100644 --- a/xfa/src/fwl/src/lightwidget/theme.cpp +++ b/xfa/src/fwl/src/lightwidget/theme.cpp @@ -20,7 +20,6 @@ #include "xfa/include/fwl/theme/pictureboxtp.h" #include "xfa/include/fwl/theme/pushbuttontp.h" #include "xfa/include/fwl/theme/scrollbartp.h" -#include "xfa/src/foxitlib.h" CFWL_Theme::CFWL_Theme() { m_ThemesArray.push_back(std::unique_ptr<CFWL_WidgetTP>(new CFWL_FormTP)); diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp index d3ce414e00..05149709ef 100644 --- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp +++ b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp @@ -8,7 +8,6 @@ #include <memory> -#include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_formimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_panelimp.h" diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/src/lightwidget/widget.cpp index df8abdeede..6603df7b57 100644 --- a/xfa/src/fwl/src/lightwidget/widget.cpp +++ b/xfa/src/fwl/src/lightwidget/widget.cpp @@ -9,7 +9,6 @@ #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/foxitlib.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" diff --git a/xfa/src/fwl/src/theme/barcodetp.cpp b/xfa/src/fwl/src/theme/barcodetp.cpp index fbbdeb2267..477ce99d9b 100644 --- a/xfa/src/fwl/src/theme/barcodetp.cpp +++ b/xfa/src/fwl/src/theme/barcodetp.cpp @@ -6,7 +6,6 @@ #include "xfa/include/fwl/theme/barcodetp.h" -#include "xfa/src/foxitlib.h" #include "xfa/include/fwl/basewidget/fwl_barcode.h" #include "xfa/include/fwl/core/fwl_theme.h" #include "xfa/include/fwl/core/fwl_widget.h" diff --git a/xfa/src/fwl/src/theme/carettp.cpp b/xfa/src/fwl/src/theme/carettp.cpp index 705d0e3880..88b01d9f3d 100644 --- a/xfa/src/fwl/src/theme/carettp.cpp +++ b/xfa/src/fwl/src/theme/carettp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_caret.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" CFWL_CaretTP::CFWL_CaretTP() {} CFWL_CaretTP::~CFWL_CaretTP() {} diff --git a/xfa/src/fwl/src/theme/checkboxtp.cpp b/xfa/src/fwl/src/theme/checkboxtp.cpp index b288e5f19f..a33291472a 100644 --- a/xfa/src/fwl/src/theme/checkboxtp.cpp +++ b/xfa/src/fwl/src/theme/checkboxtp.cpp @@ -9,7 +9,6 @@ #include "xfa/include/fwl/basewidget/fwl_checkbox.h" #include "xfa/include/fwl/core/fwl_widget.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #define CHECKBOX_SIZE_SIGNMARGIN 3 #define CHECKBOX_SIZE_SIGNBORDER 2 diff --git a/xfa/src/fwl/src/theme/comboboxtp.cpp b/xfa/src/fwl/src/theme/comboboxtp.cpp index e2de30db4d..33be07d44c 100644 --- a/xfa/src/fwl/src/theme/comboboxtp.cpp +++ b/xfa/src/fwl/src/theme/comboboxtp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_combobox.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" #define FWLTHEME_CAPACITY_ComboFormHandler 8.0f diff --git a/xfa/src/fwl/src/theme/datetimepickertp.cpp b/xfa/src/fwl/src/theme/datetimepickertp.cpp index ae8cee8f94..5efe0b850e 100644 --- a/xfa/src/fwl/src/theme/datetimepickertp.cpp +++ b/xfa/src/fwl/src/theme/datetimepickertp.cpp @@ -7,7 +7,6 @@ #include "xfa/include/fwl/theme/datetimepickertp.h" #include "xfa/include/fwl/basewidget/fwl_datetimepicker.h" -#include "xfa/src/foxitlib.h" CFWL_DateTimePickerTP::CFWL_DateTimePickerTP() { m_pThemeData = new DTPThemeData; diff --git a/xfa/src/fwl/src/theme/edittp.cpp b/xfa/src/fwl/src/theme/edittp.cpp index d1389376af..a206faffe8 100644 --- a/xfa/src/fwl/src/theme/edittp.cpp +++ b/xfa/src/fwl/src/theme/edittp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_edit.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" CFWL_EditTP::CFWL_EditTP() {} CFWL_EditTP::~CFWL_EditTP() {} diff --git a/xfa/src/fwl/src/theme/formtp.cpp b/xfa/src/fwl/src/theme/formtp.cpp index 4d98762c13..1d6dcd1c17 100644 --- a/xfa/src/fwl/src/theme/formtp.cpp +++ b/xfa/src/fwl/src/theme/formtp.cpp @@ -9,7 +9,6 @@ #include "xfa/include/fwl/core/fwl_form.h" #include "xfa/include/fwl/core/fwl_widget.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #define FWLTHEME_CAPACITY_CXFormBorder 3 #define FWLTHEME_CAPACITY_CYFormBorder 3 diff --git a/xfa/src/fwl/src/theme/listboxtp.cpp b/xfa/src/fwl/src/theme/listboxtp.cpp index 7d76700368..8ffe669835 100644 --- a/xfa/src/fwl/src/theme/listboxtp.cpp +++ b/xfa/src/fwl/src/theme/listboxtp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_listbox.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" CFWL_ListBoxTP::CFWL_ListBoxTP() {} CFWL_ListBoxTP::~CFWL_ListBoxTP() {} diff --git a/xfa/src/fwl/src/theme/monthcalendartp.cpp b/xfa/src/fwl/src/theme/monthcalendartp.cpp index 1de8e57fdb..47384b979f 100644 --- a/xfa/src/fwl/src/theme/monthcalendartp.cpp +++ b/xfa/src/fwl/src/theme/monthcalendartp.cpp @@ -9,7 +9,6 @@ #include "xfa/include/fwl/basewidget/fwl_monthcalendar.h" #include "xfa/include/fwl/core/fwl_widget.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" #define FWL_THEMECAPACITY_MC_HEADER_WIDTH 200 #define FWL_THEMECAPACITY_MC_HEADER_HEIGHT 30 diff --git a/xfa/src/fwl/src/theme/pictureboxtp.cpp b/xfa/src/fwl/src/theme/pictureboxtp.cpp index 0a373bdcb1..5d7c079e86 100644 --- a/xfa/src/fwl/src/theme/pictureboxtp.cpp +++ b/xfa/src/fwl/src/theme/pictureboxtp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_picturebox.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" CFWL_PictureBoxTP::CFWL_PictureBoxTP() {} CFWL_PictureBoxTP::~CFWL_PictureBoxTP() {} diff --git a/xfa/src/fwl/src/theme/pushbuttontp.cpp b/xfa/src/fwl/src/theme/pushbuttontp.cpp index 63062562a8..76e0eab7dc 100644 --- a/xfa/src/fwl/src/theme/pushbuttontp.cpp +++ b/xfa/src/fwl/src/theme/pushbuttontp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_pushbutton.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" #define PUSHBUTTON_SIZE_Corner 2 diff --git a/xfa/src/fwl/src/theme/scrollbartp.cpp b/xfa/src/fwl/src/theme/scrollbartp.cpp index b0965f5557..424ff549e5 100644 --- a/xfa/src/fwl/src/theme/scrollbartp.cpp +++ b/xfa/src/fwl/src/theme/scrollbartp.cpp @@ -8,7 +8,6 @@ #include "xfa/include/fwl/basewidget/fwl_scrollbar.h" #include "xfa/include/fwl/core/fwl_widget.h" -#include "xfa/src/foxitlib.h" #define FWL_SCROLL_PawLen 12.5f diff --git a/xfa/src/fwl/src/theme/widgettp.cpp b/xfa/src/fwl/src/theme/widgettp.cpp index af634e67c7..7fa7812092 100644 --- a/xfa/src/fwl/src/theme/widgettp.cpp +++ b/xfa/src/fwl/src/theme/widgettp.cpp @@ -10,7 +10,6 @@ #include "xfa/include/fwl/core/fwl_widgetmgr.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/foxitlib.h" static void FWL_SetChildThemeID(IFWL_Widget* pParent, FX_DWORD dwThemeID) { IFWL_WidgetMgr* pWidgetMgr = FWL_GetWidgetMgr(); |