mac paths updated

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 2ba9c636e89da794ba21ea3edac21c711563adef..69debf772705481ca6244420c1e3dd2da89ffafd 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -2287,8 +2287,8 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
 
     int flags = 0;
     if (value)
 
     int flags = 0;
     if (value)

-        flags |= wxCONTROL_CHECKED; 
-        
+        flags |= wxCONTROL_CHECKED;
+

     wxRendererNative::Get().DrawCheckBox( &grid, dc, rectBorder, flags );
 }
 
     wxRendererNative::Get().DrawCheckBox( &grid, dc, rectBorder, flags );
 }
 


@@ -2590,8 +2590,12 @@ void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col)
     int n = FindIndex(row, col);
     if ( n == wxNOT_FOUND )
     {
     int n = FindIndex(row, col);
     if ( n == wxNOT_FOUND )
     {

-        // add the attribute
-        m_attrs.Add(new wxGridCellWithAttr(row, col, attr));
+        if ( attr )
+        {
+            // add the attribute
+            m_attrs.Add(new wxGridCellWithAttr(row, col, attr));
+        }
+        //else: nothing to do

     }
     else
     {
     }
     else
     {


@@ -7214,7 +7218,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
     m_currentCellCoords = coords;
 
     wxGridCellAttr *attr = GetCellAttr( coords );
     m_currentCellCoords = coords;
 
     wxGridCellAttr *attr = GetCellAttr( coords );

-#if !defined(__WXMAC__) 
+#if !defined(__WXMAC__)

     DrawCellHighlight( dc, attr );
 #endif
     attr->DecRef();
     DrawCellHighlight( dc, attr );
 #endif
     attr->DecRef();


@@ -7819,7 +7823,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
         }
     }
 
         }
     }
 

-    dc.SetClippingRegion( clippedcells );
+    dc.SetDeviceClippingRegion( clippedcells );

 
 
     // horizontal grid lines
 
 
     // horizontal grid lines


@@ -7924,7 +7928,7 @@ void wxGrid::SetUseNativeColLabels( bool native )
         int height = wxRendererNative::Get().GetHeaderButtonHeight( this );
         SetColLabelSize( height );
     }
         int height = wxRendererNative::Get().GetHeaderButtonHeight( this );
         SetColLabelSize( height );
     }

-    
+

     m_colLabelWin->Refresh();
 }
 
     m_colLabelWin->Refresh();
 }
 


@@ -8412,7 +8416,7 @@ void wxGrid::ShowCellEditControl()
                 if (rect.GetRight() > client_right)
                     rect.SetRight( client_right - 1 );
             }
                 if (rect.GetRight() > client_right)
                     rect.SetRight( client_right - 1 );
             }

-            
+

             editor->SetCellAttr( attr );
             editor->SetSize( rect );
             if (nXMove != 0)
             editor->SetCellAttr( attr );
             editor->SetSize( rect );
             if (nXMove != 0)


@@ -9633,7 +9637,8 @@ void wxGrid::SetCellHighlightROPenWidth(int width)
         // make any visible change if the the thickness is getting smaller.
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
         // make any visible change if the the thickness is getting smaller.
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();

-        if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+        if ( row == -1 || col == -1 ||
+                GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )

             return;
 
         wxRect rect = CellToRect(row, col);
             return;
 
         wxRect rect = CellToRect(row, col);


@@ -11014,37 +11019,36 @@ void wxGrid::ClearSelection()
 // This function returns the rectangle that encloses the given block
 // in device coords clipped to the client size of the grid window.
 //
 // This function returns the rectangle that encloses the given block
 // in device coords clipped to the client size of the grid window.
 //

-wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
-                                  const wxGridCellCoords &bottomRight ) const
+wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords& topLeft,
+                                  const wxGridCellCoords& bottomRight ) const

 {
 {

-    wxRect rect( wxGridNoCellRect );
-    wxRect cellRect;
-
-    cellRect = CellToRect( topLeft );
-    if ( cellRect != wxGridNoCellRect )
+    wxRect resultRect;
+    wxRect tempCellRect = CellToRect(topLeft);
+    if ( tempCellRect != wxGridNoCellRect )

     {
     {

-        rect = cellRect;
+        resultRect = tempCellRect;

     }
     else
     {
     }
     else
     {

-        rect = wxRect(0, 0, 0, 0);
+        resultRect = wxRect(0, 0, 0, 0);

     }
 
     }
 

-    cellRect = CellToRect( bottomRight );
-    if ( cellRect != wxGridNoCellRect )
+    tempCellRect = CellToRect(bottomRight);
+    if ( tempCellRect != wxGridNoCellRect )

     {
     {

-        rect += cellRect;
+        resultRect += tempCellRect;

     }
     else
     {
     }
     else
     {

+        // If both inputs were "wxGridNoCellRect," then there's nothing to do.

         return wxGridNoCellRect;
     }
 
         return wxGridNoCellRect;
     }
 

-    int i, j;
-    int left = rect.GetLeft();
-    int top = rect.GetTop();
-    int right = rect.GetRight();
-    int bottom = rect.GetBottom();
+    // Ensure that left/right and top/bottom pairs are in order.
+    int left = resultRect.GetLeft();
+    int top = resultRect.GetTop();
+    int right = resultRect.GetRight();
+    int bottom = resultRect.GetBottom();

 
     int leftCol = topLeft.GetCol();
     int topRow = topLeft.GetRow();
 
     int leftCol = topLeft.GetCol();
     int topRow = topLeft.GetRow();


@@ -11053,65 +11057,89 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
 
     if (left > right)
     {
 
     if (left > right)
     {

-        i = left;
+        int tmp = left;

         left = right;
         left = right;

-        right = i;
-        i = leftCol;
+        right = tmp;
+
+        tmp = leftCol;

         leftCol = rightCol;
         leftCol = rightCol;

-        rightCol = i;
+        rightCol = tmp;

     }
 
     if (top > bottom)
     {
     }
 
     if (top > bottom)
     {

-        i = top;
+        int tmp = top;

         top = bottom;
         top = bottom;

-        bottom = i;
-        i = topRow;
+        bottom = tmp;
+
+        tmp = topRow;

         topRow = bottomRow;
         topRow = bottomRow;

-        bottomRow = i;
+        bottomRow = tmp;

     }
 
     }
 

-    for ( j = topRow; j <= bottomRow; j++ )
+    // The following loop is ONLY necessary to detect and handle merged cells.
+    int cw, ch;
+    m_gridWin->GetClientSize( &cw, &ch );
+
+    // Get the origin coordinates: notice that they will be negative if the
+    // grid is scrolled downwards/to the right.
+    int gridOriginX = 0;
+    int gridOriginY = 0;
+    CalcScrolledPosition(gridOriginX, gridOriginY, &gridOriginX, &gridOriginY);
+
+    int onScreenLeftmostCol = internalXToCol(-gridOriginX);
+    int onScreenUppermostRow = internalYToRow(-gridOriginY);
+
+    int onScreenRightmostCol = internalXToCol(-gridOriginX + cw);
+    int onScreenBottommostRow = internalYToRow(-gridOriginY + ch);
+
+    // Bound our loop so that we only examine the portion of the selected block
+    // that is shown on screen. Therefore, we compare the Top-Left block values
+    // to the Top-Left screen values, and the Bottom-Right block values to the
+    // Bottom-Right screen values, choosing appropriately.
+    const int visibleTopRow = wxMax(topRow, onScreenUppermostRow);
+    const int visibleBottomRow = wxMin(bottomRow, onScreenBottommostRow);
+    const int visibleLeftCol = wxMax(leftCol, onScreenLeftmostCol);
+    const int visibleRightCol = wxMin(rightCol, onScreenRightmostCol);
+
+    for ( int j = visibleTopRow; j <= visibleBottomRow; j++ )

     {
     {

-        for ( i = leftCol; i <= rightCol; i++ )
+        for ( int i = visibleLeftCol; i <= visibleRightCol; i++ )

         {
         {

-            if ((j == topRow) || (j == bottomRow) || (i == leftCol) || (i == rightCol))
+            if ( (j == visibleTopRow) || (j == visibleBottomRow) ||
+                    (i == visibleLeftCol) || (i == visibleRightCol) )

             {
             {

-                cellRect = CellToRect( j, i );
+                tempCellRect = CellToRect( j, i );

 
 

-                if (cellRect.x < left)
-                    left = cellRect.x;
-                if (cellRect.y < top)
-                    top = cellRect.y;
-                if (cellRect.x + cellRect.width > right)
-                    right = cellRect.x + cellRect.width;
-                if (cellRect.y + cellRect.height > bottom)
-                    bottom = cellRect.y + cellRect.height;
+                if (tempCellRect.x < left)
+                    left = tempCellRect.x;
+                if (tempCellRect.y < top)
+                    top = tempCellRect.y;
+                if (tempCellRect.x + tempCellRect.width > right)
+                    right = tempCellRect.x + tempCellRect.width;
+                if (tempCellRect.y + tempCellRect.height > bottom)
+                    bottom = tempCellRect.y + tempCellRect.height;

             }
             else
             {
             }
             else
             {

-                i = rightCol; // jump over inner cells.
+                i = visibleRightCol; // jump over inner cells.

             }
         }
     }
 
             }
         }
     }
 

-    // convert to scrolled coords
-    //
+    // Convert to scrolled coords

     CalcScrolledPosition( left, top, &left, &top );
     CalcScrolledPosition( right, bottom, &right, &bottom );
 
     CalcScrolledPosition( left, top, &left, &top );
     CalcScrolledPosition( right, bottom, &right, &bottom );
 

-    int cw, ch;
-    m_gridWin->GetClientSize( &cw, &ch );
-

     if (right < 0 || bottom < 0 || left > cw || top > ch)
         return wxRect(0,0,0,0);
 
     if (right < 0 || bottom < 0 || left > cw || top > ch)
         return wxRect(0,0,0,0);
 

-    rect.SetLeft( wxMax(0, left) );
-    rect.SetTop( wxMax(0, top) );
-    rect.SetRight( wxMin(cw, right) );
-    rect.SetBottom( wxMin(ch, bottom) );
+    resultRect.SetLeft( wxMax(0, left) );
+    resultRect.SetTop( wxMax(0, top) );
+    resultRect.SetRight( wxMin(cw, right) );
+    resultRect.SetBottom( wxMin(ch, bottom) );

 
 

-    return rect;
+    return resultRect;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------