makefile enhancements for dll, ne wxwindll.ics for VA 4.0 dll

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

diff --git a/src/generic/gridsel.cpp b/src/generic/gridsel.cpp
index a4da89168510846132d567d3e7b9ba5ac9cea4f3..93a69d49c78219315962402165570da6644593ba 100644 (file)
--- a/src/generic/gridsel.cpp
+++ b/src/generic/gridsel.cpp
@@ -69,7 +69,7 @@ bool wxGridSelection::IsInSelection ( int row, int col )
         {
             wxGridCellCoords& coords = m_cellSelection[n];
             if ( row == coords.GetRow() && col == coords.GetCol() )
         {
             wxGridCellCoords& coords = m_cellSelection[n];
             if ( row == coords.GetRow() && col == coords.GetCol() )

-                return true;
+                return TRUE;

         }
     }
 
         }
     }
 


@@ -83,7 +83,7 @@ bool wxGridSelection::IsInSelection ( int row, int col )
         if ( BlockContainsCell(coords1.GetRow(), coords1.GetCol(),
                                coords2.GetRow(), coords2.GetCol(),
                                row, col ) )
         if ( BlockContainsCell(coords1.GetRow(), coords1.GetCol(),
                                coords2.GetRow(), coords2.GetCol(),
                                row, col ) )

-            return true;
+            return TRUE;

     }
 
     // Now check whether the given cell is
     }
 
     // Now check whether the given cell is


@@ -95,7 +95,7 @@ bool wxGridSelection::IsInSelection ( int row, int col )
         for ( size_t n = 0; n < count; n++ )
         {
             if ( row == m_rowSelection[n] )
         for ( size_t n = 0; n < count; n++ )
         {
             if ( row == m_rowSelection[n] )

-              return true;
+              return TRUE;

         }
     }
 
         }
     }
 


@@ -108,10 +108,10 @@ bool wxGridSelection::IsInSelection ( int row, int col )
         for ( size_t n = 0; n < count; n++ )
         {
             if ( col == m_colSelection[n] )
         for ( size_t n = 0; n < count; n++ )
         {
             if ( col == m_colSelection[n] )

-              return true;
+              return TRUE;

         }
     }
         }
     }

-    return false;
+    return FALSE;

 }
 
 // Change the selection mode
 }
 
 // Change the selection mode


@@ -147,9 +147,10 @@ void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
             else // selmode == wxGridSelectColumns)
                 SelectCol( col );
         }
             else // selmode == wxGridSelectColumns)
                 SelectCol( col );
         }

-        while( ( n = m_blockSelectionTopLeft.GetCount() ) > 0)
+
+        for (n = 0; n < m_blockSelectionTopLeft.GetCount(); n++)
+        // Note that m_blockSelectionTopLeft's size may be changing!

         {
         {

-            n--;

             wxGridCellCoords& coords = m_blockSelectionTopLeft[n];
             int topRow = coords.GetRow();
             int leftCol = coords.GetCol();
             wxGridCellCoords& coords = m_blockSelectionTopLeft[n];
             int topRow = coords.GetRow();
             int leftCol = coords.GetCol();


@@ -163,7 +164,8 @@ void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
                     m_blockSelectionTopLeft.RemoveAt(n);
                     m_blockSelectionBottomRight.RemoveAt(n);
                     SelectBlock( topRow, 0,
                     m_blockSelectionTopLeft.RemoveAt(n);
                     m_blockSelectionBottomRight.RemoveAt(n);
                     SelectBlock( topRow, 0,

-                                 bottomRow, m_grid->GetNumberCols() - 1 );
+                                 bottomRow, m_grid->GetNumberCols() - 1,
+                                 0, FALSE );

                 }
             }
             else // selmode == wxGridSelectColumns)
                 }
             }
             else // selmode == wxGridSelectColumns)


@@ -173,10 +175,12 @@ void wxGridSelection::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
                     m_blockSelectionTopLeft.RemoveAt(n);
                     m_blockSelectionBottomRight.RemoveAt(n);
                     SelectBlock( 0, leftCol,
                     m_blockSelectionTopLeft.RemoveAt(n);
                     m_blockSelectionBottomRight.RemoveAt(n);
                     SelectBlock( 0, leftCol,

-                                 m_grid->GetNumberRows() - 1, rightCol );
+                                 m_grid->GetNumberRows() - 1, rightCol,
+                                 0, FALSE );

                 }
             }
         }
                 }
             }
         }

+        m_selectionMode = selmode;

     }
 }
 
     }
 }
 


