X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afebb87be1467f24f4ffe5e8cca2a94acc5248c8..83666e99093aa0b65c497f7e6c75d98a875667cc:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 936dc0f164..ed190733d2 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -44,6 +44,7 @@ #include "wx/icon.h" #include "wx/list.h" #include "wx/listimpl.cpp" +#include "wx/imaglist.h" //----------------------------------------------------------------------------- // classes @@ -56,17 +57,29 @@ 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; +#ifdef __WXMSW__ +static const int EXPANDER_OFFSET = 4; +#else +static const int EXPANDER_OFFSET = 1; +#endif + //----------------------------------------------------------------------------- // wxDataViewHeaderWindow //----------------------------------------------------------------------------- -#define USE_NATIVE_HEADER_WINDOW 0 +// on wxMSW the header window (only that part however) can be made native! +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) + #define USE_NATIVE_HEADER_WINDOW +#endif + +//Below is the compare stuff +//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed +static wxDataViewModel * g_model; +static int g_column = -2; +static bool g_asending = true; // NB: for some reason, this class must be dllexport'ed or we get warnings from // MSVC in DLL build @@ -106,8 +119,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 @@ -135,18 +147,33 @@ 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; } + + virtual bool AcceptsFocusFromKeyboard() const { return false; } + 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_vetoColumnDrag; + bool m_delayedUpdate; + wxImageList *m_imageList; + private: DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW) }; @@ -198,6 +225,7 @@ 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 @@ -218,6 +246,7 @@ protected: m_isDragging = false; m_dirty = false; + m_hover = wxNOT_FOUND; m_column = wxNOT_FOUND; m_currentX = 0; m_minX = 0; @@ -226,7 +255,6 @@ protected: m_penCurrent = wxPen(col, 1, wxSOLID); } - void DrawCurrent(); void AdjustDC(wxDC& dc); private: @@ -254,148 +282,137 @@ public: // wxDataViewTreeNode //----------------------------------------------------------------------------- class wxDataViewTreeNode; -WX_DEFINE_SORTED_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes ); -WX_DEFINE_SORTED_ARRAY( void* , wxDataViewTreeLeaves); +WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes ); +WX_DEFINE_ARRAY( void* , wxDataViewTreeLeaves); -int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode * node1, wxDataViewTreeNode * node2); -int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2); +int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2); +int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2); class wxDataViewTreeNode { public: wxDataViewTreeNode( wxDataViewTreeNode * parent = NULL ) - :leaves( wxGenericTreeModelItemCmp ), - nodes(wxGenericTreeModelNodeCmp) - { this->parent = parent; - if( parent == NULL ) - open = true; - else - open = false; - hasChildren = false; - subTreeCount = 0; - } - //I don't know what I need to do in the destructure - ~wxDataViewTreeNode() { + m_parent = parent; + if (!parent) + m_open = true; + else + m_open = false; + m_hasChildren = false; + m_subTreeCount = 0; + } + ~wxDataViewTreeNode() + { } - wxDataViewTreeNode * GetParent() { return parent; } - void SetParent( wxDataViewTreeNode * parent ) { this->parent = parent; } - wxDataViewTreeNodes & GetNodes() { return nodes; } - wxDataViewTreeLeaves & GetChildren() { return leaves; } + wxDataViewTreeNode * GetParent() const { return m_parent; } + void SetParent( wxDataViewTreeNode * parent ) { m_parent = parent; } + wxDataViewTreeNodes & GetNodes() { return m_nodes; } + wxDataViewTreeLeaves & GetChildren() { return m_leaves; } void AddNode( wxDataViewTreeNode * node ) { - nodes.Add( node ); - leaves.Add( node->GetItem().GetID() ); + 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 ); } - void AddLeaf( void * leaf ) { leaves.Add( leaf ); } - wxDataViewItem & GetItem() { return item; } - void SetItem( const wxDataViewItem & item ) { this->item = item; } + wxDataViewItem & GetItem() { return m_item; } + const wxDataViewItem & GetItem() const { return m_item; } + void SetItem( const wxDataViewItem & item ) { m_item = item; } - unsigned int GetChildrenNumber() { return leaves.GetCount(); } - unsigned int GetNodeNumber() { return nodes.GetCount(); } - int GetIndentLevel() + unsigned int GetChildrenNumber() const { return m_leaves.GetCount(); } + unsigned int GetNodeNumber() const { return m_nodes.GetCount(); } + int GetIndentLevel() const { - int ret = 0 ; - wxDataViewTreeNode * node = this; - while( node->GetParent()->GetParent() != NULL ) - { - node = node->GetParent(); - ret ++; - } - return ret; + int ret = 0; + const wxDataViewTreeNode * node = this; + while( node->GetParent()->GetParent() != NULL ) + { + node = node->GetParent(); + ret ++; + } + return ret; } - bool IsOpen() + bool IsOpen() const { - return open ; + return m_open; } void ToggleOpen() { - int len = nodes.GetCount(); + int len = m_nodes.GetCount(); int sum = 0; - for ( int i = 0 ;i < len ; i ++) - sum += nodes[i]->GetSubTreeCount(); + for ( int i = 0;i < len; i ++) + sum += m_nodes[i]->GetSubTreeCount(); - sum += leaves.GetCount(); - if( open ) + sum += m_leaves.GetCount(); + if (m_open) { ChangeSubTreeCount(-sum); - open = !open; + m_open = !m_open; } else { - open = !open; + m_open = !m_open; ChangeSubTreeCount(sum); } } - bool HasChildren() { return hasChildren; } - void SetHasChildren( bool has ){ hasChildren = has; } + bool HasChildren() const { return m_hasChildren; } + void SetHasChildren( bool has ){ m_hasChildren = has; } - void SetSubTreeCount( int num ) { subTreeCount = num; } - int GetSubTreeCount() { return subTreeCount; } + void SetSubTreeCount( int num ) { m_subTreeCount = num; } + int GetSubTreeCount() const { return m_subTreeCount; } void ChangeSubTreeCount( int num ) { - if( !open ) - return ; - subTreeCount += num; - if( parent ) - parent->ChangeSubTreeCount(num); + if( !m_open ) + return; + m_subTreeCount += num; + if( m_parent ) + m_parent->ChangeSubTreeCount(num); } void Resort() { - wxDataViewTreeNodes nds = nodes; - wxDataViewTreeLeaves lvs = leaves; - nodes.Empty(); - leaves.Empty(); - - int len = nds.GetCount(); - if(len > 0) + if (g_column >= -1) { - int i; - for(i = 0; i < len; i ++) - nodes.Add(nds[i]); - for(i = 0; i < len; i ++) - nodes[i]->Resort(); - } - - len = lvs.GetCount(); - if(len > 0) - { - for(int i = 0; i < len; i++) - leaves.Add(lvs[i]); + 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 * parent; - wxDataViewTreeNodes nodes; - wxDataViewTreeLeaves leaves; - wxDataViewItem item; - bool open; - bool hasChildren; - int subTreeCount; + wxDataViewTreeNode *m_parent; + wxDataViewTreeNodes m_nodes; + wxDataViewTreeLeaves m_leaves; + wxDataViewItem m_item; + bool m_open; + bool m_hasChildren; + int m_subTreeCount; }; -//Below is the compare stuff -//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed -static wxDataViewModel * g_model; -static unsigned int g_column; -static bool g_asending; - -int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode * node1, wxDataViewTreeNode * node2) +int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2) { - return g_model->Compare( node1->GetItem(), node2->GetItem(), g_column, g_asending ); + return g_model->Compare( (*node1)->GetItem(), (*node2)->GetItem(), g_column, g_asending ); } -int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2) +int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2) { - return g_model->Compare( id1, id2, g_column, g_asending ); + return g_model->Compare( *id1, *id2, g_column, g_asending ); } @@ -407,7 +424,7 @@ int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2) WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection, WXDLLIMPEXP_ADV); WX_DECLARE_LIST(wxDataViewItem, ItemList); -WX_DEFINE_LIST(ItemList); +WX_DEFINE_LIST(ItemList) class wxDataViewMainWindow: public wxWindow { @@ -419,33 +436,42 @@ public: const wxString &name = wxT("wxdataviewctrlmainwindow") ); virtual ~wxDataViewMainWindow(); + bool IsVirtualList() const { return m_root == NULL; } + // notifications from wxDataViewModel - void SendModelEvent( wxEventType type, const wxDataViewItem & item); 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() - { - SortPrepare(); - m_root->Resort(); - UpdateDisplay(); + { + if (!IsVirtualList()) + { + SortPrepare(); + m_root->Resort(); + } + UpdateDisplay(); } void SortPrepare() { - g_model = GetOwner()->GetModel(); - g_column = GetOwner()->GetSortingColumn(); - wxDataViewColumn * col = GetOwner()->GetColumn(g_column); + 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_asending = col->IsSortOrderAscending(); + g_column = col->GetModelColumn(); + g_asending = col->IsSortOrderAscending(); } - + void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } wxDataViewCtrl *GetOwner() { return m_owner; } const wxDataViewCtrl *GetOwner() const { return m_owner; } @@ -477,7 +503,7 @@ public: unsigned int GetFirstVisibleRow() const; //I change this method to un const because in the tree view, the displaying number of the tree are changing along with the expanding/collapsing of the tree nodes unsigned int GetLastVisibleRow(); - unsigned int GetRowCount() ; + unsigned int GetRowCount(); wxDataViewItem GetSelection() const; wxDataViewSelection GetSelections(){ return m_selection; } @@ -488,6 +514,7 @@ public: 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 ); @@ -499,12 +526,15 @@ public: return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); } - //void EnsureVisible( unsigned int row ); wxRect GetLineRect( unsigned int row ) const; + int GetLineStart( unsigned int row ) const; // row * m_lineHeight in fixed mode + int GetLineHeight( unsigned int row ) const; // m_lineHeight in fixed mode + int GetLineAt( unsigned int y ) const; // y / m_lineHeight in fixed mode + //Some useful functions for row and item mapping wxDataViewItem GetItemByRow( unsigned int row ) const; - int GetRowByItem( const wxDataViewItem & item ); + int GetRowByItem( const wxDataViewItem & item ) const; //Methods for building the mapping tree void BuildTree( wxDataViewModel * model ); @@ -515,11 +545,11 @@ public: void Expand( unsigned int row ) { OnExpanding( row ); } void Collapse( unsigned int row ) { OnCollapsing( row ); } private: - wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ); + wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const; //We did not need this temporarily //wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item ); - int RecalculateCount() ; + int RecalculateCount(); wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item ); void OnExpanding( unsigned int row ); @@ -558,6 +588,8 @@ private: //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() @@ -584,7 +616,7 @@ public: virtual bool Cleared() { return m_mainWindow->Cleared(); } virtual void Resort() - { m_mainWindow->Resort(); } + { m_mainWindow->Resort(); } wxDataViewMainWindow *m_mainWindow; }; @@ -603,6 +635,8 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, m_dc = NULL; m_align = align; m_mode = mode; + m_wantsAttr = false; + m_hasAttr = false; } wxDataViewRenderer::~wxDataViewRenderer() @@ -625,6 +659,29 @@ wxDC *wxDataViewRenderer::GetDC() return m_dc; } +void wxDataViewRenderer::SetAlignment( int align ) +{ + m_align=align; +} + +int wxDataViewRenderer::GetAlignment() const +{ + return m_align; +} + +int wxDataViewRenderer::CalculateAlignment() const +{ + if (m_align == wxDVR_DEFAULT_ALIGNMENT) + { + if (GetOwner() == NULL) + return wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL; + + return GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL; + } + + return m_align; +} + // --------------------------------------------------------- // wxDataViewCustomRenderer // --------------------------------------------------------- @@ -637,6 +694,16 @@ 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 // --------------------------------------------------------- @@ -683,14 +750,7 @@ bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVarian bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int state ) { - wxDataViewCtrl *view = GetOwner()->GetOwner(); - wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ? - wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) : - view->GetForegroundColour(); - - dc->SetTextForeground(col); - dc->DrawText( m_text, cell.x, cell.y ); - + RenderText( m_text, 0, cell, dc, state ); return true; } @@ -706,6 +766,60 @@ 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 // --------------------------------------------------------- @@ -951,12 +1065,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; } @@ -989,6 +1101,80 @@ bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *m 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 // --------------------------------------------------------- @@ -1004,6 +1190,8 @@ wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *c SetTitle(title); SetFlags(flags); + m_autosize = width < 0; // TODO + Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width); } @@ -1015,7 +1203,7 @@ wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer * SetAlignment(align); SetFlags(flags); - Init(width < 0 ? wxDVC_TOGGLE_DEFAULT_WIDTH : width); + Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width); } wxDataViewColumn::~wxDataViewColumn() @@ -1061,6 +1249,14 @@ void wxDataViewColumn::SetSortable( bool sortable ) GetOwner()->OnColumnChange(); } +void wxDataViewColumn::SetReorderable( bool reorderable ) +{ + if (reorderable) + m_flags |= wxDATAVIEW_COL_REORDERABLE; + else + m_flags &= ~wxDATAVIEW_COL_REORDERABLE; +} + void wxDataViewColumn::SetSortOrder( bool ascending ) { m_ascending = ascending; @@ -1086,7 +1282,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); } @@ -1112,7 +1308,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); @@ -1125,17 +1328,28 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id, { m_owner = parent; - if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) ) - return false; + m_scrollOffsetX = 0; + m_delayedUpdate = false; + m_vetoColumnDrag = false; + m_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( this ); int x = pos.x == wxDefaultCoord ? 0 : pos.x, y = pos.y == wxDefaultCoord ? 0 : pos.y, w = size.x == wxDefaultCoord ? 1 : size.x, - h = 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; + 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, @@ -1151,6 +1365,9 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id, return false; } + m_imageList = new wxImageList( 16, 16 ); + (void)Header_SetImageList((HWND) m_hWnd, m_imageList->GetHIMAGELIST()); + // we need to subclass the m_hWnd to force wxWindow::HandleNotify // to call wxDataViewHeaderWindow::MSWOnNotify SubclassWin(m_hWnd); @@ -1159,75 +1376,70 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id, // header windows and must be done befor sending the HDM_LAYOUT msg SetFont(GetFont()); - RECT rcParent; - HDLAYOUT hdl; - WINDOWPOS wp; - - // Retrieve the bounding rectangle of the parent window's - // client area, and then request size and position values - // from the header control. - ::GetClientRect((HWND)hwndParent, &rcParent); - - hdl.prc = &rcParent; - hdl.pwpos = ℘ - if (!SendMessage((HWND)m_hWnd, HDM_LAYOUT, 0, (LPARAM) &hdl)) - { - wxLogLastError(_T("SendMessage")); - return false; - } - - // Set the size, position, and visibility of the header control. - SetWindowPos((HWND)m_hWnd, - wp.hwndInsertAfter, - wp.x, wp.y, - wp.cx, wp.cy, - wp.flags | SWP_SHOWWINDOW); - - // set our size hints: wxDataViewCtrl will put this wxWindow inside - // a wxBoxSizer and in order to avoid super-big header windows, - // we need to set our height as fixed - SetMinSize(wxSize(-1, wp.cy)); - SetMaxSize(wxSize(-1, wp.cy)); - return true; } wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow() { + delete m_imageList; UnsubclassWin(); } +wxSize wxDataViewHeaderWindowMSW::DoGetBestSize() const +{ + return wxSize( 80, m_buttonHeight+2 ); +} + +void wxDataViewHeaderWindowMSW::OnInternalIdle() +{ + if (m_delayedUpdate) + { + m_delayedUpdate = false; + UpdateDisplay(); + } +} + void wxDataViewHeaderWindowMSW::UpdateDisplay() { // remove old columns for (int j=0, max=Header_GetItemCount((HWND)m_hWnd); j < max; j++) Header_DeleteItem((HWND)m_hWnd, 0); + m_imageList->RemoveAll(); + // add the updated array of columns to the header control unsigned int cols = GetOwner()->GetColumnCount(); unsigned int added = 0; - wxDataViewModel * model = GetOwner()->GetModel(); for (unsigned int i = 0; i < cols; i++) { wxDataViewColumn *col = GetColumn( i ); if (col->IsHidden()) continue; // don't add it! + wxString title( col->GetTitle() ); HDITEM hdi; hdi.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH; - hdi.pszText = (wxChar *) col->GetTitle().wx_str(); + if (col->GetBitmap().IsOk()) + { + m_imageList->Add( col->GetBitmap() ); + hdi.mask |= HDI_IMAGE; + hdi.iImage = m_imageList->GetImageCount()-1; + } + hdi.pszText = (wxChar *) title.wx_str(); hdi.cxy = col->GetWidth(); hdi.cchTextMax = sizeof(hdi.pszText)/sizeof(hdi.pszText[0]); hdi.fmt = HDF_LEFT | HDF_STRING; + if (col->GetBitmap().IsOk()) + hdi.fmt |= HDF_IMAGE; + //hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP); - //sorting support - if(model && m_owner->GetSortingColumn() == i) + 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 - //hdi.fmt |= model->GetSortOrderAscending()? HDF_SORTUP:HDF_SORTDOWN; - ; + // VZ: works with 5.81 + hdi.fmt |= col->IsSortOrderAscending() ? HDF_SORTUP : HDF_SORTDOWN; } // lParam is reserved for application's use: @@ -1257,7 +1469,7 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay() default: // such alignment is not allowed for the column header! - wxFAIL; + break; // wxFAIL; } SendMessage((HWND)m_hWnd, HDM_INSERTITEM, @@ -1298,6 +1510,13 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA NMHEADER *nmHDR = (NMHEADER *)nmhdr; switch ( nmhdr->code ) { + case NM_RELEASEDCAPTURE: + { + // user has released the mouse + m_vetoColumnDrag = false; + } + break; + case HDN_BEGINTRACK: // user has started to resize a column: // do we need to veto it? @@ -1309,7 +1528,31 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA break; case HDN_BEGINDRAG: - // user has started to reorder a column + // valid column + if (nmHDR->iItem != -1) + { + // user has started to reorder a valid column + if ((m_vetoColumnDrag == true) || (!GetColumn(nmHDR->iItem)->IsReorderable())) + { + // veto it! + *result = TRUE; + m_vetoColumnDrag = true; + } + } + else + { + // veto it! + m_vetoColumnDrag = true; + } + break; + + case HDN_ENDDRAG: // user has finished reordering a column + { + wxDataViewColumn *col = GetColumn(nmHDR->iItem); + unsigned int new_pos = nmHDR->pitem->iOrder; + m_owner->ColumnMoved( col, new_pos ); + m_delayedUpdate = true; + } break; case HDN_ITEMCHANGING: @@ -1328,7 +1571,6 @@ 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 && @@ -1357,14 +1599,14 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA wxDataViewColumn *col = GetColumn(idx); if(col->IsSortable()) { - if(model && m_owner->GetSortingColumn() == idx) + if(model && m_owner->GetSortingColumn() == col) { bool order = col->IsSortOrderAscending(); col->SetSortOrder(!order); } else if(model) { - m_owner->SetSortingColumn(idx); + m_owner->SetSortingColumn(col); } } UpdateDisplay(); @@ -1432,32 +1674,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__) @@ -1528,7 +1758,7 @@ void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) int ch = h; wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE; - if (col->IsSortable() && GetOwner()->GetSortingColumn() == i) + if (col->IsSortable() && GetOwner()->GetSortingColumn() == col) { if (col->IsSortOrderAscending()) sortArrow = wxHDR_SORT_ICON_UP; @@ -1536,13 +1766,23 @@ void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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 ); @@ -1554,13 +1794,14 @@ 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: @@ -1599,10 +1840,6 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) m_owner->CalcUnscrolledPosition(w, 0, &w, NULL); w -= 6; - // erase the line if it was drawn - if (m_currentX < w) - DrawCurrent(); - if (event.ButtonUp()) { m_isDragging = false; @@ -1610,19 +1847,15 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) 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 @@ -1661,6 +1894,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; @@ -1677,7 +1917,6 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) m_isDragging = true; CaptureMouse(); m_currentX = x; - DrawCurrent(); } else // click on a column { @@ -1693,15 +1932,15 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) wxDataViewColumn *col = GetColumn(m_column); if(col->IsSortable()) { - unsigned int colnum = m_owner->GetSortingColumn(); - if(model && static_cast(colnum) == m_column) + wxDataViewColumn* sortCol = m_owner->GetSortingColumn(); + if(model && sortCol == col) { bool order = col->IsSortOrderAscending(); col->SetSortOrder(!order); } else if(model) { - m_owner->SetSortingColumn(m_column); + m_owner->SetSortingColumn(col); } } UpdateDisplay(); @@ -1724,28 +1963,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; @@ -1779,7 +1996,7 @@ void wxDataViewRenameTimer::Notify() //----------------------------------------------------------------------------- //The tree building helper, declared firstly -void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node); +static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node); int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 ) { @@ -1801,7 +2018,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 ) { @@ -1814,14 +2031,7 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i 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); @@ -1831,19 +2041,21 @@ 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), 1, wxSOLID ); + 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_count = -1; + m_underMouse = NULL; UpdateDisplay(); } @@ -1853,12 +2065,282 @@ wxDataViewMainWindow::~wxDataViewMainWindow() delete m_renameTimer; } -void wxDataViewMainWindow::OnRenameTimer() +void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { - // We have to call this here because changes may just have - // been made and no screen update taken place. - if ( m_dirty ) - wxSafeYield(); + 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 + GetOwner()->PrepareDC( dc ); + dc.SetFont( GetFont() ); + + wxRect update = GetUpdateRegion().GetBox(); + m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y ); + + // compute which items needs to be redrawn + unsigned int item_start = GetLineAt( wxMax(0,update.y) ); + unsigned int item_count = + wxMin( (int)( GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1), + (int)(GetRowCount( ) - item_start)); + unsigned int item_last = item_start + item_count; + + // compute which columns needs to be redrawn + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col_start = 0; + unsigned int x_start; + for (x_start = 0; col_start < cols; col_start++) + { + wxDataViewColumn *col = GetOwner()->GetColumn(col_start); + if (col->IsHidden()) + continue; // skip it! + + unsigned int w = col->GetWidth(); + if (x_start+w >= (unsigned int)update.x) + break; + + x_start += w; + } + + unsigned int col_last = col_start; + unsigned int x_last = x_start; + for (; col_last < cols; col_last++) + { + wxDataViewColumn *col = GetOwner()->GetColumn(col_last); + if (col->IsHidden()) + continue; // skip it! + + if (x_last > (unsigned int)update.GetRight()) + break; + + x_last += col->GetWidth(); + } + + // Draw horizontal rules if required + if ( m_owner->HasFlag(wxDV_HORIZ_RULES) ) + { + dc.SetPen(m_penRule); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + + for (unsigned int i = item_start; i <= item_last+1; i++) + { + int y = GetLineStart( i ); + dc.DrawLine(x_start, y, x_last, y); + } + } + + // Draw vertical rules if required + if ( m_owner->HasFlag(wxDV_VERT_RULES) ) + { + dc.SetPen(m_penRule); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + + int x = x_start; + for (unsigned int i = col_start; i < col_last; i++) + { + wxDataViewColumn *col = GetOwner()->GetColumn(i); + if (col->IsHidden()) + continue; // skip it + + dc.DrawLine(x, GetLineStart( item_start ), + x, GetLineStart( item_last ) ); + + x += col->GetWidth(); + } + + // Draw last vertical rule + dc.DrawLine(x, GetLineStart( item_start ), + x, GetLineStart( item_last ) ); + } + + // redraw the background for the items which are selected/current + for (unsigned int item = item_start; item < item_last; item++) + { + bool selected = m_selection.Index( item ) != wxNOT_FOUND; + if (selected || item == m_currentRow) + { + int flags = selected ? (int)wxCONTROL_SELECTED : 0; + if (item == m_currentRow) + flags |= wxCONTROL_CURRENT; + if (m_hasFocus) + flags |= wxCONTROL_FOCUSED; + + wxRect rect( x_start, GetLineStart( item ), x_last, GetLineHeight( item ) ); + wxRendererNative::Get().DrawItemSelectionRect + ( + this, + dc, + rect, + flags + ); + } + } + + wxDataViewColumn *expander = GetOwner()->GetExpanderColumn(); + if (!expander) + { + // TODO: last column for RTL support + expander = GetOwner()->GetColumn( 0 ); + GetOwner()->SetExpanderColumn(expander); + } + + // redraw all cells for all rows which must be repainted and all columns + wxRect cell_rect; + cell_rect.x = x_start; + for (unsigned int i = col_start; i < col_last; i++) + { + + wxDataViewColumn *col = GetOwner()->GetColumn( i ); + wxDataViewRenderer *cell = col->GetRenderer(); + cell_rect.width = col->GetWidth(); + + if (col->IsHidden()) + continue; // skip it! + + for (unsigned int item = item_start; item < item_last; item++) + { + // get the cell value and set it into the renderer + wxVariant value; + wxDataViewTreeNode *node = NULL; + wxDataViewItem dataitem; + + if (!IsVirtualList()) + { + node = GetTreeNodeByRow(item); + if( node == NULL ) + continue; + + dataitem = node->GetItem(); + + if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem)) + continue; + } + else + { + dataitem = wxDataViewItem( wxUIntToPtr(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 cell_rect + cell_rect.y = GetLineStart( item ); + cell_rect.height = GetLineHeight( item ); // -1 is for the horizontal rules (?) + + //Draw the expander here. + int indent = 0; + if ((!IsVirtualList()) && (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; + int expander_y = cell_rect.y + EXPANDER_MARGIN + (GetLineHeight(item) / 2) - (expander_width/2) - EXPANDER_OFFSET; + indent = indent + m_lineHeight; //try to use the m_lineHeight as the expander space + dc.SetPen( m_penExpander ); + dc.SetBrush( wxNullBrush ); + if( node->HasChildren() ) + { + 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); + } + //force the expander column to left-center align + cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); + } + if (node && !node->HasChildren()) + { + // Yes, if the node does not have any child, it must be a leaf which + // mean that it is a temporarily created by GetTreeNodeByRow + wxDELETE(node); + } + + // cannot be bigger than allocated space + wxSize size = cell->GetSize(); + // Because of the tree structure indent, here we should minus the width of the cell for drawing + size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent ); + // size.y = wxMin( size.y, cell_rect.height ); + size.y = cell_rect.height; + + wxRect item_rect(cell_rect.GetTopLeft(), size); + int align = cell->CalculateAlignment(); + + // horizontal alignment: + item_rect.x = cell_rect.x; + if (align & wxALIGN_CENTER_HORIZONTAL) + item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2); + else if (align & wxALIGN_RIGHT) + item_rect.x = cell_rect.x + cell_rect.width - size.x; + //else: wxALIGN_LEFT is the default + + // vertical alignment: + item_rect.y = cell_rect.y; + if (align & wxALIGN_CENTER_VERTICAL) + item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2); + else if (align & wxALIGN_BOTTOM) + item_rect.y = cell_rect.y + cell_rect.height - size.y; + //else: wxALIGN_TOP is the default + + // add padding + item_rect.x += PADDING_RIGHTLEFT; + item_rect.width = size.x - 2 * PADDING_RIGHTLEFT; + + //Here we add the tree indent + item_rect.x += indent; + + int state = 0; + if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND)) + state |= wxDATAVIEW_CELL_SELECTED; + + // TODO: it would be much more efficient to create a clipping + // region for the entire column being rendered (in the OnPaint + // of wxDataViewMainWindow) instead of a single clip region for + // each cell. However it would mean that each renderer should + // respect the given wxRect's top & bottom coords, eventually + // violating only the left & right coords - however the user can + // make its own renderer and thus we cannot be sure of that. + dc.SetClippingRegion( item_rect ); + cell->Render( item_rect, &dc, state ); + dc.DestroyClippingRegion(); + } + + cell_rect.x += cell_rect.width; + } +} + +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(); @@ -1873,8 +2355,10 @@ void wxDataViewMainWindow::OnRenameTimer() break; xpos += c->GetWidth(); } - wxRect labelRect( xpos, m_currentRow * m_lineHeight, - m_currentCol->GetWidth(), m_lineHeight ); + wxRect labelRect( xpos, + GetLineStart( m_currentRow ), + m_currentCol->GetWidth(), + GetLineHeight( m_currentRow ) ); GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y, &labelRect.x, &labelRect.y); @@ -1890,32 +2374,32 @@ void wxDataViewMainWindow::OnRenameTimer() class DoJob { public: - DoJob(){}; - virtual ~DoJob(){}; + DoJob() { } + virtual ~DoJob() { } //The return value control how the tree-walker tranverse the tree // 0: Job done, stop tranverse and return // 1: Ignore the current node's subtree and continue // 2: Job not done, continue enum { OK = 0 , IGR = 1, CONT = 2 }; - virtual int operator() ( wxDataViewTreeNode * node ) = 0 ; + virtual int operator() ( wxDataViewTreeNode * node ) = 0; virtual int operator() ( void * n ) = 0; }; bool Walker( wxDataViewTreeNode * node, DoJob & func ) { - if( node==NULL || !node->HasChildren()) + if( node==NULL ) return false; switch( func( node ) ) { case DoJob::OK : - return true ; + return true; case DoJob::IGR: return false; case DoJob::CONT: - default: - ; + default: + ; } wxDataViewTreeNodes nodes = node->GetNodes(); @@ -1925,7 +2409,7 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func ) int len = leaves.GetCount(); int i = 0, nodes_i = 0; - for( ; i < len ; i ++ ) + for(; i < len; i ++ ) { void * n = leaves[i]; if( nodes_i < len_nodes && n == nodes[nodes_i]->GetItem().GetID() ) @@ -1941,36 +2425,30 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func ) switch( func( n ) ) { case DoJob::OK : - return true ; + return true; case DoJob::IGR: continue; case DoJob::CONT: default: - ; + ; } } return false; } -void wxDataViewMainWindow::SendModelEvent( 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); -} - bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item) { + if (!m_root) + { + m_count++; + UpdateDisplay(); + return true; + } + SortPrepare(); wxDataViewTreeNode * node; node = FindNode(parent); - SendModelEvent(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED, item ); if( node == NULL ) return false; @@ -1995,38 +2473,52 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData return true; } -void DestroyTreeHelper( wxDataViewTreeNode * node); +static void DestroyTreeHelper( wxDataViewTreeNode * node); bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, const wxDataViewItem& item) { - SortPrepare(); + if (!m_root) + { + m_count--; + if( m_currentRow > GetRowCount() ) + m_currentRow = m_count - 1; - wxDataViewTreeNode * node; - node = FindNode(parent); + m_selection.Empty(); - SendModelEvent(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED, item); - if( node == NULL || node->GetChildren().Index( item.GetID() ) == wxNOT_FOUND ) - { - return false; + 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 ) { - int row = m_selection[0]; m_selection.Empty(); - m_selection.Add(row); } - - if( GetOwner()->GetModel()->IsContainer( item ) ) + 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 ++) + for( int i = 0; i < len; i ++) { if( nodes[i]->GetItem() == item ) { @@ -2035,389 +2527,157 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, } } - if (!n) - return false; + wxCHECK_MSG( n != NULL, false, "item not found" ); node->GetNodes().Remove( n ); sub -= n->GetSubTreeCount(); - DestroyTreeHelper(n); + ::DestroyTreeHelper(n); } - - if( node->GetChildrenNumber() == 0) - node->SetHasChildren( false ); - //Make the row number invalid and get a new valid one when user call GetRowCount m_count = -1; node->ChangeSubTreeCount(sub); + //Change the current row to the last row if the current exceed the max row number if( m_currentRow > GetRowCount() ) m_currentRow = m_count - 1; UpdateDisplay(); - return true; -} - -bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) -{ - SortPrepare(); - g_model->Resort(); - - SendModelEvent(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_CHANGED,item); return true; } -bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int col ) +bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) { - // 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_MODEL_VALUE_CHANGED, parent->GetId()); + 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() -{ - SortPrepare(); - - DestroyTree(); - UpdateDisplay(); - - wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED, parent->GetId()); - le.SetEventObject(parent); - le.SetModel(GetOwner()->GetModel()); - parent->GetEventHandler()->ProcessEvent(le); - - 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(); - unsigned int colnum = 0; - unsigned int x_start = 0, x_end = 0, w = 0; - int xx, yy, xe; - m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy ); - for (x_start = 0; colnum < column; colnum++) - { - wxDataViewColumn *col = GetOwner()->GetColumn(colnum); - if (col->IsHidden()) - continue; // skip it! - - w = col->GetWidth(); - x_start += w; - } - - x_end = x_start + w; - xe = xx + rect.width; - if( x_end > xe ) - { - sx = ( xx + x_end - xe )/x; - } - if( x_start < xx ) - { - sx = x_start/x; - } - } - m_owner->Scroll( sx, sy ); -} - -void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) +bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int col ) { - wxDataViewModel *model = GetOwner()->GetModel(); - wxAutoBufferedPaintDC dc( this ); - - // prepare the DC - dc.SetBackground(GetBackgroundColour()); - dc.Clear(); - GetOwner()->PrepareDC( dc ); - dc.SetFont( GetFont() ); - - wxRect update = GetUpdateRegion().GetBox(); - m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y ); - - // compute which items needs to be redrawn - unsigned int item_start = wxMax( 0, (update.y / m_lineHeight) ); - unsigned int item_count = - wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1), - (int)(GetRowCount( )- item_start) ); - unsigned int item_last = item_start + item_count; - - // compute which columns needs to be redrawn - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int col_start = 0; - unsigned int x_start = 0; - for (x_start = 0; col_start < cols; col_start++) - { - wxDataViewColumn *col = GetOwner()->GetColumn(col_start); - if (col->IsHidden()) - continue; // skip it! - - unsigned int w = col->GetWidth(); - if (x_start+w >= (unsigned int)update.x) - break; - - x_start += w; - } - - unsigned int col_last = col_start; - unsigned int x_last = x_start; - for (; col_last < cols; col_last++) - { - wxDataViewColumn *col = GetOwner()->GetColumn(col_last); - if (col->IsHidden()) - continue; // skip it! - - if (x_last > (unsigned int)update.GetRight()) - break; - - x_last += col->GetWidth(); - } - - // Draw horizontal rules if required - if ( m_owner->HasFlag(wxDV_HORIZ_RULES) ) - { - dc.SetPen(m_penRule); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - - for (unsigned int i = item_start; i <= item_last+1; i++) - { - int y = i * m_lineHeight; - dc.DrawLine(x_start, y, x_last, y); - } - } - - // Draw vertical rules if required - if ( m_owner->HasFlag(wxDV_VERT_RULES) ) - { - dc.SetPen(m_penRule); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - - int x = x_start; - for (unsigned int i = col_start; i < col_last; i++) - { - wxDataViewColumn *col = GetOwner()->GetColumn(i); - if (col->IsHidden()) - continue; // skip it - - dc.DrawLine(x, item_start * m_lineHeight, - x, item_last * m_lineHeight); - - x += col->GetWidth(); - } - - // Draw last vertical rule - dc.DrawLine(x, item_start * m_lineHeight, - x, item_last * m_lineHeight); - } + // NOTE: to be valid, we cannot use e.g. INT_MAX - 1 +/*#define MAX_VIRTUAL_WIDTH 100000 - // redraw the background for the items which are selected/current - for (unsigned int item = item_start; item < item_last; item++) - { - bool selected = m_selection.Index( item ) != wxNOT_FOUND; - if (selected || item == m_currentRow) - { - int flags = selected ? (int)wxCONTROL_SELECTED : 0; - if (item == m_currentRow) - flags |= wxCONTROL_CURRENT; - if (m_hasFocus) - flags |= wxCONTROL_FOCUSED; + wxRect rect( 0, row*m_lineHeight, MAX_VIRTUAL_WIDTH, m_lineHeight ); + m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + Refresh( true, &rect ); - wxRect rect( x_start, item*m_lineHeight, x_last, m_lineHeight ); - wxRendererNative::Get().DrawItemSelectionRect - ( - this, - dc, - rect, - flags - ); - } - } + return true; +*/ + SortPrepare(); + g_model->Resort(); - // redraw all cells for all rows which must be repainted and for all columns - wxRect cell_rect; - cell_rect.x = x_start; - cell_rect.height = m_lineHeight; // -1 is for the horizontal rules - for (unsigned int i = col_start; i < col_last; i++) - { - wxDataViewColumn *col = GetOwner()->GetColumn( i ); - wxDataViewRenderer *cell = col->GetRenderer(); - cell_rect.width = col->GetWidth(); + //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); - if (col->IsHidden()) - continue; // skipt it! + return true; +} - for (unsigned int item = item_start; item < item_last; item++) - { - // get the cell value and set it into the renderer - wxVariant value; - wxDataViewTreeNode * node = GetTreeNodeByRow(item); - if( node == NULL ) - { - continue; - } - - wxDataViewItem dataitem = node->GetItem(); - model->GetValue( value, dataitem, col->GetModelColumn()); - cell->SetValue( value ); +bool wxDataViewMainWindow::Cleared() +{ + DestroyTree(); - // update the y offset - cell_rect.y = item * m_lineHeight; + SortPrepare(); + BuildTree( GetOwner()->GetModel() ); - //Draw the expander here. - int indent = node->GetIndentLevel(); - if( col == GetOwner()->GetExpanderColumn() ) - { - //Calculate the indent first - indent = cell_rect.x + GetOwner()->GetIndent() * indent; + UpdateDisplay(); - int expander_width = m_lineHeight - 2*EXPANDER_MARGIN; - // change the cell_rect.x to the appropriate pos - int expander_x = indent + EXPANDER_MARGIN , expander_y = cell_rect.y + EXPANDER_MARGIN ; - indent = indent + m_lineHeight ; //try to use the m_lineHeight as the expander space - dc.SetPen( m_penExpander ); - dc.SetBrush( wxNullBrush ); - if( node->HasChildren() ) - { - //dc.DrawRoundedRectangle( expander_x,expander_y,expander_width,expander_width, 1.0); - //dc.DrawLine( expander_x + 2 , expander_y + expander_width/2, expander_x + expander_width - 2, expander_y + expander_width/2 ); - wxRect rect( expander_x , expander_y, expander_width, expander_width); - if( node->IsOpen() ) - wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, wxCONTROL_EXPANDED ); - else - wxRendererNative::Get().DrawTreeItemButton( this, dc, rect ); - } - else - { - // I am wandering whether we should draw dot lines between tree nodes - delete node; - //Yes, if the node does not have any child, it must be a leaf which mean that it is a temporarily created by GetTreeNodeByRow - } + return true; +} - //force the expander column to left-center align - cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); - } +void wxDataViewMainWindow::UpdateDisplay() +{ + m_dirty = true; +} +void wxDataViewMainWindow::OnInternalIdle() +{ + wxWindow::OnInternalIdle(); - // cannot be bigger than allocated space - wxSize size = cell->GetSize(); - // Because of the tree structure indent, here we should minus the width of the cell for drawing - size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent ); - size.y = wxMin( size.y + 2*PADDING_TOPBOTTOM, cell_rect.height ); + if (m_dirty) + { + RecalculateDisplay(); + m_dirty = false; + } +} - wxRect item_rect(cell_rect.GetTopLeft(), size); - int align = cell->GetAlignment(); +void wxDataViewMainWindow::RecalculateDisplay() +{ + wxDataViewModel *model = GetOwner()->GetModel(); + if (!model) + { + Refresh(); + return; + } - // horizontal alignment: - item_rect.x = cell_rect.x; - if (align & wxALIGN_CENTER_HORIZONTAL) - item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2); - else if (align & wxALIGN_RIGHT) - item_rect.x = cell_rect.x + cell_rect.width - size.x; - //else: wxALIGN_LEFT is the default + int width = GetEndOfLastCol(); + int height = GetLineStart( GetRowCount() ); - // vertical alignment: - item_rect.y = cell_rect.y; - if (align & wxALIGN_CENTER_VERTICAL) - item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2); - else if (align & wxALIGN_BOTTOM) - item_rect.y = cell_rect.y + cell_rect.height - size.y; - //else: wxALIGN_TOP is the default + SetVirtualSize( width, height ); + GetOwner()->SetScrollRate( 10, m_lineHeight ); - // 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; + Refresh(); +} - //Here we add the tree indent - item_rect.x += indent; +void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) +{ + wxWindow::ScrollWindow( dx, dy, rect ); - int state = 0; - if (m_selection.Index(item) != wxNOT_FOUND) - state |= wxDATAVIEW_CELL_SELECTED; + if (GetOwner()->m_headerArea) + GetOwner()->m_headerArea->ScrollWindow( dx, 0 ); +} - // TODO: it would be much more efficient to create a clipping - // region for the entire column being rendered (in the OnPaint - // of wxDataViewMainWindow) instead of a single clip region for - // each cell. However it would mean that each renderer should - // respect the given wxRect's top & bottom coords, eventually - // violating only the left & right coords - however the user can - // make its own renderer and thus we cannot be sure of that. - dc.SetClippingRegion( item_rect ); - cell->Render( item_rect, &dc, state ); - dc.DestroyClippingRegion(); +void wxDataViewMainWindow::ScrollTo( int rows, int column ) +{ + int x, y; + m_owner->GetScrollPixelsPerUnit( &x, &y ); + int sy = GetLineStart( rows )/y; + int sx = 0; + if( column != -1 ) + { + wxRect rect = GetClientRect(); + int colnum = 0; + int x_start, w = 0; + int xx, yy, xe; + m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy ); + for (x_start = 0; colnum < column; colnum++) + { + wxDataViewColumn *col = GetOwner()->GetColumn(colnum); + if (col->IsHidden()) + continue; // skip it! + + w = col->GetWidth(); + x_start += w; } - cell_rect.x += cell_rect.width; + int x_end = x_start + w; + xe = xx + rect.width; + if( x_end > xe ) + { + sx = ( xx + x_end - xe )/x; + } + if( x_start < xx ) + { + sx = x_start/x; + } } + m_owner->Scroll( sx, sy ); } int wxDataViewMainWindow::GetCountPerPage() const @@ -2433,7 +2693,7 @@ int wxDataViewMainWindow::GetEndOfLastCol() const for (i = 0; i < GetOwner()->GetColumnCount(); i++) { const wxDataViewColumn *c = - wx_const_cast(wxDataViewCtrl*, GetOwner())->GetColumn( i ); + const_cast(GetOwner())->GetColumn( i ); if (!c->IsHidden()) width += c->GetWidth(); @@ -2447,7 +2707,7 @@ unsigned int wxDataViewMainWindow::GetFirstVisibleRow() const int y = 0; m_owner->CalcUnscrolledPosition( x, y, &x, &y ); - return y / m_lineHeight; + return GetLineAt( y ); } unsigned int wxDataViewMainWindow::GetLastVisibleRow() @@ -2456,11 +2716,9 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow() m_owner->CalcUnscrolledPosition( client_size.x, client_size.y, &client_size.x, &client_size.y ); - //we should deal with the pixel here - unsigned int row = (client_size.y)/m_lineHeight; - if( client_size.y % m_lineHeight < m_lineHeight/2 ) - row -= 1; - + //we should deal with the pixel here + unsigned int row = GetLineAt(client_size.y) - 1; + return wxMin( GetRowCount()-1, row ); } @@ -2469,11 +2727,7 @@ unsigned int wxDataViewMainWindow::GetRowCount() if ( m_count == -1 ) { m_count = RecalculateCount(); - int width, height; - GetVirtualSize( &width, &height ); - height = m_count * m_lineHeight; - - SetVirtualSize( width, height ); + UpdateDisplay(); } return m_count; } @@ -2583,9 +2837,21 @@ 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 ); + wxRect rect( 0, GetLineStart( row ), GetEndOfLastCol(), GetLineHeight( row ) ); m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); wxSize client_size = GetClientSize(); @@ -2604,7 +2870,7 @@ void wxDataViewMainWindow::RefreshRows( unsigned int from, unsigned int to ) from = tmp; } - wxRect rect( 0, from*m_lineHeight, GetEndOfLastCol(), (to-from+1) * m_lineHeight ); + wxRect rect( 0, GetLineStart( from ), GetEndOfLastCol(), GetLineStart( (to-from+1) ) ); m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); wxSize client_size = GetClientSize(); @@ -2616,90 +2882,255 @@ void wxDataViewMainWindow::RefreshRows( unsigned int from, unsigned int to ) void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow ) { - unsigned int count = GetRowCount(); - if (firstRow > count) + wxSize client_size = GetClientSize(); + int start = GetLineStart( firstRow ); + m_owner->CalcScrolledPosition( start, 0, &start, NULL ); + if (start > client_size.y) return; + + wxRect rect( 0, start, client_size.x, client_size.y - start ); + + Refresh( true, &rect ); +} + +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; - wxRect rect( 0, firstRow*m_lineHeight, GetEndOfLastCol(), count * m_lineHeight ); - m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + unsigned int oldCurrent = m_currentRow; - wxSize client_size = GetClientSize(); - wxRect client_rect( 0, 0, client_size.x, client_size.y ); - wxRect intersect_rect = client_rect.Intersect( rect ); - if (intersect_rect.width > 0) - Refresh( true, &intersect_rect ); + // 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 = GetLineStart( row ); + rect.width = GetEndOfLastCol(); + rect.height = GetLineHeight( row ); + + return rect; +} + +int wxDataViewMainWindow::GetLineStart( unsigned int row ) const +{ + const wxDataViewModel *model = GetOwner()->GetModel(); + + if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) + { + // TODO make more efficient + + int start = 0; + + unsigned int r; + for (r = 0; r < row; r++) + { + const wxDataViewTreeNode* node = GetTreeNodeByRow(r); + if (!node) return start; + + wxDataViewItem item = node->GetItem(); + + if (node && !node->HasChildren()) + { + // Yes, if the node does not have any child, it must be a leaf which + // mean that it is a temporarily created by GetTreeNodeByRow + wxDELETE(node); + } + + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col; + int height = m_lineHeight; + for (col = 0; col < cols; col++) + { + const wxDataViewColumn *column = GetOwner()->GetColumn(col); + if (column->IsHidden()) + continue; // skip it! + + if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item)) + continue; // skip it! + + const wxDataViewRenderer *renderer = column->GetRenderer(); + wxVariant value; + model->GetValue( value, item, column->GetModelColumn() ); + wxDataViewRenderer *renderer2 = const_cast(renderer); + renderer2->SetValue( value ); + height = wxMax( height, renderer->GetSize().y ); + } + + + start += height; + } + + return start; + } + else + { + return row * m_lineHeight; + } } -void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event) +int wxDataViewMainWindow::GetLineAt( unsigned int y ) const { - wxCHECK_RET( newCurrent < GetRowCount(), - _T("invalid item index in OnArrowChar()") ); - - // if there is no selection, we cannot move it anywhere - if (!HasCurrentRow()) - return; + const wxDataViewModel *model = GetOwner()->GetModel(); - unsigned int oldCurrent = m_currentRow; + // check for the easy case first + if ( !GetOwner()->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) ) + return y / m_lineHeight; - // in single selection we just ignore Shift as we can't select several - // items anyhow - if ( event.ShiftDown() && !IsSingleSel() ) + // TODO make more efficient + unsigned int row = 0; + unsigned int yy = 0; + for (;;) { - RefreshRow( oldCurrent ); + const wxDataViewTreeNode* node = GetTreeNodeByRow(row); + if (!node) + { + // not really correct... + return row + ((y-yy) / m_lineHeight); + } - ChangeCurrentRow( newCurrent ); + wxDataViewItem item = node->GetItem(); - // select all the items between the old and the new one - if ( oldCurrent > newCurrent ) + if (node && !node->HasChildren()) { - newCurrent = oldCurrent; - oldCurrent = m_currentRow; + // Yes, if the node does not have any child, it must be a leaf which + // mean that it is a temporarily created by GetTreeNodeByRow + wxDELETE(node); } - SelectRows( oldCurrent, newCurrent, true ); - } - else // !shift - { - RefreshRow( oldCurrent ); + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col; + int height = m_lineHeight; + for (col = 0; col < cols; col++) + { + const wxDataViewColumn *column = GetOwner()->GetColumn(col); + if (column->IsHidden()) + continue; // skip it! - // all previously selected items are unselected unless ctrl is held - if ( !event.ControlDown() ) - SelectAllRows(false); + if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item)) + continue; // skip it! - ChangeCurrentRow( newCurrent ); + const wxDataViewRenderer *renderer = column->GetRenderer(); + wxVariant value; + model->GetValue( value, item, column->GetModelColumn() ); + wxDataViewRenderer *renderer2 = const_cast(renderer); + renderer2->SetValue( value ); + height = wxMax( height, renderer->GetSize().y ); + } - if ( !event.ControlDown() ) - SelectRow( m_currentRow, true ); - else - RefreshRow( m_currentRow ); - } + yy += height; + if (y < yy) + return row; - //EnsureVisible( m_currentRow ); + row++; + } } -wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const +int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const { - wxRect rect; - rect.x = 0; - rect.y = m_lineHeight * row; - rect.width = GetEndOfLastCol(); - rect.height = m_lineHeight; + const wxDataViewModel *model = GetOwner()->GetModel(); - return rect; + if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) + { + wxASSERT( !IsVirtualList() ); + + const wxDataViewTreeNode* node = GetTreeNodeByRow(row); + // wxASSERT( node ); + if (!node) return m_lineHeight; + + wxDataViewItem item = node->GetItem(); + + if (node && !node->HasChildren()) + { + // Yes, if the node does not have any child, it must be a leaf which + // mean that it is a temporarily created by GetTreeNodeByRow + wxDELETE(node); + } + + int height = m_lineHeight; + + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col; + for (col = 0; col < cols; col++) + { + const wxDataViewColumn *column = GetOwner()->GetColumn(col); + if (column->IsHidden()) + continue; // skip it! + + if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item)) + continue; // skip it! + + const wxDataViewRenderer *renderer = column->GetRenderer(); + wxVariant value; + model->GetValue( value, item, column->GetModelColumn() ); + wxDataViewRenderer *renderer2 = const_cast(renderer); + renderer2->SetValue( value ); + height = wxMax( height, renderer->GetSize().y ); + } + + return height; + } + else + { + return m_lineHeight; + } } class RowToItemJob: public DoJob { public: - RowToItemJob( unsigned int row , int current ) { this->row = row; this->current = current ;} - virtual ~RowToItemJob(){}; + RowToItemJob( unsigned int row , int current ) { this->row = row; this->current = current;} + virtual ~RowToItemJob() { } virtual int operator() ( wxDataViewTreeNode * node ) { current ++; if( current == static_cast(row)) - { - ret = node->GetItem() ; + { + ret = node->GetItem(); return DoJob::OK; } @@ -2726,8 +3157,8 @@ public: { current ++; if( current == static_cast(row)) - { - ret = wxDataViewItem( n ) ; + { + ret = wxDataViewItem( n ); return DoJob::OK; } return DoJob::CONT; @@ -2735,15 +3166,22 @@ public: wxDataViewItem GetResult(){ return ret; } private: unsigned int row; - int current ; + int current; wxDataViewItem ret; }; wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const { - RowToItemJob job( row, -2 ); - Walker( m_root , job ); - return job.GetResult(); + if (!m_root) + { + return wxDataViewItem( wxUIntToPtr(row) ); + } + else + { + RowToItemJob job( row, -2 ); + Walker( m_root , job ); + return job.GetResult(); + } } class RowToTreeNodeJob: public DoJob @@ -2752,18 +3190,18 @@ public: RowToTreeNodeJob( unsigned int row , int current, wxDataViewTreeNode * node ) { this->row = row; - this->current = current ; - ret = NULL ; + this->current = current; + ret = NULL; parent = node; } - virtual ~RowToTreeNodeJob(){}; + virtual ~RowToTreeNodeJob(){ } virtual int operator() ( wxDataViewTreeNode * node ) { current ++; if( current == static_cast(row)) - { - ret = node ; + { + ret = node; return DoJob::OK; } @@ -2781,7 +3219,7 @@ public: { int index = static_cast(row) - current - 1; void * n = node->GetChildren().Item( index ); - ret = new wxDataViewTreeNode( parent ) ; + ret = new wxDataViewTreeNode( parent ); ret->SetItem( wxDataViewItem( n )); ret->SetHasChildren(false); return DoJob::OK; @@ -2796,8 +3234,8 @@ public: { current ++; if( current == static_cast(row)) - { - ret = new wxDataViewTreeNode( parent ) ; + { + ret = new wxDataViewTreeNode( parent ); ret->SetItem( wxDataViewItem( n )); ret->SetHasChildren(false); return DoJob::OK; @@ -2808,14 +3246,16 @@ public: wxDataViewTreeNode * GetResult(){ return ret; } private: unsigned int row; - int current ; + int current; wxDataViewTreeNode * ret; - wxDataViewTreeNode * parent ; + wxDataViewTreeNode * parent; }; -wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) +wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) const { + wxASSERT( !IsVirtualList() ); + RowToTreeNodeJob job( row , -2, m_root ); Walker( m_root , job ); return job.GetResult(); @@ -2836,6 +3276,9 @@ wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const void wxDataViewMainWindow::OnExpanding( unsigned int row ) { + if (IsVirtualList()) + return; + wxDataViewTreeNode * node = GetTreeNodeByRow(row); if( node != NULL ) { @@ -2847,11 +3290,14 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row ) //Check if the user prevent expanding if( e.GetSkipped() ) return; - + node->ToggleOpen(); //Here I build the children of current node if( node->GetChildrenNumber() == 0 ) - BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); + { + SortPrepare(); + ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); + } m_count = -1; UpdateDisplay(); //Send the expanded event @@ -2862,6 +3308,7 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row ) SelectRow( row, false ); SelectRow( row + 1, true ); ChangeCurrentRow( row + 1 ); + SendSelectionChangedEvent( GetItemByRow(row+1)); } } else @@ -2871,6 +3318,9 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row ) void wxDataViewMainWindow::OnCollapsing(unsigned int row) { + if (IsVirtualList()) + return; + wxDataViewTreeNode * node = GetTreeNodeByRow(row); if( node != NULL ) { @@ -2891,12 +3341,13 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row) node = node->GetParent(); if( node != NULL ) { - int parent = GetRowByItem( node->GetItem() ) ; + int parent = GetRowByItem( node->GetItem() ); if( parent >= 0 ) { SelectRow( row, false); SelectRow(parent , true ); ChangeCurrentRow( parent ); + SendSelectionChangedEvent( node->GetItem() ); } } } @@ -2925,26 +3376,39 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item //Find the item along the parent-chain. //This algorithm is designed to speed up the node-finding method wxDataViewTreeNode * node = m_root; - for( ItemList::Node * n = list.GetFirst(); n; n = n->GetNext() ) + for( ItemList::const_iterator iter = list.begin(); iter !=list.end(); iter++ ) { if( node->HasChildren() ) { if( node->GetChildrenNumber() == 0 ) - BuildTreeHelper(model, node->GetItem(), node); + { + SortPrepare(); + ::BuildTreeHelper(model, node->GetItem(), node); + } wxDataViewTreeNodes nodes = node->GetNodes(); - //The wxSortedArray search a node in binary search, so using Item() is more efficient - wxDataViewTreeNode temp; - temp.SetItem(*(n->GetData())); - int index = nodes.Index( &temp ); - if( index == wxNOT_FOUND ) + unsigned int i; + bool found = false; + + for (i = 0; i < nodes.GetCount(); i ++) + { + if (nodes[i]->GetItem() == (**iter)) + { + if (nodes[i]->GetItem() == item) + return nodes[i]; + + node = nodes[i]; + found = true; + break; + } + } + if (!found) return NULL; - node = nodes[index]; } else return NULL; } - return node; + return NULL; } void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) @@ -2952,10 +3416,9 @@ void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item wxDataViewColumn *col = NULL; unsigned int cols = GetOwner()->GetColumnCount(); unsigned int colnum = 0; - unsigned int x_start = 0; int x, y; m_owner->CalcUnscrolledPosition( point.x, point.y, &x, &y ); - for (x_start = 0; colnum < cols; colnum++) + for (unsigned x_start = 0; colnum < cols; colnum++) { col = GetOwner()->GetColumn(colnum); if (col->IsHidden()) @@ -2969,14 +3432,14 @@ void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item } column = col; - item = GetItemByRow( y/m_lineHeight ); + item = GetItemByRow( GetLineAt( y ) ); } wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ) { int row = GetRowByItem(item); - int y = row*m_lineHeight; - int h = m_lineHeight; + int y = GetLineStart( row ); + int h = GetLineHeight( m_lineHeight ); int x = 0; wxDataViewColumn *col = NULL; for( int i = 0, cols = GetOwner()->GetColumnCount(); i < cols; i ++ ) @@ -2993,15 +3456,30 @@ wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxD int wxDataViewMainWindow::RecalculateCount() { - return m_root->GetSubTreeCount(); + if (!m_root) + { + wxDataViewIndexListModel *list_model = (wxDataViewIndexListModel*) GetOwner()->GetModel(); +#ifndef __WXMAC__ + return list_model->GetLastIndex() + 1; +#else + return list_model->GetLastIndex() - 1; +#endif + } + else + { + return m_root->GetSubTreeCount(); + } } class ItemToRowJob : public DoJob { public: - ItemToRowJob(const wxDataViewItem & item, ItemList::Node * node ) - { this->item = item ; ret = -1 ; nd = node ; } - virtual ~ItemToRowJob(){}; + ItemToRowJob(const wxDataViewItem& item_, ItemList::const_iterator iter) + : m_iter(iter), + item(item_) + { + ret = -1; + } //Maybe binary search will help to speed up this process virtual int operator() ( wxDataViewTreeNode * node) @@ -3012,9 +3490,9 @@ public: return DoJob::OK; } - if( nd && node->GetItem() == *(nd->GetData())) + if( node->GetItem() == **m_iter ) { - nd = nd->GetNext(); + m_iter++; return DoJob::CONT; } else @@ -3033,64 +3511,72 @@ public: return DoJob::CONT; } //the row number is begin from zero - int GetResult(){ return ret -1 ; } + int GetResult() { return ret -1; } + private: - ItemList::Node * nd; + ItemList::const_iterator m_iter; wxDataViewItem item; int ret; }; -int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) +int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const { - wxDataViewModel * model = GetOwner()->GetModel(); + const wxDataViewModel * model = GetOwner()->GetModel(); if( model == NULL ) return -1; - if( !item.IsOk() ) - return -1; - - //Compose the a parent-chain of the finding item - ItemList list; - wxDataViewItem * pItem = NULL; - list.DeleteContents( true ); - wxDataViewItem it( item ); - while( it.IsOk() ) + if (!m_root) { - pItem = new wxDataViewItem( it ); - list.Insert( pItem ); - it = model->GetParent( it ); + return wxPtrToUInt( item.GetID() ); } - pItem = new wxDataViewItem( ); - list.Insert( pItem ); + else + { + if( !item.IsOk() ) + return -1; + + //Compose the a parent-chain of the finding item + ItemList list; + wxDataViewItem * pItem; + list.DeleteContents( true ); + wxDataViewItem it( item ); + while( it.IsOk() ) + { + pItem = new wxDataViewItem( it ); + list.Insert( pItem ); + it = model->GetParent( it ); + } + pItem = new wxDataViewItem( ); + list.Insert( pItem ); - ItemToRowJob job( item, list.GetFirst() ); - Walker(m_root , job ); - return job.GetResult(); + ItemToRowJob job( item, list.begin() ); + Walker(m_root , job ); + return job.GetResult(); + } } -void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node) +static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node) { if( !model->IsContainer( item ) ) - return ; + return; - wxDataViewItem i = model->GetFirstChild( item ); - int num = 0; - while( i.IsOk() ) + wxDataViewItemArray children; + unsigned int num = model->GetChildren( item, children); + unsigned int index = 0; + while( index < num ) { - num ++; - if( model->IsContainer( i ) ) + if( model->IsContainer( children[index] ) ) { wxDataViewTreeNode * n = new wxDataViewTreeNode( node ); - n->SetItem(i); - n->SetHasChildren( true ) ; + n->SetItem(children[index]); + n->SetHasChildren( true ); node->AddNode( n ); } else { - node->AddLeaf( i.GetID() ); + node->AddLeaf( children[index].GetID() ); } - i = model->GetNextSibling( i ); + index ++; } node->SetSubTreeCount( num ); wxDataViewTreeNode * n = node->GetParent(); @@ -3101,21 +3587,32 @@ void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataVie void wxDataViewMainWindow::BuildTree(wxDataViewModel * model) { + DestroyTree(); + + if (GetOwner()->GetModel()->IsVirtualListModel()) + { + m_count = -1; + return; + } + + m_root = new wxDataViewTreeNode( NULL ); + m_root->SetHasChildren(true); + //First we define a invalid item to fetch the top-level elements wxDataViewItem item; SortPrepare(); BuildTreeHelper( model, item, m_root); - m_count = -1 ; + m_count = -1; } -void DestroyTreeHelper( wxDataViewTreeNode * node ) +static void DestroyTreeHelper( wxDataViewTreeNode * node ) { if( node->GetNodeNumber() != 0 ) { int len = node->GetNodeNumber(); - int i = 0 ; - wxDataViewTreeNodes nodes = node->GetNodes(); - for( ; i < len; i ++ ) + int i = 0; + wxDataViewTreeNodes& nodes = node->GetNodes(); + for(; i < len; i ++ ) { DestroyTreeHelper(nodes[i]); } @@ -3125,23 +3622,18 @@ void DestroyTreeHelper( wxDataViewTreeNode * node ) void wxDataViewMainWindow::DestroyTree() { - DestroyTreeHelper(m_root); - m_root->SetSubTreeCount(0); - m_count = 0 ; + if (!IsVirtualList()) + { + ::DestroyTreeHelper(m_root); + m_count = 0; + m_root = NULL; + } } void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) { - if (event.GetKeyCode() == WXK_TAB) - { - wxNavigationKeyEvent nevent; - nevent.SetWindowChange( event.ControlDown() ); - nevent.SetDirection( !event.ShiftDown() ); - nevent.SetEventObject( GetParent()->GetParent() ); - nevent.SetCurrentFocus( m_parent ); - if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent )) - return; - } + if ( GetParent()->HandleAsNavigationKey(event) ) + return; // no item -> nothing to do if (!HasCurrentRow()) @@ -3156,6 +3648,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 ); @@ -3167,11 +3673,11 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) break; //Add the process for tree expanding/collapsing case WXK_LEFT: - OnCollapsing(m_currentRow); - break; - case WXK_RIGHT: - OnExpanding( m_currentRow); - break; + OnCollapsing(m_currentRow); + break; + case WXK_RIGHT: + OnExpanding( m_currentRow); + break; case WXK_END: if (!IsEmpty()) OnArrowChar( GetRowCount() - 1, event ); @@ -3222,7 +3728,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; @@ -3243,16 +3748,58 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } if (!col) return; - wxDataViewRenderer *cell = col->GetRenderer(); - - unsigned int current = y / m_lineHeight; + wxDataViewRenderer *cell = col->GetRenderer(); + unsigned int current = GetLineAt( y ); if ((current > GetRowCount()) || (x > GetEndOfLastCol())) { // Unselect all if below the last row ? return; } + //Test whether the mouse is hovered on the tree item button + bool hover = false; + if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col)) + { + wxDataViewTreeNode * node = GetTreeNodeByRow(current); + if( node!=NULL && node->HasChildren() ) + { + int indent = node->GetIndentLevel(); + indent = GetOwner()->GetIndent()*indent; + wxRect rect( xpos + indent + EXPANDER_MARGIN, + GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET, + m_lineHeight-2*EXPANDER_MARGIN, + m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET); + if( rect.Contains( x, y) ) + { + //So the mouse is over the expander + 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()) @@ -3289,26 +3836,32 @@ 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)) { - wxDataViewItem item = GetItemByRow(current); wxVariant value; model->GetValue( value, item, col->GetModelColumn() ); cell->SetValue( value ); - wxRect cell_rect( xpos, current * m_lineHeight, - col->GetWidth(), m_lineHeight ); + wxRect cell_rect( xpos, GetLineStart( current ), + col->GetWidth(), GetLineHeight( current ) ); cell->Activate( cell_rect, model, item, col->GetModelColumn() ); + } + else + { wxWindow *parent = GetParent(); wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); - + le.SetItem( item ); le.SetEventObject(parent); - le.SetColumn(col->GetModelColumn()); - le.SetDataViewColumn(col); le.SetModel(GetOwner()->GetModel()); parent->GetEventHandler()->ProcessEvent(le); @@ -3334,27 +3887,35 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) //Process the event of user clicking the expander bool expander = false; - wxDataViewTreeNode * node = GetTreeNodeByRow(current); - if( node!=NULL && node->HasChildren() ) + if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col)) { - 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) ) + wxDataViewTreeNode * node = GetTreeNodeByRow(current); + if( node!=NULL && node->HasChildren() ) { - expander = true; - if( node->IsOpen() ) - OnCollapsing(current); - else - OnExpanding( current ); + int indent = node->GetIndentLevel(); + indent = GetOwner()->GetIndent()*indent; + wxRect rect( xpos + indent + EXPANDER_MARGIN, + GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET, + m_lineHeight-2*EXPANDER_MARGIN, + m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET); + + if( rect.Contains( x, y) ) + { + expander = true; + if( node->IsOpen() ) + OnCollapsing(current); + else + OnExpanding( current ); + } } + if (node && !node->HasChildren()) + delete node; } - //If the user click the expander, we do not do editing even if the column with expander are editable - if (m_lastOnSame && !expander ) + if (m_lastOnSame && !expander && !ignore_other_columns) { if ((col == m_currentCol) && (current == m_currentRow) && - (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) ) + (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) ) { m_renameTimer->Start( 100, true ); } @@ -3384,24 +3945,25 @@ 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() ); + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId()); + le.SetItem( item ); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetValue(value); + parent->GetEventHandler()->ProcessEvent(le); } else if (event.MiddleDown()) { - // notify cell about middle click - // cell->... } if (event.LeftDown() || forceClick) { -#ifdef __WXMSW__ SetFocus(); -#endif m_lineBeforeLastClicked = m_lineLastClicked; m_lineLastClicked = current; @@ -3415,10 +3977,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 { @@ -3431,8 +3992,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (cmdModifierDown) { ChangeCurrentRow(current); - ReverseRowSelection(m_currentRow); + SendSelectionChangedEvent(GetItemByRow(m_selection[0]) ); } else if (event.ShiftDown()) { @@ -3448,6 +4009,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } SelectRows(lineFrom, lineTo, true); + SendSelectionChangedEvent(GetItemByRow(m_selection[0]) ); } else // !ctrl, !shift { @@ -3466,6 +4028,18 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) m_lastOnSame = !forceClick && ((col == oldCurrentCol) && (current == oldCurrentRow)) && oldWasSelected; + + // Call LeftClick after everything else as under GTK+ + if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE) + { + // notify cell about right click + wxVariant value; + model->GetValue( value, item, col->GetModelColumn() ); + cell->SetValue( value ); + wxRect cell_rect( xpos, GetLineStart( current ), + col->GetWidth(), GetLineHeight( current ) ); + /* ignore ret */ cell->LeftClick( event.GetPosition(), cell_rect, model, item, col->GetModelColumn()); + } } } @@ -3500,7 +4074,7 @@ wxDataViewItem wxDataViewMainWindow::GetSelection() const //----------------------------------------------------------------------------- // wxDataViewCtrl //----------------------------------------------------------------------------- -WX_DEFINE_LIST(wxDataViewColumnList); +WX_DEFINE_LIST(wxDataViewColumnList) IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) @@ -3512,25 +4086,37 @@ wxDataViewCtrl::~wxDataViewCtrl() { if (m_notifier) GetModel()->RemoveNotifier( m_notifier ); + + m_cols.Clear(); } void wxDataViewCtrl::Init() { + m_cols.DeleteContents(true); m_notifier = NULL; + + // No sorting column at start + m_sortingColumn = NULL; + m_headerArea = NULL; } bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) { + if ( (style & wxBORDER_MASK) == 0) + style |= wxBORDER_SUNKEN; + + Init(); + if (!wxControl::Create( parent, id, pos, size, - style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator)) + style | wxScrolledWindowStyle, validator)) return false; - Init(); + SetInitialSize(size); #ifdef __WXMAC__ - MacSetClipChildren( true ) ; + MacSetClipChildren( true ); #endif m_clientArea = new wxDataViewMainWindow( this, wxID_ANY ); @@ -3570,6 +4156,15 @@ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg, } #endif +wxSize wxDataViewCtrl::GetSizeAvailableForScrollTarget(const wxSize& size) +{ + wxSize newsize = size; + if (!HasFlag(wxDV_NO_HEADER) && (m_headerArea)) + newsize.y -= m_headerArea->GetSize().y; + + return newsize; +} + void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) { // We need to override OnSize so that our scrolled @@ -3584,6 +4179,12 @@ void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) AdjustScrollbars(); } +void wxDataViewCtrl::SetFocus() +{ + if (m_clientArea) + m_clientArea->SetFocus(); +} + bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) { if (!wxDataViewCtrlBase::AssociateModel( model )) @@ -3593,6 +4194,8 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) model->AddNotifier( m_notifier ); + m_clientArea->DestroyTree(); + m_clientArea->BuildTree(model); m_clientArea->UpdateDisplay(); @@ -3610,6 +4213,26 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) return true; } +bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col ) +{ + if (!wxDataViewCtrlBase::PrependColumn(col)) + return false; + + m_cols.Insert( col ); + OnColumnChange(); + return true; +} + +bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col ) +{ + if (!wxDataViewCtrlBase::InsertColumn(pos,col)) + return false; + + m_cols.Insert( pos, col ); + OnColumnChange(); + return true; +} + void wxDataViewCtrl::OnColumnChange() { if (m_headerArea) @@ -3636,7 +4259,7 @@ unsigned int wxDataViewCtrl::GetColumnCount() const wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const { wxDataViewColumnList::const_iterator iter; - int i = 0; + unsigned int i = 0; for (iter = m_cols.begin(); iter!=m_cols.end(); iter++) { if (i == pos) @@ -3649,14 +4272,26 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const return NULL; } +void wxDataViewCtrl::ColumnMoved( wxDataViewColumn* col, unsigned int new_pos ) +{ + if (new_pos > m_cols.GetCount()) return; + + // Exchange position + m_cols.DeleteContents(false); + m_cols.DeleteObject( col ); + m_cols.Insert( new_pos, col ); + m_cols.DeleteContents(true); + + m_clientArea->UpdateDisplay(); +} + bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) { - wxDataViewColumnList::Node * ret = m_cols.Find( column ); - if (ret == NULL) + wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column ); + if (!ret) return false; - m_cols.Erase(ret); - delete column; + m_cols.Erase(ret); OnColumnChange(); return true; @@ -3664,11 +4299,35 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) bool wxDataViewCtrl::ClearColumns() { - m_cols.clear(); + 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 { @@ -3690,7 +4349,7 @@ int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) { - wxDataViewSelection selection(wxDataViewSelectionCmp) ; + wxDataViewSelection selection(wxDataViewSelectionCmp); int len = sel.GetCount(); for( int i = 0; i < len; i ++ ) { @@ -3705,7 +4364,12 @@ 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 ) @@ -3741,7 +4405,7 @@ int wxDataViewCtrl::GetSelections( wxArrayInt & sel ) const void wxDataViewCtrl::SetSelections( const wxArrayInt & sel ) { - wxDataViewSelection selection(wxDataViewSelectionCmp) ; + wxDataViewSelection selection(wxDataViewSelectionCmp); int len = sel.GetCount(); for( int i = 0; i < len; i ++ ) { @@ -3755,7 +4419,11 @@ void wxDataViewCtrl::SetSelections( const wxArrayInt & sel ) void wxDataViewCtrl::Select( int row ) { if( row >= 0 ) + { + if (m_clientArea->IsSingleSel()) + m_clientArea->SelectAllRows(false); m_clientArea->SelectRow( row, true ); + } } void wxDataViewCtrl::Unselect( int row ) @@ -3773,7 +4441,7 @@ bool wxDataViewCtrl::IsSelected( int row ) const void wxDataViewCtrl::SelectRange( int from, int to ) { - wxArrayInt sel; + wxArrayInt sel; for( int i = from; i < to; i ++ ) sel.Add( i ); m_clientArea->Select(sel); @@ -3802,7 +4470,7 @@ void wxDataViewCtrl::EnsureVisible( int row, int column ) { if( row < 0 ) row = 0; - if( row > m_clientArea->GetRowCount() ) + if( row > (int) m_clientArea->GetRowCount() ) row = m_clientArea->GetRowCount(); int first = m_clientArea->GetFirstVisibleRow(); @@ -3821,9 +4489,9 @@ void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataVie if( row >= 0 ) { if( column == NULL ) - return EnsureVisible(row, -1); + EnsureVisible(row, -1); else - { + { int col = 0; int len = GetColumnCount(); for( int i = 0; i < len; i ++ ) @@ -3835,7 +4503,7 @@ void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataVie EnsureVisible( row, col ); } } - + } void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) const @@ -3869,7 +4537,7 @@ void wxDataViewCtrl::Collapse( const wxDataViewItem & item ) { int row = m_clientArea->GetRowByItem( item ); if (row != -1) - m_clientArea->Collapse(row); + m_clientArea->Collapse(row); } #endif