Skip to content

Commit c5ec0fa

Browse files
author
Colin Robertson
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/cpp-docs-pr into cr-param-style
2 parents 65ab35a + 6ccc557 commit c5ec0fa

File tree

61 files changed

+597
-1350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+597
-1350
lines changed

‎.openpublishing.redirection.json‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,11 @@
155155
"redirect_url": "/cpp/build/linking-an-executable-to-a-dll#linking-implicitly",
156156
"redirect_document_id": false
157157
},
158+
{
159+
"source_path": "docs/mfc/active-documents-on-the-internet.md",
160+
"redirect_url": "/cpp/mfc/activex-controls",
161+
"redirect_document_id": false
162+
},
158163
{
159164
"source_path": "docs/build/naming-conventions-for-mfc-dlls.md",
160165
"redirect_url": "/cpp/mfc/mfc-library-versions#mfc-static-library-naming-conventions",
@@ -6225,6 +6230,81 @@
62256230
"redirect_url": "/cpp/windows/overview-of-windows-programming-in-cpp",
62266231
"redirect_document_id": false
62276232
},
6233+
{
6234+
"source_path": "docs/windows/implements-cancastto-method.md",
6235+
"redirect_url": "/cpp/windows/implements-structure#cancastto",
6236+
"redirect_document_id": false
6237+
},
6238+
{
6239+
"source_path": "docs/windows/implements-casttounknown-method.md",
6240+
"redirect_url": "/cpp/windows/implements-structure#casttounknown",
6241+
"redirect_document_id": false
6242+
},
6243+
{
6244+
"source_path": "docs/windows/implements-fillarraywithiid-method.md",
6245+
"redirect_url": "/cpp/windows/implements-structure#fillarraywithiid",
6246+
"redirect_document_id": false
6247+
},
6248+
{
6249+
"source_path": "docs/windows/implements-iidcount-constant.md",
6250+
"redirect_url": "/cpp/windows/implements-structure#iidcount",
6251+
"redirect_document_id": false
6252+
},
6253+
{
6254+
"source_path": "docs/windows/runtimeclass-tilde-runtimeclass-destructor.md",
6255+
"redirect_url": "/cpp/windows/runtimeclass-class#tilde-runtimeclass",
6256+
"redirect_document_id": false
6257+
},
6258+
{
6259+
"source_path": "docs/windows/runtimeclass-addref-method.md",
6260+
"redirect_url": "/cpp/windows/runtimeclass-class#addref",
6261+
"redirect_document_id": false
6262+
},
6263+
{
6264+
"source_path": "docs/windows/runtimeclass-decrementreference-method.md",
6265+
"redirect_url": "/cpp/windows/runtimeclass-class#decrementreference",
6266+
"redirect_document_id": false
6267+
},
6268+
{
6269+
"source_path": "docs/windows/runtimeclass-getiids-method.md",
6270+
"redirect_url": "/cpp/windows/runtimeclass-class#getiids",
6271+
"redirect_document_id": false
6272+
},
6273+
{
6274+
"source_path": "docs/windows/runtimeclass-getruntimeclassname-method.md",
6275+
"redirect_url": "/cpp/windows/runtimeclass-class#getruntimeclassname",
6276+
"redirect_document_id": false
6277+
},
6278+
{
6279+
"source_path": "docs/windows/runtimeclass-gettrustlevel-method.md",
6280+
"redirect_url": "/cpp/windows/runtimeclass-class#gettrustlevel",
6281+
"redirect_document_id": false
6282+
},
6283+
{
6284+
"source_path": "docs/windows/runtimeclass-getweakreference-method.md",
6285+
"redirect_url": "/cpp/windows/runtimeclass-class#getweakreference",
6286+
"redirect_document_id": false
6287+
},
6288+
{
6289+
"source_path": "docs/windows/runtimeclass-internaladdref-method.md",
6290+
"redirect_url": "/cpp/windows/runtimeclass-class#internaladdref",
6291+
"redirect_document_id": false
6292+
},
6293+
{
6294+
"source_path": "docs/windows/runtimeclass-queryinterface-method.md",
6295+
"redirect_url": "/cpp/windows/runtimeclass-class#queryinterface",
6296+
"redirect_document_id": false
6297+
},
6298+
{
6299+
"source_path": "docs/windows/runtimeclass-release-method.md",
6300+
"redirect_url": "/cpp/windows/runtimeclass-class#release",
6301+
"redirect_document_id": false
6302+
},
6303+
{
6304+
"source_path": "docs/windows/runtimeclass-runtimeclass-constructor.md",
6305+
"redirect_url": "/cpp/windows/runtimeclass-class#runtimeclass",
6306+
"redirect_document_id": false
6307+
},
62286308
{
62296309
"source_path": "docs/windows/runtimeclassflags-value-constant.md",
62306310
"redirect_url": "/cpp/windows/runtimeclassflags-structure#value-constant",

‎docs/cpp/identifiers-cpp.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Identifiers (C++) | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "09/12/2018"
55
ms.technology: ["cpp-language"]
66
ms.topic: "language-reference"
77
dev_langs: ["C++"]
@@ -90,7 +90,7 @@ int main() {
9090

9191
Identifiers cannot be exactly the same spelling and case as keywords. Identifiers that contain keywords are legal. For example, `Pint` is a legal identifier, even though it contains **int**, which is a keyword.
9292

93-
Use of two sequential underscore characters ( **__** ) at the beginning of an identifier, or a single leading underscore followed by a capital letter, is reserved for C++ implementations in all scopes. You should avoid using one leading underscore followed by a lowercase letter for names with file scope because of possible conflicts with current or future reserved identifiers.
93+
Use of two sequential underscore characters ( **__** ) in an identifier, or a single leading underscore followed by a capital letter, is reserved for C++ implementations in all scopes. You should avoid using one leading underscore followed by a lowercase letter for names with file scope because of possible conflicts with current or future reserved identifiers.
9494

9595
## See also
96-
[Lexical Conventions](../cpp/lexical-conventions.md)
96+
[Lexical Conventions](../cpp/lexical-conventions.md)

‎docs/ide/creating-a-makefile-project.md‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: "Creating a Makefile Project | Microsoft Docs"
2+
title: "Creating a C++ Makefile Project | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "02/28/2018"
4+
ms.date: "09/12/2018"
55
ms.technology: ["cpp-ide"]
66
ms.topic: "conceptual"
77
f1_keywords: ["vc.appwiz.makefile.project"]
@@ -12,21 +12,27 @@ author: "mikeblome"
1212
ms.author: "mblome"
1313
ms.workload: ["cplusplus"]
1414
---
15-
# Creating a Makefile Project
15+
# Creating a C++ Makefile Project
1616

17-
If you have an existing source code project that you build from the command line by using a makefile, the Visual Studio development environment has several ways of turning it into a project that can take full advantage of Visual Studio IDE features. This article describes how to create a Makefile Project in Visual Studio that uses your existing makefile to build your code in the IDE. Alternatively, you can use the **Create New Project from Existing Code Files** wizard to create a native MSBuild project from your source code. For more information, see [How to: Create a C++ Project from Existing Code](how-to-create-a-cpp-project-from-existing-code.md). Starting in Visual Studio 2017, you can also use the **Open Folder** feature, which can use several existing build systems as if they were native Visual Studio projects. For more information, see [Open Folder projects in Visual C++](non-msbuild-projects.md).
17+
A *makefile* is a text file that contains instructions for how to compile and link (or *build*) a set of C++ source code files. A *make* program reads the makefile and invokes a compiler, linker and possibly other programs to make an executable file. Microsoft's implementation of the *make* program is called **NMAKE**. (Visual Studio by default uses the MSBuild system based on .vcsproj files; this is what is created by **File | New | Project**.)
1818

19-
To use Visual Studio to open and build your source code by using your existing makefile, you first create a new project by selecting the MakeFile project template. A wizard helps you specify the commands and environment used by your makefile. You can then use this project to build your code in the Visual Studio development environment.
19+
If you have an existing makefile project, you have these choices if you want to code and/or debug it in the Visual Studio IDE:
2020

21-
By default, the makefile project displays no files in Solution Explorer. The makefile project specifies the build settings, which are reflected in the project's property page.
21+
- Create a Makefile Project in Visual Studio that uses your existing makefile to build your code in the IDE. (You will not have all the IDE features that you get with a native MSBuild project.) See [To create a makefile project](#create_a_makefile_project) below.
22+
- Use the **Create New Project from Existing Code Files** wizard to create a native MSBuild project from your source code. For more information, see [How to: Create a C++ Project from Existing Code](how-to-create-a-cpp-project-from-existing-code.md).
23+
- **Visual Studio 2017 and later**: Use the **Open Folder** feature to open a makefile. For more information, see [Open Folder projects in Visual C++](non-msbuild-projects.md).
2224

23-
The output file that you specify in the project has no effect on the name that the build script generates; it declares only an intention. Your makefile still controls the build process and specifies the build targets.
25+
## <a name="create_a_makefile_project"> To create a Makefile project with the makefile project template
26+
27+
In Visual Studio 2017 and later, the Makefile project template is available when the C++ Desktop Development workload is installed.
2428

25-
## To create a Makefile project
29+
Follow the wizard to specify the commands and environment used by your makefile. You can then use this project to build your code in the Visual Studio development environment.
2630

27-
1. Follow the instructions in the help topic [Creating a Project with a Visual C++ Application Wizard](../ide/creating-desktop-projects-by-using-application-wizards.md).
31+
By default, the makefile project displays no files in Solution Explorer. The makefile project specifies the build settings, which are reflected in the project's property page.
32+
33+
The output file that you specify in the project has no effect on the name that the build script generates; it declares only an intention. Your makefile still controls the build process and specifies the build targets.
2834

29-
1. In the **New Project** dialog box, expand **Visual C++** > **General** and then select **Makefile Project** in the Templates pane to open the project wizard.
35+
1. From the Visual Studio start page, type "makefile" in the **New Project** search box. Or, in the **New Project** dialog box, expand **Visual C++** > **General** (Visual Studio 2015) or **Other** (Visual Studio 2017) and then select **Makefile Project** in the Templates pane to open the project wizard.
3036

3137
1. In the [Application Settings](../ide/application-settings-makefile-project-wizard.md) page, provide the command, output, clean, and rebuild information for debug and retail builds.
3238

‎docs/mfc/TOC.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@
141141
### [Writing MFC Applications](writing-mfc-applications.md)
142142
### [ActiveX Controls on the Internet](activex-controls-on-the-internet.md)
143143
### [Upgrading an Existing ActiveX Control](upgrading-an-existing-activex-control.md)
144-
### [Active Documents on the Internet](active-documents-on-the-internet.md)
145144
### [Asynchronous Monikers on the Internet](asynchronous-monikers-on-the-internet.md)
146145
### [Testing Internet Applications](testing-internet-applications.md)
147146
### [Internet Security (C++)](internet-security-cpp.md)

‎docs/mfc/active-documents-on-the-internet.md‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎docs/mfc/active-technology-on-the-internet.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Active Technology on the Internet | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "09/12/2018"
55
ms.technology: ["cpp-mfc"]
66
ms.topic: "conceptual"
77
dev_langs: ["C++"]
@@ -13,13 +13,13 @@ ms.workload: ["cplusplus"]
1313
---
1414
# Active Technology on the Internet
1515
Active technology is an open platform that lets developers create exciting, dynamic content and applications for the global Internet, or for a company's internal network, known as an intranet. The major technologies provided by Microsoft for Internet programming are described below.
16+
17+
>[!IMPORTANT]
18+
> ActiveX is a legacy technology that should not be used for new development. For more information about modern technologies that supercede ActiveX, see [ActiveX Controls](activex-controls.md).
1619
1720
## ActiveX Controls
1821
ActiveX controls (formerly OLE controls) are objects that can be inserted into Web pages or any other application that is an ActiveX control container. Examples include buttons, stock tickers, and chart controls. For more information, see [ActiveX Controls on the Internet](../mfc/activex-controls-on-the-internet.md).
1922

20-
## Active Documents
21-
Active documents can be displayed by Web browsers or document viewers. Traditional embedded objects were limited to one page and were shown embedded in the document. With Active technology, the document can be displayed full frame in the entire client area window. For more information, see [Active Documents on the Internet](../mfc/active-documents-on-the-internet.md).
22-
2323
## Internet Data Download Services
2424
Data can be downloaded over the Internet using common protocols: HTTP, FTP, and gopher. The MFC WinInet classes make it easy to transfer data using HTTP, FTP, and gopher protocols by abstracting the TCP/IP and WinSock protocols. The MFC asynchronous moniker classes provide a way to download files without blocking and to render large objects asynchronously. For more information, see [Win32 Internet Extensions (WinInet)](../mfc/win32-internet-extensions-wininet.md).
2525

@@ -32,6 +32,5 @@ Active technology is an open platform that lets developers create exciting, dyna
3232
## See Also
3333
[MFC Internet Programming Basics](../mfc/mfc-internet-programming-basics.md)
3434
[ActiveX Controls on the Internet](../mfc/activex-controls-on-the-internet.md)
35-
[Active Documents on the Internet](../mfc/active-documents-on-the-internet.md)
3635
[Win32 Internet Extensions (WinInet)](../mfc/win32-internet-extensions-wininet.md)
3736

‎docs/mfc/activex-control-containers-handling-events-from-an-activex-control.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "ActiveX Control Containers: Handling Events from an ActiveX Control | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "09/12/2018"
55
ms.technology: ["cpp-mfc"]
66
ms.topic: "conceptual"
77
dev_langs: ["C++"]
@@ -12,7 +12,11 @@ ms.author: "mblome"
1212
ms.workload: ["cplusplus"]
1313
---
1414
# ActiveX Control Containers: Handling Events from an ActiveX Control
15-
This article discusses using the Properties window to install event handlers for ActiveX controls in an ActiveX control container. The event handlers are used to receive notifications (from the control) of certain events and perform some action in response. This notification is called "firing" the event.
15+
This article discusses using the Properties window to install event handlers for ActiveX controls in an ActiveX control container. The event handlers are used to receive notifications (from the control) of certain events and perform some action in response. This notification is called "firing" the event.
16+
17+
>[!IMPORTANT]
18+
> ActiveX is a legacy technology that should not be used for new development. For more information about modern technologies that supercede ActiveX, see [ActiveX Controls](activex-controls.md).
19+
1620

1721
> [!NOTE]
1822
> This article uses a dialog-based ActiveX control container project named Container and an embedded control named Circ as examples in the procedures and code.

0 commit comments

Comments
 (0)