make the script executable

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

diff --git a/src/generic/gridsel.cpp b/src/generic/gridsel.cpp
index d5ba76cbbb5da898ccc53e574ba6a7f936840c7c..495478bb05529a79619726f200262206f814f68f 100644 (file)
--- a/src/generic/gridsel.cpp
+++ b/src/generic/gridsel.cpp
@@ -160,9 +160,8 @@ void wxGridSelection::SetSelectionMode( wxGrid::wxGridSelectionModes selmode )
                 {
                     m_blockSelectionTopLeft.RemoveAt(n);
                     m_blockSelectionBottomRight.RemoveAt(n);
                 {
                     m_blockSelectionTopLeft.RemoveAt(n);
                     m_blockSelectionBottomRight.RemoveAt(n);

-                    SelectBlock( topRow, 0,
-                                 bottomRow, m_grid->GetNumberCols() - 1,
-                                 false, false, false, false, false );
+                    SelectBlockNoEvent( topRow, 0,
+                                 bottomRow, m_grid->GetNumberCols() - 1);

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


@@ -171,9 +170,8 @@ void wxGridSelection::SetSelectionMode( wxGrid::wxGridSelectionModes selmode )
                 {
                     m_blockSelectionTopLeft.RemoveAt(n);
                     m_blockSelectionBottomRight.RemoveAt(n);
                 {
                     m_blockSelectionTopLeft.RemoveAt(n);
                     m_blockSelectionBottomRight.RemoveAt(n);

-                    SelectBlock( 0, leftCol,
-                                 m_grid->GetNumberRows() - 1, rightCol,
-                                 false, false, false, false, false );
+                    SelectBlockNoEvent(0, leftCol,
+                                 m_grid->GetNumberRows() - 1, rightCol);

                 }
             }
         }
                 }
             }
         }


@@ -182,9 +180,7 @@ void wxGridSelection::SetSelectionMode( wxGrid::wxGridSelectionModes selmode )
     }
 }
 
     }
 }
 

-void wxGridSelection::SelectRow( int row,
-                                 bool ControlDown,  bool ShiftDown,
-                                 bool AltDown, bool MetaDown )
+void wxGridSelection::SelectRow(int row, const wxKeyboardState& kbd)

 {
     if ( m_selectionMode == wxGrid::wxGridSelectColumns )
         return;
 {
     if ( m_selectionMode == wxGrid::wxGridSelectColumns )
         return;


@@ -275,15 +271,12 @@ void wxGridSelection::SelectRow( int row,
                                     wxGridCellCoords( row, 0 ),
                                     wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ),
                                     true,
                                     wxGridCellCoords( row, 0 ),
                                     wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ),
                                     true,

-                                    ControlDown,  ShiftDown,
-                                    AltDown, MetaDown );
+                                    kbd);

 
     m_grid->GetEventHandler()->ProcessEvent( gridEvt );
 }
 
 
     m_grid->GetEventHandler()->ProcessEvent( gridEvt );
 }
 

-void wxGridSelection::SelectCol( int col,
-                                 bool ControlDown,  bool ShiftDown,
-                                 bool AltDown, bool MetaDown )
+void wxGridSelection::SelectCol(int col, const wxKeyboardState& kbd)

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


