X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a68962fc90d4abe5025a465b464599e2b471d97c..cdbcf4c286ea989bfb8922a54d9e3f80b3fc9bcb:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 1233de7dc4..d23b3c54ee 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -2,7 +2,7 @@ // Name: src/generic/datavgen.cpp // Purpose: wxDataViewCtrl generic implementation // Author: Robert Roebling -// Modified by: Francesco Montorsi, Guru Kathiresan, Otto Wyss +// Modified by: Francesco Montorsi, Guru Kathiresan, Bo Yang // Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence @@ -33,6 +33,7 @@ #include "wx/timer.h" #include "wx/settings.h" #include "wx/msgdlg.h" + #include "wx/dcscreen.h" #endif #include "wx/stockitem.h" @@ -41,6 +42,8 @@ #include "wx/renderer.h" #include "wx/dcbuffer.h" #include "wx/icon.h" +#include "wx/list.h" +#include "wx/listimpl.cpp" //----------------------------------------------------------------------------- // classes @@ -53,24 +56,34 @@ 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 //----------------------------------------------------------------------------- -#define USE_NATIVE_HEADER_WINDOW 1 +// on wxMSW the header window (only that part however) can be made native! +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) + #define USE_NATIVE_HEADER_WINDOW +#endif + +//Below is the compare stuff +//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed +static wxDataViewModel * g_model; +static int g_column = -2; +static bool g_asending = true; -class wxDataViewHeaderWindowBase : public wxControl +// 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: wxDataViewHeaderWindowBase() { m_owner = NULL; } bool Create(wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, + const wxPoint &pos, const wxSize &size, const wxString &name) { return wxWindow::Create(parent, id, pos, size, wxNO_BORDER, name); @@ -86,10 +99,10 @@ public: virtual wxDataViewColumn *GetColumn(unsigned int n) { wxASSERT(m_owner); - wxDataViewColumn *ret = m_owner->GetColumn(n); + wxDataViewColumn *ret = m_owner->GetColumn(n); wxASSERT(ret); - return ret; + return ret; } protected: @@ -99,8 +112,7 @@ protected: 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 +#ifdef USE_NATIVE_HEADER_WINDOW #define COLUMN_WIDTH_OFFSET 2 #define wxDataViewHeaderWindowMSW wxDataViewHeaderWindow @@ -114,12 +126,12 @@ public: 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 wxPoint &pos, const wxSize &size, const wxString &name); ~wxDataViewHeaderWindowMSW(); @@ -128,18 +140,29 @@ public: // the column count virtual void UpdateDisplay(); - // called when the main window gets scrolled + virtual void OnInternalIdle(); + + // called Refresh afterwards virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL); + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + protected: virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); + wxSize DoGetBestSize() const; + unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR); wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR) { return GetColumn(GetColumnIdxFromHeader(nmHDR)); } + int m_scrollOffsetX; + int m_buttonHeight; + bool m_delayedUpdate; + private: DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW) }; @@ -159,13 +182,13 @@ public: 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 wxPoint &pos, const wxSize &size, const wxString &name); ~wxGenericDataViewHeaderWindow() @@ -173,6 +196,8 @@ public: delete m_resizeCursor; } + virtual void UpdateDisplay() { Refresh(); } + // event handlers: void OnPaint( wxPaintEvent &event ); @@ -189,9 +214,10 @@ protected: bool m_isDragging; 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 + 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 @@ -209,6 +235,7 @@ protected: m_isDragging = false; m_dirty = false; + m_hover = wxNOT_FOUND; m_column = wxNOT_FOUND; m_currentX = 0; m_minX = 0; @@ -217,7 +244,6 @@ protected: m_penCurrent = wxPen(col, 1, wxSOLID); } - void DrawCurrent(); void AdjustDC(wxDC& dc); private: @@ -242,50 +268,151 @@ public: }; //----------------------------------------------------------------------------- -// wxDataViewTextCtrlWrapper: wraps a wxTextCtrl for inline editing +// wxDataViewTreeNode //----------------------------------------------------------------------------- +class wxDataViewTreeNode; +WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes ); +WX_DEFINE_ARRAY( void* , wxDataViewTreeLeaves); + +int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2); +int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2); -class wxDataViewTextCtrlWrapper : public wxEvtHandler +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 = NULL ) + { + m_parent = parent; + if (!parent) + m_open = true; + else + m_open = false; + m_hasChildren = false; + m_subTreeCount = 0; + } - wxTextCtrl *GetText() const { return m_text; } + ~wxDataViewTreeNode() + { + } - void AcceptChangesAndFinish(); + wxDataViewTreeNode * GetParent() { return m_parent; } + void SetParent( wxDataViewTreeNode * parent ) { m_parent = parent; } + wxDataViewTreeNodes & GetNodes() { return m_nodes; } + wxDataViewTreeLeaves & GetChildren() { return m_leaves; } -protected: - void OnChar( wxKeyEvent &event ); - void OnKeyUp( wxKeyEvent &event ); - void OnKillFocus( wxFocusEvent &event ); + void AddNode( wxDataViewTreeNode * node ) + { + m_leaves.Add( node->GetItem().GetID() ); + if (g_column >= -1) + m_leaves.Sort( &wxGenericTreeModelItemCmp ); + m_nodes.Add( node ); + if (g_column >= -1) + m_nodes.Sort( &wxGenericTreeModelNodeCmp ); + } + void AddLeaf( void * leaf ) + { + m_leaves.Add( leaf ); + if (g_column >= -1) + m_leaves.Sort( &wxGenericTreeModelItemCmp ); + } - bool AcceptChanges(); - void Finish(); + wxDataViewItem & GetItem() { return m_item; } + void SetItem( const wxDataViewItem & item ) { m_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 m_leaves.GetCount(); } + unsigned int GetNodeNumber() { return m_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 m_open ; + } + + void ToggleOpen() + { + int len = m_nodes.GetCount(); + int sum = 0; + for ( int i = 0 ;i < len ; i ++) + sum += m_nodes[i]->GetSubTreeCount(); + + sum += m_leaves.GetCount(); + if (m_open) + { + ChangeSubTreeCount(-sum); + m_open = !m_open; + } + else + { + m_open = !m_open; + ChangeSubTreeCount(sum); + } + } + bool HasChildren() { return m_hasChildren; } + void SetHasChildren( bool has ){ m_hasChildren = has; } + + void SetSubTreeCount( int num ) { m_subTreeCount = num; } + int GetSubTreeCount() { return m_subTreeCount; } + void ChangeSubTreeCount( int num ) + { + if( !m_open ) + return ; + m_subTreeCount += num; + if( m_parent ) + m_parent->ChangeSubTreeCount(num); + } + + void Resort() + { + if (g_column >= -1) + { + m_nodes.Sort( &wxGenericTreeModelNodeCmp ); + int len = m_nodes.GetCount(); + for (int i = 0; i < len; i ++) + m_nodes[i]->Resort(); + m_leaves.Sort( &wxGenericTreeModelItemCmp ); + } + } + +private: + wxDataViewTreeNode *m_parent; + wxDataViewTreeNodes m_nodes; + wxDataViewTreeLeaves m_leaves; + wxDataViewItem m_item; + bool m_open; + bool m_hasChildren; + int m_subTreeCount; }; +int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2) +{ + return g_model->Compare( (*node1)->GetItem(), (*node2)->GetItem(), g_column, g_asending ); +} + +int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2) +{ + return g_model->Compare( *id1, *id2, g_column, g_asending ); +} + + + //----------------------------------------------------------------------------- // wxDataViewMainWindow //----------------------------------------------------------------------------- -WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection, +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 { @@ -297,15 +424,39 @@ 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() + { + if (m_root) + { + SortPrepare(); + m_root->Resort(); + } + UpdateDisplay(); + } + + void SortPrepare() + { + g_model = GetOwner()->GetModel(); + wxDataViewColumn* col = GetOwner()->GetSortingColumn(); + if( !col ) + { + if (g_model->HasDefaultCompare()) + g_column = -1; + else + g_column = -2; + + g_asending = true; + return; + } + g_column = col->GetModelColumn(); + g_asending = col->IsSortOrderAscending(); + } void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } wxDataViewCtrl *GetOwner() { return m_owner; } @@ -323,28 +474,33 @@ public: void OnInternalIdle(); void OnRenameTimer(); - void FinishEditing( wxTextCtrl *text ); void ScrollWindow( int dx, int dy, const wxRect *rect = NULL ); + void ScrollTo( int rows, int column ); 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() const; int GetEndOfLastCol() const; unsigned int GetFirstVisibleRow() const; - unsigned int GetLastVisibleRow() const; - unsigned int GetRowCount() 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() ; + wxDataViewItem GetSelection() const; + wxDataViewSelection GetSelections(){ return m_selection; } + void SetSelections( const wxDataViewSelection & sel ) { m_selection = sel; UpdateDisplay(); } 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 ); void ReverseRowSelection( unsigned int row ); bool IsRowSelected( unsigned int row ); + void SendSelectionChangedEvent( const wxDataViewItem& item); void RefreshRow( unsigned int row ); void RefreshRows( unsigned int from, unsigned int to ); @@ -356,20 +512,43 @@ public: 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 ) const; + int GetRowByItem( const wxDataViewItem & item ); + + //Methods for building the mapping tree + void BuildTree( wxDataViewModel * model ); + void DestroyTree(); + void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ); + wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ); + + void Expand( unsigned int row ) { OnExpanding( row ); } + void Collapse( unsigned int row ) { OnCollapsing( row ); } +private: + wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ); + //We did not need this temporarily + //wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item ); + + int RecalculateCount() ; + + wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item ); + 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; @@ -385,37 +564,41 @@ private: // 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; + //This is the tree node under the cursor + wxDataViewTreeNode * m_underMouse; 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; }; @@ -426,7 +609,7 @@ public: IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase) -wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, +wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode, int align) : wxDataViewRendererBase( varianttype, mode, align ) @@ -434,6 +617,8 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, m_dc = NULL; m_align = align; m_mode = mode; + m_wantsAttr = false; + m_hasAttr = false; } wxDataViewRenderer::~wxDataViewRenderer() @@ -456,7 +641,6 @@ wxDC *wxDataViewRenderer::GetDC() return m_dc; } - // --------------------------------------------------------- // wxDataViewCustomRenderer // --------------------------------------------------------- @@ -469,13 +653,23 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, { } +void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, 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( text, cell.x + xoffset, cell.y + ((cell.height - dc->GetCharHeight()) / 2)); +} + // --------------------------------------------------------- // wxDataViewTextRenderer // --------------------------------------------------------- IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewCustomRenderer) -wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, +wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode, int align ) : wxDataViewCustomRenderer( varianttype, mode, align ) { @@ -493,16 +687,29 @@ bool wxDataViewTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const return false; } -bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int state ) +bool wxDataViewTextRenderer::HasEditorCtrl() { - wxDataViewCtrl *view = GetOwner()->GetOwner(); - wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ? - wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) : - view->GetForegroundColour(); + return true; +} - dc->SetTextForeground(col); - dc->DrawText( m_text, cell.x, cell.y ); +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 ) +{ + RenderText( m_text, 0, cell, dc, state ); return true; } @@ -518,13 +725,67 @@ wxSize wxDataViewTextRenderer::GetSize() const 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 // --------------------------------------------------------- IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewCustomRenderer) -wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, +wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode, int align ) : wxDataViewCustomRenderer( varianttype, mode, align ) { @@ -615,14 +876,14 @@ 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; } @@ -698,12 +959,12 @@ 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 ); @@ -714,9 +975,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() @@ -735,8 +996,8 @@ 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(); } @@ -763,12 +1024,10 @@ bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const return true; } -bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) +bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state ) { - dc->SetFont( GetOwner()->GetOwner()->GetFont() ); wxString tmp = m_date.FormatDate(); - dc->DrawText( tmp, cell.x, cell.y ); - + RenderText( tmp, 0, cell, dc, state ); return true; } @@ -781,16 +1040,16 @@ wxSize wxDataViewDateRenderer::GetSize() const 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_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(); @@ -801,13 +1060,87 @@ bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewListMode return true; } +// --------------------------------------------------------- +// wxDataViewIconTextRenderer +// --------------------------------------------------------- + +IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer) + +wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( + const wxString &varianttype, wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) +{ + SetMode(mode); + SetAlignment(align); +} + +wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer() +{ +} + +bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value ) +{ + m_value << value; + return true; +} + +bool wxDataViewIconTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const +{ + return false; +} + +bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state ) +{ + int xoffset = 0; + const wxIcon &icon = m_value.GetIcon(); + if (icon.IsOk()) + { + dc->DrawIcon( icon, cell.x, cell.y + ((cell.height - icon.GetHeight()) / 2)); + xoffset = icon.GetWidth()+4; + } + + RenderText( m_value.GetText(), xoffset, cell, dc, state ); + + return true; +} + +wxSize wxDataViewIconTextRenderer::GetSize() const +{ + const wxDataViewCtrl *view = GetView(); + if (!m_value.GetText().empty()) + { + int x,y; + view->GetTextExtent( m_value.GetText(), &x, &y ); + + if (m_value.GetIcon().IsOk()) + x += m_value.GetIcon().GetWidth() + 4; + return wxSize( x, y ); + } + return wxSize(80,20); +} + +wxControl * +wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow * WXUNUSED(parent), + wxRect WXUNUSED(labelRect), + const wxVariant& WXUNUSED(value)) +{ + return NULL; +} + +bool +wxDataViewIconTextRenderer::GetValueFromEditorCtrl(wxControl* WXUNUSED(editor), + wxVariant& WXUNUSED(value)) +{ + return false; +} + // --------------------------------------------------------- // wxDataViewColumn // --------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase) -wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, +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 ) @@ -816,10 +1149,12 @@ wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *c SetTitle(title); SetFlags(flags); + m_autosize = width < 0; // TODO + Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width); } -wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, +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 ) @@ -838,6 +1173,7 @@ void wxDataViewColumn::Init( int width ) { m_width = width; m_minWidth = wxDVC_DEFAULT_MINWIDTH; + m_ascending = true; } void wxDataViewColumn::SetResizeable( bool resizeable ) @@ -866,17 +1202,32 @@ void wxDataViewColumn::SetSortable( bool sortable ) m_flags |= wxDATAVIEW_COL_SORTABLE; else m_flags &= ~wxDATAVIEW_COL_SORTABLE; + + // Update header button + if (GetOwner()) + GetOwner()->OnColumnChange(); +} + +void wxDataViewColumn::SetReorderable( bool reorderable ) +{ + if (reorderable) + m_flags |= wxDATAVIEW_COL_REORDERABLE; + else + m_flags &= ~wxDATAVIEW_COL_REORDERABLE; } -void wxDataViewColumn::SetSortOrder( bool WXUNUSED(ascending) ) +void wxDataViewColumn::SetSortOrder( bool ascending ) { - // TODO + m_ascending = ascending; + + // Update header button + if (GetOwner()) + GetOwner()->OnColumnChange(); } bool wxDataViewColumn::IsSortOrderAscending() const { - // TODO - return true; + return m_ascending; } void wxDataViewColumn::SetInternalWidth( int width ) @@ -890,7 +1241,7 @@ void wxDataViewColumn::SetInternalWidth( int width ) void wxDataViewColumn::SetWidth( int width ) { - m_owner->m_headerArea->UpdateDisplay(); + if (m_owner->m_headerArea) m_owner->m_headerArea->UpdateDisplay(); SetInternalWidth(width); } @@ -916,7 +1267,14 @@ void wxDataViewHeaderWindowBase::SendEvent(wxEventType type, unsigned int n) parent->GetEventHandler()->ProcessEvent(le); } -#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW +#ifdef USE_NATIVE_HEADER_WINDOW + +#ifndef HDS_DRAGDROP + #define HDS_DRAGDROP 0x0040 +#endif +#ifndef HDS_FULLDRAG + #define HDS_FULLDRAG 0x0080 +#endif // implemented in msw/listctrl.cpp: int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick); @@ -924,32 +1282,42 @@ 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 wxPoint &pos, const wxSize &size, const wxString &name ) { m_owner = parent; - if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) ) - return false; + m_scrollOffsetX = 0; + m_delayedUpdate = false; + m_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( this ); int x = pos.x == wxDefaultCoord ? 0 : pos.x, y = pos.y == wxDefaultCoord ? 0 : pos.y, w = size.x == wxDefaultCoord ? 1 : size.x, - h = size.y == wxDefaultCoord ? 22 : size.y; + h = m_buttonHeight; + + wxSize new_size(w,h); + + if ( !CreateControl(parent, id, pos, new_size, 0, wxDefaultValidator, name) ) + return false; // create the native WC_HEADER window: WXHWND hwndParent = (HWND)parent->GetHandle(); - WXDWORD msStyle = WS_CHILD | HDS_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG; - m_hWnd = CreateWindowEx(0, - WC_HEADER, - (LPCTSTR) NULL, + WXDWORD msStyle = WS_CHILD | HDS_DRAGDROP | HDS_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG; + + if ( m_isShown ) + msStyle |= WS_VISIBLE; + + m_hWnd = CreateWindowEx(0, + WC_HEADER, + (LPCTSTR) NULL, msStyle, x, y, w, h, - (HWND)hwndParent, - (HMENU)-1, - wxGetInstance(), + (HWND)hwndParent, + (HMENU)-1, + wxGetInstance(), (LPVOID) NULL); - if (m_hWnd == NULL) + if (m_hWnd == NULL) { wxLogLastError(_T("CreateWindowEx")); return false; @@ -959,40 +1327,10 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id, // to call wxDataViewHeaderWindow::MSWOnNotify SubclassWin(m_hWnd); - // the following is required to get the default win's font for + // 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; } @@ -1001,12 +1339,26 @@ wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow() UnsubclassWin(); } +wxSize wxDataViewHeaderWindowMSW::DoGetBestSize() const +{ + return wxSize( 80, m_buttonHeight+2 ); +} + +void wxDataViewHeaderWindowMSW::OnInternalIdle() +{ + if (m_delayedUpdate) + { + m_delayedUpdate = false; + UpdateDisplay(); + } +} + void wxDataViewHeaderWindowMSW::UpdateDisplay() { // remove old columns for (int j=0, max=Header_GetItemCount((HWND)m_hWnd); j < max; j++) Header_DeleteItem((HWND)m_hWnd, 0); - + // add the updated array of columns to the header control unsigned int cols = GetOwner()->GetColumnCount(); unsigned int added = 0; @@ -1018,10 +1370,19 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay() HDITEM hdi; hdi.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH; - hdi.pszText = (wxChar *) col->GetTitle().c_str(); + 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); + + if (col->IsSortable() && GetOwner()->GetSortingColumn() == col) + { + //The Microsoft Comctrl32.dll 6.0 support SORTUP/SORTDOWN, but they are not default + //see http://msdn2.microsoft.com/en-us/library/ms649534.aspx for more detail + // VZ: works with 5.81 + hdi.fmt |= col->IsSortOrderAscending() ? HDF_SORTUP : HDF_SORTDOWN; + } // lParam is reserved for application's use: // we store there the column index to use it later in MSWOnNotify @@ -1029,7 +1390,7 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay() hdi.lParam = (LPARAM)i; // the native wxMSW implementation of the header window - // draws the column separator COLUMN_WIDTH_OFFSET pixels + // 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) @@ -1050,11 +1411,11 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay() default: // such alignment is not allowed for the column header! - wxFAIL; + break; // wxFAIL; } - - SendMessage((HWND)m_hWnd, HDM_INSERTITEM, - (WPARAM)added, (LPARAM)&hdi); + + SendMessage((HWND)m_hWnd, HDM_INSERTITEM, + (WPARAM)added, (LPARAM)&hdi); added++; } } @@ -1103,16 +1464,30 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA case HDN_BEGINDRAG: // user has started to reorder a column + if (!GetColumn(nmHDR->iItem)->IsReorderable()) + { + // veto it! + *result = TRUE; + } + break; + + case HDN_ENDDRAG: // user has finished reordering a column + { + wxDataViewColumn *col = GetColumn(nmHDR->iItem); + unsigned int new_pos = nmHDR->pitem->iOrder; + m_owner->ColumnMoved( col, new_pos ); + m_delayedUpdate = true; + } break; case HDN_ITEMCHANGING: - if (nmHDR->pitem != NULL && + 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 + // do not allow the user to resize this column under // its minimal width: *result = TRUE; } @@ -1121,10 +1496,9 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA 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 && + if (nmHDR->pitem != NULL && (nmHDR->pitem->mask & HDI_WIDTH) != 0) { unsigned int idx = GetColumnIdxFromHeader(nmHDR); @@ -1143,7 +1517,29 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA case HDN_ITEMCLICK: { unsigned int idx = GetColumnIdxFromHeader(nmHDR); - wxEventType evt = nmHDR->iButton == 0 ? + 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); @@ -1187,7 +1583,7 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA ZeroMemory(&hd, sizeof(hd)); hd.mask = HDI_WIDTH; hd.cxy = w; - Header_SetItem(GetHwnd(), + Header_SetItem(GetHwnd(), nmHDR->iItem, // NOTE: we don't want 'idx' here! &hd); @@ -1203,32 +1599,20 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA return true; } -void wxDataViewHeaderWindowMSW::ScrollWindow(int WXUNUSED(dx), int WXUNUSED(dy), - const wxRect *WXUNUSED(rect)) +void wxDataViewHeaderWindowMSW::ScrollWindow(int dx, int WXUNUSED(dy), + const wxRect * WXUNUSED(rect)) { - wxSize ourSz = GetClientSize(); - wxSize ownerSz = m_owner->GetClientSize(); + m_scrollOffsetX += dx; - // 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); + GetParent()->Layout(); } -void wxDataViewHeaderWindowMSW::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(w), int WXUNUSED(h), - int WXUNUSED(f)) +void wxDataViewHeaderWindowMSW::DoSetSize(int x, int y, + int w, int h, + int 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); + // TODO: why is there a border + 2px around it? + wxControl::DoSetSize( x+m_scrollOffsetX+1, y+1, w-m_scrollOffsetX-2, h-2, f ); } #else // !defined(__WXMSW__) @@ -1241,8 +1625,8 @@ BEGIN_EVENT_TABLE(wxGenericDataViewHeaderWindow, wxWindow) END_EVENT_TABLE() bool wxGenericDataViewHeaderWindow::Create(wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxString &name ) + const wxPoint &pos, const wxSize &size, + const wxString &name ) { m_owner = parent; @@ -1298,13 +1682,33 @@ void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) int cw = col->GetWidth(); int ch = h; + wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE; + if (col->IsSortable() && GetOwner()->GetSortingColumn() == col) + { + if (col->IsSortOrderAscending()) + sortArrow = wxHDR_SORT_ICON_UP; + else + sortArrow = wxHDR_SORT_ICON_DOWN; + } + + int state = 0; + if (m_parent->IsEnabled()) + { + if ((int) i == m_hover) + state = wxCONTROL_CURRENT; + } + else + { + state = (int) wxCONTROL_DISABLED; + } + wxRendererNative::Get().DrawHeaderButton ( this, dc, wxRect(xpos, 0, cw, ch-1), - m_parent->IsEnabled() ? 0 - : (int)wxCONTROL_DISABLED + state, + sortArrow ); // align as required the column title: @@ -1315,19 +1719,20 @@ void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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; - case wxALIGN_RIGHT: - x += cw - titleSz.GetWidth() - HEADER_HORIZ_BORDER; - break; } // always center the title vertically: int y = wxMax((ch - titleSz.GetHeight()) / 2, HEADER_VERT_BORDER); - dc.SetClippingRegion( xpos+HEADER_HORIZ_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 @@ -1353,37 +1758,29 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) if (m_isDragging) { - // we don't draw the line beyond our window, + // 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()) + if (event.ButtonUp()) { m_isDragging = false; - if (HasCapture()) + if (HasCapture()) ReleaseMouse(); m_dirty = true; + } + m_currentX = wxMax(m_minX + 7, x); + if (m_currentX < w) + { GetColumn(m_column)->SetWidth(m_currentX - m_minX); - Refresh(); GetOwner()->Refresh(); } - else - { - m_currentX = wxMax(m_minX + 7, x); - - // draw in the new location - if (m_currentX < w) DrawCurrent(); - } } else // not dragging @@ -1398,22 +1795,22 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) // find the column where this event occured int countCol = m_owner->GetColumnCount(); - for (int column = 0; column < countCol; column++) + for (int column = 0; column < countCol; column++) { wxDataViewColumn *p = GetColumn(column); - if (p->IsHidden()) + if (p->IsHidden()) continue; // skip if not shown xpos += p->GetWidth(); m_column = column; - if ((abs(x-xpos) < 3) && (y < 22)) + if ((abs(x-xpos) < 3) && (y < 22)) { hit_border = true; break; } - if (x < xpos) + if (x < xpos) { // inside the column break; @@ -1422,6 +1819,13 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) m_minX = xpos; } + int old_hover = m_hover; + m_hover = m_column; + if (event.Leaving()) + m_hover = wxNOT_FOUND; + if (old_hover != m_hover) + Refresh(); + if (m_column == wxNOT_FOUND) return; @@ -1433,24 +1837,48 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) } else if (event.LeftDown() || event.RightUp()) { - if (hit_border && event.LeftDown() && resizeable) + if (hit_border && event.LeftDown() && resizeable) { m_isDragging = true; CaptureMouse(); m_currentX = x; - DrawCurrent(); } else // click on a column { - wxEventType evt = event.LeftDown() ? + wxDataViewModel * model = GetOwner()->GetModel(); + wxEventType evt = event.LeftDown() ? wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK : wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK; SendEvent(evt, m_column); + + //Left click the header + if(event.LeftDown()) + { + wxDataViewColumn *col = GetColumn(m_column); + if(col->IsSortable()) + { + wxDataViewColumn* sortCol = m_owner->GetSortingColumn(); + if(model && sortCol == col) + { + bool order = col->IsSortOrderAscending(); + col->SetSortOrder(!order); + } + else if(model) + { + m_owner->SetSortingColumn(col); + } + } + UpdateDisplay(); + if(model) + model->Resort(); + //Send the column sorted event + SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, m_column); + } } } else if (event.Moving()) { - if (hit_border && resizeable) + if (hit_border && resizeable) m_currentCursor = m_resizeCursor; else m_currentCursor = wxSTANDARD_CURSOR; @@ -1460,28 +1888,6 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) } } -void wxGenericDataViewHeaderWindow::DrawCurrent() -{ - int x1 = m_currentX; - int y1 = 0; - ClientToScreen (&x1, &y1); - - int x2 = m_currentX-1; -#ifdef __WXMSW__ - ++x2; // but why ???? -#endif - int y2 = 0; - m_owner->GetClientSize( NULL, &y2 ); - m_owner->ClientToScreen( &x2, &y2 ); - - wxScreenDC dc; - dc.SetLogicalFunction(wxINVERT); - dc.SetPen(m_penCurrent); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - AdjustDC(dc); - dc.DrawLine(x1, y1, x2, y2); -} - void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc) { int xpix, x; @@ -1510,153 +1916,13 @@ void wxDataViewRenameTimer::Notify() m_owner->OnRenameTimer(); } -//----------------------------------------------------------------------------- -// wxDataViewTextCtrlWrapper: wraps a wxTextCtrl for inline editing -//----------------------------------------------------------------------------- - -BEGIN_EVENT_TABLE(wxDataViewTextCtrlWrapper, wxEvtHandler) - EVT_CHAR (wxDataViewTextCtrlWrapper::OnChar) - EVT_KEY_UP (wxDataViewTextCtrlWrapper::OnKeyUp) - EVT_KILL_FOCUS (wxDataViewTextCtrlWrapper::OnKillFocus) -END_EVENT_TABLE() - -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; - - m_finished = false; - m_aboutToFinish = false; - - wxVariant value; - model->GetValue( value, col, row ); - m_startValue = value.GetString(); - - m_owner->GetOwner()->CalcScrolledPosition( - rectLabel.x, rectLabel.y, &rectLabel.x, &rectLabel.y ); - - 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(); - - m_text->PushEventHandler(this); -} - -void wxDataViewTextCtrlWrapper::AcceptChangesAndFinish() -{ - m_aboutToFinish = true; - - // Notify the owner about the changes - AcceptChanges(); - - // Even if vetoed, close the control (consistent with MSW) - Finish(); -} - -void wxDataViewTextCtrlWrapper::OnChar( wxKeyEvent &event ) -{ - switch ( event.m_keyCode ) - { - case WXK_RETURN: - AcceptChangesAndFinish(); - break; - - case WXK_ESCAPE: - // m_owner->OnRenameCancelled( m_itemEdited ); - Finish(); - break; - - default: - event.Skip(); - } -} - -void wxDataViewTextCtrlWrapper::OnKeyUp( wxKeyEvent &event ) -{ - if (m_finished) - { - event.Skip(); - return; - } - - // 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); - - event.Skip(); -} - -void wxDataViewTextCtrlWrapper::OnKillFocus( wxFocusEvent &event ) -{ - if ( !m_finished && !m_aboutToFinish ) - { - AcceptChanges(); - //if ( !AcceptChanges() ) - // m_owner->OnRenameCancelled( m_itemEdited ); - - Finish(); - } - - // We must let the native text control handle focus - event.Skip(); -} - -bool wxDataViewTextCtrlWrapper::AcceptChanges() -{ - const wxString value = m_text->GetValue(); - - if ( value == m_startValue ) - // nothing changed, always accept - return true; - -// 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 ); - - return true; -} - -void wxDataViewTextCtrlWrapper::Finish() -{ - if ( !m_finished ) - { - m_finished = true; - - m_text->RemoveEventHandler(this); - m_owner->FinishEditing(m_text); - - // delete later - wxPendingDelete.Append( this ); - } -} - //----------------------------------------------------------------------------- // 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; @@ -1677,7 +1943,7 @@ 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, name ), + wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE, name ), m_selection( wxDataViewSelectionCmp ) { @@ -1685,20 +1951,12 @@ 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 = -#ifdef __WXMSW__ - 17; -#else - 20; -#endif - wxASSERT(m_lineHeight > 2*PADDING_TOPBOTTOM); + m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1 m_dragCount = 0; m_dragStart = wxPoint(0,0); @@ -1708,157 +1966,44 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i m_hasFocus = false; - SetBackgroundStyle( wxBG_STYLE_CUSTOM ); SetBackgroundColour( *wxWHITE ); - m_penRule = wxPen(GetRuleColour(), 1, wxSOLID); + SetBackgroundStyle(wxBG_STYLE_CUSTOM); + m_penRule = wxPen(GetRuleColour()); + + //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); + + //Make m_count = -1 will cause the class recaculate the real displaying number of rows. + m_count = -1 ; + m_underMouse = NULL; UpdateDisplay(); } wxDataViewMainWindow::~wxDataViewMainWindow() { + DestroyTree(); delete m_renameTimer; } -void wxDataViewMainWindow::OnRenameTimer() -{ - // We have to call this here because changes may just have - // been made and no screen update taken place. - if ( m_dirty ) - wxSafeYield(); - - - int xpos = 0; - 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 ); - - wxClassInfo *textControlClass = CLASSINFO(wxTextCtrl); - - wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject(); - m_textctrlWrapper = new wxDataViewTextCtrlWrapper(this, text, GetOwner()->GetModel(), - m_currentCol->GetModelColumn(), m_currentRow, labelRect ); -} - -void wxDataViewMainWindow::FinishEditing( wxTextCtrl *text ) -{ - delete text; - m_textctrlWrapper = NULL; - SetFocus(); - // SetFocusIgnoringChildren(); -} - -bool wxDataViewMainWindow::RowAppended() -{ - return false; -} - -bool wxDataViewMainWindow::RowPrepended() -{ - return false; -} - -bool wxDataViewMainWindow::RowInserted( unsigned int WXUNUSED(before) ) -{ - return false; -} - -bool wxDataViewMainWindow::RowDeleted( unsigned int WXUNUSED(row) ) -{ - return false; -} - -bool wxDataViewMainWindow::RowChanged( unsigned int WXUNUSED(row) ) -{ - return false; -} - -bool wxDataViewMainWindow::ValueChanged( unsigned int WXUNUSED(col), unsigned int row ) -{ - // 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; -} - -bool wxDataViewMainWindow::RowsReordered( unsigned int *WXUNUSED(new_order) ) -{ - Refresh(); - - return true; -} - -bool wxDataViewMainWindow::Cleared() -{ - return false; -} - -void wxDataViewMainWindow::UpdateDisplay() -{ - m_dirty = true; -} - -void wxDataViewMainWindow::OnInternalIdle() -{ - wxWindow::OnInternalIdle(); - - if (m_dirty) - { - RecalculateDisplay(); - m_dirty = false; - } -} - -void wxDataViewMainWindow::RecalculateDisplay() -{ - wxDataViewListModel *model = GetOwner()->GetModel(); - if (!model) - { - Refresh(); - return; - } - - int width = GetEndOfLastCol(); - int height = model->GetRowCount() * m_lineHeight; - - SetVirtualSize( width, height ); - GetOwner()->SetScrollRate( 10, m_lineHeight ); - - Refresh(); -} - -void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) -{ - wxWindow::ScrollWindow( dx, dy, rect ); - - if (GetOwner()->m_headerArea) - GetOwner()->m_headerArea->ScrollWindow( dx, 0 ); -} - void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { - wxDataViewListModel *model = GetOwner()->GetModel(); + wxDataViewModel *model = GetOwner()->GetModel(); wxAutoBufferedPaintDC dc( this ); +#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 + // prepare the DC - dc.SetBackground(GetBackgroundColour()); - dc.Clear(); GetOwner()->PrepareDC( dc ); dc.SetFont( GetFont() ); @@ -1867,9 +2012,9 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) // compute which items needs to be redrawn unsigned int item_start = wxMax( 0, (update.y / m_lineHeight) ); - unsigned int item_count = + unsigned int item_count = wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1), - (int)(model->GetRowCount() - item_start) ); + (int)(GetRowCount( ) - item_start)); unsigned int item_last = item_start + item_count; // compute which columns needs to be redrawn @@ -1936,7 +2081,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) } // Draw last vertical rule - dc.DrawLine(x, item_start * m_lineHeight, + dc.DrawLine(x, item_start * m_lineHeight, x, item_last * m_lineHeight); } @@ -1963,6 +2108,14 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) } } + 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; @@ -1976,20 +2129,93 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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; - model->GetValue( value, col->GetModelColumn(), item ); + wxDataViewTreeNode *node = NULL; + wxDataViewItem dataitem; + + if (m_root) + { + node = GetTreeNodeByRow(item); + if( node == NULL ) + continue; + + dataitem = node->GetItem(); + + if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem)) + continue; + } + else + { + dataitem = wxDataViewItem( (void*) item ); + } + + model->GetValue( value, dataitem, col->GetModelColumn()); cell->SetValue( value ); + if (cell->GetWantsAttr()) + { + wxDataViewItemAttr attr; + bool ret = model->GetAttr( dataitem, col->GetModelColumn(), attr ); + if (ret) + cell->SetAttr( attr ); + cell->SetHasAttr( ret ); + } + // update the y offset cell_rect.y = item * m_lineHeight; + //Draw the expander here. + int indent = 0; + if ((m_root) && (col == expander)) + { + indent = node->GetIndentLevel(); + + //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 wondering whether we should draw dot lines between tree nodes + if (node) + 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(); - size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width ); - size.y = wxMin( size.y + 2*PADDING_TOPBOTTOM, cell_rect.height ); + // 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(); @@ -2012,12 +2238,13 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) // 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 (m_selection.Index(item) != wxNOT_FOUND) + if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND)) state |= wxDATAVIEW_CELL_SELECTED; // TODO: it would be much more efficient to create a clipping @@ -2036,22 +2263,370 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) } } -int wxDataViewMainWindow::GetCountPerPage() const +void wxDataViewMainWindow::OnRenameTimer() { - wxSize size = GetClientSize(); - return size.y / m_lineHeight; -} + // We have to call this here because changes may just have + // been made and no screen update taken place. + if ( m_dirty ) + wxSafeYield(); -int wxDataViewMainWindow::GetEndOfLastCol() const -{ - int width = 0; + int xpos = 0; + unsigned int cols = GetOwner()->GetColumnCount(); unsigned int i; - for (i = 0; i < GetOwner()->GetColumnCount(); i++) + for (i = 0; i < cols; i++) { - const wxDataViewColumn *c = - wx_const_cast(wxDataViewCtrl*, GetOwner())->GetColumn( i ); + wxDataViewColumn *c = GetOwner()->GetColumn( i ); + if (c->IsHidden()) + continue; // skip it! - if (!c->IsHidden()) + if (c == m_currentCol) + break; + xpos += c->GetWidth(); + } + wxRect labelRect( xpos, m_currentRow * m_lineHeight, + m_currentCol->GetWidth(), m_lineHeight ); + + GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y, + &labelRect.x, &labelRect.y); + + wxDataViewItem item = GetItemByRow( m_currentRow ); + m_currentCol->GetRenderer()->StartEditing( item, labelRect ); + +} + +//------------------------------------------------------------------ +// Helper class for do operation on the tree node +//------------------------------------------------------------------ +class DoJob +{ +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 Walker( wxDataViewTreeNode * node, DoJob & func ) +{ + if( node==NULL ) + return false; + + switch( func( node ) ) + { + case DoJob::OK : + return true ; + case DoJob::IGR: + return false; + case DoJob::CONT: + default: + ; + } + + 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++; + + 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::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item) +{ + if (!m_root) + { + m_count++; + UpdateDisplay(); + return true; + } + + SortPrepare(); + + 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); + newnode->SetHasChildren( true ); + node->AddNode( newnode); + } + else + node->AddLeaf( item.GetID() ); + + node->ChangeSubTreeCount(1); + + m_count = -1; + UpdateDisplay(); + + return true; +} + +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" ); + wxCHECK_MSG( node->GetChildren().Index( item.GetID() ) != wxNOT_FOUND, false, "item not found" ); + + int sub = -1; + node->GetChildren().Remove( item.GetID() ); + //Manuplate selection + if( m_selection.GetCount() > 1 ) + { + m_selection.Empty(); + } + bool isContainer = false; + wxDataViewTreeNodes nds = node->GetNodes(); + for (size_t i = 0; i < nds.GetCount(); i ++) + { + if (nds[i]->GetItem() == item) + { + isContainer = true; + break; + } + } + if( isContainer ) + { + 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; + } + } + + wxCHECK_MSG( n != NULL, false, "item not found" ); + + node->GetNodes().Remove( n ); + sub -= n->GetSubTreeCount(); + 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() ) + m_currentRow = m_count - 1; + + UpdateDisplay(); + + return true; +} + +bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) +{ + SortPrepare(); + g_model->Resort(); + + //Send event + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetItem(item); + parent->GetEventHandler()->ProcessEvent(le); + + return true; +} + +bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int col ) +{ + // 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; +*/ + SortPrepare(); + g_model->Resort(); + + //Send event + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetItem(item); + le.SetColumn(col); + le.SetDataViewColumn(GetOwner()->GetColumn(col)); + parent->GetEventHandler()->ProcessEvent(le); + + return true; +} + +bool wxDataViewMainWindow::Cleared() +{ + DestroyTree(); + + SortPrepare(); + BuildTree( GetOwner()->GetModel() ); + + UpdateDisplay(); + + return true; +} + +void wxDataViewMainWindow::UpdateDisplay() +{ + m_dirty = true; +} + +void wxDataViewMainWindow::OnInternalIdle() +{ + wxWindow::OnInternalIdle(); + + if (m_dirty) + { + RecalculateDisplay(); + m_dirty = false; + } +} + +void wxDataViewMainWindow::RecalculateDisplay() +{ + wxDataViewModel *model = GetOwner()->GetModel(); + if (!model) + { + Refresh(); + return; + } + + int width = GetEndOfLastCol(); + int height = GetRowCount() * m_lineHeight; + + SetVirtualSize( width, height ); + GetOwner()->SetScrollRate( 10, m_lineHeight ); + + Refresh(); +} + +void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) +{ + wxWindow::ScrollWindow( dx, dy, rect ); + + 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 ); +} + +int wxDataViewMainWindow::GetCountPerPage() const +{ + wxSize size = GetClientSize(); + return size.y / m_lineHeight; +} + +int wxDataViewMainWindow::GetEndOfLastCol() const +{ + int width = 0; + unsigned int i; + for (i = 0; i < GetOwner()->GetColumnCount(); i++) + { + const wxDataViewColumn *c = + wx_const_cast(wxDataViewCtrl*, GetOwner())->GetColumn( i ); + + if (!c->IsHidden()) width += c->GetWidth(); } return width; @@ -2066,18 +2641,30 @@ unsigned int wxDataViewMainWindow::GetFirstVisibleRow() const return y / m_lineHeight; } -unsigned int wxDataViewMainWindow::GetLastVisibleRow() const +unsigned int wxDataViewMainWindow::GetLastVisibleRow() { wxSize client_size = GetClientSize(); - m_owner->CalcUnscrolledPosition( 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 ); + //we should deal with the pixel here + unsigned int row = ((client_size.y)/m_lineHeight) - 1; + + return wxMin( GetRowCount()-1, row ); } -unsigned int wxDataViewMainWindow::GetRowCount() const +unsigned int wxDataViewMainWindow::GetRowCount() { - return wx_const_cast(wxDataViewCtrl*, GetOwner())->GetModel()->GetRowCount(); + 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 ) @@ -2185,6 +2772,18 @@ bool wxDataViewMainWindow::IsRowSelected( unsigned int row ) return (m_selection.Index( row ) != wxNOT_FOUND); } +void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item) +{ + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, parent->GetId()); + + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetItem( item ); + + parent->GetEventHandler()->ProcessEvent(le); +} + void wxDataViewMainWindow::RefreshRow( unsigned int row ) { wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight ); @@ -2232,76 +2831,574 @@ void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow ) Refresh( true, &intersect_rect ); } -void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event) +void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event) +{ + wxCHECK_RET( newCurrent < GetRowCount(), + _T("invalid item index in OnArrowChar()") ); + + // if there is no selection, we cannot move it anywhere + if (!HasCurrentRow()) + return; + + unsigned int oldCurrent = m_currentRow; + + // in single selection we just ignore Shift as we can't select several + // items anyhow + if ( event.ShiftDown() && !IsSingleSel() ) + { + RefreshRow( oldCurrent ); + + ChangeCurrentRow( newCurrent ); + + // select all the items between the old and the new one + if ( oldCurrent > newCurrent ) + { + newCurrent = oldCurrent; + oldCurrent = m_currentRow; + } + + SelectRows( oldCurrent, newCurrent, true ); + if (oldCurrent!=newCurrent) + SendSelectionChangedEvent(GetItemByRow(m_selection[0])); + } + else // !shift + { + RefreshRow( oldCurrent ); + + // all previously selected items are unselected unless ctrl is held + if ( !event.ControlDown() ) + SelectAllRows(false); + + ChangeCurrentRow( newCurrent ); + + if ( !event.ControlDown() ) + { + SelectRow( m_currentRow, true ); + SendSelectionChangedEvent(GetItemByRow(m_currentRow)); + } + else + RefreshRow( m_currentRow ); + } + + GetOwner()->EnsureVisible( m_currentRow, -1 ); +} + +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 + { + //If the current has no child node, we can find the desired item of the row number directly. + //This if can speed up finding in some case, and will has a very good effect when it comes to list view + if( node->GetNodes().GetCount() == 0) + { + int index = static_cast(row) - current - 1; + ret = node->GetChildren().Item( index ); + return DoJob::OK; + } + 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) const +{ + if (!m_root) + { + return wxDataViewItem( (void*) row ); + } + else + { + RowToItemJob job( row, -2 ); + 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; + //If the current has no child node, we can find the desired item of the row number directly. + //This if can speed up finding in some case, and will has a very good effect when it comes to list view + if( node->GetNodes().GetCount() == 0) + { + int index = static_cast(row) - current - 1; + void * n = node->GetChildren().Item( index ); + ret = new wxDataViewTreeNode( parent ) ; + ret->SetItem( wxDataViewItem( n )); + ret->SetHasChildren(false); + return DoJob::OK; + } + 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) +{ + if (!m_root) + { + return NULL; + } + else + { + RowToTreeNodeJob job( row , -2, m_root ); + Walker( m_root , job ); + return job.GetResult(); + } +} + +wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const wxDataViewItem & item ) +{ + wxWindow *parent = GetParent(); + wxDataViewEvent le(type, parent->GetId()); + + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetItem( item ); + + parent->GetEventHandler()->ProcessEvent(le); + return le; +} + +void wxDataViewMainWindow::OnExpanding( unsigned int row ) +{ + wxDataViewTreeNode * node = GetTreeNodeByRow(row); + if( node != NULL ) + { + if( node->HasChildren()) + { + if( !node->IsOpen()) + { + wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,node->GetItem()); + //Check if the user prevent expanding + if( e.GetSkipped() ) + return; + + node->ToggleOpen(); + //Here I build the children of current node + if( node->GetChildrenNumber() == 0 ) + { + SortPrepare(); + BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); + } + m_count = -1; + UpdateDisplay(); + //Send the expanded event + SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem()); + } + else + { + SelectRow( row, false ); + SelectRow( row + 1, true ); + ChangeCurrentRow( row + 1 ); + SendSelectionChangedEvent( GetItemByRow(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() ) + { + wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem()); + if( e.GetSkipped() ) + return; + node->ToggleOpen(); + m_count = -1; + UpdateDisplay(); + SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,nd->GetItem()); + } + else + { + node = node->GetParent(); + if( node != NULL ) + { + int parent = GetRowByItem( node->GetItem() ) ; + if( parent >= 0 ) + { + SelectRow( row, false); + SelectRow(parent , true ); + ChangeCurrentRow( parent ); + SendSelectionChangedEvent( node->GetItem() ); + } + } + } + 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 + wxDataViewTreeNode * node = m_root; + for( ItemList::const_iterator iter = list.begin(); iter !=list.end() ; iter++ ) + { + if( node->HasChildren() ) + { + if( node->GetChildrenNumber() == 0 ) + { + SortPrepare(); + BuildTreeHelper(model, node->GetItem(), node); + } + + wxDataViewTreeNodes nodes = node->GetNodes(); + unsigned int i = 0; + for (; i < nodes.GetCount(); i ++) + { + if (nodes[i]->GetItem() == (**iter)) + { + node = nodes[i]; + break; + } + } + if (i == nodes.GetCount()) + return NULL; + } + else + return NULL; + } + return node; +} + +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++) + { + col = GetOwner()->GetColumn(colnum); + if (col->IsHidden()) + continue; // skip it! + + unsigned int w = col->GetWidth(); + if (x_start+w >= (unsigned int)x) + break; + + x_start += w; + } + + column = col; + item = GetItemByRow( y/m_lineHeight ); +} + +wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ) +{ + int row = GetRowByItem(item); + int y = row*m_lineHeight; + int h = m_lineHeight; + int x = 0; + wxDataViewColumn *col = NULL; + for( int i = 0, cols = GetOwner()->GetColumnCount(); i < cols; i ++ ) + { + col = GetOwner()->GetColumn( i ); + x += col->GetWidth(); + if( GetOwner()->GetColumn(i+1) == column ) + break; + } + int w = col->GetWidth(); + m_owner->CalcScrolledPosition( x, y, &x, &y ); + return wxRect(x, y, w, h); +} + +int wxDataViewMainWindow::RecalculateCount() +{ + 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 { - wxCHECK_RET( newCurrent < GetRowCount(), - _T("invalid item index in OnArrowChar()") ); +public: + ItemToRowJob(const wxDataViewItem & item, ItemList::const_iterator iter ) + { this->item = item ; ret = -1 ; m_iter = iter ; } + virtual ~ItemToRowJob(){}; - // if there is no selection, we cannot move it anywhere - if (!HasCurrentRow()) - return; + //Maybe binary search will help to speed up this process + virtual int operator() ( wxDataViewTreeNode * node) + { + ret ++; + if( node->GetItem() == item ) + { + return DoJob::OK; + } + + if( node->GetItem() == **m_iter ) + { + m_iter++ ; + return DoJob::CONT; + } + else + { + ret += node->GetSubTreeCount(); + return DoJob::IGR; + } - unsigned int oldCurrent = m_currentRow; + } - // in single selection we just ignore Shift as we can't select several - // items anyhow - if ( event.ShiftDown() && !IsSingleSel() ) + virtual int operator() ( void * n ) { - RefreshRow( oldCurrent ); + 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::const_iterator m_iter; + wxDataViewItem item; + int ret; - ChangeCurrentRow( newCurrent ); +}; - // select all the items between the old and the new one - if ( oldCurrent > newCurrent ) - { - newCurrent = oldCurrent; - oldCurrent = m_currentRow; - } +int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) +{ + wxDataViewModel * model = GetOwner()->GetModel(); + if( model == NULL ) + return -1; - SelectRows( oldCurrent, newCurrent, true ); + if (!m_root) + { + return wxPtrToUInt( item.GetID() ); } - else // !shift + else { - RefreshRow( oldCurrent ); + 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() ) + { + pItem = new wxDataViewItem( it ); + list.Insert( pItem ); + it = model->GetParent( it ); + } + pItem = new wxDataViewItem( ); + list.Insert( pItem ); - // all previously selected items are unselected unless ctrl is held - if ( !event.ControlDown() ) - SelectAllRows(false); + ItemToRowJob job( item, list.begin() ); + Walker(m_root , job ); + return job.GetResult(); + } +} - ChangeCurrentRow( newCurrent ); +void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node) +{ + if( !model->IsContainer( item ) ) + return ; - if ( !event.ControlDown() ) - SelectRow( m_currentRow, true ); + wxDataViewItemArray children; + unsigned int num = model->GetChildren( item, children); + unsigned int index = 0; + while( index < num ) + { + if( model->IsContainer( children[index] ) ) + { + wxDataViewTreeNode * n = new wxDataViewTreeNode( node ); + n->SetItem(children[index]); + n->SetHasChildren( true ) ; + node->AddNode( n ); + } else - RefreshRow( m_currentRow ); + { + node->AddLeaf( children[index].GetID() ); + } + index ++; } + node->SetSubTreeCount( num ); + wxDataViewTreeNode * n = node->GetParent(); + if( n != NULL) + n->ChangeSubTreeCount(num); - //EnsureVisible( m_currentRow ); } -wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const +void wxDataViewMainWindow::BuildTree(wxDataViewModel * model) { - wxRect rect; - rect.x = 0; - rect.y = m_lineHeight * row; - rect.width = GetEndOfLastCol(); - rect.height = m_lineHeight; + DestroyTree(); - return rect; + if (GetOwner()->GetModel()->IsIndexListModel()) + { + 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 ; } -void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) +void DestroyTreeHelper( wxDataViewTreeNode * node ) { - if (event.GetKeyCode() == WXK_TAB) + if( node->GetNodeNumber() != 0 ) { - 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; + int len = node->GetNodeNumber(); + int i = 0 ; + wxDataViewTreeNodes nodes = node->GetNodes(); + for( ; i < len; i ++ ) + { + DestroyTreeHelper(nodes[i]); + } + } + delete node; +} + +void wxDataViewMainWindow::DestroyTree() +{ + if (m_root) + { + DestroyTreeHelper(m_root); + m_count = 0; + m_root = NULL; } +} + +void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) +{ + if ( HandleAsNavigationKey(event) ) + return; // no item -> nothing to do if (!HasCurrentRow()) @@ -2316,6 +3413,20 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) switch ( event.GetKeyCode() ) { + case WXK_RETURN: + { + if (m_currentRow > 0) + { + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); + le.SetItem( GetItemByRow(m_currentRow) ); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + + parent->GetEventHandler()->ProcessEvent(le); + } + break; + } case WXK_UP: if ( m_currentRow > 0 ) OnArrowChar( m_currentRow - 1, event ); @@ -2325,7 +3436,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 ); @@ -2376,7 +3493,6 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) int x = event.GetX(); int y = event.GetY(); m_owner->CalcUnscrolledPosition( x, y, &x, &y ); - wxDataViewColumn *col = NULL; int xpos = 0; @@ -2397,17 +3513,56 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } if (!col) return; - wxDataViewRenderer *cell = col->GetRenderer(); + wxDataViewRenderer *cell = col->GetRenderer(); unsigned int current = y / m_lineHeight; - if ((current > GetRowCount()) || (x > GetEndOfLastCol())) { // Unselect all if below the last row ? return; } - wxDataViewListModel *model = GetOwner()->GetModel(); + //Test whether the mouse is hovered on the tree item button + bool hover = false; + if ((m_root) && (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); + if( rect.Contains( x, y) ) + { + //So the mouse is over the expander + hover = true; + if (m_underMouse && m_underMouse != node) + { + //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); + RefreshRow(GetRowByItem(m_underMouse->GetItem())); + } + if (m_underMouse != node) + { + //wxLogMessage("Do the row: %d", current); + RefreshRow(current); + } + m_underMouse = node; + } + } + if (node!=NULL && !node->HasChildren()) + delete node; + } + if (!hover) + { + if (m_underMouse != NULL) + { + //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); + RefreshRow(GetRowByItem(m_underMouse->GetItem())); + m_underMouse = NULL; + } + } + + wxDataViewModel *model = GetOwner()->GetModel(); if (event.Dragging()) { @@ -2443,18 +3598,35 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) m_lastOnSame = false; } + wxDataViewItem item = GetItemByRow(current); + bool ignore_other_columns = + ((GetOwner()->GetExpanderColumn() != col) && + (model->IsContainer(item)) && + (!model->HasContainerColumns(item))); + if (event.LeftDClick()) { if ( current == m_lineLastClicked ) { - if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE) + if ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)) { wxVariant value; - model->GetValue( value, col->GetModelColumn(), current ); + model->GetValue( value, item, col->GetModelColumn() ); cell->SetValue( value ); - wxRect cell_rect( xpos, current * m_lineHeight, + wxRect cell_rect( xpos, current * m_lineHeight, col->GetWidth(), m_lineHeight ); - cell->Activate( cell_rect, model, col->GetModelColumn(), current ); + cell->Activate( cell_rect, model, item, col->GetModelColumn() ); + + } + else + { + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); + le.SetItem( item ); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + + parent->GetEventHandler()->ProcessEvent(le); } return; } @@ -2475,7 +3647,28 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) SelectRow( m_lineSelectSingleOnUp, true ); } - if (m_lastOnSame) + //Process the event of user clicking the expander + bool expander = false; + if ((m_root) && (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); + 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 && !ignore_other_columns) { if ((col == m_currentCol) && (current == m_currentRow) && (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) ) @@ -2508,13 +3701,26 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) SelectAllRows(false); ChangeCurrentRow(current); SelectRow(m_currentRow,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() ); + cell->SetValue( value ); + wxRect cell_rect( xpos, current * m_lineHeight, + col->GetWidth(), m_lineHeight ); + if (!cell->RightClick( event.GetPosition(), cell_rect, model, 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()) { @@ -2523,9 +3729,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } if (event.LeftDown() || forceClick) { -#ifdef __WXMSW__ SetFocus(); -#endif m_lineBeforeLastClicked = m_lineLastClicked; m_lineLastClicked = current; @@ -2539,10 +3743,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if ( IsSingleSel() || !IsRowSelected(current) ) { SelectAllRows( false ); - ChangeCurrentRow(current); - SelectRow(m_currentRow,true); + SendSelectionChangedEvent(GetItemByRow( m_currentRow ) ); } else // multi sel & current is highlighted & no mod keys { @@ -2555,8 +3758,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (cmdModifierDown) { ChangeCurrentRow(current); - ReverseRowSelection(m_currentRow); + SendSelectionChangedEvent(GetItemByRow(m_selection[0]) ); } else if (event.ShiftDown()) { @@ -2572,6 +3775,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } SelectRows(lineFrom, lineTo, true); + SendSelectionChangedEvent(GetItemByRow(m_selection[0]) ); } else // !ctrl, !shift { @@ -2588,7 +3792,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) // Update selection here... m_currentCol = col; - m_lastOnSame = !forceClick && ((col == oldCurrentCol) && + m_lastOnSame = !forceClick && ((col == oldCurrentCol) && (current == oldCurrentRow)) && oldWasSelected; } } @@ -2613,9 +3817,18 @@ void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event ) event.Skip(); } +wxDataViewItem wxDataViewMainWindow::GetSelection() const +{ + if( m_selection.GetCount() != 1 ) + return wxDataViewItem(); + + return GetItemByRow( m_selection.Item(0)); +} + //----------------------------------------------------------------------------- // wxDataViewCtrl //----------------------------------------------------------------------------- +WX_DEFINE_LIST(wxDataViewColumnList) IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) @@ -2638,10 +3851,15 @@ 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 ( (style & wxBORDER_MASK) == 0) + style |= wxBORDER_SUNKEN; + + if (!wxControl::Create( parent, id, pos, size, + style | wxScrolledWindowStyle, validator)) return false; + SetInitialSize(size); + Init(); #ifdef __WXMAC__ @@ -2699,15 +3917,19 @@ 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->DestroyTree(); + + m_clientArea->BuildTree(model); + m_clientArea->UpdateDisplay(); return true; @@ -2718,6 +3940,17 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) if (!wxDataViewCtrlBase::AppendColumn(col)) return false; + m_cols.Append( col ); + OnColumnChange(); + return true; +} + +bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col ) +{ + if (!wxDataViewCtrlBase::PrependColumn(col)) + return false; + + m_cols.Insert( col ); OnColumnChange(); return true; } @@ -2730,48 +3963,303 @@ void wxDataViewCtrl::OnColumnChange() m_clientArea->UpdateDisplay(); } -void wxDataViewCtrl::SetSelection( int row ) +void wxDataViewCtrl::DoSetExpanderColumn() +{ + m_clientArea->UpdateDisplay(); +} + +void wxDataViewCtrl::DoSetIndent() +{ + m_clientArea->UpdateDisplay(); +} + +unsigned int wxDataViewCtrl::GetColumnCount() const +{ + return m_cols.GetCount(); +} + +wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const +{ + wxDataViewColumnList::const_iterator iter; + unsigned int i = 0; + for (iter = m_cols.begin(); iter!=m_cols.end(); iter++) + { + if (i == pos) + return *iter; + + if ((*iter)->IsHidden()) + continue; + i ++; + } + return NULL; +} + +void wxDataViewCtrl::ColumnMoved( wxDataViewColumn* col, unsigned int new_pos ) +{ + if (new_pos > m_cols.GetCount()) return; + m_cols.DeleteObject( col ); + m_cols.Insert( new_pos, col ); + + m_clientArea->UpdateDisplay(); +} + +bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) +{ + wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column ); + if (!ret) + return false; + + m_cols.Erase(ret); + delete column; + OnColumnChange(); + + return true; +} + +bool wxDataViewCtrl::ClearColumns() +{ + m_cols.clear(); + OnColumnChange(); + return true; +} + +int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const +{ + int ret = 0, dead = 0; + int len = GetColumnCount(); + for (int i=0; iIsHidden()) + continue; + ret += col->GetWidth(); + if (column==col) + { + CalcScrolledPosition( ret, dead, &ret, &dead ); + break; + } + } + return ret; +} + +wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const +{ + return NULL; +} + +//Selection code with wxDataViewItem as parameters +wxDataViewItem wxDataViewCtrl::GetSelection() const +{ + return m_clientArea->GetSelection(); +} + +int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const +{ + sel.Empty(); + wxDataViewSelection selection = m_clientArea->GetSelections(); + int len = selection.GetCount(); + for( int i = 0; i < len; i ++) + { + unsigned int row = selection[i]; + sel.Add( m_clientArea->GetItemByRow( row ) ); + } + return len; +} + +void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) { - m_clientArea->SelectRow(row, true); + wxDataViewSelection selection(wxDataViewSelectionCmp) ; + int len = sel.GetCount(); + for( int i = 0; i < len; i ++ ) + { + int row = m_clientArea->GetRowByItem( sel[i] ); + if( row >= 0 ) + selection.Add( static_cast(row) ); + } + m_clientArea->SetSelections( selection ); +} + +void wxDataViewCtrl::Select( const wxDataViewItem & item ) +{ + int row = m_clientArea->GetRowByItem( item ); + if( row >= 0 ) + { + //Unselect all rows before select another in the single select mode + if (m_clientArea->IsSingleSel()) + m_clientArea->SelectAllRows(false); + m_clientArea->SelectRow(row, true); + } +} + +void wxDataViewCtrl::Unselect( const wxDataViewItem & item ) +{ + int row = m_clientArea->GetRowByItem( item ); + if( row >= 0 ) + m_clientArea->SelectRow(row, false); +} + +bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const +{ + int row = m_clientArea->GetRowByItem( item ); + if( row >= 0 ) + { + return m_clientArea->IsRowSelected(row); + } + return false; } -void wxDataViewCtrl::SetSelectionRange( unsigned int from, unsigned int to ) +//Selection code with row number as parameter +int wxDataViewCtrl::GetSelections( wxArrayInt & sel ) const { - m_clientArea->SelectRows(from, to, true); + sel.Empty(); + wxDataViewSelection selection = m_clientArea->GetSelections(); + int len = selection.GetCount(); + for( int i = 0; i < len; i ++) + { + unsigned int row = selection[i]; + sel.Add( row ); + } + return len; } -void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections ) +void wxDataViewCtrl::SetSelections( const wxArrayInt & sel ) { - m_clientArea->Select(aSelections); + wxDataViewSelection selection(wxDataViewSelectionCmp) ; + int len = sel.GetCount(); + for( int i = 0; i < len; i ++ ) + { + int row = sel[i]; + if( row >= 0 ) + selection.Add( static_cast(row) ); + } + m_clientArea->SetSelections( selection ); } -void wxDataViewCtrl::Unselect( unsigned int WXUNUSED(row) ) +void wxDataViewCtrl::Select( int row ) { - // FIXME - TODO + if( row >= 0 ) + { + if (m_clientArea->IsSingleSel()) + m_clientArea->SelectAllRows(false); + m_clientArea->SelectRow( row, true ); + } } -bool wxDataViewCtrl::IsSelected( unsigned int WXUNUSED(row) ) const +void wxDataViewCtrl::Unselect( int row ) { - // FIXME - TODO + if( row >= 0 ) + m_clientArea->SelectRow(row, false); +} +bool wxDataViewCtrl::IsSelected( int row ) const +{ + if( row >= 0 ) + return m_clientArea->IsRowSelected(row); return false; } -int wxDataViewCtrl::GetSelection() const +void wxDataViewCtrl::SelectRange( int from, int to ) { - // FIXME - TODO + wxArrayInt sel; + for( int i = from; i < to; i ++ ) + sel.Add( i ); + m_clientArea->Select(sel); +} - return -1; +void wxDataViewCtrl::UnselectRange( int from, int to ) +{ + wxDataViewSelection sel = m_clientArea->GetSelections(); + for( int i = from; i < to; i ++ ) + if( sel.Index( i ) != wxNOT_FOUND ) + sel.Remove( i ); + m_clientArea->SetSelections(sel); } -int wxDataViewCtrl::GetSelections(wxArrayInt& WXUNUSED(aSelections) ) const +void wxDataViewCtrl::SelectAll() { - // FIXME - TODO + m_clientArea->SelectAllRows(true); +} - return 0; +void wxDataViewCtrl::UnselectAll() +{ + m_clientArea->SelectAllRows(false); } -#endif +void wxDataViewCtrl::EnsureVisible( int row, int column ) +{ + if( row < 0 ) + row = 0; + if( row > (int) m_clientArea->GetRowCount() ) + row = m_clientArea->GetRowCount(); + + int first = m_clientArea->GetFirstVisibleRow(); + int last = m_clientArea->GetLastVisibleRow(); + if( row < first ) + m_clientArea->ScrollTo( row, column ); + else if( row > last ) + m_clientArea->ScrollTo( row - last + first, column ); + else + m_clientArea->ScrollTo( first, column ); +} + +void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column ) +{ + 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 ); + } + } + +} + +void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) const +{ + m_clientArea->HitTest(point, item, column); +} + +wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ) const +{ + return m_clientArea->GetItemRect(item, column); +} + +wxDataViewItem wxDataViewCtrl::GetItemByRow( unsigned int row ) const +{ + return m_clientArea->GetItemByRow( row ); +} + +int wxDataViewCtrl::GetRowByItem( const wxDataViewItem & item ) const +{ + return m_clientArea->GetRowByItem( item ); +} + +void wxDataViewCtrl::Expand( const wxDataViewItem & item ) +{ + int row = m_clientArea->GetRowByItem( item ); + if (row != -1) + m_clientArea->Expand(row); +} + +void wxDataViewCtrl::Collapse( const wxDataViewItem & item ) +{ + int row = m_clientArea->GetRowByItem( item ); + if (row != -1) + m_clientArea->Collapse(row); +} + + #endif // !wxUSE_GENERICDATAVIEWCTRL #endif