X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e721a2a2a41393346e0c86965cfd04f056196c2a..c437b3f4e47b74715a2f2385d4862972babd7802:/src/common/headerctrlcmn.cpp diff --git a/src/common/headerctrlcmn.cpp b/src/common/headerctrlcmn.cpp index a7a197afeb..270e124bd2 100644 --- a/src/common/headerctrlcmn.cpp +++ b/src/common/headerctrlcmn.cpp @@ -45,6 +45,8 @@ const unsigned int wxNO_COLUMN = static_cast(-1); // wxHeaderColumnsRearrangeDialog: dialog for customizing our columns // ---------------------------------------------------------------------------- +#if wxUSE_REARRANGECTRL + class wxHeaderColumnsRearrangeDialog : public wxRearrangeDialog { public: @@ -63,6 +65,8 @@ public: } }; +#endif // wxUSE_REARRANGECTRL + } // anonymous namespace // ============================================================================ @@ -73,9 +77,9 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxHeaderCtrlNameStr[] = "wxHeaderCtrl"; BEGIN_EVENT_TABLE(wxHeaderCtrlBase, wxControl) EVT_HEADER_SEPARATOR_DCLICK(wxID_ANY, wxHeaderCtrlBase::OnSeparatorDClick) -#if wxUSE_MENU +#if wxUSE_MENUS EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxHeaderCtrlBase::OnRClick) -#endif // wxUSE_MENU +#endif // wxUSE_MENUS END_EVENT_TABLE() void wxHeaderCtrlBase::ScrollWindow(int dx, @@ -120,7 +124,7 @@ void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event) UpdateColumn(col); } -#if wxUSE_MENU +#if wxUSE_MENUS void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event) { @@ -133,7 +137,7 @@ void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event) ShowColumnsMenu(ScreenToClient(wxGetMousePosition())); } -#endif // wxUSE_MENU +#endif // wxUSE_MENUS // ---------------------------------------------------------------------------- // wxHeaderCtrlBase column reordering @@ -271,7 +275,7 @@ wxHeaderCtrlBase::DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int cou // wxHeaderCtrl extra UI // ---------------------------------------------------------------------------- -#if wxUSE_MENU +#if wxUSE_MENUS void wxHeaderCtrlBase::AddColumnsItems(wxMenu& menu, int idColumnsBase) { @@ -320,7 +324,7 @@ bool wxHeaderCtrlBase::ShowColumnsMenu(const wxPoint& pt, const wxString& title) return true; } -#endif // wxUSE_MENU +#endif // wxUSE_MENUS bool wxHeaderCtrlBase::ShowCustomizeDialog() { @@ -469,23 +473,23 @@ wxHeaderCtrlSimple::UpdateColumnWidthToFit(unsigned int idx, int widthTitle) IMPLEMENT_DYNAMIC_CLASS(wxHeaderCtrlEvent, wxNotifyEvent) -const wxEventType wxEVT_COMMAND_HEADER_CLICK = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_RIGHT_CLICK = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_MIDDLE_CLICK = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_CLICK, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_RIGHT_CLICK, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_MIDDLE_CLICK, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_DCLICK = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_RIGHT_DCLICK = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_MIDDLE_DCLICK = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_DCLICK, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_RIGHT_DCLICK, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_MIDDLE_DCLICK, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_BEGIN_RESIZE = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_RESIZING = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_END_RESIZE = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_BEGIN_RESIZE, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_RESIZING, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_END_RESIZE, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_BEGIN_REORDER = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_END_REORDER = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_BEGIN_REORDER, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_END_REORDER, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED, wxHeaderCtrlEvent); #endif // wxUSE_HEADERCTRL