@@ -372,16 +365,14 @@ void wxGridSelection::SelectCol( int col,
                                     wxGridCellCoords( 0, col ),
                                     wxGridCellCoords( m_grid->GetNumberRows() - 1, col ),
                                     true,
                                     wxGridCellCoords( 0, col ),
                                     wxGridCellCoords( m_grid->GetNumberRows() - 1, col ),
                                     true,

-                                    ControlDown,  ShiftDown,
-                                    AltDown, MetaDown );
+                                    kbd );

 
     m_grid->GetEventHandler()->ProcessEvent( gridEvt );
 }
 
 void wxGridSelection::SelectBlock( int topRow, int leftCol,
                                    int bottomRow, int rightCol,
 
     m_grid->GetEventHandler()->ProcessEvent( gridEvt );
 }
 
 void wxGridSelection::SelectBlock( int topRow, int leftCol,
                                    int bottomRow, int rightCol,

-                                   bool ControlDown, bool ShiftDown,
-                                   bool AltDown, bool MetaDown,
+                                   const wxKeyboardState& kbd,

                                    bool sendEvent )
 {
     // Fix the coordinates of the block if needed.
                                    bool sendEvent )
 {
     // Fix the coordinates of the block if needed.


@@ -432,8 +423,7 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
     if ( m_selectionMode == wxGrid::wxGridSelectCells &&
          topRow == bottomRow && leftCol == rightCol )
     {
     if ( m_selectionMode == wxGrid::wxGridSelectCells &&
          topRow == bottomRow && leftCol == rightCol )
     {

-        SelectCell( topRow, leftCol, ControlDown,  ShiftDown,
-                    AltDown, MetaDown, sendEvent );
+        SelectCell( topRow, leftCol, kbd, sendEvent );

     }
 
     size_t count, n;
     }
 
     size_t count, n;


@@ -553,28 +543,24 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
             wxGridCellCoords( topRow, leftCol ),
             wxGridCellCoords( bottomRow, rightCol ),
             true,
             wxGridCellCoords( topRow, leftCol ),
             wxGridCellCoords( bottomRow, rightCol ),
             true,

-            ControlDown, ShiftDown,
-            AltDown, MetaDown );
+            kbd);

         m_grid->GetEventHandler()->ProcessEvent( gridEvt );
     }
 }
 
 void wxGridSelection::SelectCell( int row, int col,
         m_grid->GetEventHandler()->ProcessEvent( gridEvt );
     }
 }
 
 void wxGridSelection::SelectCell( int row, int col,

-                                  bool ControlDown, bool ShiftDown,
-                                  bool AltDown, bool MetaDown,
+                                  const wxKeyboardState& kbd,

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

-        SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1,
-                    ControlDown, ShiftDown, AltDown, MetaDown, sendEvent);
+        SelectBlock(row, 0, row, m_grid->GetNumberCols() - 1, kbd, sendEvent);

 
         return;
     }
     else if ( m_selectionMode == wxGrid::wxGridSelectColumns )
     {
 
         return;
     }
     else if ( m_selectionMode == wxGrid::wxGridSelectColumns )
     {

-        SelectBlock(0, col, m_grid->GetNumberRows() - 1, col,
-                    ControlDown, ShiftDown, AltDown, MetaDown, sendEvent);
+        SelectBlock(0, col, m_grid->GetNumberRows() - 1, col, kbd, sendEvent);

 
         return;
     }
 
         return;
     }


@@ -601,20 +587,19 @@ void wxGridSelection::SelectCell( int row, int col,
             wxGridCellCoords( row, col ),
             wxGridCellCoords( row, col ),
             true,
             wxGridCellCoords( row, col ),
             wxGridCellCoords( row, col ),
             true,

-            ControlDown, ShiftDown,
-            AltDown, MetaDown );
+            kbd);

         m_grid->GetEventHandler()->ProcessEvent( gridEvt );
     }
 }
 
         m_grid->GetEventHandler()->ProcessEvent( gridEvt );
     }
 }
 

-void wxGridSelection::ToggleCellSelection( int row, int col,
-                                           bool ControlDown, bool ShiftDown,
-                                           bool AltDown, bool MetaDown )
+void
+wxGridSelection::ToggleCellSelection(int row, int col,
+                                     const wxKeyboardState& kbd)

 {
     // if the cell is not selected, select it
     if ( !IsInSelection ( row, col ) )
     {
 {
     // if the cell is not selected, select it
     if ( !IsInSelection ( row, col ) )
     {

-        SelectCell( row, col, ControlDown, ShiftDown, AltDown, MetaDown );
+        SelectCell(row, col, kbd);

 
         return;
     }
 
         return;
     }


@@ -651,8 +636,7 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
                                                 wxGridCellCoords( row, col ),
                                                 wxGridCellCoords( row, col ),
                                                 false,
                                                 wxGridCellCoords( row, col ),
                                                 wxGridCellCoords( row, col ),
                                                 false,

-                                                ControlDown, ShiftDown,
-                                                AltDown, MetaDown );
+                                                kbd );

                 m_grid->GetEventHandler()->ProcessEvent( gridEvt );
 
                 return;
                 m_grid->GetEventHandler()->ProcessEvent( gridEvt );
 
                 return;


