diff options
| author | weili <weili@chromium.org> | 2016-06-18 06:21:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-18 06:21:57 -0700 |
| commit | 4ce94e118d66064715de5baebeb4b2b580dcac66 (patch) | |
| tree | ba74181eb90675172d3c7f4be8e71ada3fbc9125 /xfa/fwl/basewidget/ifwl_combobox.h | |
| parent | 2fad11a8d9d2704cd9ee28b02373ad7ce19c65e3 (diff) | |
| download | pdfium-4ce94e118d66064715de5baebeb4b2b580dcac66.tar.xz | |
Make code compile with clang_use_chrome_plugin (part VI)
This change mainly contains files in xfa/fwl directory.
This is part of the efforts to make PDFium code compilable
by Clang chromium style plugins.
The changes are mainly the following:
-- move inline constructor/destructor of complex class/struct out-of-line;
-- add constructor/destructor of complex class/struct if not
explicitly defined;
-- add explicit out-of-line copy constructor when needed;
-- move inline virtual functions out-of-line;
-- Properly mark virtual functions with 'override';
-- some minor cleanups;
BUG=pdfium:469
Review-Url: https://codereview.chromium.org/2070583003
Diffstat (limited to 'xfa/fwl/basewidget/ifwl_combobox.h')
| -rw-r--r-- | xfa/fwl/basewidget/ifwl_combobox.h | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/xfa/fwl/basewidget/ifwl_combobox.h b/xfa/fwl/basewidget/ifwl_combobox.h index 2d9c907b39..5165ef2c48 100644 --- a/xfa/fwl/basewidget/ifwl_combobox.h +++ b/xfa/fwl/basewidget/ifwl_combobox.h @@ -39,36 +39,33 @@ class IFWL_ComboBox; #define FWL_STYLEEXT_CMB_ListItemIconText (1L << 12) #define FWL_STYLEEXT_CMB_ReadOnly (1L << 13) -BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbPreDropDown, CFWL_EventType::PreDropDown) -END_FWL_EVENT_DEF - -BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbPostDropDown, CFWL_EventType::PostDropDown) -END_FWL_EVENT_DEF - -BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbCloseUp, CFWL_EventType::CloseUp) -END_FWL_EVENT_DEF - -BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbEditChanged, CFWL_EventType::EditChanged) -int32_t nChangeType; -CFX_WideString wsInsert; -CFX_WideString wsDelete; -END_FWL_EVENT_DEF - -BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbSelChanged, CFWL_EventType::SelectChanged) -CFX_Int32Array iArraySels; -FX_BOOL bLButtonUp; -END_FWL_EVENT_DEF - -BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbHoverChanged, CFWL_EventType::HoverChanged) -int32_t m_iCurHover; -END_FWL_EVENT_DEF - -BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbDrawItem, CFWL_EventType::DrawItem) -CFX_Graphics* m_pGraphics; -CFX_Matrix m_matrix; -int32_t m_index; -CFX_RectF m_rtItem; -END_FWL_EVENT_DEF +FWL_EVENT_DEF(CFWL_EvtCmbPreDropDown, CFWL_EventType::PreDropDown) + +FWL_EVENT_DEF(CFWL_EvtCmbPostDropDown, CFWL_EventType::PostDropDown) + +FWL_EVENT_DEF(CFWL_EvtCmbCloseUp, CFWL_EventType::CloseUp) + +FWL_EVENT_DEF(CFWL_EvtCmbEditChanged, + CFWL_EventType::EditChanged, + int32_t nChangeType; + CFX_WideString wsInsert; + CFX_WideString wsDelete;) + +FWL_EVENT_DEF(CFWL_EvtCmbSelChanged, + CFWL_EventType::SelectChanged, + CFX_Int32Array iArraySels; + FX_BOOL bLButtonUp;) + +FWL_EVENT_DEF(CFWL_EvtCmbHoverChanged, + CFWL_EventType::HoverChanged, + int32_t m_iCurHover;) + +FWL_EVENT_DEF(CFWL_EvtCmbDrawItem, + CFWL_EventType::DrawItem, + CFX_Graphics* m_pGraphics; + CFX_Matrix m_matrix; + int32_t m_index; + CFX_RectF m_rtItem;) class IFWL_ComboBoxDP : public IFWL_ListBoxDP { public: |