#include "wx/list.h"
#include "wx/listimpl.cpp"
#include "wx/imaglist.h"
+#include "wx/headerctrl.h"
//-----------------------------------------------------------------------------
// classes
static const int EXPANDER_OFFSET = 1;
#endif
-//-----------------------------------------------------------------------------
-// wxDataViewHeaderWindow
-//-----------------------------------------------------------------------------
-
-// on wxMSW the header window (only that part however) can be made native!
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
- #define USE_NATIVE_HEADER_WINDOW
-#endif
-
//Below is the compare stuff
//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed
static wxDataViewModel * g_model;
static int g_column = -2;
static bool g_asending = true;
-// NB: for some reason, this class must be dllexport'ed or we get warnings from
-// MSVC in DLL build
-class WXDLLIMPEXP_ADV wxDataViewHeaderWindowBase : public wxControl
+//-----------------------------------------------------------------------------
+// wxDataViewHeaderWindow
+//-----------------------------------------------------------------------------
+
+class wxDataViewHeaderWindow : public wxHeaderCtrl
{
public:
- wxDataViewHeaderWindowBase()
- { m_owner = NULL; }
-
- bool Create(wxDataViewCtrl *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const wxString &name)
+ wxDataViewHeaderWindow(wxDataViewCtrl *parent)
+ : wxHeaderCtrl(parent)
{
- return wxWindow::Create(parent, id, pos, size, wxNO_BORDER, name);
}
- void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; }
- wxDataViewCtrl *GetOwner() { return m_owner; }
-
- // called on column addition/removal
- virtual void UpdateDisplay() { /* by default, do nothing */ }
-
- // returns the n-th column
- virtual wxDataViewColumn *GetColumn(unsigned int n)
- {
- wxASSERT(m_owner);
- wxDataViewColumn *ret = m_owner->GetColumn(n);
- wxASSERT(ret);
-
- return ret;
- }
+ wxDataViewCtrl *GetOwner() const
+ { return static_cast<wxDataViewCtrl *>(GetParent()); }
protected:
- wxDataViewCtrl *m_owner;
-
- // sends an event generated from the n-th wxDataViewColumn
- void SendEvent(wxEventType type, unsigned int n);
-};
-
-#ifdef USE_NATIVE_HEADER_WINDOW
-
-#define COLUMN_WIDTH_OFFSET 2
-#define wxDataViewHeaderWindowMSW wxDataViewHeaderWindow
-
-class wxDataViewHeaderWindowMSW : public wxDataViewHeaderWindowBase
-{
-public:
-
- wxDataViewHeaderWindowMSW( wxDataViewCtrl *parent,
- wxWindowID id,
- const wxPoint &pos = wxDefaultPosition,
- const wxSize &size = wxDefaultSize,
- const wxString &name = wxT("wxdataviewctrlheaderwindow") )
+ // implement/override wxHeaderCtrl functions by forwarding them to the main
+ // control
+ virtual const wxHeaderColumn& GetColumn(unsigned int idx) const
{
- Create(parent, id, pos, size, name);
+ return *(GetOwner()->GetColumn(idx));
}
- bool Create(wxDataViewCtrl *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const wxString &name);
-
- ~wxDataViewHeaderWindowMSW();
-
- // called when any column setting is changed and/or changed
- // the column count
- virtual void UpdateDisplay();
-
- virtual void OnInternalIdle();
-
- // called Refresh afterwards
- virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);
-
- virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-protected:
- virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-
- virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags);
-
- wxSize DoGetBestSize() const;
-
- unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR);
+ virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
+ {
+ wxDataViewCtrl * const owner = GetOwner();
- wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR)
- { return GetColumn(GetColumnIdxFromHeader(nmHDR)); }
+ int widthContents = owner->GetBestColumnWidth(idx);
+ owner->GetColumn(idx)->SetWidth(wxMax(widthTitle, widthContents));
+ owner->OnColumnChange(idx);
- int m_scrollOffsetX;
- int m_buttonHeight;
- bool m_vetoColumnDrag;
- bool m_delayedUpdate;
- wxImageList *m_imageList;
+ return true;
+ }
private:
- DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW)
-};
-
-#else // !defined(__WXMSW__)
-
-#define HEADER_WINDOW_HEIGHT 25
-#define HEADER_HORIZ_BORDER 5
-#define HEADER_VERT_BORDER 3
-#define wxGenericDataViewHeaderWindow wxDataViewHeaderWindow
-
-class wxGenericDataViewHeaderWindow : public wxDataViewHeaderWindowBase
-{
-public:
- wxGenericDataViewHeaderWindow( wxDataViewCtrl *parent,
- wxWindowID id,
- const wxPoint &pos = wxDefaultPosition,
- const wxSize &size = wxDefaultSize,
- const wxString &name = wxT("wxdataviewctrlheaderwindow") )
+ bool SendEvent(wxEventType type, unsigned int n)
{
- Init();
- Create(parent, id, pos, size, name);
- }
+ wxDataViewCtrl * const owner = GetOwner();
+ wxDataViewEvent event(type, owner->GetId());
- bool Create(wxDataViewCtrl *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const wxString &name);
+ event.SetEventObject(owner);
+ event.SetColumn(n);
+ event.SetDataViewColumn(owner->GetColumn(n));
+ event.SetModel(owner->GetModel());
- ~wxGenericDataViewHeaderWindow()
- {
- delete m_resizeCursor;
+ // for events created by wxDataViewHeaderWindow the
+ // row / value fields are not valid
+ return owner->GetEventHandler()->ProcessEvent(event);
}
- virtual void UpdateDisplay() { Refresh(); }
-
- // event handlers:
-
- void OnPaint( wxPaintEvent &event );
- void OnMouse( wxMouseEvent &event );
- void OnSetFocus( wxFocusEvent &event );
-
-
-protected:
+ void OnClick(wxHeaderCtrlEvent& event)
+ {
+ const unsigned idx = event.GetColumn();
- // vars used for column resizing:
+ if ( SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, idx) )
+ return;
- wxCursor *m_resizeCursor;
- const wxCursor *m_currentCursor;
- bool m_isDragging;
+ // default handling for the column click is to sort by this column or
+ // toggle its sort order
+ wxDataViewCtrl * const owner = GetOwner();
+ wxDataViewColumn * const col = owner->GetColumn(idx);
+ if ( !col->IsSortable() )
+ {
+ // no default handling for non-sortable columns
+ event.Skip();
+ return;
+ }
- bool m_dirty; // needs refresh?
- int m_hover; // index of the column under the mouse
- int m_column; // index of the column being resized
- int m_currentX; // divider line position in logical (unscrolled) coords
- int m_minX; // minimal position beyond which the divider line
- // can't be dragged in logical coords
+ if ( col->IsSortKey() )
+ {
+ // already using this column for sorting, just change the order
+ col->ToggleSortOrder();
+ }
+ else // not using this column for sorting yet
+ {
+ // first unset the old sort column if any
+ int oldSortKey = owner->GetSortingColumnIndex();
+ if ( oldSortKey != wxNOT_FOUND )
+ {
+ owner->GetColumn(oldSortKey)->UnsetAsSortKey();
+ owner->OnColumnChange(oldSortKey);
+ }
- // the pen used to draw the current column width drag line
- // when resizing the columsn
- wxPen m_penCurrent;
+ owner->SetSortingColumnIndex(idx);
+ col->SetAsSortKey();
+ }
+ wxDataViewModel * const model = owner->GetModel();
+ if ( model )
+ model->Resort();
- // internal utilities:
+ owner->OnColumnChange(idx);
+ }
- void Init()
+ void OnRClick(wxHeaderCtrlEvent& event)
{
- m_currentCursor = (wxCursor *) NULL;
- m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
-
- m_isDragging = false;
- m_dirty = false;
+ if ( !SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK,
+ event.GetColumn()) )
+ event.Skip();
+ }
- m_hover = wxNOT_FOUND;
- m_column = wxNOT_FOUND;
- m_currentX = 0;
- m_minX = 0;
+ void OnEndResize(wxHeaderCtrlEvent& event)
+ {
+ wxDataViewCtrl * const owner = GetOwner();
- wxColour col = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
- m_penCurrent = wxPen(col, 1, wxSOLID);
+ const unsigned col = event.GetColumn();
+ owner->GetColumn(col)->SetWidth(event.GetWidth());
+ GetOwner()->OnColumnChange(col);
}
- void AdjustDC(wxDC& dc);
+ void OnEndReorder(wxHeaderCtrlEvent& event)
+ {
+ wxDataViewCtrl * const owner = GetOwner();
+ owner->ColumnMoved(owner->GetColumn(event.GetColumn()),
+ event.GetNewOrder());
+ }
-private:
- DECLARE_DYNAMIC_CLASS(wxGenericDataViewHeaderWindow)
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxDataViewHeaderWindow)
};
-#endif // defined(__WXMSW__)
+BEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl)
+ EVT_HEADER_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnClick)
+ EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnRClick)
+
+ EVT_HEADER_END_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnEndResize)
+
+ EVT_HEADER_END_REORDER(wxID_ANY, wxDataViewHeaderWindow::OnEndReorder)
+END_EVENT_TABLE()
//-----------------------------------------------------------------------------
// wxDataViewRenameTimer
void Expand( unsigned int row ) { OnExpanding( row ); }
void Collapse( unsigned int row ) { OnCollapsing( row ); }
+ bool IsExpanded( unsigned int row ) const;
private:
wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const;
//We did not need this temporarily
return false;
}
-// ---------------------------------------------------------
-// wxDataViewColumn
-// ---------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
-
-wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell,
- unsigned int model_column,
- int width, wxAlignment align, int flags ) :
- wxDataViewColumnBase( title, cell, model_column, width, align, flags )
-{
- SetAlignment(align);
- SetTitle(title);
- SetFlags(flags);
-
- m_autosize = width < 0; // TODO
-
- Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width);
-}
-
-wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell,
- unsigned int model_column,
- int width, wxAlignment align, int flags ) :
- wxDataViewColumnBase( bitmap, cell, model_column, width, align, flags )
-{
- SetAlignment(align);
- SetFlags(flags);
-
- Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width);
-}
-
-wxDataViewColumn::~wxDataViewColumn()
-{
-}
-
-void wxDataViewColumn::Init( int width )
-{
- m_width = width;
- m_minWidth = wxDVC_DEFAULT_MINWIDTH;
- m_ascending = true;
-}
-
-void wxDataViewColumn::SetResizeable( bool resizeable )
-{
- if (resizeable)
- m_flags |= wxDATAVIEW_COL_RESIZABLE;
- else
- m_flags &= ~wxDATAVIEW_COL_RESIZABLE;
-}
-
-void wxDataViewColumn::SetHidden( bool hidden )
-{
- if (hidden)
- m_flags |= wxDATAVIEW_COL_HIDDEN;
- else
- m_flags &= ~wxDATAVIEW_COL_HIDDEN;
-
- // tell our owner to e.g. update its scrollbars:
- if (GetOwner())
- GetOwner()->OnColumnChange();
-}
-
-void wxDataViewColumn::SetSortable( bool sortable )
-{
- if (sortable)
- m_flags |= wxDATAVIEW_COL_SORTABLE;
- else
- m_flags &= ~wxDATAVIEW_COL_SORTABLE;
-
- // Update header button
- if (GetOwner())
- GetOwner()->OnColumnChange();
-}
-
-void wxDataViewColumn::SetReorderable( bool reorderable )
-{
- if (reorderable)
- m_flags |= wxDATAVIEW_COL_REORDERABLE;
- else
- m_flags &= ~wxDATAVIEW_COL_REORDERABLE;
-}
-
-void wxDataViewColumn::SetSortOrder( bool ascending )
-{
- m_ascending = ascending;
-
- // Update header button
- if (GetOwner())
- GetOwner()->OnColumnChange();
-}
-
-bool wxDataViewColumn::IsSortOrderAscending() const
-{
- return m_ascending;
-}
-
-void wxDataViewColumn::SetInternalWidth( int width )
-{
- m_width = width;
-
- // the scrollbars of the wxDataViewCtrl needs to be recalculated!
- if (m_owner && m_owner->m_clientArea)
- m_owner->m_clientArea->RecalculateDisplay();
-}
-
-void wxDataViewColumn::SetWidth( int width )
-{
- if (m_owner->m_headerArea) m_owner->m_headerArea->UpdateDisplay();
-
- SetInternalWidth(width);
-}
-
-
-//-----------------------------------------------------------------------------
-// wxDataViewHeaderWindowBase
-//-----------------------------------------------------------------------------
-
-void wxDataViewHeaderWindowBase::SendEvent(wxEventType type, unsigned int n)
-{
- wxWindow *parent = GetParent();
- wxDataViewEvent le(type, parent->GetId());
-
- le.SetEventObject(parent);
- le.SetColumn(n);
- le.SetDataViewColumn(GetColumn(n));
- le.SetModel(GetOwner()->GetModel());
-
- // for events created by wxDataViewHeaderWindow the
- // row / value fields are not valid
-
- parent->GetEventHandler()->ProcessEvent(le);
-}
-
-#ifdef USE_NATIVE_HEADER_WINDOW
-
-#ifndef HDS_DRAGDROP
- #define HDS_DRAGDROP 0x0040
-#endif
-#ifndef HDS_FULLDRAG
- #define HDS_FULLDRAG 0x0080
-#endif
-
-// implemented in msw/listctrl.cpp:
-int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick);
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewHeaderWindowMSW, wxWindow)
-
-bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const wxString &name )
-{
- m_owner = parent;
-
- m_scrollOffsetX = 0;
- m_delayedUpdate = false;
- m_vetoColumnDrag = false;
- m_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( this );
-
- int x = pos.x == wxDefaultCoord ? 0 : pos.x,
- y = pos.y == wxDefaultCoord ? 0 : pos.y,
- w = size.x == wxDefaultCoord ? 1 : size.x,
- h = m_buttonHeight;
-
- wxSize new_size(w,h);
-
- if ( !CreateControl(parent, id, pos, new_size, 0, wxDefaultValidator, name) )
- return false;
-
- // create the native WC_HEADER window:
- WXHWND hwndParent = (HWND)parent->GetHandle();
- WXDWORD msStyle = WS_CHILD | HDS_DRAGDROP | HDS_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG;
-
- if ( m_isShown )
- msStyle |= WS_VISIBLE;
-
- m_hWnd = CreateWindowEx(0,
- WC_HEADER,
- (LPCTSTR) NULL,
- msStyle,
- x, y, w, h,
- (HWND)hwndParent,
- (HMENU)-1,
- wxGetInstance(),
- (LPVOID) NULL);
- if (m_hWnd == NULL)
- {
- wxLogLastError(_T("CreateWindowEx"));
- return false;
- }
-
- m_imageList = new wxImageList( 16, 16 );
- (void)Header_SetImageList((HWND) m_hWnd, m_imageList->GetHIMAGELIST());
-
- // we need to subclass the m_hWnd to force wxWindow::HandleNotify
- // to call wxDataViewHeaderWindow::MSWOnNotify
- SubclassWin(m_hWnd);
-
- // the following is required to get the default win's font for
- // header windows and must be done befor sending the HDM_LAYOUT msg
- SetFont(GetFont());
-
- return true;
-}
-
-wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow()
-{
- delete m_imageList;
- UnsubclassWin();
-}
-
-wxSize wxDataViewHeaderWindowMSW::DoGetBestSize() const
-{
- return wxSize( 80, m_buttonHeight+2 );
-}
-
-void wxDataViewHeaderWindowMSW::OnInternalIdle()
-{
- if (m_delayedUpdate)
- {
- m_delayedUpdate = false;
- UpdateDisplay();
- }
-}
-
-void wxDataViewHeaderWindowMSW::UpdateDisplay()
-{
- // remove old columns
- for (int j=0, max=Header_GetItemCount((HWND)m_hWnd); j < max; j++)
- Header_DeleteItem((HWND)m_hWnd, 0);
-
- m_imageList->RemoveAll();
-
- // add the updated array of columns to the header control
- unsigned int cols = GetOwner()->GetColumnCount();
- unsigned int added = 0;
- for (unsigned int i = 0; i < cols; i++)
- {
- wxDataViewColumn *col = GetColumn( i );
- if (col->IsHidden())
- continue; // don't add it!
-
- wxString title( col->GetTitle() );
- HDITEM hdi;
- hdi.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH;
- if (col->GetBitmap().IsOk())
- {
- m_imageList->Add( col->GetBitmap() );
- hdi.mask |= HDI_IMAGE;
- hdi.iImage = m_imageList->GetImageCount()-1;
- }
- hdi.pszText = (wxChar *) title.wx_str();
- hdi.cxy = col->GetWidth();
- hdi.cchTextMax = sizeof(hdi.pszText)/sizeof(hdi.pszText[0]);
- hdi.fmt = HDF_LEFT | HDF_STRING;
- if (col->GetBitmap().IsOk())
- hdi.fmt |= HDF_IMAGE;
-
- //hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP);
-
- if (col->IsSortable() && GetOwner()->GetSortingColumn() == col)
- {
- //The Microsoft Comctrl32.dll 6.0 support SORTUP/SORTDOWN, but they are not default
- //see http://msdn2.microsoft.com/en-us/library/ms649534.aspx for more detail
- // VZ: works with 5.81
- hdi.fmt |= col->IsSortOrderAscending() ? HDF_SORTUP : HDF_SORTDOWN;
- }
-
- // lParam is reserved for application's use:
- // we store there the column index to use it later in MSWOnNotify
- // (since columns may have been hidden)
- hdi.lParam = (LPARAM)i;
-
- // the native wxMSW implementation of the header window
- // draws the column separator COLUMN_WIDTH_OFFSET pixels
- // on the right: to correct this effect we make the column
- // exactly COLUMN_WIDTH_OFFSET wider (for the first column):
- if (i == 0)
- hdi.cxy += COLUMN_WIDTH_OFFSET;
-
- switch (col->GetAlignment())
- {
- case wxALIGN_LEFT:
- hdi.fmt |= HDF_LEFT;
- break;
- case wxALIGN_CENTER:
- case wxALIGN_CENTER_HORIZONTAL:
- hdi.fmt |= HDF_CENTER;
- break;
- case wxALIGN_RIGHT:
- hdi.fmt |= HDF_RIGHT;
- break;
-
- default:
- // such alignment is not allowed for the column header!
- break; // wxFAIL;
- }
-
- SendMessage((HWND)m_hWnd, HDM_INSERTITEM,
- (WPARAM)added, (LPARAM)&hdi);
- added++;
- }
-}
-
-unsigned int wxDataViewHeaderWindowMSW::GetColumnIdxFromHeader(NMHEADER *nmHDR)
-{
- unsigned int idx;
-
- // NOTE: we don't just return nmHDR->iItem because when there are
- // hidden columns, nmHDR->iItem may be different from
- // nmHDR->pitem->lParam
-
- if (nmHDR->pitem && nmHDR->pitem->mask & HDI_LPARAM)
- {
- idx = (unsigned int)nmHDR->pitem->lParam;
- return idx;
- }
-
- HDITEM item;
- item.mask = HDI_LPARAM;
- Header_GetItem((HWND)m_hWnd, nmHDR->iItem, &item);
-
- return (unsigned int)item.lParam;
-}
-
-bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
-{
- NMHDR *nmhdr = (NMHDR *)lParam;
-
- // is it a message from the header?
- if ( nmhdr->hwndFrom != (HWND)m_hWnd )
- return wxWindow::MSWOnNotify(idCtrl, lParam, result);
-
- NMHEADER *nmHDR = (NMHEADER *)nmhdr;
- switch ( nmhdr->code )
- {
- case NM_RELEASEDCAPTURE:
- {
- // user has released the mouse
- m_vetoColumnDrag = false;
- }
- break;
-
- case HDN_BEGINTRACK:
- // user has started to resize a column:
- // do we need to veto it?
- if (!GetColumn(nmHDR->iItem)->IsResizeable())
- {
- // veto it!
- *result = TRUE;
- }
- break;
-
- case HDN_BEGINDRAG:
- // valid column
- if (nmHDR->iItem != -1)
- {
- // user has started to reorder a valid column
- if ((m_vetoColumnDrag == true) || (!GetColumn(nmHDR->iItem)->IsReorderable()))
- {
- // veto it!
- *result = TRUE;
- m_vetoColumnDrag = true;
- }
- }
- else
- {
- // veto it!
- m_vetoColumnDrag = true;
- }
- break;
-
- case HDN_ENDDRAG: // user has finished reordering a column
- {
- wxDataViewColumn *col = GetColumn(nmHDR->iItem);
- unsigned int new_pos = nmHDR->pitem->iOrder;
- m_owner->ColumnMoved( col, new_pos );
- m_delayedUpdate = true;
- }
- break;
-
- case HDN_ITEMCHANGING:
- if (nmHDR->pitem != NULL &&
- (nmHDR->pitem->mask & HDI_WIDTH) != 0)
- {
- int minWidth = GetColumnFromHeader(nmHDR)->GetMinWidth();
- if (nmHDR->pitem->cxy < minWidth)
- {
- // do not allow the user to resize this column under
- // its minimal width:
- *result = TRUE;
- }
- }
- break;
-
- case HDN_ITEMCHANGED: // user is resizing a column
- case HDN_ENDTRACK: // user has finished resizing a column
-
- // update the width of the modified column:
- if (nmHDR->pitem != NULL &&
- (nmHDR->pitem->mask & HDI_WIDTH) != 0)
- {
- unsigned int idx = GetColumnIdxFromHeader(nmHDR);
- unsigned int w = nmHDR->pitem->cxy;
- wxDataViewColumn *col = GetColumn(idx);
-
- // see UpdateDisplay() for more info about COLUMN_WIDTH_OFFSET
- if (idx == 0 && w > COLUMN_WIDTH_OFFSET)
- w -= COLUMN_WIDTH_OFFSET;
-
- if (w >= (unsigned)col->GetMinWidth())
- col->SetInternalWidth(w);
- }
- break;
-
- case HDN_ITEMCLICK:
- {
- unsigned int idx = GetColumnIdxFromHeader(nmHDR);
- wxDataViewModel * model = GetOwner()->GetModel();
-
- if(nmHDR->iButton == 0)
- {
- wxDataViewColumn *col = GetColumn(idx);
- if(col->IsSortable())
- {
- if(model && m_owner->GetSortingColumn() == col)
- {
- bool order = col->IsSortOrderAscending();
- col->SetSortOrder(!order);
- }
- else if(model)
- {
- m_owner->SetSortingColumn(col);
- }
- }
- UpdateDisplay();
- if(model)
- model->Resort();
- }
-
- wxEventType evt = nmHDR->iButton == 0 ?
- wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK :
- wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
- SendEvent(evt, idx);
- }
- break;
-
- case NM_RCLICK:
- {
- // NOTE: for some reason (i.e. for a bug in Windows)
- // the HDN_ITEMCLICK notification is not sent on
- // right clicks, so we need to handle NM_RCLICK
-
- POINT ptClick;
- int column = wxMSWGetColumnClicked(nmhdr, &ptClick);
- if (column != wxNOT_FOUND)
- {
- HDITEM item;
- item.mask = HDI_LPARAM;
- Header_GetItem((HWND)m_hWnd, column, &item);
-
- // 'idx' may be different from 'column' if there are
- // hidden columns...
- unsigned int idx = (unsigned int)item.lParam;
- SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK,
- idx);
- }
- }
- break;
-
- case HDN_GETDISPINFOW:
- // see wxListCtrl::MSWOnNotify for more info!
- break;
-
- case HDN_ITEMDBLCLICK:
- {
- unsigned int idx = GetColumnIdxFromHeader(nmHDR);
- int w = GetOwner()->GetBestColumnWidth(idx);
-
- // update the native control:
- HDITEM hd;
- ZeroMemory(&hd, sizeof(hd));
- hd.mask = HDI_WIDTH;
- hd.cxy = w;
- Header_SetItem(GetHwnd(),
- nmHDR->iItem, // NOTE: we don't want 'idx' here!
- &hd);
-
- // update the wxDataViewColumn class:
- GetColumn(idx)->SetInternalWidth(w);
- }
- break;
-
- default:
- return wxWindow::MSWOnNotify(idCtrl, lParam, result);
- }
-
- return true;
-}
-
-void wxDataViewHeaderWindowMSW::ScrollWindow(int dx, int WXUNUSED(dy),
- const wxRect * WXUNUSED(rect))
-{
- m_scrollOffsetX += dx;
-
- GetParent()->Layout();
-}
-
-void wxDataViewHeaderWindowMSW::DoSetSize(int x, int y,
- int w, int h,
- int f)
-{
- // TODO: why is there a border + 2px around it?
- wxControl::DoSetSize( x+m_scrollOffsetX+1, y+1, w-m_scrollOffsetX-2, h-2, f );
-}
-
-#else // !defined(__WXMSW__)
-
-IMPLEMENT_ABSTRACT_CLASS(wxGenericDataViewHeaderWindow, wxWindow)
-BEGIN_EVENT_TABLE(wxGenericDataViewHeaderWindow, wxWindow)
- EVT_PAINT (wxGenericDataViewHeaderWindow::OnPaint)
- EVT_MOUSE_EVENTS (wxGenericDataViewHeaderWindow::OnMouse)
- EVT_SET_FOCUS (wxGenericDataViewHeaderWindow::OnSetFocus)
-END_EVENT_TABLE()
-
-bool wxGenericDataViewHeaderWindow::Create(wxDataViewCtrl *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const wxString &name )
-{
- m_owner = parent;
-
- if (!wxDataViewHeaderWindowBase::Create(parent, id, pos, size, name))
- return false;
-
- wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes();
- SetBackgroundStyle( wxBG_STYLE_CUSTOM );
- SetOwnForegroundColour( attr.colFg );
- SetOwnBackgroundColour( attr.colBg );
- if (!m_hasFont)
- SetOwnFont( attr.font );
-
- // set our size hints: wxDataViewCtrl will put this wxWindow inside
- // a wxBoxSizer and in order to avoid super-big header windows,
- // we need to set our height as fixed
- SetMinSize(wxSize(-1, HEADER_WINDOW_HEIGHT));
- SetMaxSize(wxSize(-1, HEADER_WINDOW_HEIGHT));
-
- return true;
-}
-
-void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
-{
- int w, h;
- GetClientSize( &w, &h );
-
- wxAutoBufferedPaintDC dc( this );
-
- dc.SetBackground(GetBackgroundColour());
- dc.Clear();
-
- int xpix;
- m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
-
- int x;
- m_owner->GetViewStart( &x, NULL );
-
- // account for the horz scrollbar offset
- dc.SetDeviceOrigin( -x * xpix, 0 );
-
- dc.SetFont( GetFont() );
-
- unsigned int cols = GetOwner()->GetColumnCount();
- unsigned int i;
- int xpos = 0;
- for (i = 0; i < cols; i++)
- {
- wxDataViewColumn *col = GetColumn( i );
- if (col->IsHidden())
- continue; // skip it!
-
- int cw = col->GetWidth();
- int ch = h;
-
- wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE;
- if (col->IsSortable() && GetOwner()->GetSortingColumn() == col)
- {
- if (col->IsSortOrderAscending())
- sortArrow = wxHDR_SORT_ICON_UP;
- else
- sortArrow = wxHDR_SORT_ICON_DOWN;
- }
-
- int state = 0;
- if (m_parent->IsEnabled())
- {
- if ((int) i == m_hover)
- state = wxCONTROL_CURRENT;
- }
- else
- {
- state = (int) wxCONTROL_DISABLED;
- }
-
- wxRendererNative::Get().DrawHeaderButton
- (
- this,
- dc,
- wxRect(xpos, 0, cw, ch-1),
- state,
- sortArrow
- );
-
- // align as required the column title:
- int x = xpos;
- wxSize titleSz = dc.GetTextExtent(col->GetTitle());
- switch (col->GetAlignment())
- {
- case wxALIGN_LEFT:
- x += HEADER_HORIZ_BORDER;
- break;
- case wxALIGN_RIGHT:
- x += cw - titleSz.GetWidth() - HEADER_HORIZ_BORDER;
- break;
- default:
- case wxALIGN_CENTER:
- case wxALIGN_CENTER_HORIZONTAL:
- x += (cw - titleSz.GetWidth() - 2 * HEADER_HORIZ_BORDER)/2;
- break;
- }
-
- // always center the title vertically:
- int y = wxMax((ch - titleSz.GetHeight()) / 2, HEADER_VERT_BORDER);
-
- dc.SetClippingRegion( xpos+HEADER_HORIZ_BORDER,
- HEADER_VERT_BORDER,
- wxMax(cw - 2 * HEADER_HORIZ_BORDER, 1), // width
- wxMax(ch - 2 * HEADER_VERT_BORDER, 1)); // height
- dc.DrawText( col->GetTitle(), x, y );
- dc.DestroyClippingRegion();
-
- xpos += cw;
- }
-}
-
-void wxGenericDataViewHeaderWindow::OnSetFocus( wxFocusEvent &event )
-{
- GetParent()->SetFocus();
- event.Skip();
-}
-
-void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
-{
- // we want to work with logical coords
- int x;
- m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL);
- int y = event.GetY();
-
- if (m_isDragging)
- {
- // we don't draw the line beyond our window,
- // but we allow dragging it there
- int w = 0;
- GetClientSize( &w, NULL );
- m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
- w -= 6;
-
- if (event.ButtonUp())
- {
- m_isDragging = false;
- if (HasCapture())
- ReleaseMouse();
-
- m_dirty = true;
- }
- m_currentX = wxMax(m_minX + 7, x);
-
- if (m_currentX < w)
- {
- GetColumn(m_column)->SetWidth(m_currentX - m_minX);
- Refresh();
- GetOwner()->Refresh();
- }
-
- }
- else // not dragging
- {
- m_minX = 0;
- m_column = wxNOT_FOUND;
-
- bool hit_border = false;
-
- // end of the current column
- int xpos = 0;
-
- // find the column where this event occured
- int countCol = m_owner->GetColumnCount();
- for (int column = 0; column < countCol; column++)
- {
- wxDataViewColumn *p = GetColumn(column);
-
- if (p->IsHidden())
- continue; // skip if not shown
-
- xpos += p->GetWidth();
- m_column = column;
- if ((abs(x-xpos) < 3) && (y < 22))
- {
- hit_border = true;
- break;
- }
-
- if (x < xpos)
- {
- // inside the column
- break;
- }
-
- m_minX = xpos;
- }
-
- int old_hover = m_hover;
- m_hover = m_column;
- if (event.Leaving())
- m_hover = wxNOT_FOUND;
- if (old_hover != m_hover)
- Refresh();
-
- if (m_column == wxNOT_FOUND)
- return;
-
- bool resizeable = GetColumn(m_column)->IsResizeable();
- if (event.LeftDClick() && resizeable)
- {
- GetColumn(m_column)->SetWidth(GetOwner()->GetBestColumnWidth(m_column));
- Refresh();
- }
- else if (event.LeftDown() || event.RightUp())
- {
- if (hit_border && event.LeftDown() && resizeable)
- {
- m_isDragging = true;
- CaptureMouse();
- m_currentX = x;
- }
- else // click on a column
- {
- wxDataViewModel * model = GetOwner()->GetModel();
- wxEventType evt = event.LeftDown() ?
- wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK :
- wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
- SendEvent(evt, m_column);
-
- //Left click the header
- if(event.LeftDown())
- {
- wxDataViewColumn *col = GetColumn(m_column);
- if(col->IsSortable())
- {
- wxDataViewColumn* sortCol = m_owner->GetSortingColumn();
- if(model && sortCol == col)
- {
- bool order = col->IsSortOrderAscending();
- col->SetSortOrder(!order);
- }
- else if(model)
- {
- m_owner->SetSortingColumn(col);
- }
- }
- UpdateDisplay();
- if(model)
- model->Resort();
- //Send the column sorted event
- SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, m_column);
- }
- }
- }
- else if (event.Moving())
- {
- if (hit_border && resizeable)
- m_currentCursor = m_resizeCursor;
- else
- m_currentCursor = wxSTANDARD_CURSOR;
-
- SetCursor(*m_currentCursor);
- }
- }
-}
-
-void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc)
-{
- int xpix, x;
-
- m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
- m_owner->GetViewStart( &x, NULL );
-
- // shift the DC origin to match the position of the main window horizontal
- // scrollbar: this allows us to always use logical coords
- dc.SetDeviceOrigin( -x * xpix, 0 );
-}
-
-#endif // defined(__WXMSW__)
-
//-----------------------------------------------------------------------------
// wxDataViewRenameTimer
//-----------------------------------------------------------------------------
// compute which columns needs to be redrawn
unsigned int cols = GetOwner()->GetColumnCount();
unsigned int col_start = 0;
- unsigned int x_start = 0;
+ unsigned int x_start;
for (x_start = 0; col_start < cols; col_start++)
{
- wxDataViewColumn *col = GetOwner()->GetColumn(col_start);
+ wxDataViewColumn *col = GetOwner()->GetColumnAt(col_start);
if (col->IsHidden())
continue; // skip it!
unsigned int x_last = x_start;
for (; col_last < cols; col_last++)
{
- wxDataViewColumn *col = GetOwner()->GetColumn(col_last);
+ wxDataViewColumn *col = GetOwner()->GetColumnAt(col_last);
if (col->IsHidden())
continue; // skip it!
int x = x_start;
for (unsigned int i = col_start; i < col_last; i++)
{
- wxDataViewColumn *col = GetOwner()->GetColumn(i);
+ wxDataViewColumn *col = GetOwner()->GetColumnAt(i);
if (col->IsHidden())
continue; // skip it
wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
if (!expander)
{
- // TODO: last column for RTL support
- expander = GetOwner()->GetColumn( 0 );
+ // TODO-RTL: last column for RTL support
+ expander = GetOwner()->GetColumnAt( 0 );
GetOwner()->SetExpanderColumn(expander);
}
for (unsigned int i = col_start; i < col_last; i++)
{
- wxDataViewColumn *col = GetOwner()->GetColumn( i );
+ wxDataViewColumn *col = GetOwner()->GetColumnAt( i );
wxDataViewRenderer *cell = col->GetRenderer();
cell_rect.width = col->GetWidth();
unsigned int i;
for (i = 0; i < cols; i++)
{
- wxDataViewColumn *c = GetOwner()->GetColumn( i );
+ wxDataViewColumn *c = GetOwner()->GetColumnAt( i );
if (c->IsHidden())
continue; // skip it!
{
wxRect rect = GetClientRect();
int colnum = 0;
- int x_start = 0, x_end = 0, w = 0;
+ int x_start, w = 0;
int xx, yy, xe;
m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy );
for (x_start = 0; colnum < column; colnum++)
{
- wxDataViewColumn *col = GetOwner()->GetColumn(colnum);
+ wxDataViewColumn *col = GetOwner()->GetColumnAt(colnum);
if (col->IsHidden())
continue; // skip it!
x_start += w;
}
- x_end = x_start + w;
+ int x_end = x_start + w;
xe = xx + rect.width;
if( x_end > xe )
{
for (i = 0; i < GetOwner()->GetColumnCount(); i++)
{
const wxDataViewColumn *c =
- wx_const_cast(wxDataViewCtrl*, GetOwner())->GetColumn( i );
+ const_cast<wxDataViewCtrl*>(GetOwner())->GetColumnAt( i );
if (!c->IsHidden())
width += c->GetWidth();
return le;
}
+
+bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const
+{
+ if (IsVirtualList())
+ return false;
+
+ wxDataViewTreeNode * node = GetTreeNodeByRow(row);
+ if (!node)
+ return false;
+
+ if (!node->HasChildren())
+ return false;
+
+ return node->IsOpen();
+}
+
+
void wxDataViewMainWindow::OnExpanding( unsigned int row )
{
if (IsVirtualList())
{
if (IsVirtualList())
return;
-
+
wxDataViewTreeNode * node = GetTreeNodeByRow(row);
if( node != NULL )
{
wxDataViewColumn *col = NULL;
unsigned int cols = GetOwner()->GetColumnCount();
unsigned int colnum = 0;
- unsigned int x_start = 0;
int x, y;
m_owner->CalcUnscrolledPosition( point.x, point.y, &x, &y );
- for (x_start = 0; colnum < cols; colnum++)
+ for (unsigned x_start = 0; colnum < cols; colnum++)
{
- col = GetOwner()->GetColumn(colnum);
+ col = GetOwner()->GetColumnAt(colnum);
if (col->IsHidden())
continue; // skip it!
wxDataViewColumn *col = NULL;
for( int i = 0, cols = GetOwner()->GetColumnCount(); i < cols; i ++ )
{
- col = GetOwner()->GetColumn( i );
+ col = GetOwner()->GetColumnAt( i );
x += col->GetWidth();
- if( GetOwner()->GetColumn(i+1) == column )
+ if( GetOwner()->GetColumnAt(i+1) == column )
break;
}
int w = col->GetWidth();
//Compose the a parent-chain of the finding item
ItemList list;
- wxDataViewItem * pItem = NULL;
+ wxDataViewItem * pItem;
list.DeleteContents( true );
wxDataViewItem it( item );
while( it.IsOk() )
void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
{
- if ( HandleAsNavigationKey(event) )
+ if ( GetParent()->HandleAsNavigationKey(event) )
return;
// no item -> nothing to do
{
case WXK_RETURN:
{
- if (m_currentRow > 0)
+ if (m_currentRow >= 0)
{
wxWindow *parent = GetParent();
wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId());
unsigned int i;
for (i = 0; i < cols; i++)
{
- wxDataViewColumn *c = GetOwner()->GetColumn( i );
+ wxDataViewColumn *c = GetOwner()->GetColumnAt( i );
if (c->IsHidden())
continue; // skip it!
wxDataViewRenderer *cell = col->GetRenderer();
unsigned int current = GetLineAt( y );
- if ((current > GetRowCount()) || (x > GetEndOfLastCol()))
+ if ((current >= GetRowCount()) || (x > GetEndOfLastCol()))
{
// Unselect all if below the last row ?
return;
// select single line
SelectAllRows( false );
SelectRow( m_lineSelectSingleOnUp, true );
+ SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) );
}
//Process the event of user clicking the expander
{
m_cols.DeleteContents(true);
m_notifier = NULL;
+
+ // No sorting column at start
+ m_sortingColumnIdx = wxNOT_FOUND;
+
+ m_headerArea = NULL;
}
bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
if ( (style & wxBORDER_MASK) == 0)
style |= wxBORDER_SUNKEN;
+ Init();
+
if (!wxControl::Create( parent, id, pos, size,
style | wxScrolledWindowStyle, validator))
return false;
SetInitialSize(size);
- Init();
-
#ifdef __WXMAC__
MacSetClipChildren( true );
#endif
if (HasFlag(wxDV_NO_HEADER))
m_headerArea = NULL;
else
- m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY );
+ m_headerArea = new wxDataViewHeaderWindow(this);
SetTargetWindow( m_clientArea );
}
#endif
+wxSize wxDataViewCtrl::GetSizeAvailableForScrollTarget(const wxSize& size)
+{
+ wxSize newsize = size;
+ if (!HasFlag(wxDV_NO_HEADER) && (m_headerArea))
+ newsize.y -= m_headerArea->GetSize().y;
+
+ return newsize;
+}
+
void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
{
// We need to override OnSize so that our scrolled
AdjustScrollbars();
}
+void wxDataViewCtrl::SetFocus()
+{
+ if (m_clientArea)
+ m_clientArea->SetFocus();
+}
+
bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
{
if (!wxDataViewCtrlBase::AssociateModel( model ))
return false;
m_cols.Append( col );
- OnColumnChange();
+ OnColumnsCountChanged();
return true;
}
return false;
m_cols.Insert( col );
- OnColumnChange();
+ OnColumnsCountChanged();
return true;
}
return false;
m_cols.Insert( pos, col );
- OnColumnChange();
+ OnColumnsCountChanged();
return true;
}
-void wxDataViewCtrl::OnColumnChange()
+void wxDataViewCtrl::OnColumnChange(unsigned int idx)
+{
+ if ( m_headerArea )
+ m_headerArea->UpdateColumn(idx);
+
+ m_clientArea->UpdateDisplay();
+}
+
+void wxDataViewCtrl::OnColumnsCountChanged()
{
if (m_headerArea)
- m_headerArea->UpdateDisplay();
+ m_headerArea->SetColumnCount(GetColumnCount());
m_clientArea->UpdateDisplay();
}
return m_cols.GetCount();
}
-wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
+wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int idx ) const
{
- wxDataViewColumnList::const_iterator iter;
- unsigned int i = 0;
- for (iter = m_cols.begin(); iter!=m_cols.end(); iter++)
- {
- if (i == pos)
- return *iter;
+ return m_cols[idx];
+}
- if ((*iter)->IsHidden())
- continue;
- i ++;
- }
- return NULL;
+wxDataViewColumn *wxDataViewCtrl::GetColumnAt(unsigned int pos) const
+{
+ // columns can't be reordered if there is no header window which allows
+ // to do this
+ const unsigned idx = m_headerArea ? m_headerArea->GetColumnsOrder()[pos]
+ : pos;
+
+ return GetColumn(idx);
}
-void wxDataViewCtrl::ColumnMoved( wxDataViewColumn* col, unsigned int new_pos )
+int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const
{
- if (new_pos > m_cols.GetCount()) return;
+ const unsigned count = m_cols.size();
+ for ( unsigned n = 0; n < count; n++ )
+ {
+ if ( m_cols[n] == column )
+ return n;
+ }
- // Exchange position
- m_cols.DeleteContents(false);
- m_cols.DeleteObject( col );
- m_cols.Insert( new_pos, col );
- m_cols.DeleteContents(true);
+ return wxNOT_FOUND;
+}
+void wxDataViewCtrl::ColumnMoved(wxDataViewColumn * WXUNUSED(col),
+ unsigned int WXUNUSED(new_pos))
+{
+ // do _not_ reorder m_cols elements here, they should always be in the
+ // order in which columns were added, we only display the columns in
+ // different order
m_clientArea->UpdateDisplay();
}
return false;
m_cols.Erase(ret);
- OnColumnChange();
+ OnColumnsCountChanged();
return true;
}
bool wxDataViewCtrl::ClearColumns()
{
m_cols.Clear();
- OnColumnChange();
+ OnColumnsCountChanged();
return true;
}
int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
{
- int ret = 0, dead = 0;
- int len = GetColumnCount();
- for (int i=0; i<len; i++)
+ int ret = 0,
+ dummy = 0;
+ unsigned int len = GetColumnCount();
+ for ( unsigned int i = 0; i < len; i++ )
{
- wxDataViewColumn * col = GetColumn(i);
+ wxDataViewColumn * col = GetColumnAt(i);
if (col->IsHidden())
continue;
ret += col->GetWidth();
if (column==col)
{
- CalcScrolledPosition( ret, dead, &ret, &dead );
+ CalcScrolledPosition( ret, dummy, &ret, &dummy );
break;
}
}
wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
{
- return NULL;
+ return m_sortingColumnIdx == wxNOT_FOUND ? NULL
+ : GetColumn(m_sortingColumnIdx);
}
//Selection code with wxDataViewItem as parameters
void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
{
wxDataViewSelection selection(wxDataViewSelectionCmp);
+
+ wxDataViewItem last_parent;
+
int len = sel.GetCount();
for( int i = 0; i < len; i ++ )
{
- int row = m_clientArea->GetRowByItem( sel[i] );
+ wxDataViewItem item = sel[i];
+ wxDataViewItem parent = GetModel()->GetParent( item );
+ if (parent)
+ {
+ if (parent != last_parent)
+ ExpandAncestors(item);
+ }
+
+ last_parent = parent;
+ int row = m_clientArea->GetRowByItem( item );
if( row >= 0 )
selection.Add( static_cast<unsigned int>(row) );
}
+
m_clientArea->SetSelections( selection );
}
void wxDataViewCtrl::Select( const wxDataViewItem & item )
{
+ ExpandAncestors( item );
+
int row = m_clientArea->GetRowByItem( item );
if( row >= 0 )
{
void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column )
{
+ ExpandAncestors( item );
+
+ m_clientArea->RecalculateDisplay();
+
int row = m_clientArea->GetRowByItem(item);
if( row >= 0 )
{
if( column == NULL )
EnsureVisible(row, -1);
else
- {
- int col = 0;
- int len = GetColumnCount();
- for( int i = 0; i < len; i ++ )
- if( GetColumn(i) == column )
- {
- col = i;
- break;
- }
- EnsureVisible( row, col );
- }
+ EnsureVisible( row, GetColumnIndex(column) );
}
}
m_clientArea->Collapse(row);
}
+bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
+{
+ int row = m_clientArea->GetRowByItem( item );
+ if (row != -1)
+ return m_clientArea->IsExpanded(row);
+ return false;
+}
+
+
#endif
// !wxUSE_GENERICDATAVIEWCTRL
projects / wxWidgets.git / blobdiff