@@ -701,25 +685,22 @@ 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,
-                                 false, false, false, false, false );
+                    SelectBlockNoEvent(topRow, leftCol, row - 1, rightCol);

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

-                    SelectBlock( row + 1, leftCol, bottomRow, rightCol,
-                                 false, false, false, false, false );
+                    SelectBlockNoEvent(row + 1, leftCol, bottomRow, rightCol);

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

-                    SelectBlock( row, leftCol, row, col - 1,
-                                 false, false, false, false, false );
+                    SelectBlockNoEvent(row, leftCol, row, col - 1);

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

-                    SelectBlock( row, col + 1, row, rightCol,
-                                 false, false, false, false, false );
+                    SelectBlockNoEvent(row, col + 1, row, rightCol);

             }
         }
     }
 
             }
         }
     }
 

+    bool rowSelectionWasChanged = false;

     // remove a cell from a row, adding up to two new blocks
     if ( m_selectionMode != wxGrid::wxGridSelectColumns )
     {
     // remove a cell from a row, adding up to two new blocks
     if ( m_selectionMode != wxGrid::wxGridSelectColumns )
     {


@@ -732,20 +713,21 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
                 n--;
                 count--;
 
                 n--;
                 count--;
 

+                rowSelectionWasChanged = true;
+

                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( col > 0 )
                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( col > 0 )

-                        SelectBlock( row, 0, row, col - 1,
-                                     false, false, false, false, false );
+                        SelectBlockNoEvent(row, 0, row, col - 1);

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

-                        SelectBlock( row, col + 1,
-                                     row, m_grid->GetNumberCols() - 1,
-                                     false, false, false, false, false );
+                        SelectBlockNoEvent( row, col + 1,
+                                     row, m_grid->GetNumberCols() - 1);

                 }
             }
         }
     }
 
                 }
             }
         }
     }
 

+    bool colSelectionWasChanged = false;

     // remove a cell from a column, adding up to two new blocks
     if ( m_selectionMode != wxGrid::wxGridSelectRows )
     {
     // remove a cell from a column, adding up to two new blocks
     if ( m_selectionMode != wxGrid::wxGridSelectRows )
     {


@@ -758,15 +740,15 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
                 n--;
                 count--;
 
                 n--;
                 count--;
 

+                colSelectionWasChanged = true;
+

                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( row > 0 )
                 if (m_selectionMode == wxGrid::wxGridSelectCells)
                 {
                     if ( row > 0 )

-                        SelectBlock( 0, col, row - 1, col,
-                                     false, false, false, false, false );
+                        SelectBlockNoEvent(0, col, row - 1, col);

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

-                        SelectBlock( row + 1, col,
-                                     m_grid->GetNumberRows() - 1, col,
-                                     false, false, false, false, false );
+                        SelectBlockNoEvent(row + 1, col,
+                                     m_grid->GetNumberRows() - 1, col);

                 }
             }
         }
                 }
             }
         }


