X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/faef508f6a932cf5df0c9709843f148ada20a773..f363cee882672e147340240cf0bb194a68e37833:/src/common/headerctrlcmn.cpp diff --git a/src/common/headerctrlcmn.cpp b/src/common/headerctrlcmn.cpp index a1d79fe4af..2dfbcc6bc7 100644 --- a/src/common/headerctrlcmn.cpp +++ b/src/common/headerctrlcmn.cpp @@ -3,7 +3,6 @@ // Purpose: implementation of wxHeaderCtrlBase // Author: Vadim Zeitlin // Created: 2008-12-02 -// RCS-ID: $Id$ // Copyright: (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org> // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -23,12 +22,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 +45,8 @@ const unsigned int wxNO_COLUMN = static_cast<unsigned>(-1); // wxHeaderColumnsRearrangeDialog: dialog for customizing our columns // ---------------------------------------------------------------------------- +#if wxUSE_REARRANGECTRL + class wxHeaderColumnsRearrangeDialog : public wxRearrangeDialog { public: @@ -61,6 +65,8 @@ public: } }; +#endif // wxUSE_REARRANGECTRL + } // anonymous namespace // ============================================================================ @@ -71,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, @@ -101,6 +107,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 // ---------------------------------------------------------------------------- @@ -108,9 +129,15 @@ void wxHeaderCtrlBase::SetColumnCount(unsigned int count) void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event) { const unsigned col = event.GetColumn(); + const wxHeaderColumn& column = GetColumn(col); - int w = wxWindowBase::GetTextExtent(GetColumn(col).GetTitle()).x; - w += 4*GetCharWidth(); // add some arbitrary margins around text + if ( !column.IsResizeable() ) + { + event.Skip(); + return; + } + + int w = GetColumnTitleWidth(column); if ( !UpdateColumnWidthToFit(col, w) ) event.Skip(); @@ -118,7 +145,7 @@ void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event) UpdateColumn(col); } -#if wxUSE_MENU +#if wxUSE_MENUS void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event) { @@ -131,7 +158,7 @@ void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event) ShowColumnsMenu(ScreenToClient(wxGetMousePosition())); } -#endif // wxUSE_MENU +#endif // wxUSE_MENUS // ---------------------------------------------------------------------------- // wxHeaderCtrlBase column reordering @@ -269,7 +296,7 @@ wxHeaderCtrlBase::DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int cou // wxHeaderCtrl extra UI // ---------------------------------------------------------------------------- -#if wxUSE_MENU +#if wxUSE_MENUS void wxHeaderCtrlBase::AddColumnsItems(wxMenu& menu, int idColumnsBase) { @@ -318,10 +345,11 @@ bool wxHeaderCtrlBase::ShowColumnsMenu(const wxPoint& pt, const wxString& title) return true; } -#endif // wxUSE_MENU +#endif // wxUSE_MENUS bool wxHeaderCtrlBase::ShowCustomizeDialog() { +#if wxUSE_REARRANGECTRL // prepare the data for showing the dialog wxArrayInt order = GetColumnsOrder(); @@ -348,29 +376,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; } // ============================================================================ @@ -426,7 +457,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); @@ -463,21 +494,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_HEADER_CLICK, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_HEADER_RIGHT_CLICK, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_HEADER_MIDDLE_CLICK, wxHeaderCtrlEvent); + +wxDEFINE_EVENT( wxEVT_HEADER_DCLICK, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_HEADER_RIGHT_DCLICK, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_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_HEADER_SEPARATOR_DCLICK, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_HEADER_BEGIN_RESIZE, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_HEADER_RESIZING, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_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_HEADER_BEGIN_REORDER, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_HEADER_END_REORDER, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_BEGIN_REORDER = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_END_REORDER = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_HEADER_DRAGGING_CANCELLED, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED = wxNewEventType(); +#endif // wxUSE_HEADERCTRL