Commit a64765f6 authored by Alexandre Julliard's avatar Alexandre Julliard

user32: Don't overwrite the default button id when creating the dialog structure.

parent 1442a18e
...@@ -446,7 +446,6 @@ static HWND DIALOG_CreateIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate, ...@@ -446,7 +446,6 @@ static HWND DIALOG_CreateIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate,
dlgInfo->hMenu = HMENU_32( hMenu ); dlgInfo->hMenu = HMENU_32( hMenu );
dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->xBaseUnit = xBaseUnit;
dlgInfo->yBaseUnit = yBaseUnit; dlgInfo->yBaseUnit = yBaseUnit;
dlgInfo->idResult = IDOK;
dlgInfo->flags = flags; dlgInfo->flags = flags;
SetWindowLong16( HWND_16(hwnd), DWLP_DLGPROC, (LONG)dlgProc ); SetWindowLong16( HWND_16(hwnd), DWLP_DLGPROC, (LONG)dlgProc );
......
...@@ -339,7 +339,7 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) ...@@ -339,7 +339,7 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create )
dlgInfo->hMenu = 0; dlgInfo->hMenu = 0;
dlgInfo->xBaseUnit = 0; dlgInfo->xBaseUnit = 0;
dlgInfo->yBaseUnit = 0; dlgInfo->yBaseUnit = 0;
dlgInfo->idResult = 0; dlgInfo->idResult = IDOK;
dlgInfo->flags = 0; dlgInfo->flags = 0;
wndPtr->dlgInfo = dlgInfo; wndPtr->dlgInfo = dlgInfo;
} }
......
...@@ -672,7 +672,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, ...@@ -672,7 +672,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
dlgInfo->hMenu = hMenu; dlgInfo->hMenu = hMenu;
dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->xBaseUnit = xBaseUnit;
dlgInfo->yBaseUnit = yBaseUnit; dlgInfo->yBaseUnit = yBaseUnit;
dlgInfo->idResult = IDOK;
dlgInfo->flags = flags; dlgInfo->flags = flags;
if (template.helpId) SetWindowContextHelpId( hwnd, template.helpId ); if (template.helpId) SetWindowContextHelpId( hwnd, template.helpId );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment