Skip to content

Commit f3e83a7

Browse files
author
mikeblome
committed
fixed merge conflict
2 parents c9e05c3 + db209bc commit f3e83a7

126 files changed

Lines changed: 479 additions & 222 deletions

File tree

Some content is hidden

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

‎docs/atl/adding-a-property-page-atl-tutorial-part-6.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ ms.assetid: df80d255-e7ea-49d9-b940-3f012e90cf9b
66
---
77
# Adding a Property Page (ATL Tutorial, Part 6)
88

9+
> [!NOTE]
10+
> The ATL OLE DB Provider wizard is not available in Visual Studio 2019 and later.
11+
912
Property pages are implemented as separate COM objects, which allow them to be shared if required. In this step, you will do the following tasks to add a property page to the control:
1013

1114
- Creating the Property Page Resource

‎docs/atl/codesnippet/CPP/hosting-activex-controls-using-atl-axhost_1.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public :
5353
END_MSG_MAP()
5454

5555
BEGIN_SINK_MAP(CMainWindow)
56-
SINK_ENTRY_EX(1, __uuidof(DCalendarEvents), 1, OnClick)
56+
SINK_ENTRY_EX(1, __uuidof(DCalendarEvents), DISPID_CLICK, OnClick)
5757
END_SINK_MAP()
5858

5959
// Helper to display events

‎docs/atl/example-implementing-a-property-page.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
---
22
title: "Implementing a Property Page (ATL)"
3-
ms.date: "11/19/2018"
3+
ms.date: "05/09/2019"
44
helpviewer_keywords: ["property pages, implementing"]
55
ms.assetid: c30b67fe-ce08-4249-ae29-f3060fa8d61e
66
---
77
# Example: Implementing a Property Page
88

9+
::: moniker range="vs-2019"
10+
11+
The ATL Property Page wizard is not available in Visual Studio 2019 and later.
12+
13+
::: moniker-end
14+
15+
::: moniker range="vs-2017"
16+
917
This example shows how to build a property page that displays (and allows you to change) properties of the [Document Classes](../mfc/document-classes.md) interface.
1018

1119
The example is based on the [ATLPages sample](../overview/visual-cpp-samples.md).
@@ -154,6 +162,8 @@ End Module
154162

155163
When you run this macro, the property page will be displayed showing the file name and read-only status of the currently active text document. The read-only state of the document only reflects the ability to write to the document in the development environment; it doesn't affect the read-only attribute of the file on disk.
156164

165+
::: moniker-end
166+
157167
## See also
158168

159169
[Property Pages](../atl/atl-com-property-pages.md)<br/>

‎docs/atl/implementing-property-pages.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ ms.assetid: 62f29440-33a7-40eb-a1ef-3634c95f640c
66
---
77
# Implementing Property Pages
88

9+
::: moniker range="vs-2019"
10+
11+
The ATL Property Page wizard is not available in Visual Studio 2019 and later.
12+
13+
::: moniker-end
14+
15+
::: moniker range="vs-2017"
16+
917
Property pages are COM objects that implement the `IPropertyPage` or `IPropertyPage2` interface. ATL provides support for implementing property pages through the [ATL Property Page Wizard](../atl/reference/atl-property-page-wizard.md) in the [Add Class dialog box](../ide/add-class-dialog-box.md).
1018

