Added clipboard cut and paste

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 966d3eb192381f22e9f19b6f0f64b26f541bffb7..e2b9e3580721124017104ac5a4c6e8e0901d0ad4 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -2020,7 +2020,7 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col)
 {
     wxGridCellRenderer* renderer = NULL;
 
 {
     wxGridCellRenderer* renderer = NULL;
 

-    if ( m_defGridAttr != this || grid == NULL )
+    if ( m_defGridAttr == this || grid == NULL )

     {
         renderer = m_renderer;      // use local attribute
         if ( renderer )
     {
         renderer = m_renderer;      // use local attribute
         if ( renderer )


@@ -2088,6 +2088,9 @@ void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col)
     }
     else
     {
     }
     else
     {

+        // free the old attribute
+        m_attrs[(size_t)n].attr->DecRef();
+

         if ( attr )
         {
             // change the attribute
         if ( attr )
         {
             // change the attribute


@@ -3140,7 +3143,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
         {
             for ( n = 0;  n < numCols;  n++ )
             {
         {
             for ( n = 0;  n < numCols;  n++ )
             {

-                m_data[row].Remove( pos );
+                m_data[row].RemoveAt( pos );

             }
         }
     }
             }
         }
     }


@@ -3607,6 +3610,8 @@ void wxGrid::Create()
                                   wxDefaultSize );
 
     SetTargetWindow( m_gridWin );
                                   wxDefaultSize );
 
     SetTargetWindow( m_gridWin );

+
+    Init();

 }
 
 
 }
 
 