@@ -204,7 +208,7 @@ void wxGridSelection::SelectRow( int row, bool addToSelected )
 
     // Simplify list of selected blocks (if possible)
     count = m_blockSelectionTopLeft.GetCount();
 
     // Simplify list of selected blocks (if possible)
     count = m_blockSelectionTopLeft.GetCount();

-    bool done = false;
+    bool done = FALSE;

     for ( n = 0; n < count; n++ )
     {
         wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n];
     for ( n = 0; n < count; n++ )
     {
         wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n];


@@ -227,12 +231,12 @@ void wxGridSelection::SelectRow( int row, bool addToSelected )
             else if ( coords1.GetRow() == row + 1)
             {
                 coords1.SetRow(row);
             else if ( coords1.GetRow() == row + 1)
             {
                 coords1.SetRow(row);

-                done = true;
+                done = TRUE;

             }
             else if ( coords2.GetRow() == row - 1)
             {
                 coords2.SetRow(row);
             }
             else if ( coords2.GetRow() == row - 1)
             {
                 coords2.SetRow(row);

-                done = true;
+                done = TRUE;

             }           
         }
     }
             }           
         }
     }


@@ -258,8 +262,14 @@ void wxGridSelection::SelectRow( int row, bool addToSelected )
     if ( !m_grid->GetBatchCount() )
         ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
 
     if ( !m_grid->GetBatchCount() )
         ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
 

-    // Possibly send event here? This would imply that no event is sent,
-    // if the row already was part of the selection.
+    // Send Event
+    wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                                    wxEVT_GRID_RANGE_SELECT,
+                                    m_grid,
+                                    wxGridCellCoords( row, 0 ),
+                                    wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
+
+    m_grid->GetEventHandler()->ProcessEvent(gridEvt);

 }
 
 void wxGridSelection::SelectCol( int col, bool addToSelected )
 }
 
 void wxGridSelection::SelectCol( int col, bool addToSelected )


@@ -286,7 +296,7 @@ void wxGridSelection::SelectCol( int col, bool addToSelected )
 
     // Simplify list of selected blocks (if possible)
     count = m_blockSelectionTopLeft.GetCount();
 
     // Simplify list of selected blocks (if possible)
     count = m_blockSelectionTopLeft.GetCount();

-    bool done = false;
+    bool done = FALSE;

     for ( n = 0; n < count; n++ )
     {
         wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n];
     for ( n = 0; n < count; n++ )
     {
         wxGridCellCoords& coords1 = m_blockSelectionTopLeft[n];


@@ -309,12 +319,12 @@ void wxGridSelection::SelectCol( int col, bool addToSelected )
             else if ( coords1.GetCol() == col + 1)
             {
                 coords1.SetCol(col);
             else if ( coords1.GetCol() == col + 1)
             {
                 coords1.SetCol(col);

-                done = true;
+                done = TRUE;

             }
             else if ( coords2.GetCol() == col - 1)
             {
                 coords2.SetCol(col);
             }
             else if ( coords2.GetCol() == col - 1)
             {
                 coords2.SetCol(col);

-                done = true;
+                done = TRUE;

             }           
         }
     }
             }           
         }
     }


@@ -340,13 +350,21 @@ void wxGridSelection::SelectCol( int col, bool addToSelected )
     if ( !m_grid->GetBatchCount() )
         ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
 
     if ( !m_grid->GetBatchCount() )
         ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
 

-    // Possibly send event here? This would imply that no event is sent,
-    // if the row already was part of the selection.
+    // Send Event
+    wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                                    wxEVT_GRID_RANGE_SELECT,
+                                    m_grid,
+                                    wxGridCellCoords( 0, col ),
+                                    wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
+
+    m_grid->GetEventHandler()->ProcessEvent(gridEvt);

 }
 
 }
 

