diff options
Diffstat (limited to 'updater/options.cpp')
| -rw-r--r-- | updater/options.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/updater/options.cpp b/updater/options.cpp index f753997..12b7fc0 100644 --- a/updater/options.cpp +++ b/updater/options.cpp @@ -14,28 +14,26 @@ void add_restart_menu_item() { CLISTMENUITEM menu = {0};
menu.cbSize=sizeof(menu);
- menu.flags = CMIM_ALL;
- menu.hIcon = LoadIconEx(I_RSTRT);
+ menu.flags = CMIM_ALL | CMIF_ICONFROMICOLIB;
+ menu.icolibItem = GetIconHandle(I_RSTRT);
menu.pszName = "Restart";
menu.pszService= MS_UPDATE_MENURESTART;
menu.position = 2000099900;
hMainMenuItemRestart = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&menu);
- ReleaseIconEx(menu.hIcon);
}
void add_update_and_exit_menu_item() {
CLISTMENUITEM menu = {0};
menu.cbSize=sizeof(menu);
- menu.flags = CMIM_ALL;
- menu.hIcon = LoadIconEx(I_CHKUPDEXT);
+ menu.flags = CMIM_ALL | CMIF_ICONFROMICOLIB;
+ menu.icolibItem = GetIconHandle(I_CHKUPDEXT);
menu.pszName = "Update and Exit";
menu.pszService= MS_UPDATE_MENUUPDATEANDEXIT;
menu.position = 2000099901;
hMainMenuItemUpdateAndExit = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&menu);
- ReleaseIconEx(menu.hIcon);
}
void remove_restart_menu_item() {
@@ -53,6 +51,7 @@ void remove_update_and_exit_menu_item() { static int EnumerateFuncFillList(char *szComponentName, UpdateOptions *update_options, LPARAM lParam) {
LVITEM lvI = {0};
HWND hwndDlg = (HWND)lParam;
+ HWND hwndLV = GetDlgItem(hwndDlg, IDC_LST_REGISTERED);
TCHAR *temp_str;
// Some code to create the list-view control.
@@ -63,7 +62,7 @@ static int EnumerateFuncFillList(char *szComponentName, UpdateOptions *update_op lvI.iSubItem = 0;
lvI.pszText = (temp_str = GetTString(szComponentName));
- lvI.iItem = ListView_InsertItem(GetDlgItem(hwndDlg, IDC_LST_REGISTERED), &lvI);
+ lvI.iItem = ListView_InsertItem(hwndLV, &lvI);
mir_free(temp_str);
lvI.mask = LVIF_TEXT;
@@ -75,9 +74,9 @@ static int EnumerateFuncFillList(char *szComponentName, UpdateOptions *update_op lvI.pszText = (((int)lvI.lParam & 2) == 2 ? TranslateT("TRUE") : TranslateT("FALSE"));
}
- ListView_SetItem(GetDlgItem(hwndDlg, IDC_LST_REGISTERED), &lvI);
+ ListView_SetItem(hwndLV, &lvI);
- ListView_SetCheckState(GetDlgItem(hwndDlg, IDC_LST_REGISTERED), lvI.iItem, update_options->enabled);
+ ListView_SetCheckState(hwndLV, lvI.iItem, update_options->enabled);
return 0;
}
@@ -153,7 +152,7 @@ static INT_PTR CALLBACK DlgProcOpts1(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR lvc.iSubItem = 1;
lvc.pszText = TranslateT("Use Beta?");
- lvc.cx = 80; // width of column in pixels
+ lvc.cx = 90; // width of column in pixels
ListView_InsertColumn(GetDlgItem(hwndDlg, IDC_LST_REGISTERED), 1, &lvc);
}
|