From 398a43d83174d75366da57726ff81f199f04e24c Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 23 Mar 2016 15:51:01 -0400 Subject: Move xfa/include/fwl/{core,basewidget} to xfa/fwl/{core,basewidget}. This CL moves and splits the FWL files from the core and basewidget directories into the non-include folders. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1827923002 . --- xfa/include/fwl/lightwidget/app.h | 2 +- xfa/include/fwl/lightwidget/barcode.h | 4 ++-- xfa/include/fwl/lightwidget/caret.h | 3 ++- xfa/include/fwl/lightwidget/checkbox.h | 2 +- xfa/include/fwl/lightwidget/combobox.h | 2 +- xfa/include/fwl/lightwidget/datetimepicker.h | 2 +- xfa/include/fwl/lightwidget/listbox.h | 6 +++--- xfa/include/fwl/lightwidget/picturebox.h | 4 ++-- xfa/include/fwl/lightwidget/pushbutton.h | 2 +- xfa/include/fwl/lightwidget/theme.h | 6 +++++- xfa/include/fwl/lightwidget/tooltipctrl.h | 2 +- xfa/include/fwl/lightwidget/widget.h | 4 +++- 12 files changed, 23 insertions(+), 16 deletions(-) (limited to 'xfa/include/fwl/lightwidget') diff --git a/xfa/include/fwl/lightwidget/app.h b/xfa/include/fwl/lightwidget/app.h index ce0c0df287..dee8d04de3 100644 --- a/xfa/include/fwl/lightwidget/app.h +++ b/xfa/include/fwl/lightwidget/app.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_APP_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_APP_H_ -#include "xfa/include/fwl/core/fwl_error.h" +#include "xfa/fwl/core/fwl_error.h" class CFWL_Theme; class IFWL_App; diff --git a/xfa/include/fwl/lightwidget/barcode.h b/xfa/include/fwl/lightwidget/barcode.h index 7056f3ac58..0483de0f4c 100644 --- a/xfa/include/fwl/lightwidget/barcode.h +++ b/xfa/include/fwl/lightwidget/barcode.h @@ -7,8 +7,8 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_ -#include "xfa/include/fwl/basewidget/fwl_barcode.h" -#include "xfa/include/fwl/core/fwl_error.h" +#include "xfa/fwl/basewidget/ifwl_barcode.h" +#include "xfa/fwl/core/fwl_error.h" #include "xfa/include/fwl/lightwidget/edit.h" class CFWL_Widget; diff --git a/xfa/include/fwl/lightwidget/caret.h b/xfa/include/fwl/lightwidget/caret.h index be11be1cf5..9f84950412 100644 --- a/xfa/include/fwl/lightwidget/caret.h +++ b/xfa/include/fwl/lightwidget/caret.h @@ -7,7 +7,8 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_CARET_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_CARET_H_ -#include "xfa/include/fwl/core/fwl_error.h" +#include "xfa/fwl/core/fwl_error.h" +#include "xfa/fxgraphics/cfx_color.h" #include "xfa/include/fwl/lightwidget/widget.h" class CFWL_Caret : public CFWL_Widget { diff --git a/xfa/include/fwl/lightwidget/checkbox.h b/xfa/include/fwl/lightwidget/checkbox.h index 3780badce2..a691c9664c 100644 --- a/xfa/include/fwl/lightwidget/checkbox.h +++ b/xfa/include/fwl/lightwidget/checkbox.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_CHECKBOX_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_CHECKBOX_H_ -#include "xfa/include/fwl/basewidget/fwl_checkbox.h" +#include "xfa/fwl/basewidget/ifwl_checkbox.h" #include "xfa/include/fwl/lightwidget/widget.h" class CFWL_CheckBox : public CFWL_Widget { diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h index db6db39d2f..4229cc9a6a 100644 --- a/xfa/include/fwl/lightwidget/combobox.h +++ b/xfa/include/fwl/lightwidget/combobox.h @@ -10,7 +10,7 @@ #include #include -#include "xfa/include/fwl/basewidget/fwl_combobox.h" +#include "xfa/fwl/basewidget/ifwl_combobox.h" #include "xfa/include/fwl/lightwidget/widget.h" class CFWL_WidgetProperties; diff --git a/xfa/include/fwl/lightwidget/datetimepicker.h b/xfa/include/fwl/lightwidget/datetimepicker.h index 22048f37f6..379883fb0b 100644 --- a/xfa/include/fwl/lightwidget/datetimepicker.h +++ b/xfa/include/fwl/lightwidget/datetimepicker.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_DATETIMEPICKER_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_DATETIMEPICKER_H_ -#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h" +#include "xfa/fwl/basewidget/ifwl_datetimepicker.h" #include "xfa/include/fwl/lightwidget/widget.h" class CFWL_DateTimePicker : public CFWL_Widget { diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h index 008f17055f..69c7d208c6 100644 --- a/xfa/include/fwl/lightwidget/listbox.h +++ b/xfa/include/fwl/lightwidget/listbox.h @@ -10,9 +10,9 @@ #include #include -#include "xfa/include/fwl/basewidget/fwl_listbox.h" -#include "xfa/include/fwl/core/fwl_error.h" -#include "xfa/include/fwl/core/fwl_widget.h" +#include "xfa/fwl/basewidget/ifwl_listbox.h" +#include "xfa/fwl/core/fwl_error.h" +#include "xfa/fwl/core/ifwl_widget.h" #include "xfa/include/fwl/lightwidget/widget.h" class CFWL_ListItem; diff --git a/xfa/include/fwl/lightwidget/picturebox.h b/xfa/include/fwl/lightwidget/picturebox.h index 793eb16fb8..b5c8ae5192 100644 --- a/xfa/include/fwl/lightwidget/picturebox.h +++ b/xfa/include/fwl/lightwidget/picturebox.h @@ -7,8 +7,8 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_PICTUREBOX_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_PICTUREBOX_H_ -#include "xfa/include/fwl/basewidget/fwl_picturebox.h" -#include "xfa/include/fwl/core/fwl_error.h" +#include "xfa/fwl/basewidget/ifwl_picturebox.h" +#include "xfa/fwl/core/fwl_error.h" #include "xfa/include/fwl/lightwidget/widget.h" class CFWL_PictureBox : public CFWL_Widget { diff --git a/xfa/include/fwl/lightwidget/pushbutton.h b/xfa/include/fwl/lightwidget/pushbutton.h index d8f5760911..abd76f50a5 100644 --- a/xfa/include/fwl/lightwidget/pushbutton.h +++ b/xfa/include/fwl/lightwidget/pushbutton.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_PUSHBUTTON_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_PUSHBUTTON_H_ -#include "xfa/include/fwl/basewidget/fwl_pushbutton.h" +#include "xfa/fwl/basewidget/ifwl_pushbutton.h" #include "xfa/include/fwl/lightwidget/widget.h" class CFWL_PushButton : public CFWL_Widget { diff --git a/xfa/include/fwl/lightwidget/theme.h b/xfa/include/fwl/lightwidget/theme.h index f47725b8ae..c39b48e307 100644 --- a/xfa/include/fwl/lightwidget/theme.h +++ b/xfa/include/fwl/lightwidget/theme.h @@ -10,11 +10,15 @@ #include #include +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_system.h" #include "core/include/fxge/fx_dib.h" -#include "xfa/include/fwl/core/fwl_theme.h" +#include "xfa/fwl/core/ifwl_themeprovider.h" class CFWL_WidgetTP; class IFWL_Widget; +class CFWL_ThemePart; +class CFWL_ThemeText; class CFWL_Theme : public IFWL_ThemeProvider { public: diff --git a/xfa/include/fwl/lightwidget/tooltipctrl.h b/xfa/include/fwl/lightwidget/tooltipctrl.h index c446fe47aa..6a487f27e7 100644 --- a/xfa/include/fwl/lightwidget/tooltipctrl.h +++ b/xfa/include/fwl/lightwidget/tooltipctrl.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIPCTRL_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIPCTRL_H_ -#include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h" +#include "xfa/fwl/basewidget/ifwl_tooltip.h" #include "xfa/include/fwl/lightwidget/widget.h" class CFWL_ToolTip : public CFWL_Widget { diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h index c10428e505..2f7ea641e9 100644 --- a/xfa/include/fwl/lightwidget/widget.h +++ b/xfa/include/fwl/lightwidget/widget.h @@ -7,7 +7,9 @@ #ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_WIDGET_H_ #define XFA_INCLUDE_FWL_LIGHTWIDGET_WIDGET_H_ -#include "xfa/include/fwl/core/fwl_widget.h" +#include "xfa/fwl/core/cfwl_event.h" +#include "xfa/fwl/core/cfwl_widgetimpproperties.h" +#include "xfa/fwl/core/ifwl_widget.h" class CFWL_Event; class CFWL_Message; -- cgit v1.2.3