Merge pull request #1717 from msebolt/resource-file-consolidation-pr30

resource file consolidation pr30

Author: rjagiewich

.openpublishing.redirection.json

@@ -7715,6 +7715,11 @@
             "redirect_url": "/cpp/windows/sizing-individual-controls",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/windows/creating-a-dialog-box-that-users-cannot-exit.md",
+            "redirect_url": "/cpp/windows/creating-a-new-dialog-box",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/windows/activationfactory-activationfactory-constructor.md",
             "redirect_url": "/cpp/windows/activationfactory-class#activationfactory",

docs/windows/TOC.md

@@ -58,8 +58,7 @@
 ##### [Accelerator Keys](predefined-accelerator-keys.md)
 #### [Binary Editor](binary-editor.md)
 #### [Dialog Editor](dialog-editor.md)
-##### [Creating a New Dialog Box](creating-a-new-dialog-box.md)
-##### [Creating a Dialog Box That Users Cannot Exit](creating-a-dialog-box-that-users-cannot-exit.md)
+##### [Creating a Dialog Box](creating-a-new-dialog-box.md)
 ##### [Showing or Hiding the Dialog Editor Toolbar](showing-or-hiding-the-dialog-editor-toolbar.md)
 ##### [Switching Between Dialog Box Controls and Code](switching-between-dialog-box-controls-and-code.md)
 ##### [Controls in Dialog Boxes](controls-in-dialog-boxes.md)

docs/windows/creating-a-dialog-box-that-users-cannot-exit.md

@@ -1,28 +1,47 @@
 ---
-title: "Creating a New Dialog Box (C++)"
+title: "Creating a Dialog Box (C++)"
 ms.date: "11/04/2016"
 f1_keywords: ["vc.editors.dialog"]
-helpviewer_keywords: ["dialog boxes [C++], creating", "Dialog Editor [C++], creating dialog boxes"]
+helpviewer_keywords: ["dialog boxes [C++], creating", "Dialog Editor [C++], creating dialog boxes", "modal dialog boxes [C++], logon screens", "logon screens"]
 ms.assetid: 303de801-c4f8-42e1-b622-353f6423f688
 ---
-# Creating a New Dialog Box (C++)
+# Creating a Dialog Box (C++)
 
-### To create a new dialog box
+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).
+
+## To create a new dialog box
 
 1. In [Resource View](../windows/resource-view-window.md), right-click your .rc file, then choose **Add Resource** from the shortcut menu.
 
    > [!NOTE]
    > 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).
 
-2. In the **Add Resource** dialog box, select **Dialog** in the **Resource Type** list, then click **New**.
+1. In the **Add Resource** dialog box, select **Dialog** in the **Resource Type** list, then choose **New**.
 
-   If a plus sign (**+**) appears next to the **Dialog** resource type, it means that dialog box templates are available. Click the plus sign to expand the list of templates, select a template, and click **New**.
+   If a plus sign (**+**) appears next to the **Dialog** resource type, it means that dialog box templates are available. Select the plus sign to expand the list of templates, select a template, and choose **New**.
 
    The new dialog box opens in the **Dialog** editor.
 
    You can also [open existing dialog boxes in the Dialog Box editor for editing](../windows/viewing-and-editing-resources-in-a-resource-editor.md).
 
-For information on adding resources to managed projects, please 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).
+## To create a dialog box that a user can't exit
+
+You can create a runtime dialog box that a user can't exit. This kind of dialog box is useful for logons, and for application or document locks.
+
+1. In the **Properties** pane for the dialog box, set the **System Menu** property to **false**.
+
+   This setting disables the dialog box system menu and **Close** button.
+
+1. In the dialog box form, delete the **Cancel** and **OK** buttons.
+
+   At run time, a user can't exit a modal dialog box that has these characteristics.
+
+To enable testing of this kind of dialog box, the test dialog box function detects when **Esc** is pressed. (**Esc** is also known as the VK_ESCAPE virtual key.) No matter how the dialog box is designed to behave at run time, you can end test mode by pressing **Esc**.
+
+> [!NOTE]
+> For MFC applications, to create a dialog box that users cannot exit, you must override the default behavior of `OnOK` and `OnCancel` because even if you delete the associated buttons, the dialog box can still be dismissed by pressing **Enter** or **Esc**.
+
+For information about how to add resources to managed projects, see [Resources in Desktop Apps](/dotnet/framework/resources/index).
 
 ## Requirements