Skip to content

Commit fb4d51e

Browse files
v-shilsv-shils
authored
Merge pull request #1720 from msebolt/resource-file-consolidation-pr32
resource file consolidation pr32
2 parents 21e1d92 + 99c7bd9 commit fb4d51e

5 files changed

+77
-97
lines changed

‎.openpublishing.redirection.json

+10
Original file line numberDiff line numberDiff line change
@@ -7740,6 +7740,16 @@
77407740
"redirect_url": "/cpp/windows/changing-a-symbol-or-symbol-name-id",
77417741
"redirect_document_id": false
77427742
},
7743+
{
7744+
"source_path": "docs/windows/mfc-database-programming-symbols.md",
7745+
"redirect_url": "/cpp/windows/mfc-predefined-symbols",
7746+
"redirect_document_id": false
7747+
},
7748+
{
7749+
"source_path": "docs/windows/mfc-windows-programming-symbols.md",
7750+
"redirect_url": "/cpp/windows/mfc-predefined-symbols",
7751+
"redirect_document_id": false
7752+
},
77437753
{
77447754
"source_path": "docs/windows/activationfactory-activationfactory-constructor.md",
77457755
"redirect_url": "/cpp/windows/activationfactory-class#activationfactory",

‎docs/windows/TOC.md

-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
#### [Predefined Symbol IDs](predefined-symbol-ids.md)
4444
##### [ATL Predefined Symbols](atl-predefined-symbols.md)
4545
##### [MFC Predefined Symbols](mfc-predefined-symbols.md)
46-
###### [MFC Database Programming Symbols](mfc-database-programming-symbols.md)
47-
###### [MFC Windows Programming Symbols](mfc-windows-programming-symbols.md)
4846
##### [Win32 Predefined Symbols](win32-predefined-symbols.md)
4947
### [Resource Editors](resource-editors.md)
5048
#### [Viewing and Editing Resources in a Resource Editor](viewing-and-editing-resources-in-a-resource-editor.md)

‎docs/windows/mfc-database-programming-symbols.md

-35
This file was deleted.

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

+67-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "MFC Predefined Symbols"
33
ms.date: "11/04/2016"
4-
helpviewer_keywords: ["MFC symbols", "symbols [C++], MFC"]
4+
helpviewer_keywords: ["MFC symbols", "symbols [C++], MFC", "MFC database programming symbols", "symbols [C++], MFC", "databases [C++], MFC programming model", "Windows programming MFC symbols [C++]"]
55
ms.assetid: c1e689c4-45d7-40a3-8ee9-f47676cc3bbb
66
---
77
# MFC Predefined Symbols
@@ -16,7 +16,7 @@ MFC projects always include several header files that support windows. These are
1616
#include <afxcmn.h> //MFC support for Windows common controls.
1717
```
1818

19-
The header files include symbol ID values for MFC common values. These symbols are only available when you are working in an MFC project. Note that the AFX_ prefix is followed by the standard symbol name prefixes.
19+
The header files include symbol ID values for MFC common values. These symbols are only available when you're working in an MFC project. The AFX_ prefix is followed by the standard symbol name prefixes.
2020

2121
|||
2222
|-|-|
@@ -199,11 +199,74 @@ The header files include symbol ID values for MFC common values. These symbols a
199199
|AFX_IDS_UPDATING_ITEMS|AFX_IDS_USER_EXCEPTION|
200200
|AFX_IDS_VERB_EDIT|AFX_IDS_VERB_PROPERTIES|
201201

202+
## MFC database programming symbols
203+
204+
The symbols in this table only appear in an MFC project when database support has been added. They support the MFC connection to SQL servers and database programming.
205+
206+
|||
207+
|-|-|
208+
|AFX_IDP_SQL_API_CONFORMANCE|AFX_IDP_SQL_BOOKMARKS_ NOT_ENABLED|
209+
|AFX_IDP_SQL_BOOKMARKS_ NOT_SUPPORTED|AFX_IDP_SQL_CONNECT_FAIL|
210+
|AFX_IDP_SQL_DATA_TRUNCATED|AFX_IDP_SQL_DYNAMIC_CURSOR_ NOT_SUPPORTED|
211+
|AFX_IDP_SQL_DYNASET_ NOT_SUPPORTED|AFX_IDP_SQL_EMPTY_COLUMN_LIST|
212+
|AFX_IDP_SQL_FIELD_NOT_FOUND|AFX_IDP_SQL_FILED_SCHEMA_ MISMATCH|
213+
|AFX_IDP_SQL_ILLEGAL_MODE|AFX_IDP_SQL_INCORRECT_ODBC|
214+
|AFX_IDP_SQL_LOCK_MODE_ NOT_SUPPORTED|AFX_IDP_SQL_MULTIPLE_ ROWS_AFFECTED|
215+
|AFX_IDP_SQL_NO_CURRENT_RECORD|AFX_IDP_SQL_NO_DATA_FOUND|
216+
|AFX_IDP_SQL_NO_POSITIONED_ UPDATES|AFX_IDP_SQL_NO_ROWS_AFFECTED|
217+
|AFX_IDP_SQL_ODBC_LOAD_FAILED|AFX_IDP_SQL_ODBC_V2_REQUIRED|
218+
|AFX_IDP_SQL_RECORDSET_ FORWARD_ONLY|AFX_IDP_SQL_RECORDSET_READONLY|
219+
|AFX_IDP_SQL_ROW_FETCH|AFX_IDP_SQL_ROW_UPDATE_ NOT_SUPPORTED|
220+
|AFX_IDP_SQL_SNAPSHOT_ NOT_SUPPORTED|AFX_IDP_SQL_SQL_CONFORMANCE|
221+
|AFX_IDP_SQL_SQL_NO_TOTAL|AFX_IDP_SQL_UPDATE_DELETE_FAILED|
222+
223+
## MFC Windows programming symbols
224+
225+
These symbols are also part of the MFC support files, but they support standard Windows application functions and actions. These symbols are used with menus. When you are working with menus in the **Menu Editor**, these symbols will appear in the **Property Window** associated with common menu commands. For instance, if your application has a **File** menu with an **Exit** command, that command will be associated with the symbol ID_APP_EXIT in the [Properties window](/visualstudio/ide/reference/properties-window).
226+
227+
||||
228+
|-|-|-|
229+
|ID_APP_ABOUT|ID_APP_EXIT|ID_APPLY_NOW|
230+
|ID_CONTEXT_HELP|ID_DEFAULT_HELP|ID_EDIT_CLEAR|
231+
|ID_EDIT_CLEAR_ALL|ID_EDIT_COPY|ID_EDIT_CUT|
232+
|ID_EDIT_FIND|ID_EDIT_PASTE|ID_EDIT_PASTE_LINK|
233+
|ID_EDIT_PASTE_SPECIAL|ID_EDIT_REDO|ID_EDIT_REPEAT|
234+
|ID_EDIT_REPLACE|ID_EDIT_SELECT_ALL|ID_EDIT_UNDO|
235+
|ID_FILE_CLOSE|ID_FILE_MRU_FILE1|ID_FILE_MRU_FILE10|
236+
|ID_FILE_MRU_FILE11|ID_FILE_MRU_FILE12|ID_FILE_MRU_FILE13|
237+
|ID_FILE_MRU_FILE14|ID_FILE_MRU_FILE15|ID_FILE_MRU_FILE16|
238+
|ID_FILE_MRU_FILE2|ID_FILE_MRU_FILE3|ID_FILE_MRU_FILE4|
239+
|ID_FILE_MRU_FILE5|ID_FILE_MRU_FILE6|ID_FILE_MRU_FILE7|
240+
|ID_FILE_MRU_FILE8|ID_FILE_MRU_FILE9|ID_FILE_MRU_FIRST|
241+
|ID_FILE_MRU_LAST|ID_FILE_NEW|ID_FILE_NEW_FRAME|
242+
|ID_FILE_OPEN|ID_FILE_PAGE_SETUP|ID_FILE_PRINT|
243+
|ID_FILE_PRINT_DIRECT|ID_FILE_PRINT_PREVIEW|ID_FILE_PRINT_SETUP|
244+
|ID_FILE_SAVE|ID_FILE_SAVE_AS|ID_FILE_SAVE_COPY_AS|
245+
|ID_FILE_SEND_MAIL|ID_FILE_UPDATE|ID_FORMAT_FONT|
246+
|ID_HELP|ID_HELP_FINDER|ID_HELP_INDEX|
247+
|ID_HELP+USING|ID_INDICATOR_CAPS|ID_INDICATOR_EXT|
248+
|ID_INDICATOR_KANA|ID_INDICATOR_NUM|ID_INDICATOR_OVR|
249+
|ID_INDICATOR_REC|ID_INDICATOR_SCRL|ID_NEXT_PANE|
250+
|ID_OLE_EDIT_CHANGE_ICON|ID_OLE_EDIT_CONVERT|ID_OLE_EDIT_LINKS|
251+
|ID_OLE_EDIT_PROPERTIES|ID_OLE_INSERT_NEW|ID_OLE_VERB_FIRST|
252+
|ID_PREV_PANE|ID_REC_FIRST|ID_RECORD_LAST|
253+
|ID_RECORD_NEXT|ID_RECORD_PREV|ID_SEPARATOR|
254+
|ID_VIEW_AUTOARRANGE|ID_VIEW_BYNAME|ID_VIEW_DETAILS|
255+
|ID_VIEW_LARGEICON|ID_VIEW_LINEUP|ID_VIEW_LIST|
256+
|ID_VIEW_REBAR|ID_VIEW_SMALLICON|ID_VIEW_STATUS_BAR|
257+
|ID_VIEW_TOOLBAR|ID_WINDOW_ARRANGE|ID_WINDOW_CASCADE|
258+
|ID_WINDOW_NEW|ID_WINDOW_SPLIT|ID_WINDOW_TILE_HORIZ|
259+
|ID_WINDOW_TILE_VERT|ID_WIZBACK|ID_WIZFINISH|
260+
|ID_WIZNEXT|IDABORT|IDC_STATIC|
261+
|IDCANCEL|IDD_ABOUTBOX|IDIGNORE|
262+
|IDNO|IDOK|IDP_OLE_INIT_FAILED|
263+
|IDRETRY|IDYES||
264+
202265
## Requirements
203266

204267
MFC
205268

206-
## See Also
269+
## See also
207270

208271
[Predefined Symbol IDs](../windows/predefined-symbol-ids.md)<br/>
209-
[Symbols: Resource Identifiers](../windows/symbols-resource-identifiers.md)
272+
[Symbols: Resource Identifiers](../windows/symbols-resource-identifiers.md)

‎docs/windows/mfc-windows-programming-symbols.md

-56
This file was deleted.

0 commit comments

Comments
 (0)