Index: ap_Win32Dialog_FormatFootnotes.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Dialog_FormatFootnotes.cpp,v retrieving revision 1.2 diff -u -r1.2 ap_Win32Dialog_FormatFootnotes.cpp --- ap_Win32Dialog_FormatFootnotes.cpp 7 Apr 2003 15:24:38 -0000 1.2 +++ ap_Win32Dialog_FormatFootnotes.cpp 7 Sep 2003 15:12:22 -0000 @@ -32,6 +32,7 @@ #include "ap_Win32Dialog_FormatFootnotes.h" #include "ap_Win32Resources.rc2" #include "xap_Win32DialogHelper.h" +#include "xap_Win32LabelledSeparator.h" #define _DS(c,s) SetDlgItemText(hWnd,AP_RID_DIALOG_FORMATFOOTNOTES_##c,pSS->getValue(AP_STRING_ID_##s)) #define _DSX(c,s) SetDlgItemText(hWnd,AP_RID_DIALOG_FORMATFOOTNOTES_##c,pSS->getValue(XAP_STRING_ID_##s)) @@ -65,6 +66,7 @@ // raise the dialog XAP_Win32App * pWin32App = static_cast(m_pApp); + XAP_Win32LabelledSeparator_RegisterClass(pWin32App); LPCTSTR lpTemplate = NULL; @@ -136,10 +138,12 @@ _DSX(BTN_CANCEL, DLG_Cancel); _DS(RADIO_RSEL, DLG_FormatFootnotes_FootRestartSec); _DS(RADIO_PAGE, DLG_FormatFootnotes_FootRestartPage); + _DS(STATIC_INITFOOTVAL, DLG_FormatFootnotes_FootInitialVal); _DS(STATIC_FSTYLES1, DLG_FormatFootnotes_FootStyle); _DS(STATIC_FSTYLES2, DLG_FormatFootnotes_FootStyle); _DS(RADIO_ENDDOC, DLG_FormatFootnotes_EndPlaceEndDoc); _DS(RADIO_ENDSEC, DLG_FormatFootnotes_EndPlaceEndSec); + _DS(STATIC_INITENDVAL, DLG_FormatFootnotes_EndInitialVal); _DS(STATIC_ESTYLES1, DLG_FormatFootnotes_EndStyle); _DS(STATIC_ESTYLES2, DLG_FormatFootnotes_EndStyle); _DS(RADIO_ERSTSEC, DLG_FormatFootnotes_EndRestartSec); Index: ap_Win32Res_FormatFootnotes.rc2 =================================================================== RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Res_FormatFootnotes.rc2,v retrieving revision 1.1 diff -u -r1.1 ap_Win32Res_FormatFootnotes.rc2 --- ap_Win32Res_FormatFootnotes.rc2 7 Apr 2003 15:24:39 -0000 1.1 +++ ap_Win32Res_FormatFootnotes.rc2 7 Sep 2003 15:12:22 -0000 @@ -28,24 +28,26 @@ ////////////////////////////////////////////////////////////////// -#define AP_RID_DIALOG_FORMATFOOTNOTES_BTN_OK IDOK -#define AP_RID_DIALOG_FORMATFOOTNOTES_BTN_CANCEL IDCANCEL -#define AP_RID_DIALOG_FORMATFOOTNOTES_COMBO_FSTYLE 1002 -#define AP_RID_DIALOG_FORMATFOOTNOTES_RADIO_RSEL 1003 -#define AP_RID_DIALOG_FORMATFOOTNOTES_RADIO_PAGE 1004 -#define AP_RID_DIALOG_FORMATFOOTNOTES_COMBO_ESTYLE 1005 -#define AP_RID_DIALOG_FORMATFOOTNOTES_SPIN_FSTYLE 1006 -#define AP_RID_DIALOG_FORMATFOOTNOTES_TEXT_FSTYLE 1007 -#define AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_FSTYLES1 1008 -#define AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_FSTYLES2 1009 - -#define AP_RID_DIALOG_FORMATFOOTNOTES_SPIN_ESTYLE 1010 -#define AP_RID_DIALOG_FORMATFOOTNOTES_TEXT_ESTYLE 1011 -#define AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_ESTYLES1 1012 -#define AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_ESTYLES2 1013 -#define AP_RID_DIALOG_FORMATFOOTNOTES_RADIO_ENDDOC 1014 -#define AP_RID_DIALOG_FORMATFOOTNOTES_RADIO_ENDSEC 1015 -#define AP_RID_DIALOG_FORMATFOOTNOTES_RADIO_ERSTSEC 1016 +#define AP_RID_DIALOG_FORMATFOOTNOTES_BTN_OK IDOK +#define AP_RID_DIALOG_FORMATFOOTNOTES_BTN_CANCEL IDCANCEL +#define AP_RID_DIALOG_FORMATFOOTNOTES_COMBO_FSTYLE 1002 +#define AP_RID_DIALOG_FORMATFOOTNOTES_RADIO_RSEL 1003 +#define AP_RID_DIALOG_FORMATFOOTNOTES_RADIO_PAGE 1004 +#define AP_RID_DIALOG_FORMATFOOTNOTES_COMBO_ESTYLE 1005 +#define AP_RID_DIALOG_FORMATFOOTNOTES_SPIN_FSTYLE 1006 +#define AP_RID_DIALOG_FORMATFOOTNOTES_TEXT_FSTYLE 1007 +#define AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_FSTYLES1 1008 +#define AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_FSTYLES2 1009 +#define AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_INITFOOTVAL 1010 + +#define AP_RID_DIALOG_FORMATFOOTNOTES_SPIN_ESTYLE 1011 +#define AP_RID_DIALOG_FORMATFOOTNOTES_TEXT_ESTYLE 1012 +#define AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_ESTYLES1 1013 +#define AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_ESTYLES2 1014 +#define AP_RID_DIALOG_FORMATFOOTNOTES_RADIO_ENDDOC 1015 +#define AP_RID_DIALOG_FORMATFOOTNOTES_RADIO_ENDSEC 1016 +#define AP_RID_DIALOG_FORMATFOOTNOTES_RADIO_ERSTSEC 1017 +#define AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_INITENDVAL 1018 #define IDC_STATIC -1 @@ -69,8 +71,8 @@ DEFPUSHBUTTON "OK",AP_RID_DIALOG_FORMATFOOTNOTES_BTN_OK,129,226,50,14 PUSHBUTTON "Cancel", AP_RID_DIALOG_FORMATFOOTNOTES_BTN_CANCEL,187,226,50,14 - LTEXT "Footnote Style",AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_FSTYLES1,9,13,49,8 - CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,64,17,179,1 + CONTROL "Footnote Style",AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_FSTYLES1, + "AbiLabelledSeparator",0x0,9,13,234,8 LTEXT "Footnote Sytle",AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_FSTYLES2,16,33,46,8 COMBOBOX AP_RID_DIALOG_FORMATFOOTNOTES_COMBO_FSTYLE,90,30,145,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -78,13 +80,14 @@ BS_AUTORADIOBUTTON,92,52,103,10 CONTROL "Restart on each page",AP_RID_DIALOG_FORMATFOOTNOTES_RADIO_PAGE,"Button", BS_AUTORADIOBUTTON,92,67,103,10 - LTEXT "Initial footnote value",IDC_STATIC,91,87,64,8 + RTEXT "Initial footnote value",AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_INITFOOTVAL,9,87,150,8,SS_CENTERIMAGE EDITTEXT AP_RID_DIALOG_FORMATFOOTNOTES_TEXT_FSTYLE,167,84,20,14,ES_AUTOHSCROLL CONTROL "Spin2",AP_RID_DIALOG_FORMATFOOTNOTES_SPIN_FSTYLE,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,186,84, 11,14 - LTEXT "Endnote Style",AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_ESTYLES1,9,106,48,8 + CONTROL "Endnote Style",AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_ESTYLES1, + "AbiLabelledSeparator",0x0,9,106,234,8 LTEXT "Endnote Sytle",AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_ESTYLES2,16,126,46,8 COMBOBOX AP_RID_DIALOG_FORMATFOOTNOTES_COMBO_ESTYLE,90,123,145,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -97,13 +100,12 @@ CONTROL "Restart on each Section",AP_RID_DIALOG_FORMATFOOTNOTES_RADIO_ERSTSEC,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,92,175,130,10 - LTEXT "Initial endnote value",IDC_STATIC,93,194,64,8 + RTEXT "Initial endnote value",AP_RID_DIALOG_FORMATFOOTNOTES_STATIC_INITENDVAL,9,194,150,8,SS_CENTERIMAGE EDITTEXT AP_RID_DIALOG_FORMATFOOTNOTES_TEXT_ESTYLE,169,192,20,14,ES_AUTOHSCROLL CONTROL "Spin2",AP_RID_DIALOG_FORMATFOOTNOTES_SPIN_ESTYLE,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,188,192, 11,14 - CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,63,109,179,1 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,8,218,240,1 END Index: ap_Win32Res_MailMerge.rc2 =================================================================== RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Res_MailMerge.rc2,v retrieving revision 1.1 diff -u -r1.1 ap_Win32Res_MailMerge.rc2 --- ap_Win32Res_MailMerge.rc2 6 Jul 2003 04:31:09 -0000 1.1 +++ ap_Win32Res_MailMerge.rc2 7 Sep 2003 15:12:22 -0000 @@ -46,9 +46,9 @@ DEFPUSHBUTTON "Insert",AP_RID_DIALOG_MAILMERGE_BTN_INSERT,148,130,50,14 PUSHBUTTON "Close",AP_RID_DIALOG_MAILMERGE_BTN_CLOSE,217,130,50,14 DEFPUSHBUTTON "Open",AP_RID_DIALOG_MAILMERGE_BTN_OPEN,81,130,50,14 - LTEXT "Available fields",AP_RID_DIALOG_MAILMERGE_STATIC_AVAIL,14,20,60,8 + LTEXT "Available fields",AP_RID_DIALOG_MAILMERGE_STATIC_AVAIL,14,20,223,8 EDITTEXT AP_RID_DIALOG_MAILMERGE_EDIT_FIELD,25,102,212,14,ES_AUTOHSCROLL - LTEXT "Field Name",AP_RID_DIALOG_MAILMERGE_STATIC_FIELD,14,87,46,8 + LTEXT "Field Name",AP_RID_DIALOG_MAILMERGE_STATIC_FIELD,14,87,223,8 LISTBOX AP_RID_DIALOG_MAILMERGE_LISTBOX,25,37,212,40,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP END