#include "wx/icon.h"
#include "wx/list.h"
#include "wx/listimpl.cpp"
+#include "wx/imaglist.h"
+#include "wx/headerctrl.h"
//-----------------------------------------------------------------------------
// classes
// the expander space margin
static const int EXPANDER_MARGIN = 4;
-//-----------------------------------------------------------------------------
-// wxDataViewHeaderWindow
-//-----------------------------------------------------------------------------
-
-#define USE_NATIVE_HEADER_WINDOW 1
+#ifdef __WXMSW__
+static const int EXPANDER_OFFSET = 4;
+#else
+static const int EXPANDER_OFFSET = 1;
+#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 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);
-};
-
-// on wxMSW the header window (only that part however) can be made native!
-#if defined(__WXMSW__) && 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();
-
- // called Refresh afterwards
- virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);
-
-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;
+ virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
+ {
+ wxDataViewCtrl * const owner = GetOwner();
- unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR);
+ int widthContents = owner->GetBestColumnWidth(idx);
+ owner->GetColumn(idx)->SetWidth(wxMax(widthTitle, widthContents));
+ owner->OnColumnChange(idx);
- wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR)
- { return GetColumn(GetColumnIdxFromHeader(nmHDR)); }
-
- int m_scrollOffsetX;
- int m_buttonHeight;
+ 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
{
}
- wxDataViewTreeNode * GetParent() { return m_parent; }
+ wxDataViewTreeNode * GetParent() const { return m_parent; }
void SetParent( wxDataViewTreeNode * parent ) { m_parent = parent; }
wxDataViewTreeNodes & GetNodes() { return m_nodes; }
wxDataViewTreeLeaves & GetChildren() { return m_leaves; }
}
wxDataViewItem & GetItem() { return m_item; }
+ const wxDataViewItem & GetItem() const { return m_item; }
void SetItem( const wxDataViewItem & item ) { m_item = item; }
- unsigned int GetChildrenNumber() { return m_leaves.GetCount(); }
- unsigned int GetNodeNumber() { return m_nodes.GetCount(); }
- int GetIndentLevel()
+ unsigned int GetChildrenNumber() const { return m_leaves.GetCount(); }
+ unsigned int GetNodeNumber() const { return m_nodes.GetCount(); }
+ int GetIndentLevel() const
{
- int ret = 0 ;
- wxDataViewTreeNode * node = this;
+ int ret = 0;
+ const wxDataViewTreeNode * node = this;
while( node->GetParent()->GetParent() != NULL )
{
node = node->GetParent();
return ret;
}
- bool IsOpen()
+ bool IsOpen() const
{
- return m_open ;
+ return m_open;
}
void ToggleOpen()
{
int len = m_nodes.GetCount();
int sum = 0;
- for ( int i = 0 ;i < len ; i ++)
+ for ( int i = 0;i < len; i ++)
sum += m_nodes[i]->GetSubTreeCount();
sum += m_leaves.GetCount();
ChangeSubTreeCount(sum);
}
}
- bool HasChildren() { return m_hasChildren; }
+ bool HasChildren() const { return m_hasChildren; }
void SetHasChildren( bool has ){ m_hasChildren = has; }
void SetSubTreeCount( int num ) { m_subTreeCount = num; }
- int GetSubTreeCount() { return m_subTreeCount; }
+ int GetSubTreeCount() const { return m_subTreeCount; }
void ChangeSubTreeCount( int num )
{
if( !m_open )
- return ;
+ return;
m_subTreeCount += num;
if( m_parent )
m_parent->ChangeSubTreeCount(num);
WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection,
WXDLLIMPEXP_ADV);
WX_DECLARE_LIST(wxDataViewItem, ItemList);
-WX_DEFINE_LIST(ItemList);
+WX_DEFINE_LIST(ItemList)
class wxDataViewMainWindow: public wxWindow
{
const wxString &name = wxT("wxdataviewctrlmainwindow") );
virtual ~wxDataViewMainWindow();
+ bool IsVirtualList() const { return m_root == NULL; }
+
// notifications from wxDataViewModel
bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
bool Cleared();
void Resort()
{
- SortPrepare();
- m_root->Resort();
+ if (!IsVirtualList())
+ {
+ SortPrepare();
+ m_root->Resort();
+ }
UpdateDisplay();
}
unsigned int GetFirstVisibleRow() const;
//I change this method to un const because in the tree view, the displaying number of the tree are changing along with the expanding/collapsing of the tree nodes
unsigned int GetLastVisibleRow();
- unsigned int GetRowCount() ;
+ unsigned int GetRowCount();
wxDataViewItem GetSelection() const;
wxDataViewSelection GetSelections(){ return m_selection; }
wxRect GetLineRect( unsigned int row ) const;
+ int GetLineStart( unsigned int row ) const; // row * m_lineHeight in fixed mode
+ int GetLineHeight( unsigned int row ) const; // m_lineHeight in fixed mode
+ int GetLineAt( unsigned int y ) const; // y / m_lineHeight in fixed mode
+
//Some useful functions for row and item mapping
wxDataViewItem GetItemByRow( unsigned int row ) const;
- int GetRowByItem( const wxDataViewItem & item );
+ int GetRowByItem( const wxDataViewItem & item ) const;
//Methods for building the mapping tree
void BuildTree( wxDataViewModel * model );
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 );
+ wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const;
//We did not need this temporarily
//wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item );
- int RecalculateCount() ;
+ int RecalculateCount();
wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item );
void OnExpanding( unsigned int row );
m_dc = NULL;
m_align = align;
m_mode = mode;
+ m_wantsAttr = false;
+ m_hasAttr = false;
}
wxDataViewRenderer::~wxDataViewRenderer()
return m_dc;
}
+void wxDataViewRenderer::SetAlignment( int align )
+{
+ m_align=align;
+}
+
+int wxDataViewRenderer::GetAlignment() const
+{
+ return m_align;
+}
+
+int wxDataViewRenderer::CalculateAlignment() const
+{
+ if (m_align == wxDVR_DEFAULT_ALIGNMENT)
+ {
+ if (GetOwner() == NULL)
+ return wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL;
+
+ return GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL;
+ }
+
+ return m_align;
+}
+
// ---------------------------------------------------------
// wxDataViewCustomRenderer
// ---------------------------------------------------------
return wxSize(80,20);
}
+// ---------------------------------------------------------
+// wxDataViewTextRendererAttr
+// ---------------------------------------------------------
+
+IMPLEMENT_CLASS(wxDataViewTextRendererAttr, wxDataViewTextRenderer)
+
+wxDataViewTextRendererAttr::wxDataViewTextRendererAttr( const wxString &varianttype,
+ wxDataViewCellMode mode, int align ) :
+ wxDataViewTextRenderer( varianttype, mode, align )
+{
+ m_wantsAttr = true;
+}
+
+bool wxDataViewTextRendererAttr::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
+{
+ wxFont font;
+ wxColour colour;
+
+ if (m_hasAttr)
+ {
+ if (m_attr.HasColour())
+ {
+ colour = dc->GetTextForeground();
+ dc->SetTextForeground( m_attr.GetColour() );
+ }
+
+ if (m_attr.GetBold() || m_attr.GetItalic())
+ {
+ font = dc->GetFont();
+ wxFont myfont = font;
+ if (m_attr.GetBold())
+ myfont.SetWeight( wxFONTWEIGHT_BOLD );
+ if (m_attr.GetItalic())
+ myfont.SetStyle( wxFONTSTYLE_ITALIC );
+ dc->SetFont( myfont );
+ }
+ }
+
+ dc->DrawText( m_text, cell.x, cell.y + ((cell.height - dc->GetCharHeight()) / 2));
+
+ // restore dc
+ if (m_hasAttr)
+ {
+ if (m_attr.HasColour())
+ dc->SetTextForeground( colour );
+
+ if (m_attr.GetBold() || m_attr.GetItalic())
+ dc->SetFont( font );
+ }
+
+ return true;
+}
+
+
// ---------------------------------------------------------
// wxDataViewBitmapRenderer
// ---------------------------------------------------------
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);
-
- 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_TOGGLE_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;
-}
+//-----------------------------------------------------------------------------
+// wxDataViewRenameTimer
+//-----------------------------------------------------------------------------
-void wxDataViewColumn::SetHidden( bool hidden )
+wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner )
{
- 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();
+ m_owner = owner;
}
-void wxDataViewColumn::SetSortable( bool sortable )
+void wxDataViewRenameTimer::Notify()
{
- if (sortable)
- m_flags |= wxDATAVIEW_COL_SORTABLE;
- else
- m_flags &= ~wxDATAVIEW_COL_SORTABLE;
-
- // Update header button
- if (GetOwner())
- GetOwner()->OnColumnChange();
+ m_owner->OnRenameTimer();
}
-void wxDataViewColumn::SetSortOrder( bool ascending )
-{
- m_ascending = ascending;
-
- // Update header button
- if (GetOwner())
- GetOwner()->OnColumnChange();
-}
+//-----------------------------------------------------------------------------
+// wxDataViewMainWindow
+//-----------------------------------------------------------------------------
-bool wxDataViewColumn::IsSortOrderAscending() const
-{
- return m_ascending;
-}
+//The tree building helper, declared firstly
+static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node);
-void wxDataViewColumn::SetInternalWidth( int width )
+int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
{
- m_width = width;
-
- // the scrollbars of the wxDataViewCtrl needs to be recalculated!
- if (m_owner && m_owner->m_clientArea)
- m_owner->m_clientArea->RecalculateDisplay();
+ if (row1 > row2) return 1;
+ if (row1 == row2) return 0;
+ return -1;
}
-void wxDataViewColumn::SetWidth( int width )
-{
- m_owner->m_headerArea->UpdateDisplay();
- SetInternalWidth(width);
-}
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow)
+BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow)
+ EVT_PAINT (wxDataViewMainWindow::OnPaint)
+ EVT_MOUSE_EVENTS (wxDataViewMainWindow::OnMouse)
+ EVT_SET_FOCUS (wxDataViewMainWindow::OnSetFocus)
+ EVT_KILL_FOCUS (wxDataViewMainWindow::OnKillFocus)
+ EVT_CHAR (wxDataViewMainWindow::OnChar)
+END_EVENT_TABLE()
-//-----------------------------------------------------------------------------
-// wxDataViewHeaderWindowBase
-//-----------------------------------------------------------------------------
+wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size, const wxString &name ) :
+ wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE, name ),
+ m_selection( wxDataViewSelectionCmp )
-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);
-}
+ SetOwner( parent );
-#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW
+ m_lastOnSame = false;
+ m_renameTimer = new wxDataViewRenameTimer( this );
-// implemented in msw/listctrl.cpp:
-int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick);
+ // TODO: user better initial values/nothing selected
+ m_currentCol = NULL;
+ m_currentRow = 0;
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewHeaderWindowMSW, wxWindow)
+ m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1
-bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- const wxString &name )
-{
- m_owner = parent;
+ m_dragCount = 0;
+ m_dragStart = wxPoint(0,0);
+ m_lineLastClicked = (unsigned int) -1;
+ m_lineBeforeLastClicked = (unsigned int) -1;
+ m_lineSelectSingleOnUp = (unsigned int) -1;
- m_scrollOffsetX = 0;
- m_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( this );
+ m_hasFocus = false;
- int x = pos.x == wxDefaultCoord ? 0 : pos.x,
- y = pos.y == wxDefaultCoord ? 0 : pos.y,
- w = size.x == wxDefaultCoord ? 1 : size.x,
- h = size.y == wxDefaultCoord ? m_buttonHeight : size.y;
+ SetBackgroundColour( *wxWHITE );
- if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) )
- return false;
+ SetBackgroundStyle(wxBG_STYLE_CUSTOM);
- // create the native WC_HEADER window:
- WXHWND hwndParent = (HWND)parent->GetHandle();
- WXDWORD msStyle = WS_CHILD | 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_penRule = wxPen(GetRuleColour());
- // we need to subclass the m_hWnd to force wxWindow::HandleNotify
- // to call wxDataViewHeaderWindow::MSWOnNotify
- SubclassWin(m_hWnd);
+ //Here I compose a pen can draw black lines, maybe there are something system colour to use
+ m_penExpander = wxPen(wxColour(0,0,0));
+ //Some new added code to deal with the tree structure
+ m_root = new wxDataViewTreeNode( NULL );
+ m_root->SetHasChildren(true);
- // 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;
+ //Make m_count = -1 will cause the class recaculate the real displaying number of rows.
+ m_count = -1;
+ m_underMouse = NULL;
+ UpdateDisplay();
}
-wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow()
+wxDataViewMainWindow::~wxDataViewMainWindow()
{
- UnsubclassWin();
+ DestroyTree();
+ delete m_renameTimer;
}
-wxSize wxDataViewHeaderWindowMSW::DoGetBestSize() const
+void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
- return wxSize(80, m_buttonHeight );
-}
+ wxDataViewModel *model = GetOwner()->GetModel();
+ wxAutoBufferedPaintDC dc( this );
-#ifndef HDF_SORTUP
-#define HDF_SORTUP 0x0400
-#endif
-#ifndef HDF_SORTDOWN
-#define HDF_SORTDOWN 0x0200
+#ifdef __WXMSW__
+ dc.SetPen( *wxTRANSPARENT_PEN );
+ dc.SetBrush( wxBrush( GetBackgroundColour()) );
+ dc.SetBrush( *wxWHITE_BRUSH );
+ wxSize size( GetClientSize() );
+ dc.DrawRectangle( 0,0,size.x,size.y );
#endif
-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);
+ // prepare the DC
+ GetOwner()->PrepareDC( dc );
+ dc.SetFont( GetFont() );
+
+ wxRect update = GetUpdateRegion().GetBox();
+ m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y );
+
+ // compute which items needs to be redrawn
+ unsigned int item_start = GetLineAt( wxMax(0,update.y) );
+ unsigned int item_count =
+ wxMin( (int)( GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1),
+ (int)(GetRowCount( ) - item_start));
+ unsigned int item_last = item_start + item_count;
- // add the updated array of columns to the header control
+ // compute which columns needs to be redrawn
unsigned int cols = GetOwner()->GetColumnCount();
- unsigned int added = 0;
- for (unsigned int i = 0; i < cols; i++)
+ unsigned int col_start = 0;
+ unsigned int x_start;
+ for (x_start = 0; col_start < cols; col_start++)
{
- wxDataViewColumn *col = GetColumn( i );
+ wxDataViewColumn *col = GetOwner()->GetColumnAt(col_start);
if (col->IsHidden())
- continue; // don't add it!
+ continue; // skip it!
- HDITEM hdi;
- hdi.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH;
- hdi.pszText = (wxChar *) col->GetTitle().wx_str();
- hdi.cxy = col->GetWidth();
- hdi.cchTextMax = sizeof(hdi.pszText)/sizeof(hdi.pszText[0]);
- hdi.fmt = HDF_LEFT | HDF_STRING;
- //hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP);
+ unsigned int w = col->GetWidth();
+ if (x_start+w >= (unsigned int)update.x)
+ break;
- 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;
- }
+ x_start += w;
+ }
- // 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;
+ unsigned int col_last = col_start;
+ unsigned int x_last = x_start;
+ for (; col_last < cols; col_last++)
+ {
+ wxDataViewColumn *col = GetOwner()->GetColumnAt(col_last);
+ if (col->IsHidden())
+ continue; // skip it!
- 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;
+ if (x_last > (unsigned int)update.GetRight())
break;
- default:
- // such alignment is not allowed for the column header!
- wxFAIL;
- }
-
- SendMessage((HWND)m_hWnd, HDM_INSERTITEM,
- (WPARAM)added, (LPARAM)&hdi);
- added++;
+ x_last += col->GetWidth();
}
-}
-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)
+ // Draw horizontal rules if required
+ if ( m_owner->HasFlag(wxDV_HORIZ_RULES) )
{
- 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;
+ dc.SetPen(m_penRule);
+ dc.SetBrush(*wxTRANSPARENT_BRUSH);
- // is it a message from the header?
- if ( nmhdr->hwndFrom != (HWND)m_hWnd )
- return wxWindow::MSWOnNotify(idCtrl, lParam, result);
+ for (unsigned int i = item_start; i <= item_last+1; i++)
+ {
+ int y = GetLineStart( i );
+ dc.DrawLine(x_start, y, x_last, y);
+ }
+ }
- NMHEADER *nmHDR = (NMHEADER *)nmhdr;
- switch ( nmhdr->code )
+ // Draw vertical rules if required
+ if ( m_owner->HasFlag(wxDV_VERT_RULES) )
{
- 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:
- // user has started to reorder a column
- 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
- case HDN_ENDDRAG: // user has finished reordering 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
+ dc.SetPen(m_penRule);
+ dc.SetBrush(*wxTRANSPARENT_BRUSH);
- 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;
+ int x = x_start;
+ for (unsigned int i = col_start; i < col_last; i++)
+ {
+ wxDataViewColumn *col = GetOwner()->GetColumnAt(i);
+ if (col->IsHidden())
+ continue; // skip it
- case HDN_GETDISPINFOW:
- // see wxListCtrl::MSWOnNotify for more info!
- break;
+ dc.DrawLine(x, GetLineStart( item_start ),
+ x, GetLineStart( item_last ) );
- 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;
+ x += col->GetWidth();
+ }
- default:
- return wxWindow::MSWOnNotify(idCtrl, lParam, result);
+ // Draw last vertical rule
+ dc.DrawLine(x, GetLineStart( item_start ),
+ x, GetLineStart( item_last ) );
}
- return true;
-}
-
-void wxDataViewHeaderWindowMSW::ScrollWindow(int dx, int dy, const wxRect *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-2, y-2, w-m_scrollOffsetX+4, h+4, 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++)
+ // redraw the background for the items which are selected/current
+ for (unsigned int item = item_start; item < item_last; item++)
{
- 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
+ bool selected = m_selection.Index( item ) != wxNOT_FOUND;
+ if (selected || item == m_currentRow)
{
- state = (int) wxCONTROL_DISABLED;
- }
+ int flags = selected ? (int)wxCONTROL_SELECTED : 0;
+ if (item == m_currentRow)
+ flags |= wxCONTROL_CURRENT;
+ if (m_hasFocus)
+ flags |= wxCONTROL_FOCUSED;
- wxRendererNative::Get().DrawHeaderButton
+ wxRect rect( x_start, GetLineStart( item ), x_last, GetLineHeight( item ) );
+ wxRendererNative::Get().DrawItemSelectionRect
(
this,
dc,
- wxRect(xpos, 0, cw, ch-1),
- state,
- sortArrow
+ rect,
+ flags
);
-
- // 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)
+ wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
+ if (!expander)
{
- // 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();
- }
-
+ // TODO-RTL: last column for RTL support
+ expander = GetOwner()->GetColumnAt( 0 );
+ GetOwner()->SetExpanderColumn(expander);
}
- else // not dragging
+
+ // redraw all cells for all rows which must be repainted and all columns
+ wxRect cell_rect;
+ cell_rect.x = x_start;
+ for (unsigned int i = col_start; i < col_last; i++)
{
- m_minX = 0;
- m_column = wxNOT_FOUND;
- bool hit_border = false;
+ wxDataViewColumn *col = GetOwner()->GetColumnAt( i );
+ wxDataViewRenderer *cell = col->GetRenderer();
+ cell_rect.width = col->GetWidth();
- // end of the current column
- int xpos = 0;
+ if (col->IsHidden())
+ continue; // skip it!
- // find the column where this event occured
- int countCol = m_owner->GetColumnCount();
- for (int column = 0; column < countCol; column++)
+ for (unsigned int item = item_start; item < item_last; item++)
{
- wxDataViewColumn *p = GetColumn(column);
+ // get the cell value and set it into the renderer
+ wxVariant value;
+ wxDataViewTreeNode *node = NULL;
+ wxDataViewItem dataitem;
+
+ if (!IsVirtualList())
+ {
+ node = GetTreeNodeByRow(item);
+ if( node == NULL )
+ continue;
- if (p->IsHidden())
- continue; // skip if not shown
+ dataitem = node->GetItem();
- xpos += p->GetWidth();
- m_column = column;
- if ((abs(x-xpos) < 3) && (y < 22))
+ if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem))
+ continue;
+ }
+ else
{
- hit_border = true;
- break;
+ dataitem = wxDataViewItem( wxUIntToPtr(item) );
}
- if (x < xpos)
+ model->GetValue( value, dataitem, col->GetModelColumn());
+ cell->SetValue( value );
+
+ if (cell->GetWantsAttr())
{
- // inside the column
- break;
+ wxDataViewItemAttr attr;
+ bool ret = model->GetAttr( dataitem, col->GetModelColumn(), attr );
+ if (ret)
+ cell->SetAttr( attr );
+ cell->SetHasAttr( ret );
}
- m_minX = xpos;
- }
+ // update cell_rect
+ cell_rect.y = GetLineStart( item );
+ cell_rect.height = GetLineHeight( item ); // -1 is for the horizontal rules (?)
- int old_hover = m_hover;
- m_hover = m_column;
- if (event.Leaving())
- m_hover = wxNOT_FOUND;
- if (old_hover != m_hover)
- Refresh();
+ //Draw the expander here.
+ int indent = 0;
+ if ((!IsVirtualList()) && (col == expander))
+ {
+ indent = node->GetIndentLevel();
- if (m_column == wxNOT_FOUND)
- return;
+ //Calculate the indent first
+ indent = cell_rect.x + GetOwner()->GetIndent() * indent;
- 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())
+ int expander_width = m_lineHeight - 2*EXPANDER_MARGIN;
+ // change the cell_rect.x to the appropriate pos
+ int expander_x = indent + EXPANDER_MARGIN;
+ int expander_y = cell_rect.y + EXPANDER_MARGIN + (GetLineHeight(item) / 2) - (expander_width/2) - EXPANDER_OFFSET;
+ indent = indent + m_lineHeight; //try to use the m_lineHeight as the expander space
+ dc.SetPen( m_penExpander );
+ dc.SetBrush( wxNullBrush );
+ if( node->HasChildren() )
{
- wxDataViewColumn *col = GetColumn(m_column);
- if(col->IsSortable())
+ wxRect rect( expander_x , expander_y, expander_width, expander_width);
+ int flag = 0;
+ if (m_underMouse == node)
{
- wxDataViewColumn* sortCol = m_owner->GetSortingColumn();
- if(model && sortCol == col)
- {
- bool order = col->IsSortOrderAscending();
- col->SetSortOrder(!order);
- }
- else if(model)
- {
- m_owner->SetSortingColumn(col);
- }
+ flag |= wxCONTROL_CURRENT;
}
- UpdateDisplay();
- if(model)
- model->Resort();
- //Send the column sorted event
- SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, m_column);
+ if( node->IsOpen() )
+ wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag|wxCONTROL_EXPANDED );
+ else
+ wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
}
+ //force the expander column to left-center align
+ cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
+ }
+ if (node && !node->HasChildren())
+ {
+ // Yes, if the node does not have any child, it must be a leaf which
+ // mean that it is a temporarily created by GetTreeNodeByRow
+ wxDELETE(node);
}
- }
- 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
-//-----------------------------------------------------------------------------
-
-wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner )
-{
- m_owner = owner;
-}
-
-void wxDataViewRenameTimer::Notify()
-{
- m_owner->OnRenameTimer();
-}
-
-//-----------------------------------------------------------------------------
-// wxDataViewMainWindow
-//-----------------------------------------------------------------------------
-
-//The tree building helper, declared firstly
-void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node);
-
-int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
-{
- if (row1 > row2) return 1;
- if (row1 == row2) return 0;
- return -1;
-}
-
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow)
-
-BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow)
- EVT_PAINT (wxDataViewMainWindow::OnPaint)
- EVT_MOUSE_EVENTS (wxDataViewMainWindow::OnMouse)
- EVT_SET_FOCUS (wxDataViewMainWindow::OnSetFocus)
- EVT_KILL_FOCUS (wxDataViewMainWindow::OnKillFocus)
- EVT_CHAR (wxDataViewMainWindow::OnChar)
-END_EVENT_TABLE()
-
-wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size, const wxString &name ) :
- wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE, name ),
- m_selection( wxDataViewSelectionCmp )
-
-{
- SetOwner( parent );
-
- m_lastOnSame = false;
- m_renameTimer = new wxDataViewRenameTimer( this );
- // TODO: user better initial values/nothing selected
- m_currentCol = NULL;
- m_currentRow = 0;
+ // cannot be bigger than allocated space
+ wxSize size = cell->GetSize();
+ // Because of the tree structure indent, here we should minus the width of the cell for drawing
+ size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent );
+ // size.y = wxMin( size.y, cell_rect.height );
+ size.y = cell_rect.height;
- m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1
+ wxRect item_rect(cell_rect.GetTopLeft(), size);
+ int align = cell->CalculateAlignment();
- m_dragCount = 0;
- m_dragStart = wxPoint(0,0);
- m_lineLastClicked = (unsigned int) -1;
- m_lineBeforeLastClicked = (unsigned int) -1;
- m_lineSelectSingleOnUp = (unsigned int) -1;
+ // horizontal alignment:
+ item_rect.x = cell_rect.x;
+ if (align & wxALIGN_CENTER_HORIZONTAL)
+ item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2);
+ else if (align & wxALIGN_RIGHT)
+ item_rect.x = cell_rect.x + cell_rect.width - size.x;
+ //else: wxALIGN_LEFT is the default
- m_hasFocus = false;
+ // vertical alignment:
+ item_rect.y = cell_rect.y;
+ if (align & wxALIGN_CENTER_VERTICAL)
+ item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2);
+ else if (align & wxALIGN_BOTTOM)
+ item_rect.y = cell_rect.y + cell_rect.height - size.y;
+ //else: wxALIGN_TOP is the default
- SetBackgroundStyle( wxBG_STYLE_CUSTOM );
- SetBackgroundColour( *wxWHITE );
+ // add padding
+ item_rect.x += PADDING_RIGHTLEFT;
+ item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
- m_penRule = wxPen(GetRuleColour(), 1, wxSOLID);
+ //Here we add the tree indent
+ item_rect.x += indent;
- //Here I compose a pen can draw black lines, maybe there are something system colour to use
- m_penExpander = wxPen( wxColour(0,0,0), 1, wxSOLID );
- //Some new added code to deal with the tree structure
- m_root = new wxDataViewTreeNode( NULL );
- m_root->SetHasChildren(true);
+ int state = 0;
+ if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))
+ state |= wxDATAVIEW_CELL_SELECTED;
- //Make m_count = -1 will cause the class recaculate the real displaying number of rows.
- m_count = -1 ;
- m_underMouse = NULL;
- UpdateDisplay();
-}
+ // TODO: it would be much more efficient to create a clipping
+ // region for the entire column being rendered (in the OnPaint
+ // of wxDataViewMainWindow) instead of a single clip region for
+ // each cell. However it would mean that each renderer should
+ // respect the given wxRect's top & bottom coords, eventually
+ // violating only the left & right coords - however the user can
+ // make its own renderer and thus we cannot be sure of that.
+ dc.SetClippingRegion( item_rect );
+ cell->Render( item_rect, &dc, state );
+ dc.DestroyClippingRegion();
+ }
-wxDataViewMainWindow::~wxDataViewMainWindow()
-{
- DestroyTree();
- delete m_renameTimer;
+ cell_rect.x += cell_rect.width;
+ }
}
void wxDataViewMainWindow::OnRenameTimer()
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!
break;
xpos += c->GetWidth();
}
- wxRect labelRect( xpos, m_currentRow * m_lineHeight,
- m_currentCol->GetWidth(), m_lineHeight );
+ wxRect labelRect( xpos,
+ GetLineStart( m_currentRow ),
+ m_currentCol->GetWidth(),
+ GetLineHeight( m_currentRow ) );
GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y,
&labelRect.x, &labelRect.y);
class DoJob
{
public:
- DoJob(){};
- virtual ~DoJob(){};
+ DoJob() { }
+ virtual ~DoJob() { }
//The return value control how the tree-walker tranverse the tree
// 0: Job done, stop tranverse and return
// 1: Ignore the current node's subtree and continue
// 2: Job not done, continue
enum { OK = 0 , IGR = 1, CONT = 2 };
- virtual int operator() ( wxDataViewTreeNode * node ) = 0 ;
+ virtual int operator() ( wxDataViewTreeNode * node ) = 0;
virtual int operator() ( void * n ) = 0;
};
switch( func( node ) )
{
case DoJob::OK :
- return true ;
+ return true;
case DoJob::IGR:
return false;
case DoJob::CONT:
- default:
- ;
+ default:
+ ;
}
wxDataViewTreeNodes nodes = node->GetNodes();
int len = leaves.GetCount();
int i = 0, nodes_i = 0;
- for( ; i < len ; i ++ )
+ for(; i < len; i ++ )
{
void * n = leaves[i];
if( nodes_i < len_nodes && n == nodes[nodes_i]->GetItem().GetID() )
switch( func( n ) )
{
case DoJob::OK :
- return true ;
+ return true;
case DoJob::IGR:
continue;
case DoJob::CONT:
default:
- ;
+ ;
}
}
return false;
bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
{
+ if (!m_root)
+ {
+ m_count++;
+ UpdateDisplay();
+ return true;
+ }
+
SortPrepare();
wxDataViewTreeNode * node;
return true;
}
-void DestroyTreeHelper( wxDataViewTreeNode * node);
+static void DestroyTreeHelper( wxDataViewTreeNode * node);
bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
const wxDataViewItem& item)
{
+ if (!m_root)
+ {
+ m_count--;
+ if( m_currentRow > GetRowCount() )
+ m_currentRow = m_count - 1;
+
+ m_selection.Empty();
+
+ UpdateDisplay();
+
+ return true;
+ }
+
wxDataViewTreeNode * node = FindNode(parent);
wxCHECK_MSG( node != NULL, false, "item not found" );
wxDataViewTreeNode * n = NULL;
wxDataViewTreeNodes nodes = node->GetNodes();
int len = nodes.GetCount();
- for( int i = 0 ; i < len; i ++)
+ for( int i = 0; i < len; i ++)
{
if( nodes[i]->GetItem() == item )
{
node->GetNodes().Remove( n );
sub -= n->GetSubTreeCount();
- DestroyTreeHelper(n);
+ ::DestroyTreeHelper(n);
}
//Make the row number invalid and get a new valid one when user call GetRowCount
m_count = -1;
node->ChangeSubTreeCount(sub);
- if( node->GetChildrenNumber() == 0)
- {
- node->GetParent()->GetNodes().Remove( node );
- delete node;
- }
//Change the current row to the last row if the current exceed the max row number
if( m_currentRow > GetRowCount() )
bool wxDataViewMainWindow::Cleared()
{
+ DestroyTree();
+
SortPrepare();
+ BuildTree( GetOwner()->GetModel() );
- DestroyTree();
UpdateDisplay();
return true;
}
int width = GetEndOfLastCol();
- int height = GetRowCount() * m_lineHeight;
+ int height = GetLineStart( GetRowCount() );
SetVirtualSize( width, height );
GetOwner()->SetScrollRate( 10, m_lineHeight );
if (GetOwner()->m_headerArea)
GetOwner()->m_headerArea->ScrollWindow( dx, 0 );
-}
-
-void wxDataViewMainWindow::ScrollTo( int rows, int column )
-{
- int x, y;
- m_owner->GetScrollPixelsPerUnit( &x, &y );
- int sy = rows*m_lineHeight/y;
- int sx = 0;
- if( column != -1 )
- {
- wxRect rect = GetClientRect();
- int colnum = 0;
- int x_start = 0, x_end = 0, 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);
- if (col->IsHidden())
- continue; // skip it!
-
- w = col->GetWidth();
- x_start += w;
- }
-
- x_end = x_start + w;
- xe = xx + rect.width;
- if( x_end > xe )
- {
- sx = ( xx + x_end - xe )/x;
- }
- if( x_start < xx )
- {
- sx = x_start/x;
- }
- }
- m_owner->Scroll( sx, sy );
-}
-
-void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
-{
- wxDataViewModel *model = GetOwner()->GetModel();
- wxAutoBufferedPaintDC dc( this );
-
- // prepare the DC
- dc.SetBackground(GetBackgroundColour());
- dc.Clear();
- GetOwner()->PrepareDC( dc );
- dc.SetFont( GetFont() );
-
- wxRect update = GetUpdateRegion().GetBox();
- m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y );
-
- // compute which items needs to be redrawn
- unsigned int item_start = wxMax( 0, (update.y / m_lineHeight) );
- unsigned int item_count =
- wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1),
- (int)(GetRowCount( )- item_start) );
- unsigned int item_last = item_start + item_count;
-
- // compute which columns needs to be redrawn
- unsigned int cols = GetOwner()->GetColumnCount();
- unsigned int col_start = 0;
- unsigned int x_start = 0;
- for (x_start = 0; col_start < cols; col_start++)
- {
- wxDataViewColumn *col = GetOwner()->GetColumn(col_start);
- if (col->IsHidden())
- continue; // skip it!
-
- unsigned int w = col->GetWidth();
- if (x_start+w >= (unsigned int)update.x)
- break;
-
- x_start += w;
- }
-
- unsigned int col_last = col_start;
- unsigned int x_last = x_start;
- for (; col_last < cols; col_last++)
- {
- wxDataViewColumn *col = GetOwner()->GetColumn(col_last);
- if (col->IsHidden())
- continue; // skip it!
-
- if (x_last > (unsigned int)update.GetRight())
- break;
-
- x_last += col->GetWidth();
- }
-
- // Draw horizontal rules if required
- if ( m_owner->HasFlag(wxDV_HORIZ_RULES) )
- {
- dc.SetPen(m_penRule);
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
- for (unsigned int i = item_start; i <= item_last+1; i++)
- {
- int y = i * m_lineHeight;
- dc.DrawLine(x_start, y, x_last, y);
- }
- }
-
- // Draw vertical rules if required
- if ( m_owner->HasFlag(wxDV_VERT_RULES) )
- {
- dc.SetPen(m_penRule);
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
- int x = x_start;
- for (unsigned int i = col_start; i < col_last; i++)
- {
- wxDataViewColumn *col = GetOwner()->GetColumn(i);
- if (col->IsHidden())
- continue; // skip it
-
- dc.DrawLine(x, item_start * m_lineHeight,
- x, item_last * m_lineHeight);
-
- x += col->GetWidth();
- }
-
- // Draw last vertical rule
- dc.DrawLine(x, item_start * m_lineHeight,
- x, item_last * m_lineHeight);
- }
-
- // redraw the background for the items which are selected/current
- for (unsigned int item = item_start; item < item_last; item++)
- {
- bool selected = m_selection.Index( item ) != wxNOT_FOUND;
- if (selected || item == m_currentRow)
- {
- int flags = selected ? (int)wxCONTROL_SELECTED : 0;
- if (item == m_currentRow)
- flags |= wxCONTROL_CURRENT;
- if (m_hasFocus)
- flags |= wxCONTROL_FOCUSED;
-
- wxRect rect( x_start, item*m_lineHeight, x_last, m_lineHeight );
- wxRendererNative::Get().DrawItemSelectionRect
- (
- this,
- dc,
- rect,
- flags
- );
- }
- }
-
- wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
- if (!expander)
- {
- // TODO: last column for RTL support
- expander = GetOwner()->GetColumn( 0 );
- GetOwner()->SetExpanderColumn(expander);
- }
-
- // redraw all cells for all rows which must be repainted and for all columns
- wxRect cell_rect;
- cell_rect.x = x_start;
- cell_rect.height = m_lineHeight; // -1 is for the horizontal rules
- for (unsigned int i = col_start; i < col_last; i++)
- {
- wxDataViewColumn *col = GetOwner()->GetColumn( i );
- wxDataViewRenderer *cell = col->GetRenderer();
- cell_rect.width = col->GetWidth();
-
- if (col->IsHidden())
- continue; // skipt it!
-
-
- for (unsigned int item = item_start; item < item_last; item++)
- {
- // get the cell value and set it into the renderer
- wxVariant value;
- wxDataViewTreeNode * node = GetTreeNodeByRow(item);
- if( node == NULL )
- continue;
-
- wxDataViewItem dataitem = node->GetItem();
-
- if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem))
- continue;
-
- model->GetValue( value, dataitem, col->GetModelColumn());
- cell->SetValue( value );
-
- // update the y offset
- cell_rect.y = item * m_lineHeight;
-
- //Draw the expander here.
- int indent = node->GetIndentLevel();
- if( col == expander )
- {
- //Calculate the indent first
- indent = cell_rect.x + GetOwner()->GetIndent() * indent;
-
- int expander_width = m_lineHeight - 2*EXPANDER_MARGIN;
- // change the cell_rect.x to the appropriate pos
- int expander_x = indent + EXPANDER_MARGIN , expander_y = cell_rect.y + EXPANDER_MARGIN ;
- indent = indent + m_lineHeight ; //try to use the m_lineHeight as the expander space
- dc.SetPen( m_penExpander );
- dc.SetBrush( wxNullBrush );
- if( node->HasChildren() )
- {
- wxRect rect( expander_x , expander_y, expander_width, expander_width);
- int flag = 0;
- if (m_underMouse == node)
- {
- flag |= wxCONTROL_CURRENT;
- }
- if( node->IsOpen() )
- wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag|wxCONTROL_EXPANDED );
- else
- wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
- }
- else
- {
- // I am wandering whether we should draw dot lines between tree nodes
- delete node;
- //Yes, if the node does not have any child, it must be a leaf which mean that it is a temporarily created by GetTreeNodeByRow
- }
-
- //force the expander column to left-center align
- cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
- }
-
-
- // cannot be bigger than allocated space
- wxSize size = cell->GetSize();
- // Because of the tree structure indent, here we should minus the width of the cell for drawing
- size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent );
- // size.y = wxMin( size.y, cell_rect.height );
- size.y = cell_rect.height;
-
- wxRect item_rect(cell_rect.GetTopLeft(), size);
- int align = cell->GetAlignment();
-
- // horizontal alignment:
- item_rect.x = cell_rect.x;
- if (align & wxALIGN_CENTER_HORIZONTAL)
- item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2);
- else if (align & wxALIGN_RIGHT)
- item_rect.x = cell_rect.x + cell_rect.width - size.x;
- //else: wxALIGN_LEFT is the default
-
- // vertical alignment:
- item_rect.y = cell_rect.y;
- if (align & wxALIGN_CENTER_VERTICAL)
- item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2);
- else if (align & wxALIGN_BOTTOM)
- item_rect.y = cell_rect.y + cell_rect.height - size.y;
- //else: wxALIGN_TOP is the default
-
- // add padding
- item_rect.x += PADDING_RIGHTLEFT;
- item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
-
- //Here we add the tree indent
- item_rect.x += indent;
-
- int state = 0;
- if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))
- state |= wxDATAVIEW_CELL_SELECTED;
+}
- // TODO: it would be much more efficient to create a clipping
- // region for the entire column being rendered (in the OnPaint
- // of wxDataViewMainWindow) instead of a single clip region for
- // each cell. However it would mean that each renderer should
- // respect the given wxRect's top & bottom coords, eventually
- // violating only the left & right coords - however the user can
- // make its own renderer and thus we cannot be sure of that.
- dc.SetClippingRegion( item_rect );
- cell->Render( item_rect, &dc, state );
- dc.DestroyClippingRegion();
+void wxDataViewMainWindow::ScrollTo( int rows, int column )
+{
+ int x, y;
+ m_owner->GetScrollPixelsPerUnit( &x, &y );
+ int sy = GetLineStart( rows )/y;
+ int sx = 0;
+ if( column != -1 )
+ {
+ wxRect rect = GetClientRect();
+ int colnum = 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()->GetColumnAt(colnum);
+ if (col->IsHidden())
+ continue; // skip it!
+
+ w = col->GetWidth();
+ x_start += w;
}
- cell_rect.x += cell_rect.width;
+ int x_end = x_start + w;
+ xe = xx + rect.width;
+ if( x_end > xe )
+ {
+ sx = ( xx + x_end - xe )/x;
+ }
+ if( x_start < xx )
+ {
+ sx = x_start/x;
+ }
}
+ m_owner->Scroll( sx, sy );
}
int wxDataViewMainWindow::GetCountPerPage() const
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();
int y = 0;
m_owner->CalcUnscrolledPosition( x, y, &x, &y );
- return y / m_lineHeight;
+ return GetLineAt( y );
}
unsigned int wxDataViewMainWindow::GetLastVisibleRow()
&client_size.x, &client_size.y );
//we should deal with the pixel here
- unsigned int row = ((client_size.y)/m_lineHeight) - 1;
+ unsigned int row = GetLineAt(client_size.y) - 1;
return wxMin( GetRowCount()-1, row );
}
if ( m_count == -1 )
{
m_count = RecalculateCount();
- int width, height;
- GetVirtualSize( &width, &height );
- height = m_count * m_lineHeight;
-
- SetVirtualSize( width, height );
+ UpdateDisplay();
}
return m_count;
}
void wxDataViewMainWindow::RefreshRow( unsigned int row )
{
- wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight );
+ wxRect rect( 0, GetLineStart( row ), GetEndOfLastCol(), GetLineHeight( row ) );
m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
wxSize client_size = GetClientSize();
from = tmp;
}
- wxRect rect( 0, from*m_lineHeight, GetEndOfLastCol(), (to-from+1) * m_lineHeight );
+ wxRect rect( 0, GetLineStart( from ), GetEndOfLastCol(), GetLineStart( (to-from+1) ) );
m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
wxSize client_size = GetClientSize();
void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow )
{
- unsigned int count = GetRowCount();
- if (firstRow > count)
- return;
+ wxSize client_size = GetClientSize();
+ int start = GetLineStart( firstRow );
+ m_owner->CalcScrolledPosition( start, 0, &start, NULL );
+ if (start > client_size.y) return;
- wxRect rect( 0, firstRow*m_lineHeight, GetEndOfLastCol(), count * m_lineHeight );
- m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+ wxRect rect( 0, start, client_size.x, client_size.y - start );
- wxSize client_size = GetClientSize();
- wxRect client_rect( 0, 0, client_size.x, client_size.y );
- wxRect intersect_rect = client_rect.Intersect( rect );
- if (intersect_rect.width > 0)
- Refresh( true, &intersect_rect );
+ Refresh( true, &rect );
}
void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event)
{
wxRect rect;
rect.x = 0;
- rect.y = m_lineHeight * row;
+ rect.y = GetLineStart( row );
rect.width = GetEndOfLastCol();
- rect.height = m_lineHeight;
+ rect.height = GetLineHeight( row );
return rect;
}
+int wxDataViewMainWindow::GetLineStart( unsigned int row ) const
+{
+ const wxDataViewModel *model = GetOwner()->GetModel();
+
+ if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
+ {
+ // TODO make more efficient
+
+ int start = 0;
+
+ unsigned int r;
+ for (r = 0; r < row; r++)
+ {
+ const wxDataViewTreeNode* node = GetTreeNodeByRow(r);
+ if (!node) return start;
+
+ wxDataViewItem item = node->GetItem();
+
+ if (node && !node->HasChildren())
+ {
+ // Yes, if the node does not have any child, it must be a leaf which
+ // mean that it is a temporarily created by GetTreeNodeByRow
+ wxDELETE(node);
+ }
+
+ unsigned int cols = GetOwner()->GetColumnCount();
+ unsigned int col;
+ int height = m_lineHeight;
+ for (col = 0; col < cols; col++)
+ {
+ const wxDataViewColumn *column = GetOwner()->GetColumn(col);
+ if (column->IsHidden())
+ continue; // skip it!
+
+ if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item))
+ continue; // skip it!
+
+ const wxDataViewRenderer *renderer = column->GetRenderer();
+ wxVariant value;
+ model->GetValue( value, item, column->GetModelColumn() );
+ wxDataViewRenderer *renderer2 = const_cast<wxDataViewRenderer*>(renderer);
+ renderer2->SetValue( value );
+ height = wxMax( height, renderer->GetSize().y );
+ }
+
+
+ start += height;
+ }
+
+ return start;
+ }
+ else
+ {
+ return row * m_lineHeight;
+ }
+}
+
+int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
+{
+ const wxDataViewModel *model = GetOwner()->GetModel();
+
+ // check for the easy case first
+ if ( !GetOwner()->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) )
+ return y / m_lineHeight;
+
+ // TODO make more efficient
+ unsigned int row = 0;
+ unsigned int yy = 0;
+ for (;;)
+ {
+ const wxDataViewTreeNode* node = GetTreeNodeByRow(row);
+ if (!node)
+ {
+ // not really correct...
+ return row + ((y-yy) / m_lineHeight);
+ }
+
+ wxDataViewItem item = node->GetItem();
+
+ if (node && !node->HasChildren())
+ {
+ // Yes, if the node does not have any child, it must be a leaf which
+ // mean that it is a temporarily created by GetTreeNodeByRow
+ wxDELETE(node);
+ }
+
+ unsigned int cols = GetOwner()->GetColumnCount();
+ unsigned int col;
+ int height = m_lineHeight;
+ for (col = 0; col < cols; col++)
+ {
+ const wxDataViewColumn *column = GetOwner()->GetColumn(col);
+ if (column->IsHidden())
+ continue; // skip it!
+
+ if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item))
+ continue; // skip it!
+
+ const wxDataViewRenderer *renderer = column->GetRenderer();
+ wxVariant value;
+ model->GetValue( value, item, column->GetModelColumn() );
+ wxDataViewRenderer *renderer2 = const_cast<wxDataViewRenderer*>(renderer);
+ renderer2->SetValue( value );
+ height = wxMax( height, renderer->GetSize().y );
+ }
+
+ yy += height;
+ if (y < yy)
+ return row;
+
+ row++;
+ }
+}
+
+int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
+{
+ const wxDataViewModel *model = GetOwner()->GetModel();
+
+ if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
+ {
+ wxASSERT( !IsVirtualList() );
+
+ const wxDataViewTreeNode* node = GetTreeNodeByRow(row);
+ // wxASSERT( node );
+ if (!node) return m_lineHeight;
+
+ wxDataViewItem item = node->GetItem();
+
+ if (node && !node->HasChildren())
+ {
+ // Yes, if the node does not have any child, it must be a leaf which
+ // mean that it is a temporarily created by GetTreeNodeByRow
+ wxDELETE(node);
+ }
+
+ int height = m_lineHeight;
+
+ unsigned int cols = GetOwner()->GetColumnCount();
+ unsigned int col;
+ for (col = 0; col < cols; col++)
+ {
+ const wxDataViewColumn *column = GetOwner()->GetColumn(col);
+ if (column->IsHidden())
+ continue; // skip it!
+
+ if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item))
+ continue; // skip it!
+
+ const wxDataViewRenderer *renderer = column->GetRenderer();
+ wxVariant value;
+ model->GetValue( value, item, column->GetModelColumn() );
+ wxDataViewRenderer *renderer2 = const_cast<wxDataViewRenderer*>(renderer);
+ renderer2->SetValue( value );
+ height = wxMax( height, renderer->GetSize().y );
+ }
+
+ return height;
+ }
+ else
+ {
+ return m_lineHeight;
+ }
+}
+
class RowToItemJob: public DoJob
{
public:
- RowToItemJob( unsigned int row , int current ) { this->row = row; this->current = current ;}
- virtual ~RowToItemJob(){};
+ RowToItemJob( unsigned int row , int current ) { this->row = row; this->current = current;}
+ virtual ~RowToItemJob() { }
virtual int operator() ( wxDataViewTreeNode * node )
{
current ++;
if( current == static_cast<int>(row))
{
- ret = node->GetItem() ;
+ ret = node->GetItem();
return DoJob::OK;
}
current ++;
if( current == static_cast<int>(row))
{
- ret = wxDataViewItem( n ) ;
+ ret = wxDataViewItem( n );
return DoJob::OK;
}
return DoJob::CONT;
wxDataViewItem GetResult(){ return ret; }
private:
unsigned int row;
- int current ;
+ int current;
wxDataViewItem ret;
};
wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const
{
- RowToItemJob job( row, -2 );
- Walker( m_root , job );
- return job.GetResult();
+ if (!m_root)
+ {
+ return wxDataViewItem( wxUIntToPtr(row) );
+ }
+ else
+ {
+ RowToItemJob job( row, -2 );
+ Walker( m_root , job );
+ return job.GetResult();
+ }
}
class RowToTreeNodeJob: public DoJob
RowToTreeNodeJob( unsigned int row , int current, wxDataViewTreeNode * node )
{
this->row = row;
- this->current = current ;
- ret = NULL ;
+ this->current = current;
+ ret = NULL;
parent = node;
}
- virtual ~RowToTreeNodeJob(){};
+ virtual ~RowToTreeNodeJob(){ }
virtual int operator() ( wxDataViewTreeNode * node )
{
current ++;
if( current == static_cast<int>(row))
{
- ret = node ;
+ ret = node;
return DoJob::OK;
}
{
int index = static_cast<int>(row) - current - 1;
void * n = node->GetChildren().Item( index );
- ret = new wxDataViewTreeNode( parent ) ;
+ ret = new wxDataViewTreeNode( parent );
ret->SetItem( wxDataViewItem( n ));
ret->SetHasChildren(false);
return DoJob::OK;
current ++;
if( current == static_cast<int>(row))
{
- ret = new wxDataViewTreeNode( parent ) ;
+ ret = new wxDataViewTreeNode( parent );
ret->SetItem( wxDataViewItem( n ));
ret->SetHasChildren(false);
return DoJob::OK;
wxDataViewTreeNode * GetResult(){ return ret; }
private:
unsigned int row;
- int current ;
+ int current;
wxDataViewTreeNode * ret;
- wxDataViewTreeNode * parent ;
+ wxDataViewTreeNode * parent;
};
-wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row)
+wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) const
{
+ wxASSERT( !IsVirtualList() );
+
RowToTreeNodeJob job( row , -2, m_root );
Walker( m_root , job );
return job.GetResult();
return le;
}
+
+bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const
+{
+ if (IsVirtualList())
+ return false;
+
+ wxDataViewTreeNode * node = GetTreeNodeByRow(row);
+ if (!node)
+ return false;
+
+ if (!node->HasChildren())
+ {
+ delete node;
+ return false;
+ }
+
+ return node->IsOpen();
+}
+
+
void wxDataViewMainWindow::OnExpanding( unsigned int row )
{
+ if (IsVirtualList())
+ return;
+
wxDataViewTreeNode * node = GetTreeNodeByRow(row);
if( node != NULL )
{
if( node->GetChildrenNumber() == 0 )
{
SortPrepare();
- BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
+ ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
}
m_count = -1;
UpdateDisplay();
void wxDataViewMainWindow::OnCollapsing(unsigned int row)
{
+ if (IsVirtualList())
+ return;
+
wxDataViewTreeNode * node = GetTreeNodeByRow(row);
if( node != NULL )
{
node = node->GetParent();
if( node != NULL )
{
- int parent = GetRowByItem( node->GetItem() ) ;
+ int parent = GetRowByItem( node->GetItem() );
if( parent >= 0 )
{
SelectRow( row, false);
//Find the item along the parent-chain.
//This algorithm is designed to speed up the node-finding method
wxDataViewTreeNode * node = m_root;
- for( ItemList::const_iterator iter = list.begin(); iter !=list.end() ; iter++ )
+ for( ItemList::const_iterator iter = list.begin(); iter !=list.end(); iter++ )
{
if( node->HasChildren() )
{
if( node->GetChildrenNumber() == 0 )
{
SortPrepare();
- BuildTreeHelper(model, node->GetItem(), node);
+ ::BuildTreeHelper(model, node->GetItem(), node);
}
wxDataViewTreeNodes nodes = node->GetNodes();
- unsigned int i = 0;
- for (; i < nodes.GetCount(); i ++)
+ unsigned int i;
+ bool found = false;
+
+ for (i = 0; i < nodes.GetCount(); i ++)
{
if (nodes[i]->GetItem() == (**iter))
{
+ if (nodes[i]->GetItem() == item)
+ return nodes[i];
+
node = nodes[i];
+ found = true;
break;
}
}
- if (i == nodes.GetCount())
+ if (!found)
return NULL;
}
else
return NULL;
}
- return node;
+ return NULL;
}
void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column )
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!
}
column = col;
- item = GetItemByRow( y/m_lineHeight );
+ item = GetItemByRow( GetLineAt( y ) );
}
wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column )
{
int row = GetRowByItem(item);
- int y = row*m_lineHeight;
- int h = m_lineHeight;
+ int y = GetLineStart( row );
+ int h = GetLineHeight( m_lineHeight );
int x = 0;
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();
int wxDataViewMainWindow::RecalculateCount()
{
- return m_root->GetSubTreeCount();
+ if (!m_root)
+ {
+ wxDataViewIndexListModel *list_model = (wxDataViewIndexListModel*) GetOwner()->GetModel();
+#ifndef __WXMAC__
+ return list_model->GetLastIndex() + 1;
+#else
+ return list_model->GetLastIndex() - 1;
+#endif
+ }
+ else
+ {
+ return m_root->GetSubTreeCount();
+ }
}
class ItemToRowJob : public DoJob
{
public:
- ItemToRowJob(const wxDataViewItem & item, ItemList::const_iterator iter )
- { this->item = item ; ret = -1 ; m_iter = iter ; }
- virtual ~ItemToRowJob(){};
+ ItemToRowJob(const wxDataViewItem& item_, ItemList::const_iterator iter)
+ : m_iter(iter),
+ item(item_)
+ {
+ ret = -1;
+ }
//Maybe binary search will help to speed up this process
virtual int operator() ( wxDataViewTreeNode * node)
if( node->GetItem() == **m_iter )
{
- m_iter++ ;
+ m_iter++;
return DoJob::CONT;
}
else
return DoJob::CONT;
}
//the row number is begin from zero
- int GetResult(){ return ret -1 ; }
+ int GetResult() { return ret -1; }
+
private:
ItemList::const_iterator m_iter;
wxDataViewItem item;
};
-int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item)
+int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const
{
- wxDataViewModel * model = GetOwner()->GetModel();
+ const wxDataViewModel * model = GetOwner()->GetModel();
if( model == NULL )
return -1;
- if( !item.IsOk() )
- return -1;
-
- //Compose the a parent-chain of the finding item
- ItemList list;
- wxDataViewItem * pItem = NULL;
- list.DeleteContents( true );
- wxDataViewItem it( item );
- while( it.IsOk() )
+ if (!m_root)
{
- pItem = new wxDataViewItem( it );
- list.Insert( pItem );
- it = model->GetParent( it );
+ return wxPtrToUInt( item.GetID() );
}
- pItem = new wxDataViewItem( );
- list.Insert( pItem );
+ else
+ {
+ if( !item.IsOk() )
+ return -1;
- ItemToRowJob job( item, list.begin() );
- Walker(m_root , job );
- return job.GetResult();
+ //Compose the a parent-chain of the finding item
+ ItemList list;
+ wxDataViewItem * pItem;
+ list.DeleteContents( true );
+ wxDataViewItem it( item );
+ while( it.IsOk() )
+ {
+ pItem = new wxDataViewItem( it );
+ list.Insert( pItem );
+ it = model->GetParent( it );
+ }
+ pItem = new wxDataViewItem( );
+ list.Insert( pItem );
+
+ ItemToRowJob job( item, list.begin() );
+ Walker(m_root , job );
+ return job.GetResult();
+ }
}
-void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node)
+static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node)
{
if( !model->IsContainer( item ) )
- return ;
+ return;
wxDataViewItemArray children;
unsigned int num = model->GetChildren( item, children);
{
wxDataViewTreeNode * n = new wxDataViewTreeNode( node );
n->SetItem(children[index]);
- n->SetHasChildren( true ) ;
+ n->SetHasChildren( true );
node->AddNode( n );
}
else
void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
{
+ DestroyTree();
+
+ if (GetOwner()->GetModel()->IsVirtualListModel())
+ {
+ m_count = -1;
+ return;
+ }
+
+ m_root = new wxDataViewTreeNode( NULL );
+ m_root->SetHasChildren(true);
+
//First we define a invalid item to fetch the top-level elements
wxDataViewItem item;
SortPrepare();
BuildTreeHelper( model, item, m_root);
- m_count = -1 ;
+ m_count = -1;
}
-void DestroyTreeHelper( wxDataViewTreeNode * node )
+static void DestroyTreeHelper( wxDataViewTreeNode * node )
{
if( node->GetNodeNumber() != 0 )
{
int len = node->GetNodeNumber();
- int i = 0 ;
- wxDataViewTreeNodes nodes = node->GetNodes();
- for( ; i < len; i ++ )
+ int i = 0;
+ wxDataViewTreeNodes& nodes = node->GetNodes();
+ for(; i < len; i ++ )
{
DestroyTreeHelper(nodes[i]);
}
void wxDataViewMainWindow::DestroyTree()
{
- DestroyTreeHelper(m_root);
- m_root->SetSubTreeCount(0);
- m_count = 0 ;
+ if (!IsVirtualList())
+ {
+ ::DestroyTreeHelper(m_root);
+ m_count = 0;
+ m_root = NULL;
+ }
}
void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
{
- if (event.GetKeyCode() == WXK_TAB)
- {
- wxNavigationKeyEvent nevent;
- nevent.SetWindowChange( event.ControlDown() );
- nevent.SetDirection( !event.ShiftDown() );
- nevent.SetEventObject( GetParent()->GetParent() );
- nevent.SetCurrentFocus( m_parent );
- if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent ))
- return;
- }
+ if ( GetParent()->HandleAsNavigationKey(event) )
+ return;
// no item -> nothing to do
if (!HasCurrentRow())
{
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!
return;
wxDataViewRenderer *cell = col->GetRenderer();
- unsigned int current = y / m_lineHeight;
- if ((current > GetRowCount()) || (x > GetEndOfLastCol()))
+ unsigned int current = GetLineAt( y );
+ if ((current >= GetRowCount()) || (x > GetEndOfLastCol()))
{
// Unselect all if below the last row ?
return;
//Test whether the mouse is hovered on the tree item button
bool hover = false;
- if (GetOwner()->GetExpanderColumn() == col)
+ if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col))
{
wxDataViewTreeNode * node = GetTreeNodeByRow(current);
if( node!=NULL && node->HasChildren() )
{
int indent = node->GetIndentLevel();
indent = GetOwner()->GetIndent()*indent;
- wxRect rect( xpos + indent + EXPANDER_MARGIN, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN);
+ wxRect rect( xpos + indent + EXPANDER_MARGIN,
+ GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET,
+ m_lineHeight-2*EXPANDER_MARGIN,
+ m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET);
if( rect.Contains( x, y) )
{
//So the mouse is over the expander
wxVariant value;
model->GetValue( value, item, col->GetModelColumn() );
cell->SetValue( value );
- wxRect cell_rect( xpos, current * m_lineHeight,
- col->GetWidth(), m_lineHeight );
+ wxRect cell_rect( xpos, GetLineStart( current ),
+ col->GetWidth(), GetLineHeight( current ) );
cell->Activate( cell_rect, model, item, col->GetModelColumn() );
}
// select single line
SelectAllRows( false );
SelectRow( m_lineSelectSingleOnUp, true );
+ SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) );
}
//Process the event of user clicking the expander
bool expander = false;
- if (GetOwner()->GetExpanderColumn() == col)
+ if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col))
{
wxDataViewTreeNode * node = GetTreeNodeByRow(current);
if( node!=NULL && node->HasChildren() )
{
int indent = node->GetIndentLevel();
indent = GetOwner()->GetIndent()*indent;
- wxRect rect( xpos + indent + EXPANDER_MARGIN, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN);
+ wxRect rect( xpos + indent + EXPANDER_MARGIN,
+ GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET,
+ m_lineHeight-2*EXPANDER_MARGIN,
+ m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET);
+
if( rect.Contains( x, y) )
{
expander = true;
OnExpanding( current );
}
}
+ if (node && !node->HasChildren())
+ delete node;
}
//If the user click the expander, we do not do editing even if the column with expander are editable
if (m_lastOnSame && !expander && !ignore_other_columns)
{
if ((col == m_currentCol) && (current == m_currentRow) &&
- (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) )
+ (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) )
{
m_renameTimer->Start( 100, true );
}
SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
}
- // notify cell about right click
- // cell->...
-
- // Allow generation of context menu event
- event.Skip();
+ wxVariant value;
+ model->GetValue( value, item, col->GetModelColumn() );
+ wxWindow *parent = GetParent();
+ wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId());
+ le.SetItem( item );
+ le.SetEventObject(parent);
+ le.SetModel(GetOwner()->GetModel());
+ le.SetValue(value);
+ parent->GetEventHandler()->ProcessEvent(le);
}
else if (event.MiddleDown())
{
- // notify cell about middle click
- // cell->...
}
if (event.LeftDown() || forceClick)
{
m_lastOnSame = !forceClick && ((col == oldCurrentCol) &&
(current == oldCurrentRow)) && oldWasSelected;
+
+ // Call LeftClick after everything else as under GTK+
+ if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE)
+ {
+ // notify cell about right click
+ wxVariant value;
+ model->GetValue( value, item, col->GetModelColumn() );
+ cell->SetValue( value );
+ wxRect cell_rect( xpos, GetLineStart( current ),
+ col->GetWidth(), GetLineHeight( current ) );
+ /* ignore ret */ cell->LeftClick( event.GetPosition(), cell_rect, model, item, col->GetModelColumn());
+ }
}
}
//-----------------------------------------------------------------------------
// wxDataViewCtrl
//-----------------------------------------------------------------------------
-WX_DEFINE_LIST(wxDataViewColumnList);
+WX_DEFINE_LIST(wxDataViewColumnList)
IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
{
if (m_notifier)
GetModel()->RemoveNotifier( m_notifier );
+
+ m_cols.Clear();
}
void wxDataViewCtrl::Init()
{
+ 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,
const wxPoint& pos, const wxSize& size,
long style, const wxValidator& validator )
{
+ if ( (style & wxBORDER_MASK) == 0)
+ style |= wxBORDER_SUNKEN;
+
+ Init();
+
if (!wxControl::Create( parent, id, pos, size,
- style | wxScrolledWindowStyle|wxBORDER_SUNKEN, validator))
+ style | wxScrolledWindowStyle, validator))
return false;
SetInitialSize(size);
- Init();
-
#ifdef __WXMAC__
- MacSetClipChildren( true ) ;
+ MacSetClipChildren( true );
#endif
m_clientArea = new wxDataViewMainWindow( this, wxID_ANY );
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 ))
model->AddNotifier( m_notifier );
+ m_clientArea->DestroyTree();
+
m_clientArea->BuildTree(model);
m_clientArea->UpdateDisplay();
return false;
m_cols.Append( col );
- OnColumnChange();
+ OnColumnsCountChanged();
return true;
}
return false;
m_cols.Insert( col );
- OnColumnChange();
+ OnColumnsCountChanged();
+ return true;
+}
+
+bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
+{
+ if (!wxDataViewCtrlBase::InsertColumn(pos,col))
+ return false;
+
+ m_cols.Insert( pos, col );
+ 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 ++;
+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);
+}
+
+int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const
+{
+ const unsigned count = m_cols.size();
+ for ( unsigned n = 0; n < count; n++ )
+ {
+ if ( m_cols[n] == column )
+ return n;
}
- return NULL;
+
+ 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();
}
bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
{
- wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column );
- if (ret == NULL)
+ wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column );
+ if (!ret)
return false;
m_cols.Erase(ret);
- delete column;
- OnColumnChange();
+ OnColumnsCountChanged();
return true;
}
bool wxDataViewCtrl::ClearColumns()
{
- m_cols.clear();
- OnColumnChange();
+ m_cols.Clear();
+ 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) ;
+ 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::SetSelections( const wxArrayInt & sel )
{
- wxDataViewSelection selection(wxDataViewSelectionCmp) ;
+ wxDataViewSelection selection(wxDataViewSelectionCmp);
int len = sel.GetCount();
for( int i = 0; i < len; i ++ )
{
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