-void wxGridSelection::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+void wxGridSelection::SelectBlock( int topRow, int leftCol,
+                                   int bottomRow, int rightCol,
+                                   wxMouseEvent* mouseEv, bool sendEvent )

 {
 {

-    // Fix the coordinates of the block if potentially needed
+    // Fix the coordinates of the block if needed.

     if ( m_selectionMode == wxGrid::wxGridSelectRows )
     {
         leftCol = 0;
     if ( m_selectionMode == wxGrid::wxGridSelectRows )
     {
         leftCol = 0;


@@ -357,10 +375,23 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, int bottomRow, int r
         topRow = 0;
         bottomRow = m_grid->GetNumberRows() - 1;
     }
         topRow = 0;
         bottomRow = m_grid->GetNumberRows() - 1;
     }

+    if ( topRow > bottomRow )
+    {
+        int temp = topRow;
+        topRow = bottomRow;
+        bottomRow = temp;
+    }
+
+    if ( leftCol > rightCol )
+    {
+        int temp = leftCol;
+        leftCol = rightCol;
+        rightCol = temp;
+    }

 
     // Handle single cell selection in SelectCell.
     if ( topRow == bottomRow && leftCol == rightCol )
 
     // Handle single cell selection in SelectCell.
     if ( topRow == bottomRow && leftCol == rightCol )

-        SelectCell( topRow, leftCol );
+        SelectCell( topRow, leftCol, sendEvent );

 
     size_t count, n;
     // Remove single cells contained in newly selected block.
 
     size_t count, n;
     // Remove single cells contained in newly selected block.


@@ -451,15 +482,47 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol, int bottomRow, int r
     if ( !m_grid->GetBatchCount() )
         ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
 
     if ( !m_grid->GetBatchCount() )
         ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
 

-    // Possibly send event?
+    // Send Event, if not disabled.
+    if ( sendEvent )
+    {
+        if ( mouseEv == 0)
+        {
+            wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                                            wxEVT_GRID_RANGE_SELECT,
+                                            m_grid,
+                                            wxGridCellCoords( topRow, leftCol ),
+                                            wxGridCellCoords( bottomRow, rightCol ) );
+            m_grid->GetEventHandler()->ProcessEvent(gridEvt);
+        }
+        else        
+        {
+            wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                                            wxEVT_GRID_RANGE_SELECT,
+                                            m_grid,
+                                            wxGridCellCoords( topRow, leftCol ),
+                                            wxGridCellCoords( bottomRow, rightCol ),
+                                            TRUE,
+                                            mouseEv->ControlDown(),
+                                            mouseEv->ShiftDown(),
+                                            mouseEv->AltDown(),
+                                            mouseEv->MetaDown() );
+            m_grid->GetEventHandler()->ProcessEvent(gridEvt);
+        }
+    }

 }
 
 }
 

-void wxGridSelection::SelectCell( int row, int col)
+void wxGridSelection::SelectCell( int row, int col, bool sendEvent )

 {
     if ( m_selectionMode == wxGrid::wxGridSelectRows )
 {
     if ( m_selectionMode == wxGrid::wxGridSelectRows )

+    {

         SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1 );
         SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1 );

+        return;
+    }

     else if ( m_selectionMode == wxGrid::wxGridSelectColumns )
     else if ( m_selectionMode == wxGrid::wxGridSelectColumns )

+    {

         SelectBlock(0, col, m_grid->GetNumberRows() - 1, col );
         SelectBlock(0, col, m_grid->GetNumberRows() - 1, col );

+        return;
+    }

     else if ( IsInSelection ( row, col ) )
         return;
     m_cellSelection.Add( wxGridCellCoords( row, col ) );
     else if ( IsInSelection ( row, col ) )
         return;
     m_cellSelection.Add( wxGridCellCoords( row, col ) );


@@ -470,7 +533,12 @@ void wxGridSelection::SelectCell( int row, int col)
     if ( !m_grid->GetBatchCount() )
         ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
 
     if ( !m_grid->GetBatchCount() )
         ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
 

-    // Possibly send event?
+    // Send event
+    wxGridEvent gridEvt( m_grid->GetId(),
+                         wxEVT_GRID_SELECT_CELL,
+                         m_grid,
+                         row, col );
+    m_grid->GetEventHandler()->ProcessEvent(gridEvt);

 }
 
 void wxGridSelection::ToggleCellSelection( int row, int col)
 }
 
 void wxGridSelection::ToggleCellSelection( int row, int col)


@@ -507,6 +575,13 @@ void wxGridSelection::ToggleCellSelection( int row, int col)
                 if ( !m_grid->GetBatchCount() )
                     ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
                 return;
                 if ( !m_grid->GetBatchCount() )
                     ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
                 return;

+
+                // Send event
+                wxGridEvent gridEvt( m_grid->GetId(),
+                                     wxEVT_GRID_SELECT_CELL,
+                                     m_grid,
+                                     row, col, -1, -1, FALSE );
+                m_grid->GetEventHandler()->ProcessEvent(gridEvt);

             }
         }
     }
             }
         }
     }