@@ -3624,7 +3629,9 @@ bool wxGrid::CreateGrid( int numRows, int numCols,
     m_table->SetView( this );
     m_ownTable = TRUE;
     m_selection = new wxGridSelection( this, selmode );
     m_table->SetView( this );
     m_ownTable = TRUE;
     m_selection = new wxGridSelection( this, selmode );

-    Init();
+
+    CalcDimensions();
+

     m_created = TRUE;
 
     return m_created;
     m_created = TRUE;
 
     return m_created;


@@ -3632,12 +3639,10 @@ bool wxGrid::CreateGrid( int numRows, int numCols,
 
 void wxGrid::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
 {
 
 void wxGrid::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
 {

-    if ( !m_created )
-    {
-        wxFAIL_MSG( wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") );
-    }
-    else
-        m_selection->SetSelectionMode( selmode );
+    wxCHECK_RET( m_created,
+                 wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") );
+
+    m_selection->SetSelectionMode( selmode );

 }
 
 bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
 }
 
 bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,


@@ -3664,7 +3669,9 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
         if (takeOwnership)
             m_ownTable = TRUE;
         m_selection = new wxGridSelection( this, selmode );
         if (takeOwnership)
             m_ownTable = TRUE;
         m_selection = new wxGridSelection( this, selmode );

-        Init();
+
+        CalcDimensions();
+

         m_created = TRUE;
     }
 
         m_created = TRUE;
     }
 


@@ -3746,8 +3753,6 @@ void wxGrid::Init()
 
     m_extraWidth =
     m_extraHeight = 50;
 
     m_extraWidth =
     m_extraHeight = 50;

-
-    CalcDimensions();

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


@@ -4010,8 +4015,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             {
                 for ( i = 0;  i < numRows;  i++ )
                 {
             {
                 for ( i = 0;  i < numRows;  i++ )
                 {

-                    m_rowHeights.Remove( pos );
-                    m_rowBottoms.Remove( pos );
+                    m_rowHeights.RemoveAt( pos );
+                    m_rowBottoms.RemoveAt( pos );

                 }
 
                 int h = 0;
                 }
 
                 int h = 0;


@@ -4146,8 +4151,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             {
                 for ( i = 0;  i < numCols;  i++ )
                 {
             {
                 for ( i = 0;  i < numCols;  i++ )
                 {

-                    m_colWidths.Remove( pos );
-                    m_colRights.Remove( pos );
+                    m_colWidths.RemoveAt( pos );
+                    m_colRights.RemoveAt( pos );

                 }
 
                 int w = 0;
                 }
 
                 int w = 0;


@@ -4202,8 +4207,8 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
     wxRegionIterator iter( reg );
     wxRect r;
 
     wxRegionIterator iter( reg );
     wxRect r;
 

-    wxArrayInt  rowlabels;           
-        
+    wxArrayInt  rowlabels;
+

     int top, bottom;
     while ( iter )
     {
     int top, bottom;
     while ( iter )
     {


@@ -5449,11 +5454,14 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
 // Generate a grid event based on a mouse event and
 // return the result of ProcessEvent()
 //
 // Generate a grid event based on a mouse event and
 // return the result of ProcessEvent()
 //

-bool wxGrid::SendEvent( const wxEventType type,
+int wxGrid::SendEvent( const wxEventType type,

                         int row, int col,
                         wxMouseEvent& mouseEv )
 {
                         int row, int col,
                         wxMouseEvent& mouseEv )
 {

-    if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
+   bool claimed;
+   bool vetoed= FALSE;
+       
+   if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )

     {
         int rowOrCol = (row == -1 ? col : row);
 
     {
         int rowOrCol = (row == -1 ? col : row);
 


@@ -5467,9 +5475,12 @@ bool wxGrid::SendEvent( const wxEventType type,
                                  mouseEv.ShiftDown(),
                                  mouseEv.AltDown(),
                                  mouseEv.MetaDown() );
                                  mouseEv.ShiftDown(),
                                  mouseEv.AltDown(),
                                  mouseEv.MetaDown() );

-        return GetEventHandler()->ProcessEvent(gridEvt);
+
+        claimed = GetEventHandler()->ProcessEvent(gridEvt);
+       vetoed = !gridEvt.IsAllowed();
+

     }
     }

-    else if ( type == wxEVT_GRID_RANGE_SELECT )
+   else if ( type == wxEVT_GRID_RANGE_SELECT )

     {
         // Right now, it should _never_ end up here!
         wxGridRangeSelectEvent gridEvt( GetId(),
     {
         // Right now, it should _never_ end up here!
         wxGridRangeSelectEvent gridEvt( GetId(),


@@ -5483,9 +5494,11 @@ bool wxGrid::SendEvent( const wxEventType type,
                                         mouseEv.AltDown(),
                                         mouseEv.MetaDown() );
 
                                         mouseEv.AltDown(),
                                         mouseEv.MetaDown() );
 

-        return GetEventHandler()->ProcessEvent(gridEvt);
+        claimed = GetEventHandler()->ProcessEvent(gridEvt);
+       vetoed = !gridEvt.IsAllowed();
+       

     }
     }

-    else
+   else

     {
         wxGridEvent gridEvt( GetId(),
                              type,
     {
         wxGridEvent gridEvt( GetId(),
                              type,


@@ -5498,17 +5511,27 @@ bool wxGrid::SendEvent( const wxEventType type,
                              mouseEv.ShiftDown(),
                              mouseEv.AltDown(),
                              mouseEv.MetaDown() );
                              mouseEv.ShiftDown(),
                              mouseEv.AltDown(),
                              mouseEv.MetaDown() );

-        return GetEventHandler()->ProcessEvent(gridEvt);
+         claimed = GetEventHandler()->ProcessEvent(gridEvt);
+        vetoed = !gridEvt.IsAllowed();

     }
     }

+
+  // A Veto'd event may not be `claimed' so test this first
+  if (vetoed) return -1;
+  return claimed ? 1 : 0;
+
+

 }
 
 
 // Generate a grid event of specified type and return the result
 // of ProcessEvent().
 //
 }
 
 
 // Generate a grid event of specified type and return the result
 // of ProcessEvent().
 //

-bool wxGrid::SendEvent( const wxEventType type,
+int wxGrid::SendEvent( const wxEventType type,

                         int row, int col )
 {
                         int row, int col )
 {

+   bool claimed;
+   bool vetoed= FALSE;
+

     if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
     {
         int rowOrCol = (row == -1 ? col : row);
     if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE )
     {
         int rowOrCol = (row == -1 ? col : row);


@@ -5518,7 +5541,8 @@ bool wxGrid::SendEvent( const wxEventType type,
                                  this,
                                  rowOrCol );
 
                                  this,
                                  rowOrCol );
 

-        return GetEventHandler()->ProcessEvent(gridEvt);
+        claimed = GetEventHandler()->ProcessEvent(gridEvt);
+        vetoed  = !gridEvt.IsAllowed();

     }
     else
     {
     }
     else
     {


@@ -5527,8 +5551,14 @@ bool wxGrid::SendEvent( const wxEventType type,
                              this,
                              row, col );
 
                              this,
                              row, col );
 

-        return GetEventHandler()->ProcessEvent(gridEvt);
-    }
+        claimed = GetEventHandler()->ProcessEvent(gridEvt);
+        vetoed  = !gridEvt.IsAllowed();
+     }
+
+       // A Veto'd event may not be `claimed' so test this first
+       if (vetoed) return -1;
+       return claimed ? 1 : 0;
+

 }
 
 
 }
 
 


@@ -5818,7 +5848,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
 
             // Otherwise refresh redraws the highlight!
             m_currentCellCoords = coords;
 
             // Otherwise refresh redraws the highlight!
             m_currentCellCoords = coords;

-            
+

             DrawGridCellArea(dc,cells);
             DrawAllGridLines( dc, r );
         }
             DrawGridCellArea(dc,cells);
             DrawAllGridLines( dc, r );
         }


@@ -6578,12 +6608,12 @@ void wxGrid::EnableCellEditControl( bool enable )
 
     if ( enable != m_cellEditCtrlEnabled )
     {
 
     if ( enable != m_cellEditCtrlEnabled )
     {

-        // TODO allow the app to Veto() this event?
-        SendEvent(enable ? wxEVT_GRID_EDITOR_SHOWN : wxEVT_GRID_EDITOR_HIDDEN);
-

         if ( enable )
         {
         if ( enable )
         {

-            // this should be checked by the caller!
+           if (SendEvent( wxEVT_GRID_EDITOR_SHOWN) <0)
+               return;
+
+           // this should be checked by the caller!

             wxASSERT_MSG( CanEnableCellControl(),
                           _T("can't enable editing for this cell!") );
 
             wxASSERT_MSG( CanEnableCellControl(),
                           _T("can't enable editing for this cell!") );
 


@@ -6594,7 +6624,10 @@ void wxGrid::EnableCellEditControl( bool enable )
         }
         else
         {
         }
         else
         {

-            HideCellEditControl();
+           //FIXME:add veto support
+           SendEvent( wxEVT_GRID_EDITOR_HIDDEN);
+
+           HideCellEditControl();

             SaveEditControlValue();
 
             // do it after HideCellEditControl()
             SaveEditControlValue();
 
             // do it after HideCellEditControl()


@@ -6740,6 +6773,8 @@ void wxGrid::SaveEditControlValue()
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
 
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
 

+        wxString oldval = GetCellValue(row,col);
+

         wxGridCellAttr* attr = GetCellAttr(row, col);
         wxGridCellEditor* editor = attr->GetEditor(this, row, col);
         bool changed = editor->EndEdit(row, col, this);
         wxGridCellAttr* attr = GetCellAttr(row, col);
         wxGridCellEditor* editor = attr->GetEditor(this, row, col);
         bool changed = editor->EndEdit(row, col, this);


@@ -6749,9 +6784,13 @@ void wxGrid::SaveEditControlValue()
 
         if (changed)
         {
 
         if (changed)
         {

-            SendEvent( wxEVT_GRID_CELL_CHANGE,
+            if ( SendEvent( wxEVT_GRID_CELL_CHANGE,

                        m_currentCellCoords.GetRow(),
                        m_currentCellCoords.GetRow(),

-                       m_currentCellCoords.GetCol() );
+                       m_currentCellCoords.GetCol() ) < 0 ) {
+
+                             //Event has been veto set the data back.
+                              SetCellValue(row,col,oldval);
+              }

         }
     }
 }
         }
     }
 }


@@ -6911,6 +6950,7 @@ bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible )
 //
 void wxGrid::MakeCellVisible( int row, int col )
 {
 //
 void wxGrid::MakeCellVisible( int row, int col )
 {

+

     int i;
     int xpos = -1, ypos = -1;
 
     int i;
     int xpos = -1, ypos = -1;
 


@@ -6951,7 +6991,10 @@ void wxGrid::MakeCellVisible( int row, int col )
             // we divide it later by GRID_SCROLL_LINE, make sure that we don't
             // have rounding errors (this is important, because if we do, we
             // might not scroll at all and some cells won't be redrawn)
             // we divide it later by GRID_SCROLL_LINE, make sure that we don't
             // have rounding errors (this is important, because if we do, we
             // might not scroll at all and some cells won't be redrawn)

-            ypos += GRID_SCROLL_LINE / 2;
+            //
+            // Sometimes GRID_SCROLL_LINE/2 is not enough, so just add a full
+            // scroll unit...
+            ypos += GRID_SCROLL_LINE;

         }
 
         if ( left < 0 )
         }
 
         if ( left < 0 )


@@ -6973,7 +7016,7 @@ void wxGrid::MakeCellVisible( int row, int col )
             }
 
             // see comment for ypos above
             }
 
             // see comment for ypos above

-            xpos += GRID_SCROLL_LINE / 2;
+            xpos += GRID_SCROLL_LINE;

         }
 
         if ( xpos != -1  ||  ypos != -1 )
         }
 
         if ( xpos != -1  ||  ypos != -1 )