summaryrefslogtreecommitdiff
path: root/xfa/fwl
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-10-20 09:59:48 -0700
committerCommit bot <commit-bot@chromium.org>2016-10-20 09:59:48 -0700
commit05259e98f7416b59da18ee6059b48a23fddca8af (patch)
tree8af6be4a43aa37e8cd36023ffd36262c04c26ff7 /xfa/fwl
parent73895de7dea3737d1a25801001b8efe186c6f5a3 (diff)
downloadpdfium-05259e98f7416b59da18ee6059b48a23fddca8af.tar.xz
Move fwl/lightwidget to fwl/core
This CL moves the code from fwl/lightwidget into fwl/core. In anticipation of merging the two hierarchies. Review-Url: https://chromiumcodereview.appspot.com/2430923006
Diffstat (limited to 'xfa/fwl')
-rw-r--r--xfa/fwl/core/cfwl_barcode.cpp (renamed from xfa/fwl/lightwidget/cfwl_barcode.cpp)2
-rw-r--r--xfa/fwl/core/cfwl_barcode.h (renamed from xfa/fwl/lightwidget/cfwl_barcode.h)8
-rw-r--r--xfa/fwl/core/cfwl_checkbox.cpp (renamed from xfa/fwl/lightwidget/cfwl_checkbox.cpp)2
-rw-r--r--xfa/fwl/core/cfwl_checkbox.h (renamed from xfa/fwl/lightwidget/cfwl_checkbox.h)8
-rw-r--r--xfa/fwl/core/cfwl_combobox.cpp (renamed from xfa/fwl/lightwidget/cfwl_combobox.cpp)2
-rw-r--r--xfa/fwl/core/cfwl_combobox.h (renamed from xfa/fwl/lightwidget/cfwl_combobox.h)8
-rw-r--r--xfa/fwl/core/cfwl_datetimepicker.cpp (renamed from xfa/fwl/lightwidget/cfwl_datetimepicker.cpp)2
-rw-r--r--xfa/fwl/core/cfwl_datetimepicker.h (renamed from xfa/fwl/lightwidget/cfwl_datetimepicker.h)8
-rw-r--r--xfa/fwl/core/cfwl_edit.cpp (renamed from xfa/fwl/lightwidget/cfwl_edit.cpp)2
-rw-r--r--xfa/fwl/core/cfwl_edit.h (renamed from xfa/fwl/lightwidget/cfwl_edit.h)8
-rw-r--r--xfa/fwl/core/cfwl_listbox.cpp (renamed from xfa/fwl/lightwidget/cfwl_listbox.cpp)2
-rw-r--r--xfa/fwl/core/cfwl_listbox.h (renamed from xfa/fwl/lightwidget/cfwl_listbox.h)8
-rw-r--r--xfa/fwl/core/cfwl_picturebox.cpp (renamed from xfa/fwl/lightwidget/cfwl_picturebox.cpp)2
-rw-r--r--xfa/fwl/core/cfwl_picturebox.h (renamed from xfa/fwl/lightwidget/cfwl_picturebox.h)8
-rw-r--r--xfa/fwl/core/cfwl_pushbutton.cpp (renamed from xfa/fwl/lightwidget/cfwl_pushbutton.cpp)2
-rw-r--r--xfa/fwl/core/cfwl_pushbutton.h (renamed from xfa/fwl/lightwidget/cfwl_pushbutton.h)8
-rw-r--r--xfa/fwl/core/cfwl_widget.cpp (renamed from xfa/fwl/lightwidget/cfwl_widget.cpp)2
-rw-r--r--xfa/fwl/core/cfwl_widget.h (renamed from xfa/fwl/lightwidget/cfwl_widget.h)8
-rw-r--r--xfa/fwl/core/cfwl_widgetproperties.cpp (renamed from xfa/fwl/lightwidget/cfwl_widgetproperties.cpp)4
-rw-r--r--xfa/fwl/core/cfwl_widgetproperties.h (renamed from xfa/fwl/lightwidget/cfwl_widgetproperties.h)6
-rw-r--r--xfa/fwl/core/ifwl_edit.h2
-rw-r--r--xfa/fwl/core/ifwl_picturebox.cpp2
22 files changed, 52 insertions, 52 deletions
diff --git a/xfa/fwl/lightwidget/cfwl_barcode.cpp b/xfa/fwl/core/cfwl_barcode.cpp
index c26d719b3f..67cbc301bd 100644
--- a/xfa/fwl/lightwidget/cfwl_barcode.cpp
+++ b/xfa/fwl/core/cfwl_barcode.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fwl/lightwidget/cfwl_barcode.h"
+#include "xfa/fwl/core/cfwl_barcode.h"
#include <memory>
diff --git a/xfa/fwl/lightwidget/cfwl_barcode.h b/xfa/fwl/core/cfwl_barcode.h
index 4bb3d608aa..39006676e9 100644
--- a/xfa/fwl/lightwidget/cfwl_barcode.h
+++ b/xfa/fwl/core/cfwl_barcode.h
@@ -4,12 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_BARCODE_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_BARCODE_H_
+#ifndef XFA_FWL_CORE_CFWL_BARCODE_H_
+#define XFA_FWL_CORE_CFWL_BARCODE_H_
+#include "xfa/fwl/core/cfwl_edit.h"
#include "xfa/fwl/core/fwl_error.h"
#include "xfa/fwl/core/ifwl_barcode.h"
-#include "xfa/fwl/lightwidget/cfwl_edit.h"
class CFWL_Widget;
class CFWL_WidgetProperties;
@@ -125,4 +125,4 @@ class CFWL_Barcode : public CFWL_Edit {
CFWL_BarcodeDP m_barcodeData;
};
-#endif // XFA_FWL_LIGHTWIDGET_CFWL_BARCODE_H_
+#endif // XFA_FWL_CORE_CFWL_BARCODE_H_
diff --git a/xfa/fwl/lightwidget/cfwl_checkbox.cpp b/xfa/fwl/core/cfwl_checkbox.cpp
index aeaf3f519f..bc55a690f3 100644
--- a/xfa/fwl/lightwidget/cfwl_checkbox.cpp
+++ b/xfa/fwl/core/cfwl_checkbox.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fwl/lightwidget/cfwl_checkbox.h"
+#include "xfa/fwl/core/cfwl_checkbox.h"
#include <memory>
diff --git a/xfa/fwl/lightwidget/cfwl_checkbox.h b/xfa/fwl/core/cfwl_checkbox.h
index 343970c3a4..9daab33150 100644
--- a/xfa/fwl/lightwidget/cfwl_checkbox.h
+++ b/xfa/fwl/core/cfwl_checkbox.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_CHECKBOX_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_CHECKBOX_H_
+#ifndef XFA_FWL_CORE_CFWL_CHECKBOX_H_
+#define XFA_FWL_CORE_CFWL_CHECKBOX_H_
+#include "xfa/fwl/core/cfwl_widget.h"
#include "xfa/fwl/core/ifwl_checkbox.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
class CFWL_CheckBox : public CFWL_Widget {
public:
@@ -43,4 +43,4 @@ class CFWL_CheckBox : public CFWL_Widget {
CFWL_CheckBoxDP m_checkboxData;
};
-#endif // XFA_FWL_LIGHTWIDGET_CFWL_CHECKBOX_H_
+#endif // XFA_FWL_CORE_CFWL_CHECKBOX_H_
diff --git a/xfa/fwl/lightwidget/cfwl_combobox.cpp b/xfa/fwl/core/cfwl_combobox.cpp
index a56b875907..e00f785ade 100644
--- a/xfa/fwl/lightwidget/cfwl_combobox.cpp
+++ b/xfa/fwl/core/cfwl_combobox.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fwl/lightwidget/cfwl_combobox.h"
+#include "xfa/fwl/core/cfwl_combobox.h"
#include <utility>
diff --git a/xfa/fwl/lightwidget/cfwl_combobox.h b/xfa/fwl/core/cfwl_combobox.h
index b6dee570cb..6e4988fe8e 100644
--- a/xfa/fwl/lightwidget/cfwl_combobox.h
+++ b/xfa/fwl/core/cfwl_combobox.h
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_COMBOBOX_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_COMBOBOX_H_
+#ifndef XFA_FWL_CORE_CFWL_COMBOBOX_H_
+#define XFA_FWL_CORE_CFWL_COMBOBOX_H_
#include <memory>
#include <vector>
+#include "xfa/fwl/core/cfwl_widget.h"
#include "xfa/fwl/core/ifwl_combobox.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
class CFWL_WidgetProperties;
class IFWL_ComboBoxDP;
@@ -145,4 +145,4 @@ class CFWL_ComboBoxItem : public IFWL_ListItem {
void* m_pData;
};
-#endif // XFA_FWL_LIGHTWIDGET_CFWL_COMBOBOX_H_
+#endif // XFA_FWL_CORE_CFWL_COMBOBOX_H_
diff --git a/xfa/fwl/lightwidget/cfwl_datetimepicker.cpp b/xfa/fwl/core/cfwl_datetimepicker.cpp
index be59564750..7d5a1535f1 100644
--- a/xfa/fwl/lightwidget/cfwl_datetimepicker.cpp
+++ b/xfa/fwl/core/cfwl_datetimepicker.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fwl/lightwidget/cfwl_datetimepicker.h"
+#include "xfa/fwl/core/cfwl_datetimepicker.h"
#include <memory>
diff --git a/xfa/fwl/lightwidget/cfwl_datetimepicker.h b/xfa/fwl/core/cfwl_datetimepicker.h
index 309988446d..a3299a92a0 100644
--- a/xfa/fwl/lightwidget/cfwl_datetimepicker.h
+++ b/xfa/fwl/core/cfwl_datetimepicker.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_DATETIMEPICKER_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_DATETIMEPICKER_H_
+#ifndef XFA_FWL_CORE_CFWL_DATETIMEPICKER_H_
+#define XFA_FWL_CORE_CFWL_DATETIMEPICKER_H_
+#include "xfa/fwl/core/cfwl_widget.h"
#include "xfa/fwl/core/ifwl_datetimepicker.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
class CFWL_DateTimePicker : public CFWL_Widget {
public:
@@ -67,4 +67,4 @@ class CFWL_DateTimePicker : public CFWL_Widget {
CFWL_DateTimePickerDP m_DateTimePickerDP;
};
-#endif // XFA_FWL_LIGHTWIDGET_CFWL_DATETIMEPICKER_H_
+#endif // XFA_FWL_CORE_CFWL_DATETIMEPICKER_H_
diff --git a/xfa/fwl/lightwidget/cfwl_edit.cpp b/xfa/fwl/core/cfwl_edit.cpp
index f5f0eb9c89..9e106929bb 100644
--- a/xfa/fwl/lightwidget/cfwl_edit.cpp
+++ b/xfa/fwl/core/cfwl_edit.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fwl/lightwidget/cfwl_edit.h"
+#include "xfa/fwl/core/cfwl_edit.h"
#include <memory>
#include <vector>
diff --git a/xfa/fwl/lightwidget/cfwl_edit.h b/xfa/fwl/core/cfwl_edit.h
index cbca3d9cf4..83343ac751 100644
--- a/xfa/fwl/lightwidget/cfwl_edit.h
+++ b/xfa/fwl/core/cfwl_edit.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_EDIT_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_EDIT_H_
+#ifndef XFA_FWL_CORE_CFWL_EDIT_H_
+#define XFA_FWL_CORE_CFWL_EDIT_H_
#include <vector>
+#include "xfa/fwl/core/cfwl_widget.h"
#include "xfa/fwl/core/ifwl_edit.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
class CFWL_WidgetProperties;
class IFDE_TxtEdtDoRecord;
@@ -68,4 +68,4 @@ class CFWL_Edit : public CFWL_Widget {
const CFX_ByteStringC& bsReplace);
};
-#endif // XFA_FWL_LIGHTWIDGET_CFWL_EDIT_H_
+#endif // XFA_FWL_CORE_CFWL_EDIT_H_
diff --git a/xfa/fwl/lightwidget/cfwl_listbox.cpp b/xfa/fwl/core/cfwl_listbox.cpp
index f55bcc671a..3884e8c42e 100644
--- a/xfa/fwl/lightwidget/cfwl_listbox.cpp
+++ b/xfa/fwl/core/cfwl_listbox.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fwl/lightwidget/cfwl_listbox.h"
+#include "xfa/fwl/core/cfwl_listbox.h"
#include <memory>
diff --git a/xfa/fwl/lightwidget/cfwl_listbox.h b/xfa/fwl/core/cfwl_listbox.h
index 4a251ca9f2..52caaeaea9 100644
--- a/xfa/fwl/lightwidget/cfwl_listbox.h
+++ b/xfa/fwl/core/cfwl_listbox.h
@@ -4,16 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_LISTBOX_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_LISTBOX_H_
+#ifndef XFA_FWL_CORE_CFWL_LISTBOX_H_
+#define XFA_FWL_CORE_CFWL_LISTBOX_H_
#include <memory>
#include <vector>
+#include "xfa/fwl/core/cfwl_widget.h"
#include "xfa/fwl/core/fwl_error.h"
#include "xfa/fwl/core/ifwl_listbox.h"
#include "xfa/fwl/core/ifwl_widget.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
class CFWL_ListItem;
@@ -120,4 +120,4 @@ class CFWL_ListItem : public IFWL_ListItem {
CFX_RectF m_rtCheckBox;
};
-#endif // XFA_FWL_LIGHTWIDGET_CFWL_LISTBOX_H_
+#endif // XFA_FWL_CORE_CFWL_LISTBOX_H_
diff --git a/xfa/fwl/lightwidget/cfwl_picturebox.cpp b/xfa/fwl/core/cfwl_picturebox.cpp
index d4b9f30d6e..92058a9818 100644
--- a/xfa/fwl/lightwidget/cfwl_picturebox.cpp
+++ b/xfa/fwl/core/cfwl_picturebox.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fwl/lightwidget/cfwl_picturebox.h"
+#include "xfa/fwl/core/cfwl_picturebox.h"
#include <memory>
diff --git a/xfa/fwl/lightwidget/cfwl_picturebox.h b/xfa/fwl/core/cfwl_picturebox.h
index 149f3c9965..584950f045 100644
--- a/xfa/fwl/lightwidget/cfwl_picturebox.h
+++ b/xfa/fwl/core/cfwl_picturebox.h
@@ -4,12 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_PICTUREBOX_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_PICTUREBOX_H_
+#ifndef XFA_FWL_CORE_CFWL_PICTUREBOX_H_
+#define XFA_FWL_CORE_CFWL_PICTUREBOX_H_
+#include "xfa/fwl/core/cfwl_widget.h"
#include "xfa/fwl/core/fwl_error.h"
#include "xfa/fwl/core/ifwl_picturebox.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
class CFWL_PictureBox : public CFWL_Widget {
public:
@@ -64,4 +64,4 @@ class CFWL_PictureBox : public CFWL_Widget {
CFWL_PictureBoxDP m_PictureBoxDP;
};
-#endif // XFA_FWL_LIGHTWIDGET_CFWL_PICTUREBOX_H_
+#endif // XFA_FWL_CORE_CFWL_PICTUREBOX_H_
diff --git a/xfa/fwl/lightwidget/cfwl_pushbutton.cpp b/xfa/fwl/core/cfwl_pushbutton.cpp
index d864ea9ca2..8425f5de24 100644
--- a/xfa/fwl/lightwidget/cfwl_pushbutton.cpp
+++ b/xfa/fwl/core/cfwl_pushbutton.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fwl/lightwidget/cfwl_pushbutton.h"
+#include "xfa/fwl/core/cfwl_pushbutton.h"
#include <memory>
diff --git a/xfa/fwl/lightwidget/cfwl_pushbutton.h b/xfa/fwl/core/cfwl_pushbutton.h
index 0199dbb778..8f11660ce9 100644
--- a/xfa/fwl/lightwidget/cfwl_pushbutton.h
+++ b/xfa/fwl/core/cfwl_pushbutton.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_PUSHBUTTON_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_PUSHBUTTON_H_
+#ifndef XFA_FWL_CORE_CFWL_PUSHBUTTON_H_
+#define XFA_FWL_CORE_CFWL_PUSHBUTTON_H_
+#include "xfa/fwl/core/cfwl_widget.h"
#include "xfa/fwl/core/ifwl_pushbutton.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
class CFWL_PushButton : public CFWL_Widget {
public:
@@ -43,4 +43,4 @@ class CFWL_PushButton : public CFWL_Widget {
CFWL_PushButtonDP m_buttonData;
};
-#endif // XFA_FWL_LIGHTWIDGET_CFWL_PUSHBUTTON_H_
+#endif // XFA_FWL_CORE_CFWL_PUSHBUTTON_H_
diff --git a/xfa/fwl/lightwidget/cfwl_widget.cpp b/xfa/fwl/core/cfwl_widget.cpp
index c77bfc215c..7f6bd3b07c 100644
--- a/xfa/fwl/lightwidget/cfwl_widget.cpp
+++ b/xfa/fwl/core/cfwl_widget.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
+#include "xfa/fwl/core/cfwl_widget.h"
#include "xfa/fde/tto/fde_textout.h"
#include "xfa/fwl/core/cfwl_themetext.h"
diff --git a/xfa/fwl/lightwidget/cfwl_widget.h b/xfa/fwl/core/cfwl_widget.h
index 16b1141aae..cc6967852f 100644
--- a/xfa/fwl/lightwidget/cfwl_widget.h
+++ b/xfa/fwl/core/cfwl_widget.h
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_WIDGET_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_WIDGET_H_
+#ifndef XFA_FWL_CORE_CFWL_WIDGET_H_
+#define XFA_FWL_CORE_CFWL_WIDGET_H_
#include <memory>
#include "xfa/fwl/core/cfwl_event.h"
+#include "xfa/fwl/core/cfwl_widgetproperties.h"
#include "xfa/fwl/core/ifwl_widget.h"
-#include "xfa/fwl/lightwidget/cfwl_widgetproperties.h"
class CFWL_Event;
class CFWL_Message;
@@ -62,4 +62,4 @@ class CFWL_Widget {
std::unique_ptr<CFWL_WidgetProperties> m_pProperties;
};
-#endif // XFA_FWL_LIGHTWIDGET_CFWL_WIDGET_H_
+#endif // XFA_FWL_CORE_CFWL_WIDGET_H_
diff --git a/xfa/fwl/lightwidget/cfwl_widgetproperties.cpp b/xfa/fwl/core/cfwl_widgetproperties.cpp
index 31e1dda687..fae1ff605a 100644
--- a/xfa/fwl/lightwidget/cfwl_widgetproperties.cpp
+++ b/xfa/fwl/core/cfwl_widgetproperties.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fwl/lightwidget/cfwl_widgetproperties.h"
+#include "xfa/fwl/core/cfwl_widgetproperties.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
+#include "xfa/fwl/core/cfwl_widget.h"
CFWL_WidgetProperties::CFWL_WidgetProperties()
: m_dwStyles(FWL_WGTSTYLE_Child),
diff --git a/xfa/fwl/lightwidget/cfwl_widgetproperties.h b/xfa/fwl/core/cfwl_widgetproperties.h
index 73e8fecee8..afadfc49f1 100644
--- a/xfa/fwl/lightwidget/cfwl_widgetproperties.h
+++ b/xfa/fwl/core/cfwl_widgetproperties.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_WIDGETPROPERTIES_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_WIDGETPROPERTIES_H_
+#ifndef XFA_FWL_CORE_CFWL_WIDGETPROPERTIES_H_
+#define XFA_FWL_CORE_CFWL_WIDGETPROPERTIES_H_
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_string.h"
@@ -34,4 +34,4 @@ class CFWL_WidgetProperties {
CFWL_Widget* m_pOwner;
};
-#endif // XFA_FWL_LIGHTWIDGET_CFWL_WIDGETPROPERTIES_H_
+#endif // XFA_FWL_CORE_CFWL_WIDGETPROPERTIES_H_
diff --git a/xfa/fwl/core/ifwl_edit.h b/xfa/fwl/core/ifwl_edit.h
index e327a2509f..7c0c451cf9 100644
--- a/xfa/fwl/core/ifwl_edit.h
+++ b/xfa/fwl/core/ifwl_edit.h
@@ -14,9 +14,9 @@
#include "xfa/fde/ifde_txtedtdorecord.h"
#include "xfa/fde/ifde_txtedtengine.h"
#include "xfa/fwl/core/cfwl_event.h"
+#include "xfa/fwl/core/cfwl_widget.h"
#include "xfa/fwl/core/ifwl_dataprovider.h"
#include "xfa/fwl/core/ifwl_scrollbar.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
#include "xfa/fxgraphics/cfx_path.h"
#define FWL_STYLEEXT_EDT_ReadOnly (1L << 0)
diff --git a/xfa/fwl/core/ifwl_picturebox.cpp b/xfa/fwl/core/ifwl_picturebox.cpp
index 301c404767..3539e08b0b 100644
--- a/xfa/fwl/core/ifwl_picturebox.cpp
+++ b/xfa/fwl/core/ifwl_picturebox.cpp
@@ -6,8 +6,8 @@
#include "xfa/fwl/core/ifwl_picturebox.h"
+#include "xfa/fwl/core/cfwl_picturebox.h"
#include "xfa/fwl/core/fwl_noteimp.h"
-#include "xfa/fwl/lightwidget/cfwl_picturebox.h"
IFWL_PictureBox::IFWL_PictureBox(const CFWL_WidgetImpProperties& properties)
: IFWL_Widget(properties, nullptr),