Add backend descriptions for all backends to the documentation.

[wxWidgets.git] / src / generic / datavgen.cpp

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index b2b2c6374d967d7ca6f58861ac0eed415ef97dcb..bdc389ad666390c374662c5c18d328f1bc55b2cc 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -214,6 +214,8 @@ private:
             model->Resort();
 
         owner->OnColumnChange(idx);
             model->Resort();
 
         owner->OnColumnChange(idx);

+
+        SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, idx);

     }
 
     void OnRClick(wxHeaderCtrlEvent& event)
     }
 
     void OnRClick(wxHeaderCtrlEvent& event)


@@ -532,6 +534,8 @@ public:
     int GetLineHeight( unsigned int row ) const; // m_lineHeight in fixed mode
     int GetLineAt( unsigned int y ) const;       // y / 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
 

+    void SetRowHeight( int lineHeight ) { m_lineHeight = lineHeight; }
+

     // Some useful functions for row and item mapping
     wxDataViewItem GetItemByRow( unsigned int row ) const;
     int GetRowByItem( const wxDataViewItem & item ) const;
     // Some useful functions for row and item mapping
     wxDataViewItem GetItemByRow( unsigned int row ) const;
     int GetRowByItem( const wxDataViewItem & item ) const;


@@ -796,9 +800,9 @@ bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
 
 bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
 {
 
 bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
 {

-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())

         dc->DrawBitmap( m_bitmap, cell.x, cell.y );
         dc->DrawBitmap( m_bitmap, cell.x, cell.y );

-    else if (m_icon.Ok())
+    else if (m_icon.IsOk())

         dc->DrawIcon( m_icon, cell.x, cell.y );
 
     return true;
         dc->DrawIcon( m_icon, cell.x, cell.y );
 
     return true;


@@ -806,9 +810,9 @@ bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state
 
 wxSize wxDataViewBitmapRenderer::GetSize() const
 {
 
 wxSize wxDataViewBitmapRenderer::GetSize() const
 {

-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())

         return wxSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() );
         return wxSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() );

-    else if (m_icon.Ok())
+    else if (m_icon.IsOk())

         return wxSize( m_icon.GetWidth(), m_icon.GetHeight() );
 
     return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE);
         return wxSize( m_icon.GetWidth(), m_icon.GetHeight() );
 
     return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE);


@@ -1597,6 +1601,12 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     dc.DrawRectangle(GetClientSize());
 #endif
 
     dc.DrawRectangle(GetClientSize());
 #endif
 

+    if ( IsEmpty() )
+    {
+        // No items to draw.
+        return;
+    }
+

     // prepare the DC
     GetOwner()->PrepareDC( dc );
     dc.SetFont( GetFont() );
     // prepare the DC
     GetOwner()->PrepareDC( dc );
     dc.SetFont( GetFont() );


@@ -1763,8 +1773,11 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
                 dataitem = node->GetItem();
 
 
                 dataitem = node->GetItem();
 

-                if ((i > 0) && model->IsContainer(dataitem) &&
-                    !model->HasContainerColumns(dataitem))
+                // Skip all columns of "container" rows except the expander
+                // column itself unless HasContainerColumns() overrides this.
+                if ( col != GetOwner()->GetExpanderColumn() &&
+                        model->IsContainer(dataitem) &&
+                            !model->HasContainerColumns(dataitem) )

                     continue;
             }
             else
                     continue;
             }
             else


@@ -3021,7 +3034,7 @@ 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;
     // Find the item along the parent-chain.
     // This algorithm is designed to speed up the node-finding method
     wxDataViewTreeNode* node = m_root;

-    for( unsigned iter = parentChain.size()-1; iter>=0; --iter )
+    for( unsigned iter = parentChain.size()-1; ; --iter )

     {
         if( node->HasChildren() )
         {
     {
         if( node->HasChildren() )
         {


@@ -3052,6 +3065,9 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
         }
         else
             return NULL;
         }
         else
             return NULL;

+
+        if ( !iter )
+            break;

     }
     return NULL;
 }
     }
     return NULL;
 }


@@ -3363,7 +3379,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_DOWN:
             break;
 
         case WXK_DOWN:

-            if ( m_currentRow < GetRowCount() - 1 )
+            if ( m_currentRow + 1 < GetRowCount() )

                 OnArrowChar( m_currentRow + 1, event );
             break;
         // Add the process for tree expanding/collapsing
                 OnArrowChar( m_currentRow + 1, event );
             break;
         // Add the process for tree expanding/collapsing


@@ -3712,8 +3728,10 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
         if (!IsRowSelected(current))
         {
             SelectAllRows(false);
         if (!IsRowSelected(current))
         {
             SelectAllRows(false);

+            const unsigned oldCurrent = m_currentRow;

             ChangeCurrentRow(current);
             SelectRow(m_currentRow,true);
             ChangeCurrentRow(current);
             SelectRow(m_currentRow,true);

+            RefreshRow(oldCurrent);

             SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
         }
     }
             SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
         }
     }


@@ -4014,6 +4032,16 @@ void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
     Layout();
 
     AdjustScrollbars();
     Layout();
 
     AdjustScrollbars();

+
+    // We must redraw the headers if their height changed. Normally this
+    // shouldn't happen as the control shouldn't let itself be resized beneath
+    // its minimal height but avoid the display artefacts that appear if it
+    // does happen, e.g. because there is really not enough vertical space.
+    if ( !HasFlag(wxDV_NO_HEADER) && m_headerArea &&
+            m_headerArea->GetSize().y <= m_headerArea->GetBestSize(). y )
+    {
+        m_headerArea->Refresh();
+    }

 }
 
 void wxDataViewCtrl::SetFocus()
 }
 
 void wxDataViewCtrl::SetFocus()


@@ -4118,6 +4146,16 @@ unsigned int wxDataViewCtrl::GetColumnCount() const
     return m_cols.GetCount();
 }
 
     return m_cols.GetCount();
 }
 

+bool wxDataViewCtrl::SetRowHeight( int lineHeight )
+{
+    if ( !m_clientArea )
+        return false;
+
+    m_clientArea->SetRowHeight(lineHeight);
+
+    return true;
+}
+

 wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int idx ) const
 {
     return m_cols[idx];
 wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int idx ) const
 {
     return m_cols[idx];