I see the possibility of splitting the patch into a large patch that does not contain the PickIconDlg_OnClickButton function and a small patch that adds the PickIconDlg_OnClickButton function and also the call to this function in the PickIconDlg_Proc function. Unfortunately, this does not help much, because the PickIconDlg_OnClickButton function has less than 100 lines of code.