X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b10575493017f39b1cccee01743044e429a43f4..77611ad4da9df336a0805508276a81b8f4437107:/src/generic/grid.cpp

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 792b92b12c..4a3a28cce0 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -52,6 +52,9 @@
 #include "wx/grid.h"
 #include "wx/generic/gridsel.h"
 
+// Required for wxIs... functions
+#include <ctype.h>
+
 // ----------------------------------------------------------------------------
 // array classes
 // ----------------------------------------------------------------------------
@@ -2453,12 +2456,12 @@ wxGridStringTable::~wxGridStringTable()
 {
 }
 
-long wxGridStringTable::GetNumberRows()
+int wxGridStringTable::GetNumberRows()
 {
     return m_data.GetCount();
 }
 
-long wxGridStringTable::GetNumberCols()
+int wxGridStringTable::GetNumberCols()
 {
     if ( m_data.GetCount() > 0 )
         return m_data[0].GetCount();
@@ -3800,10 +3803,13 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
                 break;
 
                 case WXGRID_CURSOR_SELECT_ROW:
-                    if ( (row = YToRow( y )) >= 0  &&
-                         !IsInSelection( row, 0 ) )
-                    {
-                        SelectRow( row, TRUE );
+                    if ( (row = YToRow( y )) >= 0 )
+		    {
+		        m_selection->SelectRow( row,
+						event.ControlDown(),
+						event.ShiftDown(),
+						event.AltDown(),
+						event.MetaDown() );
                     }
 
                 // default label to suppress warnings about "enumeration value
@@ -3840,7 +3846,23 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
             if ( row >= 0  &&
                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
             {
-                SelectRow( row, event.ShiftDown() );
+	        if ( !event.ShiftDown() && !event.ControlDown() )
+		    ClearSelection();
+		if ( event.ShiftDown() )
+		    m_selection->SelectBlock( m_currentCellCoords.GetRow(),
+					      0,
+					      row,
+					      GetNumberCols() - 1,
+					      event.ControlDown(),
+					      event.ShiftDown(),
+					      event.AltDown(),
+					      event.MetaDown() );
+		else
+		    m_selection->SelectRow( row,
+					    event.ControlDown(),
+					    event.ShiftDown(),
+					    event.AltDown(),
+					    event.MetaDown() );
                 ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin);
             }
         }
@@ -3967,10 +3989,13 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
                 break;
 
                 case WXGRID_CURSOR_SELECT_COL:
-                    if ( (col = XToCol( x )) >= 0  &&
-                         !IsInSelection( 0, col ) )
-                    {
-                        SelectCol( col, TRUE );
+                    if ( (col = XToCol( x )) >= 0 )
+		    {
+		        m_selection->SelectCol( col,
+						event.ControlDown(),
+						event.ShiftDown(),
+						event.AltDown(),
+						event.MetaDown() );
                     }
 
                 // default label to suppress warnings about "enumeration value
@@ -4007,7 +4032,22 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
             if ( col >= 0  &&
                  !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
             {
-                SelectCol( col, event.ShiftDown() );
+	        if ( !event.ShiftDown() && !event.ControlDown() )
+		    ClearSelection();
+		if ( event.ShiftDown() )
+		    m_selection->SelectBlock( 0,
+					      m_currentCellCoords.GetCol(),
+					      GetNumberRows() - 1, col,
+					      event.ControlDown(),
+					      event.ShiftDown(),
+					      event.AltDown(),
+					      event.MetaDown() );
+		else
+		    m_selection->SelectCol( col,
+					    event.ControlDown(),
+					    event.ShiftDown(),
+					    event.AltDown(),
+					    event.MetaDown() );
                 ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
             }
         }
@@ -4265,7 +4305,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 {
                     MakeCellVisible(coords);
                     // TODO: need to introduce a delay or something here.  The
-                    // scrolling is way to fast, at least on MSW.
+                    // scrolling is way to fast, at least on MSW - also on GTK.
                 }
             }
         }
@@ -4946,8 +4986,8 @@ bool wxGrid::SendEvent( const wxEventType type,
                              type,
                              this,
                              row, col,
-                             FALSE,
                              mouseEv.GetX(), mouseEv.GetY(),
+                             FALSE,
                              mouseEv.ControlDown(),
                              mouseEv.ShiftDown(),
                              mouseEv.AltDown(),
@@ -5102,7 +5142,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 break;
 
             case WXK_ESCAPE:
-                m_selection->ClearSelection();
+                ClearSelection();
                 break;
 
             case WXK_TAB:
@@ -7582,7 +7622,7 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s )
 void wxGrid::SelectRow( int row, bool addToSelected )
 {
     if ( IsSelection() && !addToSelected )
-        m_selection->ClearSelection();
+        ClearSelection();
 
     m_selection->SelectRow( row );
 }
@@ -7591,7 +7631,7 @@ void wxGrid::SelectRow( int row, bool addToSelected )
 void wxGrid::SelectCol( int col, bool addToSelected )
 {
     if ( IsSelection() && !addToSelected )
-        m_selection->ClearSelection();
+        ClearSelection();
 
     m_selection->SelectCol( col );
 }