Skip to content

Commit 0255cda

Browse files
author
Colin Robertson
authored
Merge pull request MicrosoftDocs#803 from MicrosoftDocs/master636858535699611668
Fix git push error for protected CLA branch
2 parents e08ddfe + 470de13 commit 0255cda

43 files changed

Lines changed: 1123 additions & 1466 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.

‎.openpublishing.redirection.json‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8060,6 +8060,86 @@
80608060
"redirect_url": "/cpp/windows/arrangement-of-controls-on-dialog-boxes",
80618061
"redirect_document_id": false
80628062
},
8063+
{
8064+
"source_path": "docs/windows/selecting-multiple-menus-or-menu-commands.md",
8065+
"redirect_url": "/cpp/windows/creating-a-menu",
8066+
"redirect_document_id": false
8067+
},
8068+
{
8069+
"source_path": "docs/windows/associating-a-menu-command-with-an-accelerator-key.md",
8070+
"redirect_url": "/cpp/windows/menu-command-properties",
8071+
"redirect_document_id": false
8072+
},
8073+
{
8074+
"source_path": "docs/windows/image-menu-image-editor-for-icons.md",
8075+
"redirect_url": "/cpp/windows/image-editor-for-icons",
8076+
"redirect_document_id": false
8077+
},
8078+
{
8079+
"source_path": "docs/windows/toolbar-image-editor-for-icons.md",
8080+
"redirect_url": "/cpp/windows/image-editor-for-icons",
8081+
"redirect_document_id": false
8082+
},
8083+
{
8084+
"source_path": "docs/windows/window-panes-image-editor-for-icons.md",
8085+
"redirect_url": "/cpp/windows/image-editor-for-icons",
8086+
"redirect_document_id": false
8087+
},
8088+
{
8089+
"source_path": "docs/windows/icons-and-cursors-image-resources-for-display-devices-image-editor-for-icons.md",
8090+
"redirect_url": "/cpp/windows/creating-an-icon-or-other-image-image-editor-for-icons",
8091+
"redirect_document_id": false
8092+
},
8093+
{
8094+
"source_path": "docs/windows/saving-bitmaps-as-gifs-or-jpegs-image-editor-for-icons.md",
8095+
"redirect_url": "/cpp/windows/creating-an-icon-or-other-image-image-editor-for-icons",
8096+
"redirect_document_id": false
8097+
},
8098+
{
8099+
"source_path": "docs/windows/converting-an-image-from-one-format-to-another-image-editor-for-icons.md",
8100+
"redirect_url": "/cpp/windows/creating-an-icon-or-other-image-image-editor-for-icons",
8101+
"redirect_document_id": false
8102+
},
8103+
{
8104+
"source_path": "docs/windows/drawing-lines-or-closed-figures-image-editor-for-icons.md",
8105+
"redirect_url": "/cpp/windows/using-a-drawing-tool-image-editor-for-icons",
8106+
"redirect_document_id": false
8107+
},
8108+
{
8109+
"source_path": "docs/windows/creating-a-custom-brush-image-editor-for-icons.md",
8110+
"redirect_url": "/cpp/windows/using-a-drawing-tool-image-editor-for-icons",
8111+
"redirect_document_id": false
8112+
},
8113+
{
8114+
"source_path": "docs/windows/editing-parts-of-an-image-image-editor-for-icons.md",
8115+
"redirect_url": "/cpp/windows/selecting-an-area-of-an-image-image-editor-for-icons",
8116+
"redirect_document_id": false
8117+
},
8118+
{
8119+
"source_path": "docs/windows/flipping-an-image-image-editor-for-icons.md",
8120+
"redirect_url": "/cpp/windows/selecting-an-area-of-an-image-image-editor-for-icons",
8121+
"redirect_document_id": false
8122+
},
8123+
{
8124+
"source_path": "docs/windows/resizing-an-image-image-editor-for-icons.md",
8125+
"redirect_url": "/cpp/windows/selecting-an-area-of-an-image-image-editor-for-icons",
8126+
"redirect_document_id": false
8127+
},
8128+
{
8129+
"source_path": "docs/windows/editing-an-image-outside-of-a-project-image-editor-for-icons.md",
8130+
"redirect_url": "/cpp/windows/selecting-an-area-of-an-image-image-editor-for-icons",
8131+
"redirect_document_id": false
8132+
},
8133+
{
8134+
"source_path": "docs/windows/changing-image-properties-image-editor-for-icons.md",
8135+
"redirect_url": "/cpp/windows/selecting-an-area-of-an-image-image-editor-for-icons",
8136+
"redirect_document_id": false
8137+
},
8138+
{
8139+
"source_path": "docs/windows/editing-graphical-resources-image-editor-for-icons.md",
8140+
"redirect_url": "/cpp/windows/image-editor-for-icons",
8141+
"redirect_document_id": false
8142+
},
80638143
{
80648144
"source_path": "docs/windows/activationfactory-activationfactory-constructor.md",
80658145
"redirect_url": "/cpp/windows/activationfactory-class#activationfactory",

‎docs/windows/TOC.md‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
## [Creating an Empty Windows Desktop Application](creating-an-empty-windows-desktop-application.md)
1010
## [Adding Files to an Empty Win32 Applications](adding-files-to-an-empty-win32-applications.md)
1111
## [Working with Resource Files](working-with-resource-files.md)
12-
### [Resource Files (Visual Studio)](resource-files-visual-studio.md)
12+
### [Resource Files](resource-files-visual-studio.md)
1313
#### [How to: Create Resources](how-to-create-a-resource-script-file.md)
1414
#### [How to: Manage Resources](how-to-copy-resources.md)
1515
#### [How to: Include Resources at Compile Time](how-to-include-resources-at-compile-time.md)
16-
### [Symbols: Resource Identifiers](symbols-resource-identifiers.md)
16+
### [Resource Identifiers (Symbols)](symbols-resource-identifiers.md)
1717
#### [How to: Create Symbols](creating-new-symbols.md)
1818
#### [How to: Manage Symbols](changing-a-symbol-or-symbol-name-id.md)
1919
#### [Predefined Symbol IDs](predefined-symbol-ids.md)
@@ -31,30 +31,14 @@
3131
###### [Arrangement of Controls on Dialog Boxes](arrangement-of-controls-on-dialog-boxes.md)
3232
###### [Defining Control Access and Values](defining-mnemonics-access-keys.md)
3333
#### [Image Editor for Icons](image-editor-for-icons.md)
34-
##### [Editing Graphical Resources (Image Editor for Icons)](editing-graphical-resources-image-editor-for-icons.md)
35-
###### [Creating an Icon or Other Image (Image Editor for Icons)](creating-an-icon-or-other-image-image-editor-for-icons.md)
36-
###### [Using a Drawing Tool (Image Editor for Icons)](using-a-drawing-tool-image-editor-for-icons.md)
37-
###### [Drawing Lines or Closed Figures (Image Editor for Icons)](drawing-lines-or-closed-figures-image-editor-for-icons.md)
38-
###### [Selecting an Area of an Image (Image Editor for Icons)](selecting-an-area-of-an-image-image-editor-for-icons.md)
39-
###### [Editing Parts of an Image (Image Editor for Icons)](editing-parts-of-an-image-image-editor-for-icons.md)
40-
###### [Flipping an Image (Image Editor for Icons)](flipping-an-image-image-editor-for-icons.md)
41-
###### [Resizing an Image (Image Editor for Icons)](resizing-an-image-image-editor-for-icons.md)
42-
###### [Creating a Custom Brush (Image Editor for Icons)](creating-a-custom-brush-image-editor-for-icons.md)
43-
###### [Changing Image Properties (Image Editor for Icons)](changing-image-properties-image-editor-for-icons.md)
44-
###### [Saving Bitmaps as GIFs or JPEGs (Image Editor for Icons)](saving-bitmaps-as-gifs-or-jpegs-image-editor-for-icons.md)
45-
###### [Converting an Image From One Format to Another (Image Editor for Icons)](converting-an-image-from-one-format-to-another-image-editor-for-icons.md)
46-
###### [Editing an Image Outside of a Project (Image Editor for Icons)](editing-an-image-outside-of-a-project-image-editor-for-icons.md)
47-
###### [Image Menu (Image Editor for Icons)](image-menu-image-editor-for-icons.md)
48-
###### [Toolbar (Image Editor for Icons)](toolbar-image-editor-for-icons.md)
49-
###### [Window Panes (Image Editor for Icons)](window-panes-image-editor-for-icons.md)
50-
##### [Working with Color (Image Editor for Icons)](working-with-color-image-editor-for-icons.md)
51-
##### [Icons and Cursors: Image Resources for Display Devices (Image Editor for Icons)](icons-and-cursors-image-resources-for-display-devices-image-editor-for-icons.md)
52-
##### [Accelerator Keys (Image Editor for Icons)](accelerator-keys-image-editor-for-icons.md)
34+
##### [Creating an Icon or Other Image](creating-an-icon-or-other-image-image-editor-for-icons.md)
35+
##### [Editing an Image](selecting-an-area-of-an-image-image-editor-for-icons.md)
36+
##### [Using a Drawing Tool](using-a-drawing-tool-image-editor-for-icons.md)
37+
##### [Working with Color](working-with-color-image-editor-for-icons.md)
38+
##### [Accelerator Keys](accelerator-keys-image-editor-for-icons.md)
5339
#### [Menu Editor](menu-editor.md)
54-
##### [Creating Menus](creating-a-menu.md)
55-
##### [Editing Multiple Menus or Menu Commands](selecting-multiple-menus-or-menu-commands.md)
56-
##### [Associating Menu Commands](associating-a-menu-command-with-an-accelerator-key.md)
57-
##### [Menu Command Properties](menu-command-properties.md)
40+
##### [Creating and Editing Menus](creating-a-menu.md)
41+
##### [Menu Commands](menu-command-properties.md)
5842
#### [String Editor](string-editor.md)
5943
#### [Toolbar Editor](toolbar-editor.md)
6044
#### [Version Information Editor](version-information-editor.md)

‎docs/windows/accelerator-editor.md‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Accelerator Editor (C++)"
3-
ms.date: "11/04/2016"
3+
ms.date: "02/14/2019"
44
f1_keywords: ["vc.editors.accelerator.F1", "vc.editors.accelerator"]
55
helpviewer_keywords: ["accelerator tables [C++], editing", "tables [C++], accelerator key", "accelerator keys [C++]", "resource editors [C++], Accelerator editor", "keyboard shortcuts [C++], Accelerator editor", "accelerator properties", "properties [C++], accelerator properties", "Type property", "Key property", "Modifier property", "VIRTKEY", "Key property", "ID property", "accelerator tables [C++], editing", "keyboard shortcuts [C++], editing in an accelerator table", "searching, in accelarator tables", "accelerator tables [C++], finding entries", "accelerator tables [C++], adding entries", "New Accelerator command", "accelerator tables [C++], deleting entries", "keyboard shortcuts [C++], deleting entry from accelerator table", "accelerator tables [C++], copying entries", "rc files [C++], moving an accelerator table entry", ".rc files [C++], moving accelerator table entries", "accelerator tables [C++], moving entries", "keyboard shortcuts [C++], property changing", "accelerator tables [C++], changing properties"]
66
ms.assetid: 013c30b6-5d61-4f1c-acef-8bd15bed7060
@@ -21,9 +21,7 @@ For a list of pre-defined accelerator keys, see [Predefined Accelerator Keys](..
2121
> [!NOTE]
2222
> Windows does not allow you to create empty accelerator tables. If you create an accelerator table with no entries, it is deleted automatically when you save the table.
2323
24-
For information on adding resources to managed projects, see [Resources in Desktop Apps](/dotnet/framework/resources/index) in the *.NET Framework Developer's Guide*. For information on manually adding resource files to managed projects, accessing resources, displaying static resources, and assigning resource strings to properties, see [Creating Resource Files for Desktop Apps](/dotnet/framework/resources/creating-resource-files-for-desktop-apps). For information on globalization and localization of resources in managed apps, see [Globalizing and Localizing .NET Framework Applications](/dotnet/standard/globalization-localization/index).
25-
26-
## Accelerator properties
24+
## Accelerator Properties
2725

2826
You can set accelerator properties in the [Properties window](/visualstudio/ide/reference/properties-window) at any time. You can also use the **Accelerator** editor to modify the accelerator properties in the accelerator table. Changes made using the **Properties** window or the **Accelerator** editor have the same result: edits are immediately reflected in the accelerator table.
2927

@@ -83,15 +81,12 @@ The **Type** property determines whether the shortcut key combination associated
8381
> [!NOTE]
8482
> If you want to enter a value into the accelerator table and have the value be treated as ASCII/ANSI, simply click the **Type** for the entry in the table and select ASCII from the drop down list. However, if you use the **Next Key Typed** command (**Edit** menu) to specify the `Key`, you must change the **Type** property from VIRTKEY to ASCII *before* entering the `Key` code.
8583
86-
## Accelerator tables
84+
## Accelerator Tables
8785

8886
In a C++ project, you can edit an accelerator table directly with in-place editing in the **Accelerator** editor.
8987

9088
The procedures below refer to the use of standard property pages, however, both in-place editing and the property page method have the same result. Changes made using property pages or using in-place editing are immediately reflected in the accelerator table.
9189

92-
> [!NOTE]
93-
> If your project doesn't already contain an .rc file, please see [Creating a New Resource Script File](../windows/how-to-create-a-resource-script-file.md).
94-
9590
### To edit in an accelerator table
9691

9792
1. Open the accelerator table by double-clicking its icon in [Resource View](../windows/resource-view-window.md).
@@ -174,9 +169,7 @@ You can then scan the list and find the entry.
174169

175170
Win32
176171

177-
## See also
178-
179-
[Resource Editors](../windows/resource-editors.md)
172+
## See Also
180173

181-
[Editing in an Accelerator Table](../windows/editing-in-an-accelerator-table.md)<br/>
174+
[Resource Editors](../windows/resource-editors.md)<br/>
182175
[Predefined Accelerator Keys](../windows/predefined-accelerator-keys.md)<br/>

‎docs/windows/associating-a-menu-command-with-an-accelerator-key.md‎

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

‎docs/windows/atl-predefined-symbols.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "ATL Predefined Symbols"
3-
ms.date: "11/04/2016"
3+
ms.date: "02/14/2019"
44
helpviewer_keywords: ["symbols [C++], ATL predefined", "ATL symbols"]
55
ms.assetid: 60d8f4e6-6ed9-47f3-9051-e4bf34384456
66
---
@@ -28,4 +28,5 @@ ATL
2828
## See Also
2929

3030
[Predefined Symbol IDs](../windows/predefined-symbol-ids.md)<br/>
31-
[Symbols: Resource Identifiers](../windows/symbols-resource-identifiers.md)
31+
[MFC Predefined Symbols](../windows/mfc-predefined-symbols.md)<br/>
32+
[Win32 Predefined Symbols](../windows/win32-predefined-symbols.md)<br/>

0 commit comments

Comments
 (0)