support for toggle bitmap button

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index dc0f58a4fe47542f89cf31f9ee89c45033b10bce..9ae974c053c3918d3ae3a3333360209bc3ebadc4 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -800,6 +800,12 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state
     if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE)
         flags |= wxCONTROL_DISABLED;
 
     if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE)
         flags |= wxCONTROL_DISABLED;
 

+    // check boxes we draw must always have the same, standard size (if it's
+    // bigger than the cell size the checkbox will be truncated because the
+    // caller had set the clipping rectangle to prevent us from drawing outside
+    // the cell)
+    cell.SetSize(GetSize());
+

     wxRendererNative::Get().DrawCheckBox(
             GetOwner()->GetOwner(),
             *dc,
     wxRendererNative::Get().DrawCheckBox(
             GetOwner()->GetOwner(),
             *dc,


@@ -1565,6 +1571,13 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     // compute which columns needs to be redrawn
     unsigned int cols = GetOwner()->GetColumnCount();
 
     // compute which columns needs to be redrawn
     unsigned int cols = GetOwner()->GetColumnCount();

+    if ( !cols )
+    {
+        // we assume that we have at least one column below and painting an
+        // empty control is unnecessary anyhow
+        return;
+    }
+

     unsigned int col_start = 0;
     unsigned int x_start;
     for (x_start = 0; col_start < cols; col_start++)
     unsigned int col_start = 0;
     unsigned int x_start;
     for (x_start = 0; col_start < cols; col_start++)


@@ -1643,7 +1656,8 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             if (m_hasFocus)
                 flags |= wxCONTROL_FOCUSED;
 
             if (m_hasFocus)
                 flags |= wxCONTROL_FOCUSED;
 

-            wxRect rect( x_start, GetLineStart( item ), x_last, GetLineHeight( item ) );
+            wxRect rect( x_start, GetLineStart( item ),
+                         x_last - x_start, GetLineHeight( item ) );

             wxRendererNative::Get().DrawItemSelectionRect
                                 (
                                     this,
             wxRendererNative::Get().DrawItemSelectionRect
                                 (
                                     this,


@@ -1658,7 +1672,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if (m_dropHint)
     {
         wxRect rect( x_start, GetLineStart( m_dropHintLine ),
     if (m_dropHint)
     {
         wxRect rect( x_start, GetLineStart( m_dropHintLine ),

-                    x_last, GetLineHeight( m_dropHintLine ) );
+                     x_last - x_start, GetLineHeight( m_dropHintLine ) );

         dc.SetPen( *wxBLACK_PEN );
         dc.SetBrush( *wxTRANSPARENT_BRUSH );
         dc.DrawRectangle( rect );
         dc.SetPen( *wxBLACK_PEN );
         dc.SetBrush( *wxTRANSPARENT_BRUSH );
         dc.DrawRectangle( rect );


@@ -1682,7 +1696,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         wxDataViewRenderer *cell = col->GetRenderer();
         cell_rect.width = col->GetWidth();
 
         wxDataViewRenderer *cell = col->GetRenderer();
         cell_rect.width = col->GetWidth();
 

-        if (col->IsHidden())
+        if ( col->IsHidden() || cell_rect.width <= 0 )

             continue;       // skip it!
 
         for (unsigned int item = item_start; item < item_last; item++)
             continue;       // skip it!
 
         for (unsigned int item = item_start; item < item_last; item++)


@@ -1720,40 +1734,42 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             cell_rect.y = GetLineStart( item );
             cell_rect.height = GetLineHeight( item );
 
             cell_rect.y = GetLineStart( item );
             cell_rect.height = GetLineHeight( item );
 

-            // Draw the expander here.
+            // deal with the expander

             int indent = 0;
             if ((!IsVirtualList()) && (col == expander))
             {
             int indent = 0;
             if ((!IsVirtualList()) && (col == expander))
             {

-                indent = node->GetIndentLevel();
-

                 // Calculate the indent first
                 // Calculate the indent first

-                indent = cell_rect.x + GetOwner()->GetIndent() * indent;
+                indent = GetOwner()->GetIndent() * node->GetIndentLevel();

 
 

-                int expander_width = m_lineHeight - 2*EXPANDER_MARGIN;
+                // we reserve m_lineHeight of horizontal space for the expander
+                // but leave EXPANDER_MARGIN around the expander itself
+                int exp_x = cell_rect.x + indent + 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 += m_lineHeight;

 
 

-                indent = indent + m_lineHeight;
-                    // try to use the m_lineHeight as the expander space
-
-                dc.SetPen( m_penExpander );
-                dc.SetBrush( wxNullBrush );
-                if( node->HasChildren() )
+                // draw expander if needed and visible
+                if ( node->HasChildren() && exp_x < cell_rect.GetRight() )

                 {
                 {

-                    wxRect rect( expander_x , expander_y, expander_width, expander_width);
+                    dc.SetPen( m_penExpander );
+                    dc.SetBrush( wxNullBrush );
+
+                    int exp_size = m_lineHeight - 2*EXPANDER_MARGIN;
+                    int exp_y = cell_rect.y + (cell_rect.height - exp_size)/2
+                                   + EXPANDER_MARGIN - EXPANDER_OFFSET;
+
+                    const wxRect rect(exp_x, exp_y, exp_size, exp_size);
+

                     int flag = 0;
                     int flag = 0;

-                    if (m_underMouse == node)
-                    {
+                    if ( m_underMouse == node )

                         flag |= wxCONTROL_CURRENT;
                         flag |= wxCONTROL_CURRENT;

-                    }
-                    if( node->IsOpen() )
-                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect,
-                                                                    flag|wxCONTROL_EXPANDED );
-                    else
-                        wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
+                    if ( node->IsOpen() )
+                        flag |= wxCONTROL_EXPANDED;
+
+                    // ensure that we don't overflow the cell (which might
+                    // happen if the column is very narrow)
+                    wxDCClipper clip(dc, cell_rect);
+
+                    wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);

                 }
 
                 // force the expander column to left-center align
                 }
 
                 // force the expander column to left-center align


@@ -1773,6 +1789,9 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             item_rect.x += indent;
             item_rect.width -= indent;
 
             item_rect.x += indent;
             item_rect.width -= indent;
 

+            if ( item_rect.width <= 0 )
+                continue;
+

             int state = 0;
             if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))
                 state |= wxDATAVIEW_CELL_SELECTED;
             int state = 0;
             if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))
                 state |= wxDATAVIEW_CELL_SELECTED;


@@ -2054,6 +2073,7 @@ bool wxDataViewMainWindow::Cleared()
 void wxDataViewMainWindow::UpdateDisplay()
 {
     m_dirty = true;
 void wxDataViewMainWindow::UpdateDisplay()
 {
     m_dirty = true;

+    m_underMouse = NULL;

 }
 
 void wxDataViewMainWindow::OnInternalIdle()
 }
 
 void wxDataViewMainWindow::OnInternalIdle()


@@ -3674,7 +3694,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             {
                 ChangeCurrentRow(current);
                 ReverseRowSelection(m_currentRow);
             {
                 ChangeCurrentRow(current);
                 ReverseRowSelection(m_currentRow);

-                SendSelectionChangedEvent(GetItemByRow(m_selection[0]) );
+                SendSelectionChangedEvent(GetItemByRow(m_currentRow));

             }
             else if (event.ShiftDown())
             {
             }
             else if (event.ShiftDown())
             {


@@ -4105,7 +4125,11 @@ void wxDataViewCtrl::Select( const wxDataViewItem & item )
         // Unselect all rows before select another in the single select mode
         if (m_clientArea->IsSingleSel())
             m_clientArea->SelectAllRows(false);
         // Unselect all rows before select another in the single select mode
         if (m_clientArea->IsSingleSel())
             m_clientArea->SelectAllRows(false);

+            

         m_clientArea->SelectRow(row, true);
         m_clientArea->SelectRow(row, true);

+        
+        // Also set focus to the selected item
+        m_clientArea->ChangeCurrentRow( row );

     }
 }
 
     }
 }