X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64b3c26259a7708d9dfe02c9a5ea8d80b6dec09f..6f3f9b50aa275243ade3541ecccb95de22cf57a9:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 6e22f1e1cf..f47731e5e4 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -2,6 +2,7 @@ // Name: src/generic/datavgen.cpp // Purpose: wxDataViewCtrl generic implementation // Author: Robert Roebling +// Modified by: Francesco Montorsi, Guru Kathiresan, Otto Wyss // Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence @@ -22,7 +23,9 @@ #ifndef WX_PRECOMP #ifdef __WXMSW__ + #include "wx/msw/private.h" #include "wx/msw/wrapwin.h" + #include "wx/msw/wrapcctl.h" // include "properly" #endif #include "wx/sizer.h" #include "wx/log.h" @@ -30,6 +33,7 @@ #include "wx/timer.h" #include "wx/settings.h" #include "wx/msgdlg.h" + #include "wx/dcscreen.h" #endif #include "wx/stockitem.h" @@ -38,6 +42,8 @@ #include "wx/renderer.h" #include "wx/dcbuffer.h" #include "wx/icon.h" +#include "wx/list.h" +#include "wx/listimpl.cpp" //----------------------------------------------------------------------------- // classes @@ -45,36 +51,191 @@ class wxDataViewCtrl; +static const int SCROLL_UNIT_X = 15; + +// the cell padding on the left/right +static const int PADDING_RIGHTLEFT = 3; + +// the cell padding on the top/bottom +static const int PADDING_TOPBOTTOM = 1; + +// the expander space margin +static const int EXPANDER_MARGIN = 4; + //----------------------------------------------------------------------------- // wxDataViewHeaderWindow //----------------------------------------------------------------------------- -class wxDataViewHeaderWindow: public wxWindow +#define USE_NATIVE_HEADER_WINDOW 1 + +// 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 { public: - wxDataViewHeaderWindow( wxDataViewCtrl *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - const wxString &name = wxT("wxdataviewctrlheaderwindow") ); - virtual ~wxDataViewHeaderWindow(); + wxDataViewHeaderWindowBase() + { m_owner = NULL; } + + bool Create(wxDataViewCtrl *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size, + const wxString &name) + { + 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; + } + +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") ) + { + Create(parent, id, pos, size, name); + } + + 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 when the main window gets scrolled + 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); + + unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR); + + wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR) + { return GetColumn(GetColumnIdxFromHeader(nmHDR)); } + +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") ) + { + Init(); + Create(parent, id, pos, size, name); + } + + bool Create(wxDataViewCtrl *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size, + const wxString &name); + + ~wxGenericDataViewHeaderWindow() + { + delete m_resizeCursor; + } + + virtual void UpdateDisplay() { Refresh(); } + + // event handlers: + void OnPaint( wxPaintEvent &event ); void OnMouse( wxMouseEvent &event ); void OnSetFocus( wxFocusEvent &event ); -private: - wxDataViewCtrl *m_owner; + +protected: + + // vars used for column resizing: + wxCursor *m_resizeCursor; + const wxCursor *m_currentCursor; + bool m_isDragging; + + bool m_dirty; // needs refresh? + 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 + + // the pen used to draw the current column width drag line + // when resizing the columsn + wxPen m_penCurrent; + + + // internal utilities: + + void Init() + { + m_currentCursor = (wxCursor *) NULL; + m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); + + m_isDragging = false; + m_dirty = false; + + m_column = wxNOT_FOUND; + m_currentX = 0; + m_minX = 0; + + wxColour col = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); + m_penCurrent = wxPen(col, 1, wxSOLID); + } + + void DrawCurrent(); + void AdjustDC(wxDC& dc); private: - DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindow) + DECLARE_DYNAMIC_CLASS(wxGenericDataViewHeaderWindow) DECLARE_EVENT_TABLE() }; +#endif // defined(__WXMSW__) + //----------------------------------------------------------------------------- // wxDataViewRenameTimer //----------------------------------------------------------------------------- @@ -90,49 +251,161 @@ public: }; //----------------------------------------------------------------------------- -// wxDataViewTextCtrlWrapper: wraps a wxTextCtrl for inline editing +// wxDataViewTreeNode //----------------------------------------------------------------------------- +class wxDataViewTreeNode; +WX_DEFINE_SORTED_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes ); +WX_DEFINE_SORTED_ARRAY( void* , wxDataViewTreeLeaves); -class wxDataViewTextCtrlWrapper : public wxEvtHandler +int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode * node1, wxDataViewTreeNode * node2); +int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2); + +class wxDataViewTreeNode { public: - // NB: text must be a valid object but not Create()d yet - wxDataViewTextCtrlWrapper( wxDataViewMainWindow *owner, - wxTextCtrl *text, - wxDataViewListModel *model, - unsigned int col, unsigned int row, - wxRect cellLabel ); + wxDataViewTreeNode( wxDataViewTreeNode * parent ) + :leaves( wxGenericTreeModelItemCmp ), + nodes(wxGenericTreeModelNodeCmp) + { this->parent = parent; + if( parent == NULL ) + open = true; + else + open = false; + hasChildren = false; + subTreeCount = 0; + } + //I don't know what I need to do in the destructure + ~wxDataViewTreeNode() + { - wxTextCtrl *GetText() const { return m_text; } + } - void AcceptChangesAndFinish(); + wxDataViewTreeNode * GetParent() { return parent; } + void SetParent( wxDataViewTreeNode * parent ) { this->parent = parent; } + wxDataViewTreeNodes & GetNodes() { return nodes; } + wxDataViewTreeLeaves & GetChildren() { return leaves; } -protected: - void OnChar( wxKeyEvent &event ); - void OnKeyUp( wxKeyEvent &event ); - void OnKillFocus( wxFocusEvent &event ); + void AddNode( wxDataViewTreeNode * node ) + { + nodes.Add( node ); + leaves.Add( node->GetItem().GetID() ); + } + void AddLeaf( void * leaf ) { leaves.Add( leaf ); } - bool AcceptChanges(); - void Finish(); + wxDataViewItem & GetItem() { return item; } + void SetItem( const wxDataViewItem & item ) { this->item = item; } -private: - wxDataViewMainWindow *m_owner; - wxTextCtrl *m_text; - wxString m_startValue; - wxDataViewListModel *m_model; - unsigned int m_col; - unsigned int m_row; - bool m_finished; - bool m_aboutToFinish; + unsigned int GetChildrenNumber() { return leaves.GetCount(); } + unsigned int GetNodeNumber() { return nodes.GetCount(); } + int GetIndentLevel() + { + int ret = 0 ; + wxDataViewTreeNode * node = this; + while( node->GetParent()->GetParent() != NULL ) + { + node = node->GetParent(); + ret ++; + } + return ret; + } - DECLARE_EVENT_TABLE() + bool IsOpen() + { + return open ; + } + + void ToggleOpen() + { + int len = nodes.GetCount(); + int sum = 0; + for ( int i = 0 ;i < len ; i ++) + sum += nodes[i]->GetSubTreeCount(); + + sum += leaves.GetCount(); + if( open ) + { + ChangeSubTreeCount(-sum); + open = !open; + } + else + { + open = !open; + ChangeSubTreeCount(sum); + } + } + bool HasChildren() { return hasChildren; } + void SetHasChildren( bool has ){ hasChildren = has; } + + void SetSubTreeCount( int num ) { subTreeCount = num; } + int GetSubTreeCount() { return subTreeCount; } + void ChangeSubTreeCount( int num ) + { + if( !open ) + return ; + subTreeCount += num; + if( parent ) + parent->ChangeSubTreeCount(num); + } + + void Resort() + { + wxDataViewTreeNodes nds = nodes; + wxDataViewTreeLeaves lvs = leaves; + nodes.Empty(); + leaves.Empty(); + + int len = nds.GetCount(); + if(len > 0) + { + int i; + for(i = 0; i < len; i ++) + nodes.Add(nds[i]); + for(i = 0; i < len; i ++) + nodes[i]->Resort(); + } + + len = lvs.GetCount(); + if(len > 0) + { + for(int i = 0; i < len; i++) + leaves.Add(lvs[i]); + } + } + +private: + wxDataViewTreeNode * parent; + wxDataViewTreeNodes nodes; + wxDataViewTreeLeaves leaves; + wxDataViewItem item; + bool open; + bool hasChildren; + int subTreeCount; }; +//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; + +int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode * node1, wxDataViewTreeNode * node2) +{ + return g_model->Compare( node1->GetItem(), node2->GetItem() ); +} + +int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2) +{ + return g_model->Compare( id1, id2 ); +} + + + //----------------------------------------------------------------------------- // wxDataViewMainWindow //----------------------------------------------------------------------------- -WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection, WXDLLIMPEXP_ADV); +WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection, + WXDLLIMPEXP_ADV); +WX_DECLARE_LIST(wxDataViewItem, ItemList); +WX_DEFINE_LIST(ItemList); class wxDataViewMainWindow: public wxWindow { @@ -144,18 +417,18 @@ public: const wxString &name = wxT("wxdataviewctrlmainwindow") ); virtual ~wxDataViewMainWindow(); - // notifications from wxDataViewListModel - bool RowAppended(); - bool RowPrepended(); - bool RowInserted( unsigned int before ); - bool RowDeleted( unsigned int row ); - bool RowChanged( unsigned int row ); - bool ValueChanged( unsigned int col, unsigned int row ); - bool RowsReordered( unsigned int *new_order ); + // notifications from wxDataViewModel + bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ); + bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ); + bool ItemChanged( const wxDataViewItem &item ); + bool ValueChanged( const wxDataViewItem &item, unsigned int col ); bool Cleared(); + void Resort() + { g_model = GetOwner()->GetModel(); m_root->Resort(); UpdateDisplay(); } void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } wxDataViewCtrl *GetOwner() { return m_owner; } + const wxDataViewCtrl *GetOwner() const { return m_owner; } void OnPaint( wxPaintEvent &event ); void OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event); @@ -169,22 +442,25 @@ public: void OnInternalIdle(); void OnRenameTimer(); - void FinishEditing( wxTextCtrl *text ); - void ScrollWindow( int dx, int dy, const wxRect *rect ); + void ScrollWindow( int dx, int dy, const wxRect *rect = NULL ); bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; } void ChangeCurrentRow( unsigned int row ); - bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); }; + bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); } bool IsEmpty() { return GetRowCount() == 0; } - int GetCountPerPage(); - int GetEndOfLastCol(); - unsigned int GetFirstVisibleRow(); + int GetCountPerPage() const; + int GetEndOfLastCol() const; + 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(); + void Select( const wxArrayInt& aSelections ); void SelectAllRows( bool on ); void SelectRow( unsigned int row, bool on ); void SelectRows( unsigned int from, unsigned int to, bool on ); @@ -195,17 +471,44 @@ public: void RefreshRows( unsigned int from, unsigned int to ); void RefreshRowsAfter( unsigned int firstRow ); + // returns the colour to be used for drawing the rules + wxColour GetRuleColour() const + { + return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); + } + + //void EnsureVisible( unsigned int row ); + wxRect GetLineRect( unsigned int row ) const; + + //Some useful functions for row and item mapping + wxDataViewItem GetItemByRow( unsigned int row ); + unsigned int GetRowByItem( const wxDataViewItem & item ); + + //Methods for building the mapping tree + void BuildTree( wxDataViewModel * model ); + void DestroyTree(); +private: + wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ); + //We did not need this temporarily + //wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item ); + + int RecalculateCount() ; + + void OnExpanding( unsigned int row ); + void OnCollapsing( unsigned int row ); + + wxDataViewTreeNode * FindNode( const wxDataViewItem & item ); + private: wxDataViewCtrl *m_owner; int m_lineHeight; bool m_dirty; wxDataViewColumn *m_currentCol; - unsigned int m_currentRow; + unsigned int m_currentRow; wxDataViewSelection m_selection; wxDataViewRenameTimer *m_renameTimer; - wxDataViewTextCtrlWrapper *m_textctrlWrapper; bool m_lastOnSame; bool m_hasFocus; @@ -218,37 +521,42 @@ private: m_lineBeforeLastClicked, m_lineSelectSingleOnUp; + // the pen used to draw horiz/vertical rules + wxPen m_penRule; + + // the pen used to draw the expander and the lines + wxPen m_penExpander; + + //This is the tree structure of the model + wxDataViewTreeNode * m_root; + int m_count; private: DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow) DECLARE_EVENT_TABLE() }; // --------------------------------------------------------- -// wxGenericDataViewListModelNotifier +// wxGenericDataViewModelNotifier // --------------------------------------------------------- -class wxGenericDataViewListModelNotifier: public wxDataViewListModelNotifier +class wxGenericDataViewModelNotifier: public wxDataViewModelNotifier { public: - wxGenericDataViewListModelNotifier( wxDataViewMainWindow *mainWindow ) + wxGenericDataViewModelNotifier( wxDataViewMainWindow *mainWindow ) { m_mainWindow = mainWindow; } - virtual bool RowAppended() - { return m_mainWindow->RowAppended(); } - virtual bool RowPrepended() - { return m_mainWindow->RowPrepended(); } - virtual bool RowInserted( unsigned int before ) - { return m_mainWindow->RowInserted( before ); } - virtual bool RowDeleted( unsigned int row ) - { return m_mainWindow->RowDeleted( row ); } - virtual bool RowChanged( unsigned int row ) - { return m_mainWindow->RowChanged( row ); } - virtual bool ValueChanged( unsigned int col, unsigned int row ) - { return m_mainWindow->ValueChanged( col, row ); } - virtual bool RowsReordered( unsigned int *new_order ) - { return m_mainWindow->RowsReordered( new_order ); } + virtual bool ItemAdded( const wxDataViewItem & parent, const wxDataViewItem & item ) + { return m_mainWindow->ItemAdded( parent , item ); } + virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) + { return m_mainWindow->ItemDeleted( parent, item ); } + virtual bool ItemChanged( const wxDataViewItem & item ) + { return m_mainWindow->ItemChanged(item); } + virtual bool ValueChanged( const wxDataViewItem & item , unsigned int col ) + { return m_mainWindow->ValueChanged( item, col ); } virtual bool Cleared() { return m_mainWindow->Cleared(); } + virtual void Resort() + { m_mainWindow->Resort(); } wxDataViewMainWindow *m_mainWindow; }; @@ -259,10 +567,14 @@ public: IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase) -wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewRendererBase( varianttype, mode ) +wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, + wxDataViewCellMode mode, + int align) : + wxDataViewRendererBase( varianttype, mode, align ) { m_dc = NULL; + m_align = align; + m_mode = mode; } wxDataViewRenderer::~wxDataViewRenderer() @@ -292,8 +604,8 @@ wxDC *wxDataViewRenderer::GetDC() IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer) wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, - wxDataViewCellMode mode ) : - wxDataViewRenderer( varianttype, mode ) + wxDataViewCellMode mode, int align ) : + wxDataViewRenderer( varianttype, mode, align ) { } @@ -303,8 +615,9 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewCustomRenderer) -wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCustomRenderer( varianttype, mode ) +wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, + wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) { } @@ -315,20 +628,53 @@ bool wxDataViewTextRenderer::SetValue( const wxVariant &value ) return true; } -bool wxDataViewTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) +bool wxDataViewTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const { return false; } -bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) +bool wxDataViewTextRenderer::HasEditorCtrl() +{ + return true; +} + +wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent, + wxRect labelRect, const wxVariant &value ) +{ + return new wxTextCtrl( parent, wxID_ANY, value, + wxPoint(labelRect.x,labelRect.y), + wxSize(labelRect.width,labelRect.height) ); +} + +bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant &value ) { + wxTextCtrl *text = (wxTextCtrl*) editor; + value = text->GetValue(); + return true; +} + +bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int state ) +{ + wxDataViewCtrl *view = GetOwner()->GetOwner(); + wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ? + wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) : + view->GetForegroundColour(); + + dc->SetTextForeground(col); dc->DrawText( m_text, cell.x, cell.y ); return true; } -wxSize wxDataViewTextRenderer::GetSize() +wxSize wxDataViewTextRenderer::GetSize() const { + const wxDataViewCtrl *view = GetView(); + if (!m_text.empty()) + { + int x,y; + view->GetTextExtent( m_text, &x, &y ); + return wxSize( x, y ); + } return wxSize(80,20); } @@ -338,8 +684,9 @@ wxSize wxDataViewTextRenderer::GetSize() IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewCustomRenderer) -wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCustomRenderer( varianttype, mode ) +wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, + wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) { } @@ -353,7 +700,7 @@ bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value ) return true; } -bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) +bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) const { return false; } @@ -368,7 +715,7 @@ bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state return true; } -wxSize wxDataViewBitmapRenderer::GetSize() +wxSize wxDataViewBitmapRenderer::GetSize() const { if (m_bitmap.Ok()) return wxSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() ); @@ -385,8 +732,8 @@ wxSize wxDataViewBitmapRenderer::GetSize() IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewCustomRenderer) wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype, - wxDataViewCellMode mode ) : - wxDataViewCustomRenderer( varianttype, mode ) + wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) { m_toggle = false; } @@ -398,7 +745,7 @@ bool wxDataViewToggleRenderer::SetValue( const wxVariant &value ) return true; } -bool wxDataViewToggleRenderer::GetValue( wxVariant &WXUNUSED(value) ) +bool wxDataViewToggleRenderer::GetValue( wxVariant &WXUNUSED(value) ) const { return false; } @@ -428,16 +775,18 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state return true; } -bool wxDataViewToggleRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *model, unsigned int col, unsigned int row ) +bool wxDataViewToggleRenderer::Activate( wxRect WXUNUSED(cell), + wxDataViewModel *model, + const wxDataViewItem & item, unsigned int col) { bool value = !m_toggle; wxVariant variant = value; - model->SetValue( variant, col, row ); - model->ValueChanged( col, row ); + model->SetValue( variant, item, col); + model->ValueChanged( item, col ); return true; } -wxSize wxDataViewToggleRenderer::GetSize() +wxSize wxDataViewToggleRenderer::GetSize() const { return wxSize(20,20); } @@ -449,8 +798,8 @@ wxSize wxDataViewToggleRenderer::GetSize() IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer) wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label, - const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCustomRenderer( varianttype, mode ) + const wxString &varianttype, wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) { m_label = label; m_value = 0; @@ -470,6 +819,12 @@ bool wxDataViewProgressRenderer::SetValue( const wxVariant &value ) return true; } +bool wxDataViewProgressRenderer::GetValue( wxVariant &value ) const +{ + value = (long) m_value; + return true; +} + bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { double pct = (double)m_value / 100.0; @@ -486,7 +841,7 @@ bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(sta return true; } -wxSize wxDataViewProgressRenderer::GetSize() +wxSize wxDataViewProgressRenderer::GetSize() const { return wxSize(40,12); } @@ -495,18 +850,20 @@ wxSize wxDataViewProgressRenderer::GetSize() // wxDataViewDateRenderer // --------------------------------------------------------- -#if wxUSE_CALENDARCTRL +#define wxUSE_DATE_RENDERER_POPUP (wxUSE_CALENDARCTRL && wxUSE_POPUPWIN) + +#if wxUSE_DATE_RENDERER_POPUP class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow { public: wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value, - wxDataViewListModel *model, unsigned int col, unsigned int row ) : - wxPopupTransientWindow( parent, wxBORDER_SIMPLE ) + wxDataViewModel *model, const wxDataViewItem & item, unsigned int col) : + wxPopupTransientWindow( parent, wxBORDER_SIMPLE ), + m_item( item ) { m_model = model; m_col = col; - m_row = row; m_cal = new wxCalendarCtrl( this, wxID_ANY, *value ); wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL ); sizer->Add( m_cal, 1, wxGROW ); @@ -517,9 +874,9 @@ public: void OnCalendar( wxCalendarEvent &event ); wxCalendarCtrl *m_cal; - wxDataViewListModel *m_model; + wxDataViewModel *m_model; unsigned int m_col; - unsigned int m_row; + const wxDataViewItem & m_item; protected: virtual void OnDismiss() @@ -538,18 +895,18 @@ void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event ) { wxDateTime date = event.GetDate(); wxVariant value = date; - m_model->SetValue( value, m_col, m_row ); - m_model->ValueChanged( m_col, m_row ); + m_model->SetValue( value, m_item, m_col ); + m_model->ValueChanged( m_item, m_col ); DismissAndNotify(); } -#endif // wxUSE_CALENDARCTRL +#endif // wxUSE_DATE_RENDERER_POPUP IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer) wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype, - wxDataViewCellMode mode ) : - wxDataViewCustomRenderer( varianttype, mode ) + wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) { } @@ -560,6 +917,12 @@ bool wxDataViewDateRenderer::SetValue( const wxVariant &value ) return true; } +bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const +{ + value = m_date; + return true; +} + bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { dc->SetFont( GetOwner()->GetOwner()->GetFont() ); @@ -569,31 +932,32 @@ bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) return true; } -wxSize wxDataViewDateRenderer::GetSize() +wxSize wxDataViewDateRenderer::GetSize() const { - wxDataViewCtrl* view = GetOwner()->GetOwner(); + const wxDataViewCtrl* view = GetView(); wxString tmp = m_date.FormatDate(); wxCoord x,y,d; view->GetTextExtent( tmp, &x, &y, &d ); return wxSize(x,y+d); } -bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *model, unsigned int col, unsigned int row ) +bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model, + const wxDataViewItem & item, unsigned int col ) { wxVariant variant; - model->GetValue( variant, col, row ); + model->GetValue( variant, item, col ); wxDateTime value = variant.GetDateTime(); -#if wxUSE_CALENDARCTRL +#if wxUSE_DATE_RENDERER_POPUP wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient( - GetOwner()->GetOwner()->GetParent(), &value, model, col, row ); + GetOwner()->GetOwner()->GetParent(), &value, model, item, col); wxPoint pos = wxGetMousePosition(); popup->Move( pos ); popup->Layout(); popup->Popup( popup->m_cal ); -#else +#else // !wxUSE_DATE_RENDERER_POPUP wxMessageBox(value.Format()); -#endif +#endif // wxUSE_DATE_RENDERER_POPUP/!wxUSE_DATE_RENDERER_POPUP return true; } @@ -603,92 +967,480 @@ bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewListMode IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase) -wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, unsigned int model_column, - int width, int flags ) : - wxDataViewColumnBase( title, cell, model_column, width, flags ) +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() { - m_width = width; - if (m_width < 0) - m_width = 80; } -wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, unsigned int model_column, - int width, int flags ) : - wxDataViewColumnBase( bitmap, cell, model_column, width, flags ) +void wxDataViewColumn::Init( int width ) { m_width = width; - if (m_width < 0) - m_width = 30; + m_minWidth = wxDVC_DEFAULT_MINWIDTH; + m_ascending = true; } -void wxDataViewColumn::SetAlignment( wxAlignment WXUNUSED(align) ) +void wxDataViewColumn::SetResizeable( bool resizeable ) { - // TODO + if (resizeable) + m_flags |= wxDATAVIEW_COL_RESIZABLE; + else + m_flags &= ~wxDATAVIEW_COL_RESIZABLE; } -void wxDataViewColumn::SetSortable( bool WXUNUSED(sortable) ) +void wxDataViewColumn::SetHidden( bool hidden ) { - // TODO + 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(); } -bool wxDataViewColumn::GetSortable() +void wxDataViewColumn::SetSortable( bool sortable ) { - // TODO - return false; + if (sortable) + m_flags |= wxDATAVIEW_COL_SORTABLE; + else + m_flags &= ~wxDATAVIEW_COL_SORTABLE; + + // Update header button + if (GetOwner()) + GetOwner()->OnColumnChange(); +} + +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 ) +{ + m_owner->m_headerArea->UpdateDisplay(); + + SetInternalWidth(width); } -void wxDataViewColumn::SetSortOrder( bool WXUNUSED(ascending) ) + +//----------------------------------------------------------------------------- +// wxDataViewHeaderWindowBase +//----------------------------------------------------------------------------- + +void wxDataViewHeaderWindowBase::SendEvent(wxEventType type, unsigned int n) { - // TODO + 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); } -bool wxDataViewColumn::IsSortOrderAscending() +#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW + +// 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 ) { - // TODO + m_owner = parent; + + if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) ) + return 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 ? 22 : size.y; + + // create the native WC_HEADER window: + WXHWND hwndParent = (HWND)parent->GetHandle(); + WXDWORD msStyle = WS_CHILD | HDS_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG; + 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; + } + + // 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()); + + RECT rcParent; + HDLAYOUT hdl; + WINDOWPOS wp; + + // Retrieve the bounding rectangle of the parent window's + // client area, and then request size and position values + // from the header control. + ::GetClientRect((HWND)hwndParent, &rcParent); + + hdl.prc = &rcParent; + hdl.pwpos = ℘ + if (!SendMessage((HWND)m_hWnd, HDM_LAYOUT, 0, (LPARAM) &hdl)) + { + wxLogLastError(_T("SendMessage")); + return false; + } + + // Set the size, position, and visibility of the header control. + SetWindowPos((HWND)m_hWnd, + wp.hwndInsertAfter, + wp.x, wp.y, + wp.cx, wp.cy, + wp.flags | SWP_SHOWWINDOW); + + // 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, wp.cy)); + SetMaxSize(wxSize(-1, wp.cy)); + return true; } +wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow() +{ + UnsubclassWin(); +} -wxDataViewColumn::~wxDataViewColumn() +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); + + // add the updated array of columns to the header control + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int added = 0; + wxDataViewModel * model = GetOwner()->GetModel(); + for (unsigned int i = 0; i < cols; i++) + { + wxDataViewColumn *col = GetColumn( i ); + if (col->IsHidden()) + continue; // don't add 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; + + // 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! + wxFAIL; + } + + SendMessage((HWND)m_hWnd, HDM_INSERTITEM, + (WPARAM)added, (LPARAM)&hdi); + added++; + } } -void wxDataViewColumn::SetTitle( const wxString &title ) +unsigned int wxDataViewHeaderWindowMSW::GetColumnIdxFromHeader(NMHEADER *nmHDR) { - wxDataViewColumnBase::SetTitle( title ); + 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; } -void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap ) +bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) { - wxDataViewColumnBase::SetBitmap( bitmap ); + 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 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 && model->GetSortingColumn() == idx) + { + bool order = col->IsSortOrderAscending(); + col->SetSortOrder(!order); + model->SetSortOrderAscending(!order); + } + else if(model) + { + model->SetSortingColumn(idx); + model->SetSortOrderAscending(true); + } + } + 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; } -int wxDataViewColumn::GetWidth() +void wxDataViewHeaderWindowMSW::ScrollWindow(int WXUNUSED(dx), int WXUNUSED(dy), + const wxRect *WXUNUSED(rect)) { - return m_width; + wxSize ourSz = GetClientSize(); + wxSize ownerSz = m_owner->GetClientSize(); + + // where should the (logical) origin of this window be placed? + int x1 = 0, y1 = 0; + m_owner->CalcUnscrolledPosition(0, 0, &x1, &y1); + + // put this window on top of our parent and + SetWindowPos((HWND)m_hWnd, HWND_TOP, -x1, 0, + ownerSz.GetWidth() + x1, ourSz.GetHeight(), + SWP_SHOWWINDOW); } -//----------------------------------------------------------------------------- -// wxDataViewHeaderWindow -//----------------------------------------------------------------------------- +void wxDataViewHeaderWindowMSW::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(w), int WXUNUSED(h), + int WXUNUSED(f)) +{ + // the wxDataViewCtrl's internal wxBoxSizer will call this function when + // the wxDataViewCtrl window gets resized: the following dummy call + // to ScrollWindow() is required in order to get this header window + // correctly repainted when it's (horizontally) scrolled: + + ScrollWindow(0, 0); +} -IMPLEMENT_ABSTRACT_CLASS(wxDataViewHeaderWindow, wxWindow) +#else // !defined(__WXMSW__) -BEGIN_EVENT_TABLE(wxDataViewHeaderWindow,wxWindow) - EVT_PAINT (wxDataViewHeaderWindow::OnPaint) - EVT_MOUSE_EVENTS (wxDataViewHeaderWindow::OnMouse) - EVT_SET_FOCUS (wxDataViewHeaderWindow::OnSetFocus) +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() -wxDataViewHeaderWindow::wxDataViewHeaderWindow( wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, const wxString &name ) : - wxWindow( parent, id, pos, size, 0, name ) +bool wxGenericDataViewHeaderWindow::Create(wxDataViewCtrl *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size, + const wxString &name ) { - SetOwner( parent ); + m_owner = parent; - m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); + if (!wxDataViewHeaderWindowBase::Create(parent, id, pos, size, name)) + return false; wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes(); SetBackgroundStyle( wxBG_STYLE_CUSTOM ); @@ -696,14 +1448,17 @@ wxDataViewHeaderWindow::wxDataViewHeaderWindow( wxDataViewCtrl *parent, wxWindow SetOwnBackgroundColour( attr.colBg ); if (!m_hasFont) SetOwnFont( attr.font ); -} -wxDataViewHeaderWindow::~wxDataViewHeaderWindow() -{ - delete m_resizeCursor; + // 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 wxDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) +void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { int w, h; GetClientSize( &w, &h ); @@ -724,203 +1479,247 @@ void wxDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.SetFont( GetFont() ); - unsigned int cols = GetOwner()->GetNumberOfColumns(); + unsigned int cols = GetOwner()->GetColumnCount(); unsigned int i; int xpos = 0; for (i = 0; i < cols; i++) { - wxDataViewColumn *col = GetOwner()->GetColumn( i ); - int width = col->GetWidth(); + wxDataViewColumn *col = GetColumn( i ); + if (col->IsHidden()) + continue; // skip it! - int cw = width; + int cw = col->GetWidth(); int ch = h; + wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE; + if (col->IsSortable()) + { + if (col->IsSortOrderAscending()) + sortArrow = wxHDR_SORT_ICON_UP; + else + sortArrow = wxHDR_SORT_ICON_DOWN; + } + wxRendererNative::Get().DrawHeaderButton ( this, dc, wxRect(xpos, 0, cw, ch-1), m_parent->IsEnabled() ? 0 - : (int)wxCONTROL_DISABLED + : (int)wxCONTROL_DISABLED, + sortArrow ); - dc.DrawText( col->GetTitle(), xpos+3, 3 ); + // 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_CENTER: + case wxALIGN_CENTER_HORIZONTAL: + x += (cw - titleSz.GetWidth() - 2 * HEADER_HORIZ_BORDER)/2; + break; + case wxALIGN_RIGHT: + x += cw - titleSz.GetWidth() - HEADER_HORIZ_BORDER; + break; + } - xpos += width; - } -} + // always center the title vertically: + int y = wxMax((ch - titleSz.GetHeight()) / 2, HEADER_VERT_BORDER); -void wxDataViewHeaderWindow::OnMouse( wxMouseEvent &WXUNUSED(event) ) -{ + 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 wxDataViewHeaderWindow::OnSetFocus( wxFocusEvent &event ) +void wxGenericDataViewHeaderWindow::OnSetFocus( wxFocusEvent &event ) { GetParent()->SetFocus(); event.Skip(); } -//----------------------------------------------------------------------------- -// wxDataViewRenameTimer -//----------------------------------------------------------------------------- - -wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner ) +void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) { - m_owner = owner; -} + // we want to work with logical coords + int x; + m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL); + int y = event.GetY(); -void wxDataViewRenameTimer::Notify() -{ - m_owner->OnRenameTimer(); -} + 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; + + // erase the line if it was drawn + if (m_currentX < w) + DrawCurrent(); + + if (event.ButtonUp()) + { + m_isDragging = false; + if (HasCapture()) + ReleaseMouse(); -//----------------------------------------------------------------------------- -// wxDataViewTextCtrlWrapper: wraps a wxTextCtrl for inline editing -//----------------------------------------------------------------------------- + m_dirty = true; -BEGIN_EVENT_TABLE(wxDataViewTextCtrlWrapper, wxEvtHandler) - EVT_CHAR (wxDataViewTextCtrlWrapper::OnChar) - EVT_KEY_UP (wxDataViewTextCtrlWrapper::OnKeyUp) - EVT_KILL_FOCUS (wxDataViewTextCtrlWrapper::OnKillFocus) -END_EVENT_TABLE() + GetColumn(m_column)->SetWidth(m_currentX - m_minX); -wxDataViewTextCtrlWrapper::wxDataViewTextCtrlWrapper( - wxDataViewMainWindow *owner, - wxTextCtrl *text, - wxDataViewListModel *model, - unsigned int col, unsigned int row, - wxRect rectLabel ) -{ - m_owner = owner; - m_model = model; - m_row = row; - m_col = col; - m_text = text; + Refresh(); + GetOwner()->Refresh(); + } + else + { + m_currentX = wxMax(m_minX + 7, x); - m_finished = false; - m_aboutToFinish = false; + // draw in the new location + if (m_currentX < w) DrawCurrent(); + } - wxVariant value; - model->GetValue( value, col, row ); - m_startValue = value.GetString(); + } + else // not dragging + { + m_minX = 0; + m_column = wxNOT_FOUND; - m_owner->GetOwner()->CalcScrolledPosition( - rectLabel.x, rectLabel.y, &rectLabel.x, &rectLabel.y ); + bool hit_border = false; - m_text->Create( owner, wxID_ANY, m_startValue, - wxPoint(rectLabel.x-2,rectLabel.y-2), - wxSize(rectLabel.width+7,rectLabel.height+4) ); - m_text->SetFocus(); + // end of the current column + int xpos = 0; - m_text->PushEventHandler(this); -} + // find the column where this event occured + int countCol = m_owner->GetColumnCount(); + for (int column = 0; column < countCol; column++) + { + wxDataViewColumn *p = GetColumn(column); -void wxDataViewTextCtrlWrapper::AcceptChangesAndFinish() -{ - m_aboutToFinish = true; + if (p->IsHidden()) + continue; // skip if not shown - // Notify the owner about the changes - AcceptChanges(); + xpos += p->GetWidth(); + m_column = column; + if ((abs(x-xpos) < 3) && (y < 22)) + { + hit_border = true; + break; + } - // Even if vetoed, close the control (consistent with MSW) - Finish(); -} + if (x < xpos) + { + // inside the column + break; + } -void wxDataViewTextCtrlWrapper::OnChar( wxKeyEvent &event ) -{ - switch ( event.m_keyCode ) - { - case WXK_RETURN: - AcceptChangesAndFinish(); - break; + m_minX = xpos; + } - case WXK_ESCAPE: - // m_owner->OnRenameCancelled( m_itemEdited ); - Finish(); - break; + if (m_column == wxNOT_FOUND) + return; - default: - event.Skip(); + 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; + DrawCurrent(); + } + else // click on a column + { + wxEventType evt = event.LeftDown() ? + wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK : + wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK; + SendEvent(evt, m_column); + } + } + else if (event.Moving()) + { + if (hit_border && resizeable) + m_currentCursor = m_resizeCursor; + else + m_currentCursor = wxSTANDARD_CURSOR; + + SetCursor(*m_currentCursor); + } } } -void wxDataViewTextCtrlWrapper::OnKeyUp( wxKeyEvent &event ) +void wxGenericDataViewHeaderWindow::DrawCurrent() { - if (m_finished) - { - event.Skip(); - return; - } + int x1 = m_currentX; + int y1 = 0; + ClientToScreen (&x1, &y1); - // auto-grow the textctrl - wxSize parentSize = m_owner->GetSize(); - wxPoint myPos = m_text->GetPosition(); - wxSize mySize = m_text->GetSize(); - int sx, sy; - m_text->GetTextExtent(m_text->GetValue() + _T("MM"), &sx, &sy); - if (myPos.x + sx > parentSize.x) - sx = parentSize.x - myPos.x; - if (mySize.x > sx) - sx = mySize.x; - m_text->SetSize(sx, wxDefaultCoord); + int x2 = m_currentX-1; +#ifdef __WXMSW__ + ++x2; // but why ???? +#endif + int y2 = 0; + m_owner->GetClientSize( NULL, &y2 ); + m_owner->ClientToScreen( &x2, &y2 ); - event.Skip(); + wxScreenDC dc; + dc.SetLogicalFunction(wxINVERT); + dc.SetPen(m_penCurrent); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + AdjustDC(dc); + dc.DrawLine(x1, y1, x2, y2); } -void wxDataViewTextCtrlWrapper::OnKillFocus( wxFocusEvent &event ) +void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc) { - if ( !m_finished && !m_aboutToFinish ) - { - AcceptChanges(); - //if ( !AcceptChanges() ) - // m_owner->OnRenameCancelled( m_itemEdited ); + int xpix, x; - Finish(); - } + m_owner->GetScrollPixelsPerUnit( &xpix, NULL ); + m_owner->GetViewStart( &x, NULL ); - // We must let the native text control handle focus - event.Skip(); + // 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 ); } -bool wxDataViewTextCtrlWrapper::AcceptChanges() -{ - const wxString value = m_text->GetValue(); - - if ( value == m_startValue ) - // nothing changed, always accept - return true; +#endif // defined(__WXMSW__) -// if ( !m_owner->OnRenameAccept(m_itemEdited, value) ) - // vetoed by the user -// return false; - - // accepted, do rename the item - wxVariant variant; - variant = value; - m_model->SetValue( variant, m_col, m_row ); - m_model->ValueChanged( m_col, m_row ); +//----------------------------------------------------------------------------- +// wxDataViewRenameTimer +//----------------------------------------------------------------------------- - return true; +wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner ) +{ + m_owner = owner; } -void wxDataViewTextCtrlWrapper::Finish() +void wxDataViewRenameTimer::Notify() { - if ( !m_finished ) - { - m_finished = true; - - m_text->RemoveEventHandler(this); - m_owner->FinishEditing(m_text); - - // delete later - wxPendingDelete.Append( this ); - } + 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; @@ -949,14 +1748,19 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i m_lastOnSame = false; m_renameTimer = new wxDataViewRenameTimer( this ); - m_textctrlWrapper = NULL; // TODO: user better initial values/nothing selected m_currentCol = NULL; m_currentRow = 0; // TODO: we need to calculate this smartly - m_lineHeight = 20; + m_lineHeight = +#ifdef __WXMSW__ + 17; +#else + 20; +#endif + wxASSERT(m_lineHeight > 2*PADDING_TOPBOTTOM); m_dragCount = 0; m_dragStart = wxPoint(0,0); @@ -969,11 +1773,22 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i SetBackgroundStyle( wxBG_STYLE_CUSTOM ); SetBackgroundColour( *wxWHITE ); + m_penRule = wxPen(GetRuleColour(), 1, wxSOLID); + + //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); + + //Make m_count = -1 will cause the class recaculate the real displaying number of rows. + m_count = -1 ; UpdateDisplay(); } wxDataViewMainWindow::~wxDataViewMainWindow() { + DestroyTree(); delete m_renameTimer; } @@ -984,78 +1799,263 @@ void wxDataViewMainWindow::OnRenameTimer() if ( m_dirty ) wxSafeYield(); - int xpos = 0; - unsigned int cols = GetOwner()->GetNumberOfColumns(); + unsigned int cols = GetOwner()->GetColumnCount(); unsigned int i; for (i = 0; i < cols; i++) { wxDataViewColumn *c = GetOwner()->GetColumn( i ); + if (c->IsHidden()) + continue; // skip it! + if (c == m_currentCol) break; xpos += c->GetWidth(); } - wxRect labelRect( xpos, m_currentRow * m_lineHeight, m_currentCol->GetWidth(), m_lineHeight ); + wxRect labelRect( xpos, m_currentRow * m_lineHeight, + m_currentCol->GetWidth(), m_lineHeight ); - wxClassInfo *textControlClass = CLASSINFO(wxTextCtrl); + GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y, + &labelRect.x, &labelRect.y); - wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject(); - m_textctrlWrapper = new wxDataViewTextCtrlWrapper(this, text, GetOwner()->GetModel(), - m_currentCol->GetModelColumn(), m_currentRow, labelRect ); + wxDataViewItem item = GetItemByRow( m_currentRow ); + m_currentCol->GetRenderer()->StartEditing( item, labelRect ); } -void wxDataViewMainWindow::FinishEditing( wxTextCtrl *text ) +//------------------------------------------------------------------ +// Helper class for do operation on the tree node +//------------------------------------------------------------------ +class DoJob { - delete text; - m_textctrlWrapper = NULL; - SetFocus(); - // SetFocusIgnoringChildren(); -} +public: + 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() ( void * n ) = 0; +}; -bool wxDataViewMainWindow::RowAppended() +#if 0 +class ItemAddJob: public DoJob { - return false; -} +public: + ItemAddJob( const wxDataViewItem & parent, const wxDataViewItem & item, int * count ) + { this->parent = parent ; this->item = item ; m_count = count; } + virtual ~ItemAddJob(){}; + + virtual int operator() ( wxDataViewTreeNode * node ) + { + if( node->GetItem() == parent ) + { + node->SetHasChildren( true ); + wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node ); + newnode->SetItem(item); + node->AppendChild( newnode); + *m_count = -1; + return OK; + } + return CONT; + } + +private: + int * m_count; + wxDataViewItem parent, item; +}; +#endif -bool wxDataViewMainWindow::RowPrepended() +bool Walker( wxDataViewTreeNode * node, DoJob & func ) { + if( node==NULL || !node->HasChildren()) + return false; + + wxDataViewTreeNodes nodes = node->GetNodes(); + wxDataViewTreeLeaves leaves = node->GetChildren(); + + int len_nodes = nodes.GetCount(); + int len = leaves.GetCount(); + int i = 0, nodes_i = 0; + for( ; i < len ; i ++ ) + { + void * n = leaves[i]; + if( nodes_i < len_nodes && n == nodes[nodes_i]->GetItem().GetID() ) + { + wxDataViewTreeNode * nd = nodes[nodes_i]; + nodes_i++; + + switch( func( nd ) ) + { + case DoJob::OK : + return true ; + case DoJob::IGR: + continue; + case DoJob::CONT: + default: + ; + } + + if( Walker( nd , func ) ) + return true; + + } + else + switch( func( n ) ) + { + case DoJob::OK : + return true ; + case DoJob::IGR: + continue; + case DoJob::CONT: + default: + ; + } + } return false; } -bool wxDataViewMainWindow::RowInserted( unsigned int WXUNUSED(before) ) +bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item) { - return false; + g_model = GetOwner()->GetModel(); + + wxDataViewTreeNode * node; + node = FindNode(parent); + + if( node == NULL ) + return false; + + node->SetHasChildren( true ); + + if( g_model->IsContainer( item ) ) + { + wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node ); + newnode->SetItem(item); + node->AddNode( newnode); + } + else + node->AddLeaf( item.GetID() ); + + node->ChangeSubTreeCount(1); + + m_count = -1; + UpdateDisplay(); + return true; } -bool wxDataViewMainWindow::RowDeleted( unsigned int WXUNUSED(row) ) +#if 0 +class ItemDeleteJob: public DoJob { - return false; -} +public: + ItemDeleteJob( const wxDataViewItem & item, int * count ) { m_item = item; m_count = count; } + virtual ~ItemDeleteJob(){} + virtual int operator() ( wxDataViewTreeNode * node ) + { + if( node->GetItem() == m_item ) + { + node->GetParent()->GetChildren().Remove( node ); + delete node; + *m_count = -1; + return DoJob::OK; + } + return DoJob::CONT; + } -bool wxDataViewMainWindow::RowChanged( unsigned int WXUNUSED(row) ) +private: + int * m_count; + wxDataViewItem m_item; +}; +#endif + +void DestroyTreeHelper( wxDataViewTreeNode * node); + +bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, + const wxDataViewItem& item) { - return false; + g_model = GetOwner()->GetModel(); + + wxDataViewTreeNode * node; + node = FindNode(parent); + + if( node == NULL || node->GetChildren().Index( item.GetID() ) == wxNOT_FOUND ) + { + return false; + } + + int sub = -1; + node->GetChildren().Remove( item.GetID() ); + if( GetOwner()->GetModel()->IsContainer( item ) ) + { + wxDataViewTreeNode * n = NULL; + wxDataViewTreeNodes nodes = node->GetNodes(); + int len = nodes.GetCount(); + for( int i = 0 ; i < len; i ++) + { + if( nodes[i]->GetItem() == item ) + { + n = nodes[i]; + break; + } + } + + if (!n) + return false; + + node->GetNodes().Remove( n ); + sub -= n->GetSubTreeCount(); + DestroyTreeHelper(n); + } + + if( node->GetChildrenNumber() == 0) + node->SetHasChildren( false ); + + //Make the row number invalid and get a new valid one when user call GetRowCount + m_count = -1; + node->ChangeSubTreeCount(sub); + //Change the current row to the last row if the current exceed the max row number + if( m_currentRow > GetRowCount() ) + m_currentRow = m_count - 1; + + UpdateDisplay(); + return true; } -bool wxDataViewMainWindow::ValueChanged( unsigned int WXUNUSED(col), unsigned int row ) +bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) { - wxRect rect( 0, row*m_lineHeight, 10000, m_lineHeight ); - m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - Refresh( true, &rect ); + g_model = GetOwner()->GetModel(); + unsigned int row = GetRowByItem(item); + RefreshRow( row ); return true; } -bool wxDataViewMainWindow::RowsReordered( unsigned int *WXUNUSED(new_order) ) +bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int WXUNUSED(col) ) { - Refresh(); + // NOTE: to be valid, we cannot use e.g. INT_MAX - 1 +/*#define MAX_VIRTUAL_WIDTH 100000 + + wxRect rect( 0, row*m_lineHeight, MAX_VIRTUAL_WIDTH, m_lineHeight ); + m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + Refresh( true, &rect ); + return true; +*/ + g_model = GetOwner()->GetModel(); + + unsigned int row = GetRowByItem(item); + RefreshRow( row ); return true; } bool wxDataViewMainWindow::Cleared() { - return false; + g_model = GetOwner()->GetModel(); + + DestroyTree(); + UpdateDisplay(); + return true; } void wxDataViewMainWindow::UpdateDisplay() @@ -1076,23 +2076,15 @@ void wxDataViewMainWindow::OnInternalIdle() void wxDataViewMainWindow::RecalculateDisplay() { - wxDataViewListModel *model = GetOwner()->GetModel(); + wxDataViewModel *model = GetOwner()->GetModel(); if (!model) { Refresh(); return; } - int width = 0; - unsigned int cols = GetOwner()->GetNumberOfColumns(); - unsigned int i; - for (i = 0; i < cols; i++) - { - wxDataViewColumn *col = GetOwner()->GetColumn( i ); - width += col->GetWidth(); - } - - int height = model->GetNumberOfRows() * m_lineHeight; + int width = GetEndOfLastCol(); + int height = GetRowCount() * m_lineHeight; SetVirtualSize( width, height ); GetOwner()->SetScrollRate( 10, m_lineHeight ); @@ -1103,42 +2095,113 @@ void wxDataViewMainWindow::RecalculateDisplay() void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) { wxWindow::ScrollWindow( dx, dy, rect ); - GetOwner()->m_headerArea->ScrollWindow( dx, 0 ); + + if (GetOwner()->m_headerArea) + GetOwner()->m_headerArea->ScrollWindow( dx, 0 ); } 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 ); - wxDataViewListModel *model = GetOwner()->GetModel(); - + // 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)(model->GetNumberOfRows()-item_start) ); + 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); + } - unsigned int item; - for (item = item_start; item < item_start+item_count; item++) + // redraw the background for the items which are selected/current + for (unsigned int item = item_start; item < item_last; item++) { - if (m_selection.Index( item ) != wxNOT_FOUND) + bool selected = m_selection.Index( item ) != wxNOT_FOUND; + if (selected || item == m_currentRow) { - int flags = wxCONTROL_SELECTED; + int flags = selected ? (int)wxCONTROL_SELECTED : 0; if (item == m_currentRow) flags |= wxCONTROL_CURRENT; if (m_hasFocus) flags |= wxCONTROL_FOCUSED; - wxRect rect( 0, item*m_lineHeight+1, GetEndOfLastCol(), m_lineHeight-2 ); + + wxRect rect( x_start, item*m_lineHeight, x_last, m_lineHeight ); wxRendererNative::Get().DrawItemSelectionRect ( this, @@ -1147,85 +2210,149 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) flags ); } - else - { - if (item == m_currentRow) - { - int flags = wxCONTROL_CURRENT; - if (m_hasFocus) - flags |= wxCONTROL_FOCUSED; // should have no effect - wxRect rect( 0, item*m_lineHeight+1, GetEndOfLastCol(), m_lineHeight-2 ); - wxRendererNative::Get().DrawItemSelectionRect - ( - this, - dc, - rect, - flags - ); - - } - } } + // redraw all cells for all rows which must be repainted and for all columns wxRect cell_rect; - cell_rect.x = 0; - cell_rect.height = m_lineHeight; - unsigned int cols = GetOwner()->GetNumberOfColumns(); - unsigned int i; - for (i = 0; i < cols; i++) + 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(); - for (item = item_start; item < item_start+item_count; item++) + if (col->IsHidden()) + continue; // skipt it! + + for (unsigned int item = item_start; item < item_last; item++) { - cell_rect.y = item*m_lineHeight; + // get the cell value and set it into the renderer wxVariant value; - model->GetValue( value, col->GetModelColumn(), item ); + wxDataViewTreeNode * node = GetTreeNodeByRow(item); + if( node == NULL ) + { + continue; + } + + wxDataViewItem dataitem = node->GetItem(); + model->GetValue( value, dataitem, col->GetModelColumn()); cell->SetValue( value ); - wxSize size = cell->GetSize(); - // cannot be bigger than allocated space - size.x = wxMin( size.x, cell_rect.width ); - size.y = wxMin( size.y, cell_rect.height ); - // TODO: check for left/right/centre alignment here - wxRect item_rect; - // for now: centre - item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2); - item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2); - item_rect.width = size.x; - item_rect.height= size.y; + // update the y offset + cell_rect.y = item * m_lineHeight; + + //Draw the expander here. + int indent = node->GetIndentLevel(); + if( col->GetModelColumn() == GetOwner()->GetExpanderColumn() ) + { + //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() ) + { + //dc.DrawRoundedRectangle( expander_x,expander_y,expander_width,expander_width, 1.0); + //dc.DrawLine( expander_x + 2 , expander_y + expander_width/2, expander_x + expander_width - 2, expander_y + expander_width/2 ); + wxRect rect( expander_x , expander_y, expander_width, expander_width); + if( node->IsOpen() ) + wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, wxCONTROL_EXPANDED ); + else + wxRendererNative::Get().DrawTreeItemButton( this, dc, rect ); + } + 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 + 2*PADDING_TOPBOTTOM, 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.y += PADDING_TOPBOTTOM; + item_rect.width = size.x - 2 * PADDING_RIGHTLEFT; + item_rect.height = size.y - 2 * PADDING_TOPBOTTOM; + + //Here we add the tree indent + item_rect.x += indent; int state = 0; - if (item == m_currentRow) + if (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(); } cell_rect.x += cell_rect.width; } } -int wxDataViewMainWindow::GetCountPerPage() +int wxDataViewMainWindow::GetCountPerPage() const { wxSize size = GetClientSize(); return size.y / m_lineHeight; } -int wxDataViewMainWindow::GetEndOfLastCol() +int wxDataViewMainWindow::GetEndOfLastCol() const { int width = 0; unsigned int i; - for (i = 0; i < GetOwner()->GetNumberOfColumns(); i++) + for (i = 0; i < GetOwner()->GetColumnCount(); i++) { - wxDataViewColumn *c = GetOwner()->GetColumn( i ); - width += c->GetWidth(); + const wxDataViewColumn *c = + wx_const_cast(wxDataViewCtrl*, GetOwner())->GetColumn( i ); + + if (!c->IsHidden()) + width += c->GetWidth(); } return width; } -unsigned int wxDataViewMainWindow::GetFirstVisibleRow() +unsigned int wxDataViewMainWindow::GetFirstVisibleRow() const { int x = 0; int y = 0; @@ -1237,14 +2364,24 @@ unsigned int wxDataViewMainWindow::GetFirstVisibleRow() unsigned int wxDataViewMainWindow::GetLastVisibleRow() { wxSize client_size = GetClientSize(); - m_owner->CalcUnscrolledPosition( client_size.x, client_size.y, &client_size.x, &client_size.y ); + m_owner->CalcUnscrolledPosition( client_size.x, client_size.y, + &client_size.x, &client_size.y ); return wxMin( GetRowCount()-1, ((unsigned)client_size.y/m_lineHeight)+1 ); } unsigned int wxDataViewMainWindow::GetRowCount() { - return GetOwner()->GetModel()->GetNumberOfRows(); + if ( m_count == -1 ) + { + m_count = RecalculateCount(); + int width, height; + GetVirtualSize( &width, &height ); + height = m_count * m_lineHeight; + + SetVirtualSize( width, height ); + } + return m_count; } void wxDataViewMainWindow::ChangeCurrentRow( unsigned int row ) @@ -1327,6 +2464,17 @@ void wxDataViewMainWindow::SelectRows( unsigned int from, unsigned int to, bool RefreshRows( from, to ); } +void wxDataViewMainWindow::Select( const wxArrayInt& aSelections ) +{ + for (size_t i=0; i < aSelections.GetCount(); i++) + { + int n = aSelections[i]; + + m_selection.Add( n ); + RefreshRow( n ); + } +} + void wxDataViewMainWindow::ReverseRowSelection( unsigned int row ) { if (m_selection.Index( row ) == wxNOT_FOUND) @@ -1432,7 +2580,394 @@ void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent RefreshRow( m_currentRow ); } - // MoveToFocus(); + //EnsureVisible( m_currentRow ); +} + +wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const +{ + wxRect rect; + rect.x = 0; + rect.y = m_lineHeight * row; + rect.width = GetEndOfLastCol(); + rect.height = m_lineHeight; + + return rect; +} + +class RowToItemJob: public DoJob +{ +public: + RowToItemJob( unsigned int row , int current ) { this->row = row; this->current = current ;} + virtual ~RowToItemJob(){}; + + virtual int operator() ( wxDataViewTreeNode * node ) + { + current ++; + if( current == static_cast(row)) + { + ret = node->GetItem() ; + return DoJob::OK; + } + + if( node->GetSubTreeCount() + current < static_cast(row) ) + { + current += node->GetSubTreeCount(); + return DoJob::IGR; + } + else + return DoJob::CONT; + } + + virtual int operator() ( void * n ) + { + current ++; + if( current == static_cast(row)) + { + ret = wxDataViewItem( n ) ; + return DoJob::OK; + } + return DoJob::CONT; + } + wxDataViewItem GetResult(){ return ret; } +private: + unsigned int row; + int current ; + wxDataViewItem ret; +}; + +wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) +{ + RowToItemJob job( row, -1 ); + Walker( m_root , job ); + return job.GetResult(); +} + +class RowToTreeNodeJob: public DoJob +{ +public: + RowToTreeNodeJob( unsigned int row , int current, wxDataViewTreeNode * node ) + { + this->row = row; + this->current = current ; + ret = NULL ; + parent = node; + } + virtual ~RowToTreeNodeJob(){}; + + virtual int operator() ( wxDataViewTreeNode * node ) + { + current ++; + if( current == static_cast(row)) + { + ret = node ; + return DoJob::OK; + } + + if( node->GetSubTreeCount() + current < static_cast(row) ) + { + current += node->GetSubTreeCount(); + return DoJob::IGR; + } + else + { + parent = node; + return DoJob::CONT; + } + + } + + virtual int operator() ( void * n ) + { + current ++; + if( current == static_cast(row)) + { + ret = new wxDataViewTreeNode( parent ) ; + ret->SetItem( wxDataViewItem( n )); + ret->SetHasChildren(false); + return DoJob::OK; + } + + return DoJob::CONT; + } + wxDataViewTreeNode * GetResult(){ return ret; } +private: + unsigned int row; + int current ; + wxDataViewTreeNode * ret; + wxDataViewTreeNode * parent ; +}; + + +wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) +{ + RowToTreeNodeJob job( row , -1, m_root ); + Walker( m_root , job ); + return job.GetResult(); +} + +#if 0 +class CountJob : public DoJob +{ +public: + CountJob(){ count = 0 ; } + virtual ~CountJob(){}; + + virtual int operator () ( wxDataViewTreeNode * node ) + { + count ++; + if ( node->IsOpen()) + return DoJob::CONT; + else + return DoJob::IGR; + } + + unsigned int GetResult() + { + return count ; + } +private: + unsigned int count; +}; +#endif + +void wxDataViewMainWindow::OnExpanding( unsigned int row ) +{ + wxDataViewTreeNode * node = GetTreeNodeByRow(row); + if( node != NULL ) + { + if( node->HasChildren()) + if( !node->IsOpen()) + { + node->ToggleOpen(); + //Here I build the children of current node + if( node->GetChildrenNumber() == 0 ) + BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); + m_count = -1; + UpdateDisplay(); + } + else + { + SelectRow( row, false ); + SelectRow( row + 1, true ); + ChangeCurrentRow( row + 1 ); + } + else + delete node; + } +} + +void wxDataViewMainWindow::OnCollapsing(unsigned int row) +{ + wxDataViewTreeNode * node = GetTreeNodeByRow(row); + if( node != NULL ) + { + wxDataViewTreeNode * nd = node; + + if( node->HasChildren() && node->IsOpen() ) + { + node->ToggleOpen(); + m_count = -1; + UpdateDisplay(); + //RefreshRows(row,GetLastVisibleRow()); + } + else + { + node = node->GetParent(); + if( node != NULL ) + { + int parent = GetRowByItem( node->GetItem()) ; + SelectRow( row, false); + SelectRow(parent , true ); + ChangeCurrentRow( parent ); + } + } + if( !nd->HasChildren()) + delete nd; + } +} + +wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item ) +{ + wxDataViewModel * model = GetOwner()->GetModel(); + if( model == NULL ) + return NULL; + + //Compose the a parent-chain of the finding item + ItemList list; + list.DeleteContents( true ); + wxDataViewItem it( item ); + while( it.IsOk() ) + { + wxDataViewItem * pItem = new wxDataViewItem( it ); + list.Insert( pItem ); + it = model->GetParent( it ); + } + + //Find the item along the parent-chain. + //This algorithm is designed to speed up the node-finding method + bool found = true; + wxDataViewTreeNode * node = m_root; + for( ItemList::Node * n = list.GetFirst(); n; n = n->GetNext() ) + { + if( node->HasChildren() ) + { + if( node->GetChildrenNumber() == 0 ) + BuildTreeHelper(model, node->GetItem(), node); + + int len = node->GetNodeNumber(); + wxDataViewTreeNodes nodes = node->GetNodes(); + int j = 0; + for( ; j < len; j ++) + { + if( nodes[j]->GetItem() == *(n->GetData())) + { + node = nodes[j]; + break; + } + } + // Whenever we can't find the node in any level, return NULL to indicate the item can't be found + if( j == len ) + { + found = false; + return NULL; + } + } + else + return NULL; + } + return node; +} + +int wxDataViewMainWindow::RecalculateCount() +{ + return m_root->GetSubTreeCount(); +} + +class ItemToRowJob : public DoJob +{ +public: + ItemToRowJob(const wxDataViewItem & item, ItemList::Node * node ) + { this->item = item ; ret = 0 ; nd = node ; } + virtual ~ItemToRowJob(){}; + + virtual int operator() ( wxDataViewTreeNode * node) + { + ret ++; + if( node->GetItem() == item ) + { + return DoJob::OK; + } + + if( nd && node->GetItem() == *(nd->GetData())) + { + nd = nd->GetNext(); + return DoJob::CONT; + } + else + { + ret += node->GetSubTreeCount(); + return DoJob::IGR; + } + + } + + virtual int operator() ( void * n ) + { + ret ++; + if( n == item.GetID() ) + return DoJob::OK; + return DoJob::CONT; + } + //the row number is begin from zero + int GetResult(){ return ret -1 ; } +private: + ItemList::Node * nd; + wxDataViewItem item; + int ret; + +}; + +unsigned int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) +{ + wxDataViewModel * model = GetOwner()->GetModel(); + if( model == NULL ) + return 0; + + //Compose the a parent-chain of the finding item + ItemList list; + list.DeleteContents( true ); + wxDataViewItem it( item ); + while( it.IsOk() ) + { + wxDataViewItem * pItem = new wxDataViewItem( it ); + list.Insert( pItem ); + it = model->GetParent( it ); + } + + ItemToRowJob job( item, list.GetFirst() ); + Walker(m_root , job ); + return job.GetResult(); +} + +void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node) +{ + if( !model->IsContainer( item ) ) + return ; + + wxDataViewItem i = model->GetFirstChild( item ); + int num = 0; + while( i.IsOk() ) + { + num ++; + if( model->IsContainer( i ) ) + { + wxDataViewTreeNode * n = new wxDataViewTreeNode( node ); + n->SetItem(i); + n->SetHasChildren( true ) ; + node->AddNode( n ); + } + else + { + node->AddLeaf( i.GetID() ); + } + i = model->GetNextSibling( i ); + } + node->SetSubTreeCount( num ); + wxDataViewTreeNode * n = node->GetParent(); + if( n != NULL) + n->ChangeSubTreeCount(num); + +} + +void wxDataViewMainWindow::BuildTree(wxDataViewModel * model) +{ + //First we define a invalid item to fetch the top-level elements + wxDataViewItem item; + g_model = GetOwner()->GetModel(); + BuildTreeHelper( model, item, m_root); + m_count = -1 ; +} + +void DestroyTreeHelper( wxDataViewTreeNode * node ) +{ + if( node->GetNodeNumber() != 0 ) + { + int len = node->GetNodeNumber(); + int i = 0 ; + wxDataViewTreeNodes nodes = node->GetNodes(); + for( ; i < len; i ++ ) + { + DestroyTreeHelper(nodes[i]); + } + } + delete node; +} + +void wxDataViewMainWindow::DestroyTree() +{ + DestroyTreeHelper(m_root); + m_root->SetSubTreeCount(0); + m_count = 0 ; } void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) @@ -1470,7 +3005,13 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) if ( m_currentRow < GetRowCount() - 1 ) OnArrowChar( m_currentRow + 1, event ); break; - + //Add the process for tree expanding/collapsing + case WXK_LEFT: + OnCollapsing(m_currentRow); + break; + case WXK_RIGHT: + OnExpanding( m_currentRow); + break; case WXK_END: if (!IsEmpty()) OnArrowChar( GetRowCount() - 1, event ); @@ -1525,11 +3066,14 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) wxDataViewColumn *col = NULL; int xpos = 0; - unsigned int cols = GetOwner()->GetNumberOfColumns(); + unsigned int cols = GetOwner()->GetColumnCount(); unsigned int i; for (i = 0; i < cols; i++) { wxDataViewColumn *c = GetOwner()->GetColumn( i ); + if (c->IsHidden()) + continue; // skip it! + if (x < xpos + c->GetWidth()) { col = c; @@ -1549,7 +3093,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) return; } - wxDataViewListModel *model = GetOwner()->GetModel(); + wxDataViewModel *model = GetOwner()->GetModel(); if (event.Dragging()) { @@ -1591,11 +3135,13 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE) { + wxDataViewItem item = GetItemByRow(current); wxVariant value; - model->GetValue( value, col->GetModelColumn(), current ); + model->GetValue( value, item, col->GetModelColumn() ); cell->SetValue( value ); - wxRect cell_rect( xpos, current * m_lineHeight, col->GetWidth(), m_lineHeight ); - cell->Activate( cell_rect, model, col->GetModelColumn(), current ); + wxRect cell_rect( xpos, current * m_lineHeight, + col->GetWidth(), m_lineHeight ); + cell->Activate( cell_rect, model, item, col->GetModelColumn() ); } return; } @@ -1616,7 +3162,26 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) SelectRow( m_lineSelectSingleOnUp, true ); } - if (m_lastOnSame) + //Process the event of user clicking the expander + bool expander = false; + 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); + if( rect.Contains( x, y) ) + { + expander = true; + if( node->IsOpen() ) + OnCollapsing(current); + else + OnExpanding( current ); + } + } + + //If the user click the expander, we do not do editing even if the column with expander are editable + if (m_lastOnSame && !expander ) { if ((col == m_currentCol) && (current == m_currentRow) && (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) ) @@ -1729,7 +3294,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) // Update selection here... m_currentCol = col; - m_lastOnSame = !forceClick && ((col == oldCurrentCol) && (current == oldCurrentRow)) && oldWasSelected; + m_lastOnSame = !forceClick && ((col == oldCurrentCol) && + (current == oldCurrentRow)) && oldWasSelected; } } @@ -1753,6 +3319,14 @@ void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event ) event.Skip(); } +wxDataViewItem wxDataViewMainWindow::GetSelection() +{ + if( m_selection.GetCount() != 1 ) + return wxDataViewItem(); + + return GetItemByRow( m_selection.Item(0)); +} + //----------------------------------------------------------------------------- // wxDataViewCtrl //----------------------------------------------------------------------------- @@ -1778,7 +3352,8 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) { - if (!wxControl::Create( parent, id, pos, size, style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator)) + if (!wxControl::Create( parent, id, pos, size, + style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator)) return false; Init(); @@ -1788,16 +3363,17 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, #endif m_clientArea = new wxDataViewMainWindow( this, wxID_ANY ); -#ifdef __WXMSW__ - m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,22) ); -#else - m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,25) ); -#endif + + if (HasFlag(wxDV_NO_HEADER)) + m_headerArea = NULL; + else + m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY ); SetTargetWindow( m_clientArea ); wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); - sizer->Add( m_headerArea, 0, wxGROW ); + if (m_headerArea) + sizer->Add( m_headerArea, 0, wxGROW ); sizer->Add( m_clientArea, 1, wxGROW ); SetSizer( sizer ); @@ -1837,15 +3413,17 @@ void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) AdjustScrollbars(); } -bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model ) +bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) { if (!wxDataViewCtrlBase::AssociateModel( model )) return false; - m_notifier = new wxGenericDataViewListModelNotifier( m_clientArea ); + m_notifier = new wxGenericDataViewModelNotifier( m_clientArea ); model->AddNotifier( m_notifier ); + m_clientArea->BuildTree(model); + m_clientArea->UpdateDisplay(); return true; @@ -1856,24 +3434,47 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) if (!wxDataViewCtrlBase::AppendColumn(col)) return false; + OnColumnChange(); + return true; +} + +void wxDataViewCtrl::OnColumnChange() +{ + if (m_headerArea) + m_headerArea->UpdateDisplay(); + m_clientArea->UpdateDisplay(); +} - return true; +void wxDataViewCtrl::DoSetExpanderColumn() +{ + m_clientArea->UpdateDisplay(); } -void wxDataViewCtrl::SetSelection( int WXUNUSED(row) ) +void wxDataViewCtrl::DoSetIndent() { - // FIXME - TODO + m_clientArea->UpdateDisplay(); } -void wxDataViewCtrl::SetSelectionRange( unsigned int WXUNUSED(from), unsigned int WXUNUSED(to) ) +wxDataViewItem wxDataViewCtrl::GetSelection() { - // FIXME - TODO + return m_clientArea->GetSelection(); } -void wxDataViewCtrl::SetSelections( const wxArrayInt& WXUNUSED(aSelections) ) +/******************************************************************** +void wxDataViewCtrl::SetSelection( int row ) { - // FIXME - TODO + m_clientArea->SelectRow(row, true); +} + +void wxDataViewCtrl::SetSelectionRange( unsigned int from, unsigned int to ) +{ + m_clientArea->SelectRows(from, to, true); +} + +void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections ) +{ + m_clientArea->Select(aSelections); } void wxDataViewCtrl::Unselect( unsigned int WXUNUSED(row) ) @@ -1901,7 +3502,7 @@ int wxDataViewCtrl::GetSelections(wxArrayInt& WXUNUSED(aSelections) ) const return 0; } - +*********************************************************************/ #endif // !wxUSE_GENERICDATAVIEWCTRL