- fix build

- set control ids

svn path=/trunk/; revision=29538
This commit is contained in:
Johannes Anderwald 2007-10-12 14:49:21 +00:00
parent 16fd2633a6
commit d85b18bd0a
4 changed files with 13 additions and 13 deletions

View file

@ -420,7 +420,7 @@ SH_ShowDriveProperties(WCHAR * drive)
for (i = 0; i < DRIVE_PROPERTY_PAGES; i++) for (i = 0; i < DRIVE_PROPERTY_PAGES; i++)
{ {
HPROPSHEETPAGE hprop = SH_CreatePropertySheetPage(PropPages[i].resname, PropPages[i].dlgproc, (LPARAM)drive); HPROPSHEETPAGE hprop = SH_CreatePropertySheetPage(PropPages[i].resname, PropPages[i].dlgproc, (LPARAM)drive, NULL);
if (hprop) if (hprop)
{ {
hpsp[psh.nPages] = hprop; hpsp[psh.nPages] = hprop;

View file

@ -332,13 +332,13 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Recycle Bin Properties" CAPTION "Recycle Bin Properties"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
{ {
CONTROL "", -1, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70 GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70
RADIOBUTTON "&Custom size:", -1, 20, 90, 80, 10 RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10
EDITTEXT -1, 90, 90, 50, 10, WS_TABSTOP EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP
LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10 LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10
RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", -1, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP
RADIOBUTTON"&Display delete confirmation dialog", -1, 20, 155, 140, 10, WS_TABSTOP RADIOBUTTON"&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP
} }
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

View file

@ -332,13 +332,13 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Recycle Bin Properties" CAPTION "Recycle Bin Properties"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
{ {
CONTROL "", -1, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50
GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70 GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70
RADIOBUTTON "&Custom size:", -1, 20, 90, 80, 10 RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10
EDITTEXT -1, 90, 90, 50, 10, WS_TABSTOP EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP
LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10 LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10
RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", -1, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP
RADIOBUTTON"&Display delete confirmation dialog", -1, 20, 155, 140, 10, WS_TABSTOP RADIOBUTTON"&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP
} }
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

View file

@ -2716,13 +2716,13 @@ ShellLink_ShowProperties( IShellLinkImpl *This )
memset(hppages, 0x0, sizeof(HPROPSHEETPAGE) * MAX_PROPERTY_SHEET_PAGE); memset(hppages, 0x0, sizeof(HPROPSHEETPAGE) * MAX_PROPERTY_SHEET_PAGE);
hpage = SH_CreatePropertySheetPage("SHELL_FILE_GENERAL_DLG", SH_FileGeneralDlgProc, (LPARAM)This->sLinkPath); hpage = SH_CreatePropertySheetPage("SHELL_FILE_GENERAL_DLG", SH_FileGeneralDlgProc, (LPARAM)This->sLinkPath, NULL);
if ( hpage == NULL ) if ( hpage == NULL )
return E_FAIL; return E_FAIL;
else else
hppages[numpages++] = hpage; hppages[numpages++] = hpage;
hpage = SH_CreatePropertySheetPage("SHELL_GENERAL_SHORTCUT_DLG", SH_ShellLinkDlgProc, (LPARAM)This); hpage = SH_CreatePropertySheetPage("SHELL_GENERAL_SHORTCUT_DLG", SH_ShellLinkDlgProc, (LPARAM)This, NULL);
if ( hpage == NULL ) if ( hpage == NULL )
{ {
ERR("SH_CreatePropertySheetPage failed\n"); ERR("SH_CreatePropertySheetPage failed\n");