@@ -550,16 +625,18 @@ void wxGridSelection::ToggleCellSelection( int row, int col)
             if ( m_selectionMode != wxGrid::wxGridSelectColumns )
             {
                 if ( topRow < row )
             if ( m_selectionMode != wxGrid::wxGridSelectColumns )
             {
                 if ( topRow < row )

-                    SelectBlock( topRow, leftCol, row - 1, rightCol );
+                    SelectBlock( topRow, leftCol,
+                                 row - 1, rightCol, 0, FALSE );

                 if ( bottomRow > row )
                 if ( bottomRow > row )

-                    SelectBlock( row + 1, leftCol, bottomRow, rightCol );
+                    SelectBlock( row + 1, leftCol,
+                                 bottomRow, rightCol, 0, FALSE );

             }
             if ( m_selectionMode != wxGrid::wxGridSelectRows )
             {
                 if ( leftCol < col )
             }
             if ( m_selectionMode != wxGrid::wxGridSelectRows )
             {
                 if ( leftCol < col )

-                    SelectBlock( row, leftCol, row, col - 1 );
+                    SelectBlock( row, leftCol, row, col - 1, 0, FALSE );

                 if ( rightCol > col )
                 if ( rightCol > col )

-                    SelectBlock( row, col + 1, row, rightCol );
+                    SelectBlock( row, col + 1, row, rightCol, 0, FALSE );

             }
         }
     }
             }
         }
     }


@@ -577,9 +654,11 @@ void wxGridSelection::ToggleCellSelection( int row, int col)
                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( col > 0 )
                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( col > 0 )

-                        SelectBlock( row, 0, row, col - 1 );
+                        SelectBlock( row, 0, row, col - 1, 0, FALSE );

                     if ( col < m_grid->GetNumberCols() - 1 )
                     if ( col < m_grid->GetNumberCols() - 1 )

-                        SelectBlock( row, col + 1, row, m_grid->GetNumberCols() - 1 );
+                        SelectBlock( row, col + 1,
+                                     row, m_grid->GetNumberCols() - 1,
+                                     0, FALSE );

                 }
             }
         }
                 }
             }
         }


@@ -598,34 +677,65 @@ void wxGridSelection::ToggleCellSelection( int row, int col)
                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( row > 0 )
                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( row > 0 )

-                        SelectBlock( 0, col, row - 1, col );
+                        SelectBlock( 0, col, row - 1, col, 0, FALSE );

                     if ( row < m_grid->GetNumberRows() - 1 )
                     if ( row < m_grid->GetNumberRows() - 1 )

-                        SelectBlock( row + 1, col, m_grid->GetNumberRows() - 1, col );
+                        SelectBlock( row + 1, col,
+                                     m_grid->GetNumberRows() - 1, col,
+                                     0, FALSE );

                 }
             }
         }
     }
 
                 }
             }
         }
     }
 

-    // Refresh the screen; according to m_selectionMode, we
-    // need to either update only the cell, or the whole row/column.
+    // Refresh the screen and send the event; according to m_selectionMode,
+    // we need to either update only the cell, or the whole row/column.

     wxRect r;
     switch (m_selectionMode)
     {
       case wxGrid::wxGridSelectCells:
     wxRect r;
     switch (m_selectionMode)
     {
       case wxGrid::wxGridSelectCells:

-        r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, col ),
-                                       wxGridCellCoords( row, col ) );
-        break;
+      {
+          r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, col ),
+                                         wxGridCellCoords( row, col ) );
+          if ( !m_grid->GetBatchCount() )
+              ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+          wxGridEvent gridEvt( m_grid->GetId(),
+                               wxEVT_GRID_SELECT_CELL,
+                               m_grid,
+                               row, col, -1, -1, FALSE );
+          m_grid->GetEventHandler()->ProcessEvent(gridEvt);
+          break;
+      }

       case wxGrid::wxGridSelectRows:
       case wxGrid::wxGridSelectRows:

-        r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
-                                       wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
-        break;
+      {
+          r = m_grid->BlockToDeviceRect( wxGridCellCoords( row, 0 ),
+                                         wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
+          if ( !m_grid->GetBatchCount() )
+              ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+          wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                                          wxEVT_GRID_RANGE_SELECT,
+                                          m_grid,
+                                          wxGridCellCoords( row, 0 ),
+                                          wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ),
+                                          FALSE );
+          m_grid->GetEventHandler()->ProcessEvent(gridEvt);
+          break;
+      }

       case wxGrid::wxGridSelectColumns:
       case wxGrid::wxGridSelectColumns:

-        r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
-                                       wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
-        break;
+      {
+          r = m_grid->BlockToDeviceRect( wxGridCellCoords( 0, col ),
+                                         wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
+          if ( !m_grid->GetBatchCount() )
+              ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
+          wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                                          wxEVT_GRID_RANGE_SELECT,
+                                          m_grid,
+                                          wxGridCellCoords( 0, col ),
+                                          wxGridCellCoords( m_grid->GetNumberRows() - 1, col ),
+                                          FALSE );
+          m_grid->GetEventHandler()->ProcessEvent(gridEvt);
+          break;
+      }

     }
     }

-    if ( !m_grid->GetBatchCount() )
-        ((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );

 }
 
 void wxGridSelection::ClearSelection()
 }
 
 void wxGridSelection::ClearSelection()