Skip to content

Commit b64acae

Browse files
authored
Remove references to IE where possible (WPF) (#8942)
1 parent d4a3c0c commit b64acae

File tree

14 files changed

+111
-141
lines changed

14 files changed

+111
-141
lines changed

xml/System.Windows.Controls/DataGridHyperlinkColumn.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
![DataGridHyperlinkColumn with email addresses](~/add/media/wpf-hyperlinkcolumn.png "DataGridHyperlinkColumn with email addresses")
3131
3232
> [!NOTE]
33-
> <xref:System.Windows.Documents.Hyperlink> navigation can only occur if either the direct or indirect parent of a <xref:System.Windows.Documents.Hyperlink> is a navigation host. Examples of navigation hosts include <xref:System.Windows.Navigation.NavigationWindow>, <xref:System.Windows.Controls.Frame>, or any browser that can host XBAPs, such as Microsoft Internet Explorer 6 or later and Firefox 2.0 or later. For more information, see the "Navigation Hosts" topic in [Navigation Overview](/dotnet/framework/wpf/app-development/navigation-overview).
33+
> <xref:System.Windows.Documents.Hyperlink> navigation can only occur if either the direct or indirect parent of a <xref:System.Windows.Documents.Hyperlink> is a navigation host. Examples of navigation hosts include <xref:System.Windows.Navigation.NavigationWindow>, <xref:System.Windows.Controls.Frame>, or any browser that can host XBAPs. For more information, see the "Navigation Hosts" article in [Navigation Overview](/dotnet/desktop/wpf/app-development/navigation-overview?view=netframeworkdesktop-4.8).
34+
>
35+
> For more information about XBAP support, see [Frequently asked questions about WPF browser-hosted applications (XBAP)](/dotnet/desktop/wpf/app-development/xbap-faq?view=netframeworkdesktop-4.8).
3436
3537
To populate the column, bind the column to the <xref:System.Uri> data by using the <xref:System.Windows.Controls.DataGridBoundColumn.Binding%2A> property. To display hyperlink text that is different than the URI string, bind the text value to the <xref:System.Windows.Controls.DataGridHyperlinkColumn.ContentBinding%2A> property. The <xref:System.Windows.Controls.DataGridBoundColumn.Binding%2A> property is applied to the <xref:System.Windows.Documents.Hyperlink> or <xref:System.Windows.Controls.TextBox> element created in the column. The <xref:System.Windows.FrameworkElement.DataContext%2A> for the element in each cell is the data item for the row the cell is in. Therefore, to set up the binding you only have to set the <xref:System.Windows.Data.Binding.Path%2A?displayProperty=nameWithType>. Optionally, you can specify a <xref:System.Windows.Data.Binding.Converter%2A?displayProperty=nameWithType> if you want to convert the data. For more information about data binding, see [Data Binding (WPF)](/dotnet/framework/wpf/data/data-binding-wpf).
3638

xml/System.Windows.Controls/Page.xml

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</Attribute>
3232
</Attributes>
3333
<Docs>
34-
<summary>Encapsulates a page of content that can be navigated to and hosted by Windows Internet Explorer, <see cref="T:System.Windows.Navigation.NavigationWindow" />, and <see cref="T:System.Windows.Controls.Frame" />.</summary>
34+
<summary>Encapsulates a page of content that can be navigated to and hosted by a browser, <see cref="T:System.Windows.Navigation.NavigationWindow" />, and <see cref="T:System.Windows.Controls.Frame" />.</summary>
3535
<remarks>
3636
<format type="text/markdown"><![CDATA[
3737
@@ -74,13 +74,11 @@
7474
7575
- Programmatically by using <xref:System.Windows.Navigation.NavigationService>.
7676
77-
- Visually by using the navigation UI of the host, including Windows Internet Explorer, <xref:System.Windows.Navigation.NavigationWindow>, and <xref:System.Windows.Controls.Frame>.
77+
- Visually by using the navigation UI of the host, including a browser, <xref:System.Windows.Navigation.NavigationWindow>, and <xref:System.Windows.Controls.Frame>.
7878
7979
For structured navigation using page functions (<xref:System.Windows.Navigation.PageFunction%601>), see [Structured Navigation Overview](/dotnet/framework/wpf/app-development/structured-navigation-overview) and [Navigation Topologies Overview](/dotnet/framework/wpf/app-development/navigation-topologies-overview).
8080
81-
Dependency properties for this control might be set by the control's default style. If a property is set by a default style, the property might change from its default value when the control appears in the application. The default style is determined by which desktop theme is used when the application is running.
82-
83-
81+
Dependency properties for this control might be set by the control's default style. If a property is set by a default style, the property might change from its default value when the control appears in the application. The default style is determined by which desktop theme is used when the application is running.
8482
8583
## Examples
8684
The following example shows how a standard page is defined using only markup:
@@ -1113,9 +1111,7 @@
11131111
<xref:System.Windows.Navigation.NavigationWindow> displays navigation UI by default to enable browser-style forwards and backwards navigation. If a page is set as the <xref:System.Windows.Application.StartupUri%2A>, <xref:System.Windows.Application> automatically opens a <xref:System.Windows.Navigation.NavigationWindow> to host the page in. If the page does not want to use the default <xref:System.Windows.Navigation.NavigationWindow> navigation UI, it can set <xref:System.Windows.Controls.Page.ShowsNavigationUI%2A> to `false`.
11141112
11151113
> [!NOTE]
1116-
> Because WPF does not integrate with the navigation UI for Microsoft Internet Explorer 6, it provides its own navigation UI, which can be shown or hidden by setting <xref:System.Windows.Controls.Page.ShowsNavigationUI%2A>. WPF does integrate with the Windows Internet Explorer 7 navigation UI, so setting <xref:System.Windows.Controls.Page.ShowsNavigationUI%2A> on pages in Windows Internet Explorer 7 has no effect.
1117-
1118-
1114+
> Because WPF does not integrate with the navigation UI for Microsoft Internet Explorer 6, it provides its own navigation UI, which can be shown or hidden by setting <xref:System.Windows.Controls.Page.ShowsNavigationUI%2A>. WPF does integrate with the Windows Internet Explorer 7 navigation UI, so setting <xref:System.Windows.Controls.Page.ShowsNavigationUI%2A> on pages in Windows Internet Explorer 7 has no effect.
11191115
11201116
## Examples
11211117
The following example shows how to use XAML to hide the navigation UI of a <xref:System.Windows.Navigation.NavigationWindow>.
@@ -1427,19 +1423,17 @@
14271423
## Remarks
14281424
<xref:System.Windows.Controls.Page.WindowHeight%2A> is only applied when a <xref:System.Windows.Controls.Page> is hosted directly by a window, which includes:
14291425
1430-
- <xref:System.Windows.Window>
1431-
1432-
- <xref:System.Windows.Navigation.NavigationWindow>
1433-
1434-
- Windows Internet Explorer
1426+
- <xref:System.Windows.Window>
1427+
- <xref:System.Windows.Navigation.NavigationWindow>
1428+
- A browser
14351429
14361430
If a <xref:System.Windows.Controls.Page> is hosted by a <xref:System.Windows.Controls.Frame>, setting <xref:System.Windows.Controls.Page.WindowHeight%2A> has no effect, but you can still get the value of <xref:System.Windows.Controls.Page.WindowHeight%2A>.
14371431
1438-
A <xref:System.Windows.Controls.Page> in an XAML browser application (XBAP) can only use <xref:System.Windows.Controls.Page.WindowHeight%2A> to change the height of Windows Internet Explorer; the height cannot be changed by setting <xref:System.Windows.FrameworkElement.Height%2A>, <xref:System.Windows.FrameworkElement.MinHeight%2A>, or <xref:System.Windows.FrameworkElement.MaxHeight%2A>.
1432+
A <xref:System.Windows.Controls.Page> in an XAML browser application (XBAP) can only use <xref:System.Windows.Controls.Page.WindowHeight%2A> to change the height of the browser; the height cannot be changed by setting <xref:System.Windows.FrameworkElement.Height%2A>, <xref:System.Windows.FrameworkElement.MinHeight%2A>, or <xref:System.Windows.FrameworkElement.MaxHeight%2A>.
1433+
1434+
For more information about XBAP support, see [Frequently asked questions about WPF browser-hosted applications (XBAP)](/dotnet/desktop/wpf/app-development/xbap-faq?view=netframeworkdesktop-4.8).
14391435
1440-
The minimum height of the Windows Internet Explorer window is 150 pixels. For browser-hosted pages, this means that the value of <xref:System.Windows.Controls.Page.WindowHeight%2A> may not be applied if it would cause the total height of the Windows Internet Explorer window to be less than 150 pixels.
1441-
1442-
1436+
The minimum height of the Windows Internet Explorer window is 150 pixels. For browser-hosted pages, this means that the value of <xref:System.Windows.Controls.Page.WindowHeight%2A> may not be applied if it would cause the total height of the Internet Explorer window to be less than 150 pixels.
14431437
14441438
## Examples
14451439
The following example shows how to set the height of a window from a page.
@@ -1546,19 +1540,17 @@
15461540
## Remarks
15471541
<xref:System.Windows.Controls.Page.WindowWidth%2A> is only applied when a <xref:System.Windows.Controls.Page> is hosted directly by a window, which includes:
15481542
1549-
- <xref:System.Windows.Window>
1550-
1551-
- <xref:System.Windows.Navigation.NavigationWindow>
1552-
1553-
- Windows Internet Explorer
1543+
- <xref:System.Windows.Window>
1544+
- <xref:System.Windows.Navigation.NavigationWindow>
1545+
- A browser
15541546
15551547
If a <xref:System.Windows.Controls.Page> is hosted by a <xref:System.Windows.Controls.Frame>, setting <xref:System.Windows.Controls.Page.WindowWidth%2A> has no effect, but you can still get the value of <xref:System.Windows.Controls.Page.WindowWidth%2A>.
15561548
1557-
A <xref:System.Windows.Controls.Page> in an XAML browser application (XBAP) can only use <xref:System.Windows.Controls.Page.WindowWidth%2A> to change the width of Windows Internet Explorer; the width cannot be changed by setting <xref:System.Windows.FrameworkElement.Width%2A>, <xref:System.Windows.FrameworkElement.MinWidth%2A>, or <xref:System.Windows.FrameworkElement.MaxWidth%2A>.
1558-
1559-
The minimum width of the Windows Internet Explorer window is 250 pixels. For browser-hosted pages, this means that the value of <xref:System.Windows.Controls.Page.WindowWidth%2A> may not be applied if it would cause the total width of the Windows Internet Explorer window to be less than 250 pixels.
1549+
A <xref:System.Windows.Controls.Page> in an XAML browser application (XBAP) can only use <xref:System.Windows.Controls.Page.WindowWidth%2A> to change the width of the browser; the width cannot be changed by setting <xref:System.Windows.FrameworkElement.Width%2A>, <xref:System.Windows.FrameworkElement.MinWidth%2A>, or <xref:System.Windows.FrameworkElement.MaxWidth%2A>.
1550+
1551+
For more information about XBAP support, see [Frequently asked questions about WPF browser-hosted applications (XBAP)](/dotnet/desktop/wpf/app-development/xbap-faq?view=netframeworkdesktop-4.8).
15601552
1561-
1553+
The minimum width of the Windows Internet Explorer window is 250 pixels. For browser-hosted pages, this means that the value of <xref:System.Windows.Controls.Page.WindowWidth%2A> may not be applied if it would cause the total width of the Windows Internet Explorer window to be less than 250 pixels.
15621554
15631555
## Examples
15641556
The following example shows how to set the width of a window from a page.

xml/System.Windows.Documents/Hyperlink.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,11 @@
3939
<format type="text/markdown"><![CDATA[
4040
4141
## Remarks
42-
<xref:System.Windows.Documents.Hyperlink> implements the <xref:System.Windows.Documents.Hyperlink.NavigateUri%2A> property that you set with the <xref:System.Uri> of the content that should be navigated to when the Hyperlink is clicked. <xref:System.Windows.Documents.Hyperlink> navigation can only occur, however, if either the direct or indirect parent of a <xref:System.Windows.Documents.Hyperlink> is a navigation host, including <xref:System.Windows.Navigation.NavigationWindow>, <xref:System.Windows.Controls.Frame>, or any browser that can host XBAPs (which includes Internet Explorer 6 and later versions, and Firefox 2.0+). For more information, see the **Navigation Hosts** topic in [Navigation Overview](/dotnet/framework/wpf/app-development/navigation-overview).
42+
<xref:System.Windows.Documents.Hyperlink> implements the <xref:System.Windows.Documents.Hyperlink.NavigateUri%2A> property that you set with the <xref:System.Uri> of the content that should be navigated to when the Hyperlink is clicked. <xref:System.Windows.Documents.Hyperlink> navigation can only occur, however, if either the direct or indirect parent of a <xref:System.Windows.Documents.Hyperlink> is a navigation host, including <xref:System.Windows.Navigation.NavigationWindow>, <xref:System.Windows.Controls.Frame>, or any browser that can host XBAPs. For more information, see the **Navigation Hosts** topic in [Navigation Overview](/dotnet/framework/wpf/app-development/navigation-overview).
4343
4444
<xref:System.Windows.Documents.Hyperlink> enforces a strong content model for child content. See [TextElement Content Model Overview](/dotnet/framework/wpf/advanced/textelement-content-model-overview) for more information about the <xref:System.Windows.Documents.Hyperlink> content model.
4545
46-
Dependency properties for this control might be set by the control's default style. If a property is set by a default style, the property might change from its default value when the control appears in the application. The default style is determined by which desktop theme is used when the application is running.
47-
48-
46+
Dependency properties for this control might be set by the control's default style. If a property is set by a default style, the property might change from its default value when the control appears in the application. The default style is determined by which desktop theme is used when the application is running.
4947
5048
## Examples
5149
The following example shows simple use of a <xref:System.Windows.Documents.Hyperlink> element.
@@ -673,7 +671,7 @@
673671
## Remarks
674672
To link to a particular inline element, specify the element name preceded by a pound symbol (#).
675673
676-
<xref:System.Windows.Documents.Hyperlink> can navigate to the value of the <xref:System.Windows.Documents.Hyperlink.NavigateUri> property only if either the direct or indirect parent of a <xref:System.Windows.Documents.Hyperlink> is a navigation host, including <xref:System.Windows.Navigation.NavigationWindow>, <xref:System.Windows.Controls.Frame>, or any browser that can host XBAPs (which includes Internet Explorer 6 and later versions, and Firefox 2.0+). For more information, see the Navigation Hosts section in [Navigation Overview](/dotnet/framework/wpf/app-development/navigation-overview)</see>.
674+
<xref:System.Windows.Documents.Hyperlink> can navigate to the value of the <xref:System.Windows.Documents.Hyperlink.NavigateUri> property only if either the direct or indirect parent of a <xref:System.Windows.Documents.Hyperlink> is a navigation host, including <xref:System.Windows.Navigation.NavigationWindow>, <xref:System.Windows.Controls.Frame>, or any browser that can host XBAPs. For more information, see the Navigation Hosts section in [Navigation Overview](/dotnet/framework/wpf/app-development/navigation-overview).
677675
678676
When a user hovers the mouse over a <xref:System.Windows.Documents.Hyperlink> in an XBAP, the URI stored in the <xref:System.Windows.Documents.Hyperlink.NavigateUri%2A> property is displayed in the status bar. <xref:System.Windows.Documents.Hyperlink> navigates to this URI when the user clicks the <xref:System.Windows.Documents.Hyperlink>. If the value of the <xref:System.Windows.Documents.Hyperlink.NavigateUri%2A> property changes after the user clicks the <xref:System.Windows.Documents.Hyperlink> and before the subsequent navigation request, <xref:System.Windows.Documents.Hyperlink> ignores the new value of the <xref:System.Windows.Documents.Hyperlink.NavigateUri%2A> property and navigates to the URI that was the value of the <xref:System.Windows.Documents.Hyperlink.NavigateUri%2A> property when the user clicked the <xref:System.Windows.Documents.Hyperlink>.
679677

xml/System.Windows.Interop/BrowserInteropHelper.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,11 @@
9797
## Remarks
9898
With the returned <xref:System.Windows.Interop.BrowserInteropHelper.HostScript%2A> object, you can access the properties, methods, and events of the HTML window object, call a script function directly, or access a global variable. The syntax to access these items uses the familiar dot notation.
9999
100-
For more information about the window object, see [window object](https://go.microsoft.com/fwlink/?LinkId=160274) in the Dynamic HTML (DHTML) documentation.
100+
For more information about the window object, see [Window](https://developer.mozilla.org/docs/Web/API/Window).
101101
102102
The <xref:System.Windows.Interop.BrowserInteropHelper.HostScript%2A> property returns `null` if the frame is navigated to from a cross-domain location.
103103
104-
This feature can be turned off for Internet Explorer by setting the **ScriptInteropDisallow** registry value. For more information, see [Security (WPF)](/dotnet/framework/wpf/security-wpf).
105-
106-
104+
This feature can be turned off for the browser by setting the **ScriptInteropDisallow** registry value. For more information, see [Security (WPF)](/dotnet/desktop/wpf/security-wpf?view=netframeworkdesktop-4.8).
107105
108106
## Examples
109107
The following example demonstrates how to retrieve the <xref:System.Windows.Interop.BrowserInteropHelper.HostScript%2A> object and close the browser window.

xml/System.Windows.Media/Brushes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<format type="text/markdown"><![CDATA[
2626
2727
## Remarks
28-
Color names in Windows Presentation Foundation match the color names in the .NET Framework, Windows Forms, and Microsoft Internet Explorer. These colors and their names are based on the UNIX X11 color values.
28+
Color names in Windows Presentation Foundation match the color names in .NET Framework and Windows Forms. These colors and their names are based on the UNIX X11 color values.
2929
3030
The following image shows the color of each predefined brush, its name, and its hexadecimal value.
3131

xml/System.Windows.Media/Colors.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
<format type="text/markdown"><![CDATA[
2626
2727
## Remarks
28-
The Windows Presentation Foundation color names match the .NET Framework, Windows Forms, and Microsoft Internet Explorer color names. This representation is based on UNIX X11 named color values.
28+
The Windows Presentation Foundation color names match the .NET Framework and Windows Forms color names. This representation is based on UNIX X11 named color values.
2929
3030
The following image shows each predefined color, its name, and its hexadecimal value.
3131
3232
![Predefined colors](~/add/media/art-color-table.png "Predefined colors")
3333
Color Table including a color swatch, the color name, and the hexadecimal value
3434
35-
See the <xref:System.Windows.Media.Brush> class for a variety of other more complex ways you can color an area, including gradients (<xref:System.Windows.Media.LinearGradientBrush>, <xref:System.Windows.Media.RadialGradientBrush>) or images (<xref:System.Windows.Media.ImageBrush>).
35+
See the <xref:System.Windows.Media.Brush> class for a variety of other, more complex ways you can color an area, including gradients (<xref:System.Windows.Media.LinearGradientBrush>, <xref:System.Windows.Media.RadialGradientBrush>) or images (<xref:System.Windows.Media.ImageBrush>).
3636
3737
<a name="xamlTextUsage_Colors"></a>
3838
## XAML Text Usage

0 commit comments

Comments
 (0)