ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

For modal propsheets we should run our own message loop rather than

Browse Source 
use a modal dialogbox just like Windows does.  This helps apps that
subclass the propsheet's wndproc.
This commit is contained in:
Huw Davies 2005-06-15 19:12:57 +00:00 committed by Alexandre Julliard
parent 118ea90888
commit 2e301ceb1c
1 changed files with 64 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
dlls/comctl32/propsheet.c
View File

@ -131,6 +131,7 @@ typedef struct tagPropSheetInfo
int width; int width;
int height; int height;
HIMAGELIST hImageList; HIMAGELIST hImageList;
BOOL ended;
} PropSheetInfo; } PropSheetInfo;
typedef struct typedef struct
@ -706,14 +707,6 @@ int PROPSHEET_CreateDialog(PropSheetInfo* psInfo)
* actual return value is either TRUE (success), FALSE (cancel) or * actual return value is either TRUE (success), FALSE (cancel) or
* -1 (error). */ * -1 (error). */
if( psInfo->unicode ) if( psInfo->unicode )
{
if (!(psInfo->ppshheader.dwFlags & PSH_MODELESS))
ret = DialogBoxIndirectParamW(psInfo->ppshheader.hInstance,
(LPDLGTEMPLATEW) temp,
psInfo->ppshheader.hwndParent,
PROPSHEET_DialogProc,
(LPARAM)psInfo);
else
{ {
ret = (int)CreateDialogIndirectParamW(psInfo->ppshheader.hInstance, ret = (int)CreateDialogIndirectParamW(psInfo->ppshheader.hInstance,
(LPDLGTEMPLATEW) temp, (LPDLGTEMPLATEW) temp,
@ -722,15 +715,6 @@ int PROPSHEET_CreateDialog(PropSheetInfo* psInfo)
(LPARAM)psInfo); (LPARAM)psInfo);
if ( !ret ) ret = -1; if ( !ret ) ret = -1;
} }
}
else
{
if (!(psInfo->ppshheader.dwFlags & PSH_MODELESS))
ret = DialogBoxIndirectParamA(psInfo->ppshheader.hInstance,
(LPDLGTEMPLATEA) temp,
psInfo->ppshheader.hwndParent,
PROPSHEET_DialogProc,
(LPARAM)psInfo);
else else
{ {
ret = (int)CreateDialogIndirectParamA(psInfo->ppshheader.hInstance, ret = (int)CreateDialogIndirectParamA(psInfo->ppshheader.hInstance,
@ -740,7 +724,6 @@ int PROPSHEET_CreateDialog(PropSheetInfo* psInfo)
(LPARAM)psInfo); (LPARAM)psInfo);
if ( !ret ) ret = -1; if ( !ret ) ret = -1;
} }
}
Free(temp); Free(temp);
@ -1757,7 +1740,7 @@ static BOOL PROPSHEET_Finish(HWND hwndDlg)
if (psInfo->isModeless) if (psInfo->isModeless)
psInfo->activeValid = FALSE; psInfo->activeValid = FALSE;
else else
EndDialog(hwndDlg, TRUE); psInfo->ended = TRUE;
return TRUE; return TRUE;
} }
@ -1870,7 +1853,7 @@ static void PROPSHEET_Cancel(HWND hwndDlg, LPARAM lParam)
psInfo->activeValid = FALSE; psInfo->activeValid = FALSE;
} }
else else
EndDialog(hwndDlg, FALSE); psInfo->ended = TRUE;
} }
/****************************************************************************** /******************************************************************************
@ -2396,7 +2379,7 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg,
psInfo->active_page = -1; psInfo->active_page = -1;
if (!psInfo->isModeless) if (!psInfo->isModeless)
{ {
EndDialog(hwndDlg, FALSE); psInfo->ended = TRUE;
return TRUE; return TRUE;
} }
} }
@ -2737,6 +2720,34 @@ static void PROPSHEET_CleanUp(HWND hwndDlg)
GlobalFree((HGLOBAL)psInfo); GlobalFree((HGLOBAL)psInfo);
} }
static INT do_loop(PropSheetInfo *psInfo)
{
MSG msg;
INT ret = -1;
HWND hwnd = psInfo->hwnd;
while(IsWindow(hwnd) && !psInfo->ended && (ret = GetMessageW(&msg, NULL, 0, 0)))
{
if(ret == -1)
break;
if(!IsDialogMessageW(hwnd, &msg))
{
TranslateMessage(&msg);
DispatchMessageW(&msg);
}
}
if(ret == 0)
{
PostQuitMessage(msg.wParam);
ret = -1;
}
DestroyWindow(hwnd);
return ret;
}
/****************************************************************************** /******************************************************************************
* PropertySheet (COMCTL32.@) * PropertySheet (COMCTL32.@)
* PropertySheetA (COMCTL32.@) * PropertySheetA (COMCTL32.@)
@ -2787,7 +2798,11 @@ INT WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh)
} }
psInfo->unicode = FALSE; psInfo->unicode = FALSE;
psInfo->ended = FALSE;
bRet = PROPSHEET_CreateDialog(psInfo); bRet = PROPSHEET_CreateDialog(psInfo);
if(!psInfo->isModeless)
bRet = do_loop(psInfo);
return bRet; return bRet;
} }
@ -2834,7 +2849,11 @@ INT WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh)
} }
psInfo->unicode = TRUE; psInfo->unicode = TRUE;
psInfo->ended = FALSE;
bRet = PROPSHEET_CreateDialog(psInfo); bRet = PROPSHEET_CreateDialog(psInfo);
if(!psInfo->isModeless)
bRet = do_loop(psInfo);
return bRet; return bRet;
} }
@ -3039,7 +3058,7 @@ static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID)
if (psInfo->isModeless) if (psInfo->isModeless)
psInfo->activeValid = FALSE; psInfo->activeValid = FALSE;
else else
EndDialog(hwnd, result); psInfo->ended = TRUE;
} }
else else
EnableWindow(hwndApplyBtn, FALSE); EnableWindow(hwndApplyBtn, FALSE);
@ -3424,6 +3443,17 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
} }
return TRUE; return TRUE;
case WM_SYSCOMMAND:
switch(wParam & 0xfff0)
{
case SC_CLOSE:
PROPSHEET_Cancel(hwnd, 1);
return TRUE;
default:
return FALSE;
}
case WM_NOTIFY: case WM_NOTIFY:
{ {
NMHDR* pnmh = (LPNMHDR) lParam; NMHDR* pnmh = (LPNMHDR) lParam;