X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d37b709c4b94d8690f9fe6adbdc1246e9f51bf4e..9a7b7798282622e445efc3318b6c85ff0bed9af8:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 6c05b975ba..1b6a371e82 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -56,9 +56,6 @@ 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; @@ -66,7 +63,7 @@ static const int EXPANDER_MARGIN = 4; // wxDataViewHeaderWindow //----------------------------------------------------------------------------- -#define USE_NATIVE_HEADER_WINDOW 0 +#define USE_NATIVE_HEADER_WINDOW 1 //Below is the compare stuff //For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed @@ -141,17 +138,23 @@ public: // the column count virtual void UpdateDisplay(); - // called when the main window gets scrolled + // called Refresh afterwards virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL); protected: virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); + wxSize DoGetBestSize() const; + unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR); wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR) { return GetColumn(GetColumnIdxFromHeader(nmHDR)); } + + int m_scrollOffsetX; + int m_buttonHeight; private: DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW) @@ -234,7 +237,6 @@ protected: m_penCurrent = wxPen(col, 1, wxSOLID); } - void DrawCurrent(); void AdjustDC(wxDC& dc); private: @@ -272,118 +274,116 @@ class wxDataViewTreeNode { public: wxDataViewTreeNode( wxDataViewTreeNode * parent = NULL ) - { 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() { return m_parent; } + void SetParent( wxDataViewTreeNode * parent ) { m_parent = parent; } + wxDataViewTreeNodes & GetNodes() { return m_nodes; } + wxDataViewTreeLeaves & GetChildren() { return m_leaves; } void AddNode( wxDataViewTreeNode * node ) { - leaves.Add( node->GetItem().GetID() ); + m_leaves.Add( node->GetItem().GetID() ); if (g_column >= -1) - leaves.Sort( &wxGenericTreeModelItemCmp ); - nodes.Add( node ); + m_leaves.Sort( &wxGenericTreeModelItemCmp ); + m_nodes.Add( node ); if (g_column >= -1) - nodes.Sort( &wxGenericTreeModelNodeCmp ); + m_nodes.Sort( &wxGenericTreeModelNodeCmp ); } void AddLeaf( void * leaf ) { - leaves.Add( leaf ); + m_leaves.Add( leaf ); if (g_column >= -1) - leaves.Sort( &wxGenericTreeModelItemCmp ); + m_leaves.Sort( &wxGenericTreeModelItemCmp ); } - wxDataViewItem & GetItem() { return item; } - void SetItem( const wxDataViewItem & item ) { this->item = item; } + wxDataViewItem & GetItem() { return m_item; } + void SetItem( const wxDataViewItem & item ) { m_item = item; } - unsigned int GetChildrenNumber() { return leaves.GetCount(); } - unsigned int GetNodeNumber() { return nodes.GetCount(); } + unsigned int GetChildrenNumber() { return m_leaves.GetCount(); } + unsigned int GetNodeNumber() { return m_nodes.GetCount(); } int GetIndentLevel() { int ret = 0 ; - wxDataViewTreeNode * node = this; - while( node->GetParent()->GetParent() != NULL ) - { - node = node->GetParent(); - ret ++; - } - return ret; + wxDataViewTreeNode * node = this; + while( node->GetParent()->GetParent() != NULL ) + { + node = node->GetParent(); + ret ++; + } + return ret; } bool IsOpen() { - 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(); + 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() { 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() { return m_subTreeCount; } void ChangeSubTreeCount( int num ) { - if( !open ) + if( !m_open ) return ; - subTreeCount += num; - if( parent ) - parent->ChangeSubTreeCount(num); + m_subTreeCount += num; + if( m_parent ) + m_parent->ChangeSubTreeCount(num); } void Resort() { if (g_column >= -1) { - nodes.Sort( &wxGenericTreeModelNodeCmp ); - int len = nodes.GetCount(); + m_nodes.Sort( &wxGenericTreeModelNodeCmp ); + int len = m_nodes.GetCount(); for (int i = 0; i < len; i ++) - { - nodes[i]->Resort(); - } - leaves.Sort( &wxGenericTreeModelItemCmp ); + 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; }; int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2) @@ -405,7 +405,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 { @@ -502,7 +502,6 @@ public: return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); } - //void EnsureVisible( unsigned int row ); wxRect GetLineRect( unsigned int row ) const; //Some useful functions for row and item mapping @@ -642,6 +641,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 // --------------------------------------------------------- @@ -688,14 +697,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; } @@ -956,12 +958,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; } @@ -1018,46 +1018,52 @@ bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value ) return true; } -bool wxDataViewIconTextRenderer::GetValue( wxVariant &value ) const +bool wxDataViewIconTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const { return false; } bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state ) { - wxDataViewCtrl *view = GetOwner()->GetOwner(); - - dc->SetFont( view->GetFont() ); - - wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ? - wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) : - view->GetForegroundColour(); - - dc->SetTextForeground(col); - + int xoffset = 0; const wxIcon &icon = m_value.GetIcon(); if (icon.IsOk()) { - dc->DrawIcon( icon, cell.x, cell.y ); // TODO centre - cell.x += icon.GetWidth()+4; + dc->DrawIcon( icon, cell.x, cell.y + ((cell.height - icon.GetHeight()) / 2)); + xoffset = icon.GetWidth()+4; } - dc->DrawText( m_value.GetText(), cell.x, cell.y ); + RenderText( m_value.GetText(), xoffset, cell, dc, state ); return true; } wxSize wxDataViewIconTextRenderer::GetSize() const { - return wxSize(80,16); // TODO + 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 *parent, wxRect labelRect, const wxVariant &value ) +wxControl * +wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow * WXUNUSED(parent), + wxRect WXUNUSED(labelRect), + const wxVariant& WXUNUSED(value)) { return NULL; } -bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ) +bool +wxDataViewIconTextRenderer::GetValueFromEditorCtrl(wxControl* WXUNUSED(editor), + wxVariant& WXUNUSED(value)) { return false; } @@ -1198,17 +1204,24 @@ 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_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( this ) + 10; 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 = size.y == wxDefaultCoord ? m_buttonHeight : size.y; + + if ( !CreateControl(parent, id, pos, 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, @@ -1231,37 +1244,7 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id, // the following is required to get the default win's font for // header windows and must be done befor sending the HDM_LAYOUT msg SetFont(GetFont()); - - RECT rcParent; - HDLAYOUT hdl; - WINDOWPOS wp; - - // Retrieve the bounding rectangle of the parent window's - // client area, and then request size and position values - // from the header control. - ::GetClientRect((HWND)hwndParent, &rcParent); - - hdl.prc = &rcParent; - hdl.pwpos = ℘ - if (!SendMessage((HWND)m_hWnd, HDM_LAYOUT, 0, (LPARAM) &hdl)) - { - wxLogLastError(_T("SendMessage")); - return false; - } - - // Set the size, position, and visibility of the header control. - SetWindowPos((HWND)m_hWnd, - wp.hwndInsertAfter, - wp.x, wp.y, - wp.cx, wp.cy, - wp.flags | SWP_SHOWWINDOW); - - // set our size hints: wxDataViewCtrl will put this wxWindow inside - // a wxBoxSizer and in order to avoid super-big header windows, - // we need to set our height as fixed - SetMinSize(wxSize(-1, wp.cy)); - SetMaxSize(wxSize(-1, wp.cy)); - + return true; } @@ -1270,6 +1253,11 @@ wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow() UnsubclassWin(); } +wxSize wxDataViewHeaderWindowMSW::DoGetBestSize() const +{ + return wxSize(80, m_buttonHeight ); +} + void wxDataViewHeaderWindowMSW::UpdateDisplay() { // remove old columns @@ -1279,7 +1267,6 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay() // 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 ); @@ -1294,13 +1281,12 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay() hdi.fmt = HDF_LEFT | HDF_STRING; //hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP); - //sorting support - if(model && m_owner->GetSortingColumn() == col) + 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: @@ -1330,7 +1316,7 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay() default: // such alignment is not allowed for the column header! - wxFAIL; + break; // wxFAIL; } SendMessage((HWND)m_hWnd, HDM_INSERTITEM, @@ -1505,32 +1491,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(); - - // 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); + m_scrollOffsetX += dx; + + 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__) @@ -1608,11 +1582,11 @@ void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) else sortArrow = wxHDR_SORT_ICON_DOWN; } - + int state = 0; if (m_parent->IsEnabled()) { - if (i == m_hover) + if ((int) i == m_hover) state = wxCONTROL_CURRENT; } else @@ -1637,13 +1611,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: @@ -1735,7 +1710,7 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) m_minX = xpos; } - + int old_hover = m_hover; m_hover = m_column; if (event.Leaving()) @@ -1805,33 +1780,6 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) } } -//I must say that this function is deprecated, but I think it is useful to keep it for a time -void wxGenericDataViewHeaderWindow::DrawCurrent() -{ -#if 1 - GetColumn(m_column)->SetWidth(m_currentX - m_minX); -#else - 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 ); -#endif -} - void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc) { int xpix, x; @@ -1887,7 +1835,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 ) { @@ -1900,14 +1848,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); @@ -2146,7 +2087,7 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) le.SetModel(GetOwner()->GetModel()); le.SetItem(item); parent->GetEventHandler()->ProcessEvent(le); - + return true; } @@ -2238,8 +2179,8 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column ) if( column != -1 ) { wxRect rect = GetClientRect(); - unsigned int colnum = 0; - unsigned int x_start = 0, x_end = 0, w = 0; + int colnum = 0; + int x_start = 0, x_end = 0, w = 0; int xx, yy, xe; m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy ); for (x_start = 0; colnum < column; colnum++) @@ -2404,14 +2345,16 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { // get the cell value and set it into the renderer wxVariant value; - wxDataViewTreeNode * node = GetTreeNodeByRow(item); - if( node == NULL ) - { - continue; - } + wxDataViewTreeNode * node = GetTreeNodeByRow(item); + if( node == NULL ) + continue; wxDataViewItem dataitem = node->GetItem(); - model->GetValue( value, dataitem, col->GetModelColumn()); + + if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem)) + continue; + + model->GetValue( value, dataitem, col->GetModelColumn()); cell->SetValue( value ); // update the y offset @@ -2459,7 +2402,8 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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 + 1*PADDING_TOPBOTTOM, cell_rect.height ); + // size.y = wxMin( size.y, cell_rect.height ); + size.y = cell_rect.height; wxRect item_rect(cell_rect.GetTopLeft(), size); int align = cell->GetAlignment(); @@ -2482,15 +2426,13 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) // add padding item_rect.x += PADDING_RIGHTLEFT; - //item_rect.y += PADDING_TOPBOTTOM; item_rect.width = size.x - 2 * PADDING_RIGHTLEFT; - item_rect.height = size.y - 1 * PADDING_TOPBOTTOM; //Here we add the tree indent item_rect.x += indent; int state = 0; - if (m_selection.Index(item) != wxNOT_FOUND) + if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND)) state |= wxDATAVIEW_CELL_SELECTED; // TODO: it would be much more efficient to create a clipping @@ -2546,9 +2488,7 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow() &client_size.x, &client_size.y ); //we should deal with the pixel here - unsigned int row = (client_size.y)/m_lineHeight; - if( client_size.y % m_lineHeight < m_lineHeight/2 ) - row -= 1; + unsigned int row = ((client_size.y)/m_lineHeight) - 1; return wxMin( GetRowCount()-1, row ); } @@ -2780,7 +2720,7 @@ void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent RefreshRow( m_currentRow ); } - //EnsureVisible( m_currentRow ); + GetOwner()->EnsureVisible( m_currentRow, -1 ); } wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const @@ -3047,7 +2987,7 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item } wxDataViewTreeNodes nodes = node->GetNodes(); - int i = 0; + unsigned int i = 0; for (; i < nodes.GetCount(); i ++) { if (nodes[i]->GetItem() == (**iter)) @@ -3194,7 +3134,7 @@ void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataVie wxDataViewItemArray children; unsigned int num = model->GetChildren( item, children); - int index = 0; + unsigned int index = 0; while( index < num ) { if( model->IsContainer( children[index] ) ) @@ -3400,17 +3340,17 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (m_underMouse && m_underMouse != node) { //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); - Refresh(GetRowByItem(m_underMouse->GetItem())); + RefreshRow(GetRowByItem(m_underMouse->GetItem())); } if (m_underMouse != node) { //wxLogMessage("Do the row: %d", current); - Refresh(current); + RefreshRow(current); } m_underMouse = node; } } - if (node!=NULL && !node->HasChildren()) + if (node!=NULL && !node->HasChildren()) delete node; } if (!hover) @@ -3418,7 +3358,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (m_underMouse != NULL) { //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); - Refresh(GetRowByItem(m_underMouse->GetItem())); + RefreshRow(GetRowByItem(m_underMouse->GetItem())); m_underMouse = NULL; } } @@ -3459,13 +3399,18 @@ 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 ); @@ -3478,7 +3423,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { wxWindow *parent = GetParent(); wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); - le.SetItem( GetItemByRow(current) ); + le.SetItem( item ); le.SetEventObject(parent); le.SetModel(GetOwner()->GetModel()); @@ -3524,7 +3469,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } } //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) ) @@ -3672,7 +3617,7 @@ wxDataViewItem wxDataViewMainWindow::GetSelection() const //----------------------------------------------------------------------------- // wxDataViewCtrl //----------------------------------------------------------------------------- -WX_DEFINE_LIST(wxDataViewColumnList); +WX_DEFINE_LIST(wxDataViewColumnList) IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) @@ -3696,9 +3641,11 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, long style, const wxValidator& validator ) { if (!wxControl::Create( parent, id, pos, size, - style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator)) + style | wxScrolledWindowStyle|wxBORDER_SUNKEN, validator)) return false; + SetInitialSize(size); + Init(); #ifdef __WXMAC__ @@ -3719,7 +3666,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, sizer->Add( m_headerArea, 0, wxGROW ); sizer->Add( m_clientArea, 1, wxGROW ); SetSizer( sizer ); - + return true; } @@ -3782,6 +3729,16 @@ 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; +} + void wxDataViewCtrl::OnColumnChange() { if (m_headerArea) @@ -3808,7 +3765,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) @@ -4007,7 +3964,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();