Skip to content

Commit 6e8b60b

Browse files
author
Colin Robertson
authored
Merge pull request MicrosoftDocs#1586 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
2 parents 8cd71a4 + c19f638 commit 6e8b60b

6 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎docs/dotnet/stl-clr-library-reference.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.assetid: a9d9ca00-7bf2-48c1-b205-3ae6f8c25f82
77
---
88
# STL/CLR Library Reference
99

10-
The STL/CLR Library provides an interface similar to the C++ Standard Library containers for use with C++ and the .NET Framework common language runtime (CLR). STL/CLR is completely separate from the Microsoft implementation of the C++ Standard Libary. STL/CLR is maintained for legacy support but is not kept up-to-date with the C++ standard. We strongly recommend using the native [C++ Standard Library](../standard-library/cpp-standard-library-reference.md) containers instead of STL/CLR whenever possible.
10+
The STL/CLR Library provides an interface similar to the C++ Standard Library containers for use with C++ and the .NET Framework common language runtime (CLR). STL/CLR is completely separate from the Microsoft implementation of the C++ Standard Library. STL/CLR is maintained for legacy support but is not kept up-to-date with the C++ standard. We strongly recommend using the native [C++ Standard Library](../standard-library/cpp-standard-library-reference.md) containers instead of STL/CLR whenever possible.
1111

1212
To use STL/CLR:
1313

‎docs/mfc/hierarchy-chart.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ ms.assetid: 19d70341-e391-4a72-94c6-35755ce975d4
99

1010
The following illustration represents the MFC classes derived from `CObject`:
1111

12-
![Classes Derived From CObject](../mfc/media/mfc_heirarchy_chart1of3.png "mfc_heirarchy_chart1of3")
12+
![Classes Derived From CObject](../mfc/media/mfc_hierarchy_chart1of3.png)
1313

1414
The following illustration represents the MFC classes derived from `CWnd` and `CCmdTarget`:
1515

16-
![Classes Derived From CCmdTarget or CWnd](../mfc/media/mfc_heirarchy_chart2of3.png "mfc_heirarchy_chart2of3")
16+
![Classes Derived From CCmdTarget or CWnd](../mfc/media/mfc_hierarchy_chart2of3.png)
1717

1818
The following illustration represents the MFC classes not derived from `CObject`:
1919

20-
![Classes Not Derived From CObject](../mfc/media/mfc_heirarchy_chart3of3.png "mfc_heirarchy_chart3of3")
20+
![Classes Not Derived From CObject](../mfc/media/mfc_hierarchy_chart3of3.png)
2121

2222
You can download the complete chart from the following location: [MFC Hierarchy Charts Download](https://aka.ms/hxgg8e).
2323

docs/mfc/media/mfc_heirarchy_chart1of3.png renamed to docs/mfc/media/mfc_hierarchy_chart1of3.png

File renamed without changes.

docs/mfc/media/mfc_heirarchy_chart2of3.png renamed to docs/mfc/media/mfc_hierarchy_chart2of3.png

File renamed without changes.

docs/mfc/media/mfc_heirarchy_chart3of3.png renamed to docs/mfc/media/mfc_hierarchy_chart3of3.png

File renamed without changes.

‎docs/mfc/reference/cricheditctrl-class.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ Nonzero if initialization is successful; otherwise, 0.
289289

290290
You construct a `CRichEditCtrl` object in two steps. First, call the [CRichEditCtrl](#cricheditctrl) constructor, then call `Create`, which creates the Windows edit control and attaches it to the `CRichEditCtrl` object.
291291

292-
When you create a rich edit control with this function, first you must load the necessary common controls library. To load the libary, call the global function [AfxInitRichEdit](application-information-and-management.md#afxinitrichedit), which in turn initializes the common controls library. You need to call `AfxInitRichEdit` only once in your process.
292+
When you create a rich edit control with this function, first you must load the necessary common controls library. To load the library, call the global function [AfxInitRichEdit](application-information-and-management.md#afxinitrichedit), which in turn initializes the common controls library. You need to call `AfxInitRichEdit` only once in your process.
293293

294294
When `Create` executes, Windows sends the [WM_NCCREATE](../../mfc/reference/cwnd-class.md#onnccreate), [WM_NCCALCSIZE](../../mfc/reference/cwnd-class.md#onnccalcsize), [WM_CREATE](../../mfc/reference/cwnd-class.md#oncreate), and [WM_GETMINMAXINFO](../../mfc/reference/cwnd-class.md#ongetminmaxinfo) messages to the edit control.
295295

0 commit comments

Comments
 (0)