Author: pfj
Update of /cvs/pkgs/rpms/mono/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22695/devel
Modified Files: import.log mono-2.2-winforms.patch mono.spec Log Message:
Missed a file with sed Updated winforms patch
Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- import.log 30 Nov 2008 19:12:11 -0000 1.18 +++ import.log 30 Nov 2008 19:58:12 -0000 1.19 @@ -16,3 +16,4 @@ mono-2_2-3_pre1_fc10:HEAD:mono-2.2-3.pre1.fc10.src.rpm:1227693180 mono-2_2-4_pre1_fc10:HEAD:mono-2.2-4.pre1.fc10.src.rpm:1227705354 mono-2_2-5_pre1_fc11:HEAD:mono-2.2-5.pre1.fc11.src.rpm:1228072254 +mono-2_2-6_pre1_fc11:HEAD:mono-2.2-6.pre1.fc11.src.rpm:1228075040
mono-2.2-winforms.patch:
Index: mono-2.2-winforms.patch =================================================================== RCS file: /cvs/pkgs/rpms/mono/devel/mono-2.2-winforms.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mono-2.2-winforms.patch 30 Nov 2008 19:12:11 -0000 1.1 +++ mono-2.2-winforms.patch 30 Nov 2008 19:58:12 -0000 1.2 @@ -90,3 +90,103 @@ } }
+--- mono-2.2/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs 2008-11-13 23:30:08.000000000 +0000 ++++ mono-2.2/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView-new.cs 2008-11-30 19:31:54.000000000 +0000 +@@ -671,8 +671,7 @@ + if (value.DataGridView != this) { + throw new ArgumentException("The cell is not in this DataGridView."); + } +- currentCell = value; +- currentRow = currentCell.OwningRow; ++ SetCurrentCellAddressCore(value.ColumnIndex, value.RowIndex, false, true, false); + } + } + +@@ -683,7 +682,11 @@ + + [Browsable (false)] + public DataGridViewRow CurrentRow { +- get { return currentRow; } ++ get { ++ if (currentCell != null) ++ return currentCell.OwningRow; ++ return null; ++ } + } + + [DefaultValue ("")] +@@ -4203,26 +4206,18 @@ + Invalidate (); + return; + } +- +- if (cell == currentCell) { +- BeginEdit (true); +- return; +- } else if (currentCell != null) { +- EndEdit (); +- OnCellLeave(new DataGridViewCellEventArgs(currentCell.ColumnIndex, currentCell.RowIndex)); +- } +- currentCell = cell; +- currentCellAddress = new Point (currentCell.ColumnIndex, currentCell.RowIndex); +- currentRow = cell.OwningRow; +- OnCurrentCellChanged(EventArgs.Empty); +- OnCellEnter(new DataGridViewCellEventArgs(cell.ColumnIndex, cell.RowIndex)); +- if (editMode == DataGridViewEditMode.EditOnEnter) { +- BeginEdit (true); +- } ++ SetCurrentCellAddressCore(cell.ColumnIndex, cell.RowIndex, false, true, true); + Invalidate(); + return; + } + ++ private void UpdateBindingPosition(int position) ++ { ++ BindingSource source = dataSource as BindingSource; ++ if (source != null && source.CurrencyManager != null) ++ source.CurrencyManager.Position = position; ++ } ++ + protected override void OnMouseEnter (EventArgs e) + { + base.OnMouseEnter(e); +@@ -5307,7 +5302,7 @@ + base.SetBoundsCore(x, y, width, height, specified); + } + +- [MonoTODO ("Does not use validateCurrentCell or throughMouseClick")] ++ [MonoTODO ("Does not use validateCurrentCell")] + protected virtual bool SetCurrentCellAddressCore (int columnIndex, int rowIndex, bool setAnchorCellAddress, bool validateCurrentCell, bool throughMouseClick) + { + if ((columnIndex < 0 || columnIndex > Columns.Count - 1) && rowIndex != -1) +@@ -5327,12 +5322,25 @@ + + if (setAnchorCellAddress) + anchor_cell = new Point (columnIndex, rowIndex); +- ++ DataGridViewCell oldCell = CurrentCell; ++ currentCell = cell; + currentCellAddress = new Point (columnIndex, rowIndex); +- CurrentCell = cell; +- +- OnCurrentCellChanged (EventArgs.Empty); +- ++ if (currentCell != oldCell) { ++ if (oldCell != null) { ++ EndEdit(); ++ OnCellLeave(new DataGridViewCellEventArgs(oldCell.ColumnIndex, oldCell.RowIndex)); ++ OnRowLeave(new DataGridViewCellEventArgs(oldCell.ColumnIndex, oldCell.RowIndex)); ++ } ++ UpdateBindingPosition(currentCell.RowIndex); ++ OnRowEnter(new DataGridViewCellEventArgs(cell.ColumnIndex, cell.RowIndex)); ++ OnCellEnter(new DataGridViewCellEventArgs(cell.ColumnIndex, cell.RowIndex)); ++ OnCurrentCellChanged(EventArgs.Empty); ++ if (throughMouseClick && editMode == DataGridViewEditMode.EditOnEnter) ++ BeginEdit(true); ++ } else { ++ if (throughMouseClick) ++ BeginEdit(true); ++ } + return true; + } +
Index: mono.spec =================================================================== RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- mono.spec 30 Nov 2008 19:12:11 -0000 1.91 +++ mono.spec 30 Nov 2008 19:58:12 -0000 1.92 @@ -1,6 +1,6 @@ Name: mono Version: 2.2 -Release: 5.pre1%{?dist} +Release: 6.pre1%{?dist} Summary: A .NET runtime environment
Group: Development/Languages @@ -279,6 +279,7 @@ sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f" sed -i -e 's!@prefix@/lib!%{_libdir}!' "$f" sed -i -e 's!/usr/lib!%{_libdir}!' "$f" + sed -i -e 's!${prefix}/lib!%{_libdir}!' "$f" sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" sed -i -e 's!${prefix}/@reloc_libdir@!%{_libdir}!' "$f"; done @@ -681,6 +682,9 @@ %{_libdir}/pkgconfig/monodoc.pc
%changelog +* Sun Nov 30 2008 Paul F. Johnson paul@all-the-johnsons.co.uk 2.2-6.pre1 +- missed a sed invocation + * Sun Nov 30 2008 Paul F. Johnson paul@all-the-johnsons.co.uk 2.2-5.pre1 - new patch for winforms problems - reorganised patches