Index: src/text/fmt/xp/fl_FrameLayout.cpp =================================================================== --- src/text/fmt/xp/fl_FrameLayout.cpp (revision 21269) +++ src/text/fmt/xp/fl_FrameLayout.cpp (working copy) @@ -1,3 +1,5 @@ +/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */ + /* AbiWord * Copyright (C) 1998 AbiSource, Inc. * Copyright (C) 2003 Martin Sevior (msevior@physics.unimelb.edu.au> Index: src/wp/ap/win/ap_Win32Res_SplitCells.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_SplitCells.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_SplitCells.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_SPLITCELLS_BMP_LEFT 1001 #define AP_RID_DIALOG_SPLITCELLS_BMP_HORIMID 1002 #define AP_RID_DIALOG_SPLITCELLS_BMP_RIGHT 1003 Index: src/wp/ap/win/ap_Win32Res_DlgInsertBookmark.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgInsertBookmark.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgInsertBookmark.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_INSERTBOOKMARK_BTN_OK IDOK #define AP_RID_DIALOG_INSERTBOOKMARK_BTN_CANCEL IDCANCEL #define AP_RID_DIALOG_INSERTBOOKMARK_BTN_DELETE 1003 Index: src/wp/ap/win/ap_Win32Res_DlgStylist.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgStylist.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgStylist.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #ifndef TVS_SINGLEEXPAND #define TVS_SINGLEEXPAND 0x0400 #endif Index: src/wp/ap/win/ap_Win32Res_Icons.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_Icons.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_Icons.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_ICON_APPLICATION_32 10000 #define AP_RID_ICON_APPLICATION_16 10001 #define AP_RID_ICON_DOCUMENT 10002 @@ -37,20 +39,20 @@ // Menu bitmaps -AP_RID_BITMAP_CUT BITMAP DISCARDABLE "..\\..\\..\\af\\ev\\win\\bmp\\menu_cut.bmp" -AP_RID_BITMAP_COPY BITMAP DISCARDABLE "..\\..\\..\\af\\ev\\win\\bmp\\menu_copy.bmp" -AP_RID_BITMAP_PASTE BITMAP DISCARDABLE "..\\..\\..\\af\\ev\\win\\bmp\\menu_paste.bmp" -AP_RID_BITMAP_NEW BITMAP DISCARDABLE "..\\..\\..\\af\\ev\\win\\bmp\\menu_new.bmp" -AP_RID_BITMAP_OPEN BITMAP DISCARDABLE "..\\..\\..\\af\\ev\\win\\bmp\\menu_open.bmp" -AP_RID_BITMAP_PRINT BITMAP DISCARDABLE "..\\..\\..\\af\\ev\\win\\bmp\\menu_print.bmp" -AP_RID_BITMAP_FIND BITMAP DISCARDABLE "..\\..\\..\\af\\ev\\win\\bmp\\menu_search.bmp" -AP_RID_BITMAP_SYMBOL BITMAP DISCARDABLE "..\\..\\..\\af\\ev\\win\\bmp\\menu_insert_symbol.bmp" -AP_RID_BITMAP_PICTURE BITMAP DISCARDABLE "..\\..\\..\\af\\ev\\win\\bmp\\menu_insert_image.bmp" -AP_RID_BITMAP_SPELL BITMAP DISCARDABLE "..\\..\\..\\af\\ev\\win\\bmp\\menu_spellcheck.bmp" -AP_RID_BITMAP_OPTIONS BITMAP DISCARDABLE "..\\..\\..\\af\\ev\\win\\bmp\\menu_preferences.bmp" -AP_RID_BITMAP_HELP BITMAP DISCARDABLE "..\\..\\..\\af\\ev\\win\\bmp\\menu_help.bmp" -AP_RID_BITMAP_REDO BITMAP DISCARDABLE "..\\..\\..\\af\\ev\\win\\bmp\\menu_redo.bmp" -AP_RID_BITMAP_UNDO BITMAP DISCARDABLE "..\\..\\..\\af\\ev\\win\\bmp\\menu_undo.bmp" +AP_RID_BITMAP_CUT BITMAP DISCARDABLE "../../../af/ev/win/bmp/menu_cut.bmp" +AP_RID_BITMAP_COPY BITMAP DISCARDABLE "../../../af/ev/win/bmp/menu_copy.bmp" +AP_RID_BITMAP_PASTE BITMAP DISCARDABLE "../../../af/ev/win/bmp/menu_paste.bmp" +AP_RID_BITMAP_NEW BITMAP DISCARDABLE "../../../af/ev/win/bmp/menu_new.bmp" +AP_RID_BITMAP_OPEN BITMAP DISCARDABLE "../../../af/ev/win/bmp/menu_open.bmp" +AP_RID_BITMAP_PRINT BITMAP DISCARDABLE "../../../af/ev/win/bmp/menu_print.bmp" +AP_RID_BITMAP_FIND BITMAP DISCARDABLE "../../../af/ev/win/bmp/menu_search.bmp" +AP_RID_BITMAP_SYMBOL BITMAP DISCARDABLE "../../../af/ev/win/bmp/menu_insert_symbol.bmp" +AP_RID_BITMAP_PICTURE BITMAP DISCARDABLE "../../../af/ev/win/bmp/menu_insert_image.bmp" +AP_RID_BITMAP_SPELL BITMAP DISCARDABLE "../../../af/ev/win/bmp/menu_spellcheck.bmp" +AP_RID_BITMAP_OPTIONS BITMAP DISCARDABLE "../../../af/ev/win/bmp/menu_preferences.bmp" +AP_RID_BITMAP_HELP BITMAP DISCARDABLE "../../../af/ev/win/bmp/menu_help.bmp" +AP_RID_BITMAP_REDO BITMAP DISCARDABLE "../../../af/ev/win/bmp/menu_redo.bmp" +AP_RID_BITMAP_UNDO BITMAP DISCARDABLE "../../../af/ev/win/bmp/menu_undo.bmp" Index: src/wp/ap/win/ap_Win32Res_DlgTabs.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgTabs.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgTabs.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_TABS_TAB_STOP_POSITION_EDIT 1000 #define AP_RID_DIALOG_TABS_TAB_STOP_POSITION_LIST 1001 #define AP_RID_DIALOG_TABS_DEFAULT_TAB_STOPS_EDIT 1002 Index: src/wp/ap/win/ap_Win32Res_FormatTable.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_FormatTable.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_FormatTable.rc2 (working copy) @@ -27,6 +27,7 @@ // ////////////////////////////////////////////////////////////////// +#include #define AP_RID_DIALOG_FORMATTABLE_STATIC_PREVIEW 1000 #define AP_RID_DIALOG_FORMATTABLE_BMP_BOTTOM 1001 Index: src/wp/ap/win/ap_Win32Res_DlgSpell.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgSpell.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgSpell.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_SPELL_TEXT_NOT 1001 #define AP_RID_DIALOG_SPELL_RICH_SENTENCE 1002 #define AP_RID_DIALOG_SPELL_TEXT_CHANGE 1003 Index: src/wp/ap/win/ap_Win32Res_DlgPageSetup.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgPageSetup.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgPageSetup.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + // The main tab dialog #define AP_RID_DIALOG_PAGE_SETUP_BTN_OK IDOK #define AP_RID_DIALOG_PAGE_SETUP_BTN_CANCEL IDCANCEL Index: src/wp/ap/win/ap_Win32Res_DlgList.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgList.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgList.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_LIST_BTN_APPLY 1000 #define AP_RID_DIALOG_LIST_COMBO_TYPE 1001 #define AP_RID_DIALOG_LIST_STATIC_STYLE 1002 Index: src/wp/ap/win/ap_Win32Res_DlgToggleCase.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgToggleCase.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgToggleCase.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_TOGGLECASE_BTN_OK IDOK #define AP_RID_DIALOG_TOGGLECASE_BTN_CANCEL IDCANCEL #define AP_RID_DIALOG_TOGGLECASE_RDO_SentenceCase 1000 Index: src/wp/ap/win/ap_Win32Res_DlgHdrFtr.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgHdrFtr.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgHdrFtr.rc2 (working copy) @@ -26,6 +26,9 @@ // *** DIALOGS DO NOT GET COMPILED. // ////////////////////////////////////////////////////////////////// + +#include + // the main dialog #define AP_RID_DIALOG_HDRFTR_GBX_HDR 1001 #define AP_RID_DIALOG_HDRFTR_CHK_HDRFACING 1002 Index: src/wp/ap/win/ap_Win32Res_DlgMarkRevisions.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgMarkRevisions.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgMarkRevisions.rc2 (working copy) @@ -29,6 +29,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_MARK_REVISIONS_TITLE 1001 #define AP_RID_DIALOG_MARK_REVISIONS_RADIO1 1002 #define AP_RID_DIALOG_MARK_REVISIONS_RADIO2 1003 Index: src/wp/ap/win/ap_Win32Res_Manifest.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_Manifest.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_Manifest.rc2 (working copy) @@ -27,6 +27,7 @@ // ////////////////////////////////////////////////////////////////// +#include // Manifest resources, primary should be '1', see CREATEPROCESS_MANIFEST_RESOURCE_ID in winuser.h #define AP_RID_MANIFEST 1 Index: src/wp/ap/win/ap_Win32Res_DlgBreak.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgBreak.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgBreak.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_BREAK_TEXT_INSERT 1001 #define AP_RID_DIALOG_BREAK_RADIO_PAGE 1002 #define AP_RID_DIALOG_BREAK_RADIO_COL 1003 Index: src/wp/ap/win/ap_Win32Res_DlgNew.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgNew.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgNew.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_NEW_RDO_TEMPLATE 1001 #define AP_RID_DIALOG_NEW_RDO_EXISTING 1002 #define AP_RID_DIALOG_NEW_EBX_EXISTING 1004 Index: src/wp/ap/win/ap_Win32Res_MergeCells.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_MergeCells.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_MergeCells.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_MERGECELLS_BMP_LEFT 1901 #define AP_RID_DIALOG_MERGECELLS_BMP_RIGHT 1902 #define AP_RID_DIALOG_MERGECELLS_BMP_ABOVE 1903 Index: src/wp/ap/win/ap_Win32Res_DlgParagraph.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgParagraph.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgParagraph.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + // the main dialog #define AP_RID_DIALOG_PARA_TAB 1001 #define AP_RID_DIALOG_PARA_BTN_TABS 1002 Index: src/wp/ap/win/ap_Win32Res_DlgDownload_File.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgDownload_File.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgDownload_File.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_DOWNLOADFILE_TEXT 1001 #define AP_RID_DIALOG_DOWNLOADFILE_BTN_OK IDOK #define AP_RID_DIALOG_DOWNLOADFILE_BTN_CANCEL IDCANCEL Index: src/wp/ap/win/ap_Win32Res_DlgGoto.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgGoto.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgGoto.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_GOTO_BTN_GOTO 1001 #define AP_RID_DIALOG_GOTO_BTN_NEXT 1002 #define AP_RID_DIALOG_GOTO_BTN_PREV 1003 Index: src/wp/ap/win/ap_Win32Res_DlgInsert_DateTime.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgInsert_DateTime.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgInsert_DateTime.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_DATETIME_TEXT_FORMATS 1001 #define AP_RID_DIALOG_DATETIME_LIST_FORMATS 1002 //#define AP_RID_DIALOG_DATETIME_BTN_DEFAULT 1003 Index: src/wp/ap/win/ap_Win32Res_DlgColumns.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgColumns.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgColumns.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_COLUMN_GROUP1 1001 #define AP_RID_DIALOG_COLUMN_GROUP2 1002 #define AP_RID_DIALOG_COLUMN_RADIO_ONE 1003 Index: src/wp/ap/win/ap_Win32Resources_DialogReplace.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Resources_DialogReplace.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Resources_DialogReplace.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_REPLACE_BTN_FINDNEXT 1001 #define AP_RID_DIALOG_REPLACE_BTN_REPLACE 1002 #define AP_RID_DIALOG_REPLACE_BTN_REPLACEALL 1003 Index: src/wp/ap/win/ap_Win32Res_DlgInsertHyperlink.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgInsertHyperlink.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgInsertHyperlink.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_INSERTHYPERLINK_BTN_OK IDOK #define AP_RID_DIALOG_INSERTHYPERLINK_BTN_CANCEL IDCANCEL #define AP_RID_DIALOG_INSERTHYPERLINK_STATIC -1 Index: src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgOptions.rc2 (working copy) @@ -26,6 +26,9 @@ // *** DIALOGS DO NOT GET COMPILED. // ////////////////////////////////////////////////////////////////// + +#include + // the main dialog #define AP_RID_DIALOG_OPTIONS_TAB 1001 #define AP_RID_DIALOG_OPTIONS_BTN_SAVE 1002 Index: src/wp/ap/win/ap_Win32Res_Version.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_Version.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_Version.rc2 (working copy) @@ -22,6 +22,8 @@ // Version // +#include + #if defined(RC_INVOKED) && defined(ABI_BUILD_VERSION) #define _VM ABI_BUILD_VERSION_MAJOR Index: src/wp/ap/win/ap_Win32Res_FormatFootnotes.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_FormatFootnotes.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_FormatFootnotes.rc2 (working copy) @@ -27,6 +27,7 @@ // ////////////////////////////////////////////////////////////////// +#include #define AP_RID_DIALOG_FORMATFOOTNOTES_BTN_OK IDOK #define AP_RID_DIALOG_FORMATFOOTNOTES_BTN_CANCEL IDCANCEL Index: src/wp/ap/win/ap_Win32Resources.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Resources.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Resources.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_REPLACE 200 #define AP_RID_DIALOG_FIND 201 // shares class with _REPLACE #define AP_RID_DIALOG_BREAK 202 Index: src/wp/ap/win/ap_Win32Res_MailMerge.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_MailMerge.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_MailMerge.rc2 (working copy) @@ -27,6 +27,7 @@ // ////////////////////////////////////////////////////////////////// +#include #define AP_RID_DIALOG_MAILMERGE_BTN_INSERT 1100 #define AP_RID_DIALOG_MAILMERGE_BTN_CLOSE 1101 Index: src/wp/ap/win/ap_Win32Res_DlgInsertTable.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgInsertTable.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgInsertTable.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_INSERTTABLE_BTN_CANCEL IDCANCEL #define AP_RID_DIALOG_INSERTTABLE_BTN_OK IDOK Index: src/wp/ap/win/ap_Win32Res_DlgListRevisions.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgListRevisions.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgListRevisions.rc2 (working copy) @@ -29,6 +29,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_LIST_REVISIONS_TITLE 1001 #define AP_RID_DIALOG_LIST_REVISIONS_FRAME 1002 #define AP_RID_DIALOG_LIST_REVISIONS_LIST 1003 Index: src/wp/ap/win/ap_Win32Res_DlgWordCount.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgWordCount.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgWordCount.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_WORDCOUNT_TEXT_STATS 1001 #define AP_RID_DIALOG_WORDCOUNT_TEXT_PAGE 1002 #define AP_RID_DIALOG_WORDCOUNT_TEXT_WORD 1003 Index: src/wp/ap/win/ap_Win32Res_DlgFormatTOC.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgFormatTOC.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgFormatTOC.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + // General property page #define AP_RID_DIALOG_FORMATTOC_GENERAL_CHECK_HASHEADING 1100 #define AP_RID_DIALOG_FORMATTOC_GENERAL_TEXT_HEADINGTEXT 1101 Index: src/wp/ap/win/ap_Win32Res_DlgStylesNewModify.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgStylesNewModify.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgStylesNewModify.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_STYLES_NEWMODIFY_LBL_NAME 1101 #define AP_RID_DIALOG_STYLES_NEWMODIFY_LBL_BASEDON 1102 #define AP_RID_DIALOG_STYLES_NEWMODIFY_LBL_TYPE 1103 Index: src/wp/ap/win/ap_Win32Res_DlgStylesTop.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgStylesTop.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgStylesTop.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_STYLES_TOP_LIST_STYLES 1002 #define AP_RID_DIALOG_STYLES_TOP_COMBO_LIST 1003 #define AP_RID_DIALOG_STYLES_TOP_TEXT_LIST 1004 Index: src/wp/ap/win/ap_Win32Res_DlgPageNumbers.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgPageNumbers.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgPageNumbers.rc2 (working copy) @@ -24,6 +24,8 @@ // ////////////////////////////////////////////////////////////////// +#include + // the main dialog #define AP_RID_DIALOG_PAGENUMBERS_STATIC_POSITION 1002 #define AP_RID_DIALOG_PAGENUMBERS_STATIC_PREVIEW 1004 Index: src/wp/ap/win/ap_Win32Res_FormatFrame.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_FormatFrame.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_FormatFrame.rc2 (working copy) @@ -27,6 +27,7 @@ // ////////////////////////////////////////////////////////////////// +#include #define AP_RID_DIALOG_FORMATFRAME_STATIC_PREVIEW 1000 #define AP_RID_DIALOG_FORMATFRAME_BMP_BOTTOM 1001 Index: src/wp/ap/win/ap_Win32Res_DlgLatex.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgLatex.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgLatex.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_LATEX_TEXT_EXAMPLE 1001 #define AP_RID_DIALOG_LATEX_TEXT_LATEXEQUATION 1002 #define AP_RID_DIALOG_LATEX_TEXT_EMC 1003 Index: src/wp/ap/win/ap_Win32Res_DlgMetaData.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgMetaData.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgMetaData.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + // General property page #define AP_RID_DIALOG_META_GENERAL_TEXT_TITLE 1001 #define AP_RID_DIALOG_META_GENERAL_TEXT_SUBJECT 1002 Index: src/wp/ap/win/ap_Win32Res_DlgField.rc2 =================================================================== --- src/wp/ap/win/ap_Win32Res_DlgField.rc2 (revision 21269) +++ src/wp/ap/win/ap_Win32Res_DlgField.rc2 (working copy) @@ -27,6 +27,8 @@ // ////////////////////////////////////////////////////////////////// +#include + #define AP_RID_DIALOG_FIELD_TEXT_TYPES 1001 #define AP_RID_DIALOG_FIELD_LIST_TYPES 1002 #define AP_RID_DIALOG_FIELD_TEXT_FORMATS 1003