X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/482d06f8b5917f9ba0bf1b5623a70262220aed52..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/common/headerctrlcmn.cpp diff --git a/src/common/headerctrlcmn.cpp b/src/common/headerctrlcmn.cpp index bc5fd71f60..98025723ad 100644 --- a/src/common/headerctrlcmn.cpp +++ b/src/common/headerctrlcmn.cpp @@ -23,12 +23,15 @@ #pragma hdrstop #endif +#if wxUSE_HEADERCTRL + #ifndef WX_PRECOMP #include "wx/menu.h" #endif // WX_PRECOMP #include "wx/headerctrl.h" #include "wx/rearrangectrl.h" +#include "wx/renderer.h" namespace { @@ -43,6 +46,8 @@ const unsigned int wxNO_COLUMN = static_cast(-1); // wxHeaderColumnsRearrangeDialog: dialog for customizing our columns // ---------------------------------------------------------------------------- +#if wxUSE_REARRANGECTRL + class wxHeaderColumnsRearrangeDialog : public wxRearrangeDialog { public: @@ -61,6 +66,8 @@ public: } }; +#endif // wxUSE_REARRANGECTRL + } // anonymous namespace // ============================================================================ @@ -71,7 +78,9 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxHeaderCtrlNameStr[] = "wxHeaderCtrl"; BEGIN_EVENT_TABLE(wxHeaderCtrlBase, wxControl) EVT_HEADER_SEPARATOR_DCLICK(wxID_ANY, wxHeaderCtrlBase::OnSeparatorDClick) +#if wxUSE_MENUS EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxHeaderCtrlBase::OnRClick) +#endif // wxUSE_MENUS END_EVENT_TABLE() void wxHeaderCtrlBase::ScrollWindow(int dx, @@ -99,6 +108,21 @@ void wxHeaderCtrlBase::SetColumnCount(unsigned int count) DoSetCount(count); } +int wxHeaderCtrlBase::GetColumnTitleWidth(const wxHeaderColumn& col) +{ + int w = wxWindowBase::GetTextExtent(col.GetTitle()).x; + + // add some margin: + w += wxRendererNative::Get().GetHeaderButtonMargin(this); + + // if a bitmap is used, add space for it and 2px border: + wxBitmap bmp = col.GetBitmap(); + if ( bmp.IsOk() ) + w += bmp.GetWidth() + 2; + + return w; +} + // ---------------------------------------------------------------------------- // wxHeaderCtrlBase event handling // ---------------------------------------------------------------------------- @@ -106,9 +130,15 @@ void wxHeaderCtrlBase::SetColumnCount(unsigned int count) void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event) { const unsigned col = event.GetColumn(); + const wxHeaderColumn& column = GetColumn(col); + + if ( !column.IsResizeable() ) + { + event.Skip(); + return; + } - int w = wxWindowBase::GetTextExtent(GetColumn(col).GetTitle()).x; - w += 4*GetCharWidth(); // add some arbitrary margins around text + int w = GetColumnTitleWidth(column); if ( !UpdateColumnWidthToFit(col, w) ) event.Skip(); @@ -116,6 +146,8 @@ void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event) UpdateColumn(col); } +#if wxUSE_MENUS + void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event) { if ( !HasFlag(wxHD_ALLOW_HIDE) ) @@ -127,6 +159,8 @@ void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event) ShowColumnsMenu(ScreenToClient(wxGetMousePosition())); } +#endif // wxUSE_MENUS + // ---------------------------------------------------------------------------- // wxHeaderCtrlBase column reordering // ---------------------------------------------------------------------------- @@ -263,24 +297,32 @@ wxHeaderCtrlBase::DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int cou // wxHeaderCtrl extra UI // ---------------------------------------------------------------------------- -bool wxHeaderCtrlBase::ShowColumnsMenu(const wxPoint& pt, const wxString& title) -{ - // construct the menu with the entries for all columns - wxMenu menu; - if ( !title.empty() ) - menu.SetTitle(title); +#if wxUSE_MENUS +void wxHeaderCtrlBase::AddColumnsItems(wxMenu& menu, int idColumnsBase) +{ const unsigned count = GetColumnCount(); for ( unsigned n = 0; n < count; n++ ) { const wxHeaderColumn& col = GetColumn(n); - menu.AppendCheckItem(n, col.GetTitle()); + menu.AppendCheckItem(idColumnsBase + n, col.GetTitle()); if ( col.IsShown() ) menu.Check(n, true); } +} + +bool wxHeaderCtrlBase::ShowColumnsMenu(const wxPoint& pt, const wxString& title) +{ + // construct the menu with the entries for all columns + wxMenu menu; + if ( !title.empty() ) + menu.SetTitle(title); + + AddColumnsItems(menu); // ... and an extra one to show the customization dialog if the user is // allowed to reorder the columns too + const unsigned count = GetColumnCount(); if ( HasFlag(wxHD_ALLOW_REORDER) ) { menu.AppendSeparator(); @@ -304,8 +346,11 @@ bool wxHeaderCtrlBase::ShowColumnsMenu(const wxPoint& pt, const wxString& title) return true; } +#endif // wxUSE_MENUS + bool wxHeaderCtrlBase::ShowCustomizeDialog() { +#if wxUSE_REARRANGECTRL // prepare the data for showing the dialog wxArrayInt order = GetColumnsOrder(); @@ -332,29 +377,32 @@ bool wxHeaderCtrlBase::ShowCustomizeDialog() // do show it wxHeaderColumnsRearrangeDialog dlg(this, order, titles); - if ( dlg.ShowModal() != wxID_OK ) - return false; - - // and apply the changes - order = dlg.GetOrder(); - for ( pos = 0; pos < count; pos++ ) + if ( dlg.ShowModal() == wxID_OK ) { - int& idx = order[pos]; - const bool show = idx >= 0; - if ( !show ) + // and apply the changes + order = dlg.GetOrder(); + for ( pos = 0; pos < count; pos++ ) { - // make all indices positive for passing them to SetColumnsOrder() - idx = ~idx; + int& idx = order[pos]; + const bool show = idx >= 0; + if ( !show ) + { + // make all indices positive for passing them to SetColumnsOrder() + idx = ~idx; + } + + if ( show != GetColumn(idx).IsShown() ) + UpdateColumnVisibility(idx, show); } - if ( show != GetColumn(idx).IsShown() ) - UpdateColumnVisibility(idx, show); - } + UpdateColumnsOrder(order); + SetColumnsOrder(order); - UpdateColumnsOrder(order); - SetColumnsOrder(order); + return true; + } +#endif // wxUSE_REARRANGECTRL - return true; + return false; } // ============================================================================ @@ -410,7 +458,7 @@ void wxHeaderCtrlSimple::DoShowSortIndicator(unsigned int idx, bool ascending) { RemoveSortIndicator(); - m_cols[idx].SetAsSortKey(ascending); + m_cols[idx].SetSortOrder(ascending); m_sortKey = idx; UpdateColumn(idx); @@ -447,21 +495,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); + +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_DCLICK = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_RIGHT_DCLICK = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_MIDDLE_DCLICK = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK = 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_RESIZE = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_RESIZING = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_END_RESIZE = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_BEGIN_REORDER, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_END_REORDER, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_BEGIN_REORDER = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_END_REORDER = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED = wxNewEventType(); +#endif // wxUSE_HEADERCTRL