Author: martin
Date: 2006-01-15 19:48:12 -0500 (Sun, 15 Jan 2006)
New Revision: 55612
Modified:
branches/mono-1-1-13/mcs/class/Managed.Windows.Forms/SWF.csproj
branches/mono-1-1-13/mcs/class/corlib/System.Threading/Timer.cs
Log:
Fix the incorrect merging in r55424.
Modified: branches/mono-1-1-13/mcs/class/Managed.Windows.Forms/SWF.csproj
===================================================================
--- branches/mono-1-1-13/mcs/class/Managed.Windows.Forms/SWF.csproj
2006-01-15 23:28:02 UTC (rev 55611)
+++ branches/mono-1-1-13/mcs/class/Managed.Windows.Forms/SWF.csproj
2006-01-16 00:48:12 UTC (rev 55612)
@@ -544,631 +544,6 @@
BuildAction = "Compile"
/>
<File
- RelPath =
"System.Windows.Forms\DataGridViewAdvancedBorderStyle.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewAdvancedCellBorderStyle.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewAutoSizeColumnMode.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewAutoSizeColumnModeEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewAutoSizeColumnModeEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewAutoSizeColumnsMode.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewAutoSizeColumnsModeEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewAutoSizeColumnsModeEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewAutoSizeModeEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewAutoSizeModeEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewAutoSizeRowMode.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewAutoSizeRowsMode.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewBand.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewBindingCompleteEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewBindingCompleteEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewButtonCell.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewButtonColumn.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellBorderStyle.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellCancelEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellCancelEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellCollection.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellContextMenuStripNeededEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellContextMenuStripNeededEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewCell.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellErrorTextNeededEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellErrorTextNeededEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellFormattingEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellFormattingEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellMouseEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellMouseEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellPaintingEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellPaintingEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellParsingEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellParsingEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellStateChangedEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellStateChangedEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellStyleContentChangedEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellStyleContentChangedEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellStyleConverter.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewCellStyle.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellStyleScopes.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellToolTipTextNeededEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellToolTipTextNeededEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellValidatingEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellValidatingEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellValueEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCellValueEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCheckBoxCell.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewCheckBoxColumn.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewClipboardCopyMode.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewColumnCollection.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewColumn.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewColumnDesignTimeVisibleAttribute.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewColumnDividerDoubleClickEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewColumnDividerDoubleClickEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewColumnEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewColumnEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewColumnHeaderCell.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewColumnHeadersHeightSizeMode.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewColumnSortMode.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewColumnStateChangedEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewColumnStateChangedEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewComboBoxCell.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewComboBoxColumn.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewComboBoxDisplayStyle.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewComboBoxEditingControl.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewContentAlignment.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridView.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewDataErrorContexts.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewDataErrorEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewDataErrorEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewEditingControlShowingEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewEditingControlShowingEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewEditMode.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewElement.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewElementStates.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewHeaderBorderStyle.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewHeaderCell.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewHitTestType.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewImageCell.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewImageCellLayout.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewImageColumn.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewPaintParts.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowCancelEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowCancelEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowCollection.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowContextMenuStripNeededEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowContextMenuStripNeededEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewRow.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowDividerDoubleClickEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowDividerDoubleClickEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowErrorTextNeededEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowErrorTextNeededEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowHeaderCell.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowHeadersWidthSizeMode.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowHeightInfoNeededEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowHeightInfoNeededEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowHeightInfoPushedEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowHeightInfoPushedEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowPostPaintEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowPostPaintEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowPrePaintEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowPrePaintEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowsAddedEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowsAddedEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowsDeletedEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowsRemovedEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowsRemovedEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowStateChangedEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewRowStateChangedEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewSelectedCellCollection.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewSelectedColumnCollection.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewSelectedRowCollection.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewSelectionMode.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewSortCompareEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewSortCompareEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewTextBoxCell.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewTextBoxColumn.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewTextBoxEditingControl.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\DataGridViewTopLeftHeaderCell.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\DataGridViewTriState.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
RelPath = "System.Windows.Forms\DataObject.cs"
SubType = "Code"
BuildAction = "Compile"
@@ -1379,11 +754,6 @@
BuildAction = "Compile"
/>
<File
- RelPath = "System.Windows.Forms\HandledMouseEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
RelPath = "System.Windows.Forms\Help.cs"
SubType = "Code"
BuildAction = "Compile"
@@ -1454,16 +824,6 @@
BuildAction = "Compile"
/>
<File
- RelPath =
"System.Windows.Forms\IDataGridViewEditingCell.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath =
"System.Windows.Forms\IDataGridViewEditingControl.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
RelPath = "System.Windows.Forms\IDataObject.cs"
SubType = "Code"
BuildAction = "Compile"
@@ -1484,11 +844,6 @@
BuildAction = "Compile"
/>
<File
- RelPath = "System.Windows.Forms\ImageLayout.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
RelPath = "System.Windows.Forms\ImageList.cs"
SubType = "Code"
BuildAction = "Compile"
@@ -1514,16 +869,6 @@
BuildAction = "Compile"
/>
<File
- RelPath = "System.Windows.Forms\ImplicitHScrollBar.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\ImplicitVScrollBar.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
RelPath =
"System.Windows.Forms\InputLanguageChangedEventArgs.cs"
SubType = "Code"
BuildAction = "Compile"
@@ -1554,11 +899,6 @@
BuildAction = "Compile"
/>
<File
- RelPath = "System.Windows.Forms\InternalWindowManager.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
RelPath = "System.Windows.Forms\InvalidateEventArgs.cs"
SubType = "Code"
BuildAction = "Compile"
@@ -1769,11 +1109,6 @@
BuildAction = "Compile"
/>
<File
- RelPath = "System.Windows.Forms\MdiWindowManager.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
RelPath = "System.Windows.Forms\MdiChildContext.cs"
SubType = "Code"
BuildAction = "Compile"
@@ -1974,11 +1309,6 @@
BuildAction = "Compile"
/>
<File
- RelPath = "System.Windows.Forms\Padding.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
RelPath = "System.Windows.Forms\PaintEventArgs.cs"
SubType = "Code"
BuildAction = "Compile"
@@ -2004,11 +1334,6 @@
BuildAction = "Compile"
/>
<File
- RelPath = "System.Windows.Forms\PrintDialog.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
RelPath = "System.Windows.Forms\ProgressBar.cs"
SubType = "Code"
BuildAction = "Compile"
@@ -2094,16 +1419,6 @@
BuildAction = "Compile"
/>
<File
- RelPath = "System.Windows.Forms\QuestionEventArgs.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "System.Windows.Forms\QuestionEventHandler.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
RelPath = "System.Windows.Forms\RadioButton.cs"
SubType = "Code"
BuildAction = "Compile"
@@ -2364,21 +1679,11 @@
BuildAction = "Compile"
/>
<File
- RelPath = "System.Windows.Forms\TextFormatFlags.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
RelPath = "System.Windows.Forms\Theme.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
- RelPath = "System.Windows.Forms\ThemeClearlooks.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
RelPath = "System.Windows.Forms\ThemeEngine.cs"
SubType = "Code"
BuildAction = "Compile"
Modified: branches/mono-1-1-13/mcs/class/corlib/System.Threading/Timer.cs
===================================================================
--- branches/mono-1-1-13/mcs/class/corlib/System.Threading/Timer.cs
2006-01-15 23:28:02 UTC (rev 55611)
+++ branches/mono-1-1-13/mcs/class/corlib/System.Threading/Timer.cs
2006-01-16 00:48:12 UTC (rev 55612)
@@ -128,10 +128,18 @@
if (aborted)
break;
- wait.Reset ();
+ try {
+ wait.Reset ();
+ } catch
(ObjectDisposedException) {
+ // FIXME: There is some
race condition
+ // here when the
thread is being
+ // aborted on
exit.
+ return;
+ }
+
signaled = wait.WaitOne
(period, false);
- if (aborted)
+ if (aborted || disposed)
break;
if (!signaled) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
