#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
{
// wxHeaderColumnsRearrangeDialog: dialog for customizing our columns
// ----------------------------------------------------------------------------
+#if wxUSE_REARRANGECTRL
+
class wxHeaderColumnsRearrangeDialog : public wxRearrangeDialog
{
public:
}
};
+#endif // wxUSE_REARRANGECTRL
+
} // anonymous namespace
// ============================================================================
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,
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
// ----------------------------------------------------------------------------
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();
UpdateColumn(col);
}
-#if wxUSE_MENU
+#if wxUSE_MENUS
void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event)
{
ShowColumnsMenu(ScreenToClient(wxGetMousePosition()));
}
-#endif // wxUSE_MENU
+#endif // wxUSE_MENUS
// ----------------------------------------------------------------------------
// wxHeaderCtrlBase column reordering
// wxHeaderCtrl extra UI
// ----------------------------------------------------------------------------
-#if wxUSE_MENU
+#if wxUSE_MENUS
void wxHeaderCtrlBase::AddColumnsItems(wxMenu& menu, int idColumnsBase)
{
return true;
}
-#endif // wxUSE_MENU
+#endif // wxUSE_MENUS
bool wxHeaderCtrlBase::ShowCustomizeDialog()
{
+#if wxUSE_REARRANGECTRL
// prepare the data for showing the dialog
wxArrayInt order = GetColumnsOrder();
// 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;
}
// ============================================================================
{
RemoveSortIndicator();
- m_cols[idx].SetAsSortKey(ascending);
+ m_cols[idx].SetSortOrder(ascending);
m_sortKey = idx;
UpdateColumn(idx);
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