10000 Adding more MessageBox buttons and result values (#10720) · dotnet/wpf@15cc5c1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 15cc5c1

Browse files
bstordrupbstordrup
authored
Adding more MessageBox buttons and result values (#10720)
* Added additional MessageBoxButtons * Correction to order in MessageBoxButton enum * Whitespace fixes * More whitespace fixes * More whitespace fixes * Further whitespace * Whitespace * Whitespace * Whitespace again * Whitespace * Whitespace * Added tests to test exceptional paths of MessageBox.ShowCore * Reorganized tests Using WpfTheory and MemberData for similar tests * Changed the problematic test after advice. * Reverted to InlineData * Final adjustments
1 parent 97aabac commit 15cc5c1

File tree

4 files changed

+422
-131
lines changed

4 files changed

+422
-131
lines changed

‎src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,8 +979,11 @@ internal MessageBox() { }
979979
}
980980
public enum MessageBoxButton
981981
{
982+
AbortRetryIgnore = 2,
983+
CancelTryContinue = 6,
982984
OK = 0,
983985
OKCancel = 1,
986+
RetryCancel = 5,
984987
YesNo = 4,
985988
YesNoCancel = 3,
986989
}
@@ -1007,10 +1010,15 @@ public enum MessageBoxOptions
10071010
}
10081011
public enum MessageBoxResult
10091012
{
1013+
Abort = 3,
10101014
Cancel = 2,
1015+
Continue = 11,
1016+
Ignore = 5,
10111017
No = 7,
10121018
None = 0,
10131019
OK = 1,
1020+
Retry = 4,
1021+
TryAgain = 10,
10141022
Yes = 6,
10151023
}
10161024
[System.Windows.Markup.ContentPropertyAttribute("Setters")]
@@ -2059,7 +2067,7 @@ public Window() { }
20592067
[System.ComponentModel.TypeConverterAttribute(typeof(System.Windows.ThemeModeConverter))]
20602068
[System.Diagnostics.CodeAnalysis.ExperimentalAttribute("WPF0001")]
20612069
public System.Windows.ThemeMode ThemeMode { get { throw null; } set { } }
2062-
2070+
20632071
[System.Windows.LocalizabilityAttribute(System.Windows.LocalizationCategory.Title)]
20642072
public string Title { get { throw null; } set { } }
20652073
[System.ComponentModel.TypeConverterAttribute("System.Windows.LengthConverter, PresentationFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, Custom=null")]

0 commit comments

Comments
 (0)
0