diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2016-03-17 08:59:42 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2016-03-17 08:59:42 -0400 |
| commit | 811b8a4f4482bb5c11ac7610e70a4c8fd34c2907 (patch) | |
| tree | cafa17bad705518693c0a2ba9d8df9d50af2101e /xfa/include/fwl | |
| parent | a03c343b47938fcb1b562741ff05252b01a4e39d (diff) | |
| download | pdfium-811b8a4f4482bb5c11ac7610e70a4c8fd34c2907.tar.xz | |
Move xfa/include/fxgraphics/fx_graphics.h to xfa/fxgraphics.
This Cl moves and splits apart the fx_graphics.h file into individual classes.
The .cpp files are renamed to match the .h files. pre.h was removed at the
same time and its contents moved to the correct places as needed.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1810563002 .
Diffstat (limited to 'xfa/include/fwl')
| -rw-r--r-- | xfa/include/fwl/core/fwl_note.h | 4 | ||||
| -rw-r--r-- | xfa/include/fwl/core/fwl_theme.h | 6 | ||||
| -rw-r--r-- | xfa/include/fwl/core/fwl_widget.h | 1 | ||||
| -rw-r--r-- | xfa/include/fwl/lightwidget/theme.h | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h index 182c56fe3c..e41cf1dcef 100644 --- a/xfa/include/fwl/core/fwl_note.h +++ b/xfa/include/fwl/core/fwl_note.h @@ -7,8 +7,9 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_ #define XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_ +#include "core/include/fxcrt/fx_coordinates.h" +#include "xfa/fxgraphics/include/cfx_graphics.h" #include "xfa/include/fwl/core/fwl_error.h" -#include "xfa/include/fxgraphics/fx_graphics.h" class IFWL_Widget; class IFWL_NoteThread; @@ -44,6 +45,7 @@ class CFWL_EvtSizeChanged; class CFWL_EvtIdle; class IFWL_NoteDriver; class IFWL_NoteLoop; + #define FWL_MSG_Activate L"FWL_MESSAGE_Activate" #define FWL_MSG_Deactivate L"FWL_MESSAGE_Deactivate" #define FWL_MSG_SetFocus L"FWL_MESSAGE_SetFocus" diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h index 8f9f9a6c36..69783c740a 100644 --- a/xfa/include/fwl/core/fwl_theme.h +++ b/xfa/include/fwl/core/fwl_theme.h @@ -7,10 +7,14 @@ #ifndef XFA_INCLUDE_FWL_CORE_FWL_THEME_H_ #define XFA_INCLUDE_FWL_CORE_FWL_THEME_H_ +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxcrt/fx_system.h" #include "xfa/include/fwl/core/fwl_error.h" -#include "xfa/include/fxgraphics/fx_graphics.h" class IFWL_Widget; +class CFX_Graphics; +class CFX_DIBitmap; +class CFX_Path; #define FWL_WGTCAPACITY_CXBorder 1 #define FWL_WGTCAPACITY_CYBorder 2 diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h index afee2d8272..5588efe95e 100644 --- a/xfa/include/fwl/core/fwl_widget.h +++ b/xfa/include/fwl/core/fwl_widget.h @@ -10,7 +10,6 @@ #include "xfa/include/fwl/core/fwl_note.h" #include "xfa/include/fwl/core/fwl_target.h" #include "xfa/include/fwl/core/fwl_widgetdef.h" -#include "xfa/include/fxgraphics/fx_graphics.h" class IFWL_ThemeProvider; class CFWL_WidgetImpProperties; diff --git a/xfa/include/fwl/lightwidget/theme.h b/xfa/include/fwl/lightwidget/theme.h index 824cacebc7..f47725b8ae 100644 --- a/xfa/include/fwl/lightwidget/theme.h +++ b/xfa/include/fwl/lightwidget/theme.h @@ -10,6 +10,7 @@ #include <memory> #include <vector> +#include "core/include/fxge/fx_dib.h" #include "xfa/include/fwl/core/fwl_theme.h" class CFWL_WidgetTP; |