1119
To create a property page using ATL:
@@ -36,6 +44,8 @@ For an example property page implementation, see [Example: Implementing a Proper
3644
> [!NOTE]
3745
> If you want to host ActiveX controls in your property page, you will need to change the derivation of your wizard-generated class. Replace **CDialogImpl\<CYourClass>** with **CAxDialogImpl\<CYourClass>** in the list of base classes.
3846
47+
::: moniker-end
48+
3949
## See also
4050

4151
[Property Pages](../atl/atl-com-property-pages.md)<br/>

‎docs/atl/reference/adding-an-atl-active-server-page-component.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
---
22
title: "Adding an ATL Active Server Page Component"
3-
ms.date: "11/04/2016"
4-
helpviewer_keywords: ["ASP components, adding", "ASP components", "ATL, ASP components", "ATL ASP components"]
3+
ms.date: "05/09/2019"
54
ms.assetid: 7be2204c-6e58-4099-8892-001b848c8987
65
---
76
# Adding an ATL Active Server Page Component
87

8+
9+
::: moniker range="vs-2019"
10+
11+
The ATL Active Server Pages component wizard is not available in Visual Studio 2019 and later.
12+
13+
::: moniker-end
14+
15+
::: moniker range="vs-2017"
16+
917
To add an Active Template Library (ATL) object to your project, your project must have been created as an ATL COM application or as an MFC application that contains ATL support. You can use the [ATL Project Wizard](../../atl/reference/atl-project-wizard.md) to create an ATL application, you can select **Add ATL Support to MFC** from the [Add Class Dialog Box](../../ide/add-class-dialog-box.md) dialog box, or you can [add an ATL object to your MFC application](../../mfc/reference/adding-atl-support-to-your-mfc-project.md) to implement ATL support for an MFC application.
1018

1119
Active Server Pages components are part of the Internet Information Services architecture, which provides the following advanced Web development features:
@@ -24,6 +32,8 @@ Active Server Pages components are part of the Internet Information Services arc
2432

2533
1. In the [Add Class](../../ide/add-class-dialog-box.md) dialog box, in the **Templates** pane, click **ATL Active Server Page Component**, and then click **Open** to display the [ATL Active Server Page Component Wizard](../../atl/reference/atl-active-server-page-component-wizard.md).
2634

35+
::: moniker-end
36+
2737
## See also
2838

2939
[Adding a Class](../../ide/adding-a-class-visual-cpp.md)<br/>

‎docs/atl/reference/adding-an-atl-com-plus-1-0-component.md‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
---
22
title: "Adding an ATL COM+ 1.0 Component"
3-
ms.date: "11/04/2016"
4-
helpviewer_keywords: ["ATL COM+ 1.0", "ATL projects, adding components", "components [C++], adding ATL COM+ 1.0", "objects [C++], supporting ATL COM+ 1.0"]
3+
ms.date: "05/09/2019"
54
ms.assetid: c6c95e64-9ee4-4a6e-8804-5930202ce1b9
65
---
76
# Adding an ATL COM+ 1.0 Component
87

8+
9+
::: moniker range="vs-2019"
10+
11+
The ATL COM+ 1.0 Component wizard is not available in Visual Studio 2019 and later.
12+
13+
::: moniker-end
14+
15+
::: moniker range="<=vs-2017"
16+
917
This wizard adds an object to your project that supports COM+ 1.0 services, including transactions.
1018

1119
## To add an ATL COM+ 1.0 component to your project
@@ -20,3 +28,7 @@ This wizard adds an object to your project that supports COM+ 1.0 services, incl
2028

2129
[Adding a Class](../../ide/adding-a-class-visual-cpp.md)<br/>
2230
[Adding a Method](../../ide/adding-a-method-visual-cpp.md)
31+
32+
::: moniker-end
33+
34+

‎docs/atl/reference/adding-an-atl-ole-db-consumer.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
---
22
title: "Adding an ATL OLE DB Consumer"
3-
ms.date: "11/04/2016"
4-
helpviewer_keywords: ["ATL projects, adding ATL OLE DB consumers", "OLE DB, adding ATL OLE DB consumer to projects", "ATL OLE DB consumers"]
3+
ms.date: "05/09/2019"
4+
helpviewer_keywords: ["ATL OLE DB consumers"]
55
ms.assetid: f940a513-4e42-4148-b521-dd0d7dc89fa2
66
---
77
# Adding an ATL OLE DB Consumer
88

9+
::: moniker range="vs-2019"
10+
11+
The ATL OLE DB Consumer wizard is not available in Visual Studio 2019 and later. You can still add the functionality manually. For more information, see [Creating a Consumer Without Using a Wizard](../../data/oledb/creating-a-consumer-without-using-a-wizard.md).
12+
13+
::: moniker-end
14+
15+
::: moniker range="vs-2017"
16+
917
Use this wizard to add an ATL OLE DB consumer to a project. An ATL OLE DB consumer consists of an OLE DB accessor class and data bindings necessary to access a data source. The project must have been created as an ATL COM application, or as an MFC or Win32 application that contains ATL support (which the ATL OLE DB Consumer Wizard adds automatically).
1018

1119
> [!NOTE]
@@ -23,6 +31,8 @@ Use this wizard to add an ATL OLE DB consumer to a project. An ATL OLE DB consum
2331

2432
1. Click **Finish** to close the wizard. The newly created OLE DB consumer code will be inserted in your project.
2533

34+
::: moniker-end
35+
2636
## See also
2737

2838
[Adding Functionality with Code Wizards](../../ide/adding-functionality-with-code-wizards-cpp.md)

‎docs/atl/reference/adding-an-atl-ole-db-provider.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
---
22
title: "Adding an ATL OLE DB Provider"
3-
ms.date: "11/04/2016"
3+
ms.date: "05/09/2019"
44
helpviewer_keywords: ["OLE DB, adding ATL OLE DB provider to projects", "ATL projects, adding ATL OLE DB providers", "ATL OLE DB providers"]
55
ms.assetid: 26fba1e3-880f-4bc6-90e5-2096a48a3a6c
66
---
77
# Adding an ATL OLE DB Provider
88

9+
::: moniker range="vs-2019"
10+
11+
The ATL OLE DB Provider wizard is not available in Visual Studio 2019 and later.
12+
13+
::: moniker-end
14+
15+
::: moniker range="vs-2017"
16+
917
Use this wizard to add an ATL OLE DB provider to a project. An ATL OLE DB provider consists of a data source, session, command, and rowset classes. The project must have been created as an ATL COM application.
1018

1119
## To add an ATL OLE DB provider to your project
@@ -20,6 +28,8 @@ Use this wizard to add an ATL OLE DB provider to a project. An ATL OLE DB provid
2028

2129
1. Click **Finish** to close the wizard, which will insert the newly created OLE DB provider code in your project.
2230

31+
::: moniker-end
32+
2333
## See also
2434

2535
[Adding Functionality with Code Wizards](../../ide/adding-functionality-with-code-wizards-cpp.md)

‎docs/atl/reference/adding-an-atl-property-page.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
---
22
title: "Adding an ATL Property Page"
3-
ms.date: "11/04/2016"
3+
ms.date: "05/09/2019"
44
helpviewer_keywords: ["property pages, adding", "ATL projects, adding property pages", "controls [ATL], property pages"]
55
ms.assetid: ddf92b49-42a2-46d2-b6b8-d37baedebeca
66
---
77
# Adding an ATL Property Page
88

9+
> [!NOTE]
10+
> The ATL Property Page wizard is not available in Visual Studio 2019 and later.
11+
912
To add an Active Template Library (ATL) property page to your project, your project must have been created as an ATL application or as an MFC application that contains ATL support. You can use the [ATL Project Wizard](../../atl/reference/atl-project-wizard.md) to create an ATL application or [add an ATL object to your MFC application](../../mfc/reference/adding-atl-support-to-your-mfc-project.md) to implement ATL support for an MFC application.
1013

1114
If you are adding a property page for a control, your control must support the [ISpecifyPropertyPagesImpl](../../atl/reference/ispecifypropertypagesimpl-class.md) interface. By default, this interface is in the derivation list of your control class when you [create an ATL control](../../atl/reference/adding-an-atl-control.md) using the [ATL Control Wizard](../../atl/reference/atl-control-wizard.md).

‎docs/atl/reference/adding-objects-and-controls-to-an-atl-project.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
---
22
title: "Adding Objects and Controls to an ATL Project"
3-
ms.date: "11/04/2016"
3+
ms.date: "05/09/2019"
44
f1_keywords: ["vc.appwiz.ATL.controls"]
55
helpviewer_keywords: ["ATL projects, adding objects", "wizards [C++], ATL projects", "ATL projects, adding controls", "controls [ATL], adding to projects", "objects [C++], adding to ATL projects", "ATL Control Wizard"]
66
ms.assetid: c0adcbd0-07fe-4c55-a8fd-8c2c65ecdaad
77
---
88
# Adding Objects and Controls to an ATL Project
99

10+
> [!NOTE]
11+
> The ATL COM+ 1.0 Component Wizard, ATL OLE DB Consumer wizard, and ATL Active Server Page Component wizard are not available in Visual Studio 2019 and later.
12+
1013
You can use one of the ATL code wizards to add an object or a control to your ATL- or MFC-based projects. For each COM object or control you add, the wizard generates .cpp and .h files, as well as an .rgs file for script-based registry support. The following ATL code wizards are available in Visual Studio:
1114

1215
||||

0 commit comments

Comments
 (0)