@@ -775,76 +757,92 @@ void wxGridSelection::ToggleCellSelection( int row, int col,
     // 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;
     // 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)
+    if ( m_selectionMode == wxGrid::wxGridSelectCells )

     {
     {

-        case wxGrid::wxGridSelectCells:
+        if ( !m_grid->GetBatchCount() )

         {
         {

-            if ( !m_grid->GetBatchCount() )
-            {
-                r = m_grid->BlockToDeviceRect(
-                    wxGridCellCoords( row, col ),
-                    wxGridCellCoords( row, col ) );
-                ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
-            }
-
-            wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
-                wxEVT_GRID_RANGE_SELECT,
-                m_grid,
-                wxGridCellCoords( row, col ),
+            r = m_grid->BlockToDeviceRect(

                 wxGridCellCoords( row, col ),
                 wxGridCellCoords( row, col ),

-                false,
-                ControlDown, ShiftDown,
-                AltDown, MetaDown );
-            m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+                wxGridCellCoords( row, col ) );
+            ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );

         }
         }

-            break;

 
 

-        case wxGrid::wxGridSelectRows:
+        wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+            wxEVT_GRID_RANGE_SELECT,
+            m_grid,
+            wxGridCellCoords( row, col ),
+            wxGridCellCoords( row, col ),
+            false,
+            kbd );
+        m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+    }
+    else  // rows/columns selection mode
+    {
+        if ( m_selectionMode != wxGrid::wxGridSelectColumns &&
+                rowSelectionWasChanged )

         {
         {

-            if ( !m_grid->GetBatchCount() )
+            int numCols = m_grid->GetNumberCols();
+            for ( int colFrom = 0, colTo = 0; colTo <= numCols; ++colTo )

             {
             {

-                r = m_grid->BlockToDeviceRect(
-                    wxGridCellCoords( row, 0 ),
-                    wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
-                ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
-            }
+                if ( m_colSelection.Index(colTo) >= 0 || colTo == numCols )
+                {
+                    if ( colFrom < colTo )
+                    {
+                        if ( !m_grid->GetBatchCount() )
+                        {
+                            r = m_grid->BlockToDeviceRect(
+                                wxGridCellCoords( row, colFrom ),
+                                wxGridCellCoords( row, colTo-1 ) );
+                            ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+                        }
+
+                        wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                            wxEVT_GRID_RANGE_SELECT,
+                            m_grid,
+                            wxGridCellCoords( row, colFrom ),
+                            wxGridCellCoords( row, colTo - 1 ),
+                            false,
+                            kbd );
+                        m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+                    }

 
 

-            wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
-                wxEVT_GRID_RANGE_SELECT,
-                m_grid,
-                wxGridCellCoords( row, 0 ),
-                wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ),
-                false,
-                ControlDown, ShiftDown,
-                AltDown, MetaDown );
-            m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+                    colFrom = colTo + 1;
+                }
+            }

         }
         }

-            break;

 
 

-        case wxGrid::wxGridSelectColumns:
+        if ( m_selectionMode != wxGrid::wxGridSelectRows &&
+                colSelectionWasChanged )

         {
         {

-            if ( !m_grid->GetBatchCount() )
+            int numRows = m_grid->GetNumberRows();
+            for ( int rowFrom = 0, rowTo = 0; rowTo <= numRows; ++rowTo )

             {
             {

-                r = m_grid->BlockToDeviceRect(
-                    wxGridCellCoords( 0, col ),
-                    wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
-              ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
-            }
+                if ( m_rowSelection.Index(rowTo) >= 0 || rowTo == numRows )
+                {
+                    if (rowFrom < rowTo)
+                    {
+                        if ( !m_grid->GetBatchCount() )
+                        {
+                            r = m_grid->BlockToDeviceRect(
+                                wxGridCellCoords( rowFrom, col ),
+                                wxGridCellCoords( rowTo - 1, col ) );
+                          ((wxWindow *)m_grid->m_gridWin)->Refresh( false, &r );
+                        }
+
+                        wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
+                            wxEVT_GRID_RANGE_SELECT,
+                            m_grid,
+                            wxGridCellCoords( rowFrom, col ),
+                            wxGridCellCoords( rowTo - 1, col ),
+                            false,
+                            kbd );
+                        m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+                    }

 
 

-            wxGridRangeSelectEvent gridEvt( m_grid->GetId(),
-                wxEVT_GRID_RANGE_SELECT,
-                m_grid,
-                wxGridCellCoords( 0, col ),
-                wxGridCellCoords( m_grid->GetNumberRows() - 1, col ),
-                false,
-                ControlDown, ShiftDown,
-                AltDown, MetaDown );
-            m_grid->GetEventHandler()->ProcessEvent( gridEvt );
+                    rowFrom = rowTo + 1;
+                }
+            }

         }
         }

-            break;
-
-        default:
-            break;

     }
 }
 
     }
 }