diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-10-13 11:00:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-13 11:00:00 -0700 |
| commit | a4060a324d606d5a8e1d2a16d3b55a6d14a0ddbf (patch) | |
| tree | 10d5adc5e90dc75ddf7d44d4b16ad869ae0bb943 /xfa/fwl | |
| parent | b685e6471075bebd26711bc183de3128f54932e3 (diff) | |
| download | pdfium-a4060a324d606d5a8e1d2a16d3b55a6d14a0ddbf.tar.xz | |
Remove duplicate FWL key flags
The FWL key flags exist in two places, with different values between them.
This CL combines them to be in a single location.
Review-Url: https://codereview.chromium.org/2415743003
Diffstat (limited to 'xfa/fwl')
| -rw-r--r-- | xfa/fwl/basewidget/fwl_editimp.cpp | 2 | ||||
| -rw-r--r-- | xfa/fwl/basewidget/fwl_listboximp.cpp | 2 | ||||
| -rw-r--r-- | xfa/fwl/core/fwl_noteimp.h | 10 | ||||
| -rw-r--r-- | xfa/fwl/core/ifwl_app.h | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp index 0da315cf9b..8377daf628 100644 --- a/xfa/fwl/basewidget/fwl_editimp.cpp +++ b/xfa/fwl/basewidget/fwl_editimp.cpp @@ -25,8 +25,8 @@ #include "xfa/fwl/core/cfwl_themepart.h" #include "xfa/fwl/core/cfwl_widgetmgr.h" #include "xfa/fwl/core/fwl_appimp.h" -#include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/fwl_widgetimp.h" +#include "xfa/fwl/core/ifwl_app.h" #include "xfa/fwl/core/ifwl_themeprovider.h" #include "xfa/fxfa/xfa_ffdoc.h" #include "xfa/fxfa/xfa_ffwidget.h" diff --git a/xfa/fwl/basewidget/fwl_listboximp.cpp b/xfa/fwl/basewidget/fwl_listboximp.cpp index 7a487f6363..3f65837883 100644 --- a/xfa/fwl/basewidget/fwl_listboximp.cpp +++ b/xfa/fwl/basewidget/fwl_listboximp.cpp @@ -13,8 +13,8 @@ #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_themepart.h" #include "xfa/fwl/core/cfwl_themetext.h" -#include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/fwl_widgetimp.h" +#include "xfa/fwl/core/ifwl_app.h" #include "xfa/fwl/core/ifwl_themeprovider.h" namespace { diff --git a/xfa/fwl/core/fwl_noteimp.h b/xfa/fwl/core/fwl_noteimp.h index 9a0723de7b..23b3c991ab 100644 --- a/xfa/fwl/core/fwl_noteimp.h +++ b/xfa/fwl/core/fwl_noteimp.h @@ -16,16 +16,6 @@ #include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fxgraphics/cfx_graphics.h" -enum FWL_KeyFlag { - FWL_KEYFLAG_Ctrl = 1 << 0, - FWL_KEYFLAG_Alt = 1 << 1, - FWL_KEYFLAG_Shift = 1 << 2, - FWL_KEYFLAG_Command = 1 << 3, - FWL_KEYFLAG_LButton = 1 << 4, - FWL_KEYFLAG_RButton = 1 << 5, - FWL_KEYFLAG_MButton = 1 << 6 -}; - class CFWL_CoreToolTipDP; class CFWL_EventTarget; class CFWL_MsgActivate; diff --git a/xfa/fwl/core/ifwl_app.h b/xfa/fwl/core/ifwl_app.h index 03d44796fd..c030e26b2e 100644 --- a/xfa/fwl/core/ifwl_app.h +++ b/xfa/fwl/core/ifwl_app.h @@ -28,6 +28,16 @@ class CXFA_FWLAdapterWidgetMgr; class IFWL_ThemeProvider; class IFWL_Widget; +enum FWL_KeyFlag { + FWL_KEYFLAG_Ctrl = 1 << 0, + FWL_KEYFLAG_Alt = 1 << 1, + FWL_KEYFLAG_Shift = 1 << 2, + FWL_KEYFLAG_Command = 1 << 3, + FWL_KEYFLAG_LButton = 1 << 4, + FWL_KEYFLAG_RButton = 1 << 5, + FWL_KEYFLAG_MButton = 1 << 6 +}; + class IFWL_App { public: static IFWL_App* Create(CXFA_FFApp* pAdapter); |