comctl32: support PSH_WIZARDHASFINISH in wizards
Thomas Weidenmueller
wine-patches at reactsoft.com
Thu Jul 14 14:07:36 CDT 2005
- Support PSH_WIZARDHASFINISH in wizards
- Correct tab order of the wizard buttons
Best Regards,
Thomas Weidenmueller
-------------- next part --------------
Index: dlls/comctl32/comctl_Cn.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_Cn.rc,v
retrieving revision 1.5
diff -u -r1.5 comctl_Cn.rc
--- dlls/comctl32/comctl_Cn.rc 20 Sep 2004 19:13:36 -0000 1.5
+++ dlls/comctl32/comctl_Cn.rc 14 Jul 2005 17:28:59 -0000
@@ -37,9 +37,9 @@
CAPTION "Wizard"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "½áÊø", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "ÏÂÒ»²½(&N) >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< ÉÏÒ»²½(&B)", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "ÏÂÒ»²½(&N) >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "½áÊø", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "È¡Ïû", IDCANCEL,178,138,50,14
PUSHBUTTON "°ïÖú", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_Cs.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_Cs.rc,v
retrieving revision 1.3
diff -u -r1.3 comctl_Cs.rc
--- dlls/comctl32/comctl_Cs.rc 20 Sep 2004 19:13:36 -0000 1.3
+++ dlls/comctl32/comctl_Cs.rc 14 Jul 2005 17:28:39 -0000
@@ -39,9 +39,9 @@
CAPTION "Prùvodce"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "Dokonèit", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Dal¹í >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< &Zpìt", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Dal¹í >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Dokonèit", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "Storno", IDCANCEL,178,138,50,14
PUSHBUTTON "Nápovìda", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_De.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_De.rc,v
retrieving revision 1.10
diff -u -r1.10 comctl_De.rc
--- dlls/comctl32/comctl_De.rc 20 Sep 2004 19:13:36 -0000 1.10
+++ dlls/comctl32/comctl_De.rc 14 Jul 2005 17:28:09 -0000
@@ -57,9 +57,9 @@
CAPTION "Wizard"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "&Beenden", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< &Zurück", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "&Beenden", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "Abbrechen", IDCANCEL,178,138,50,14
PUSHBUTTON "&Hilfe", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_En.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_En.rc,v
retrieving revision 1.9
diff -u -r1.9 comctl_En.rc
--- dlls/comctl32/comctl_En.rc 20 Sep 2004 19:13:36 -0000 1.9
+++ dlls/comctl32/comctl_En.rc 14 Jul 2005 17:27:42 -0000
@@ -36,9 +36,9 @@
CAPTION "Wizard"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "Finish", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Next >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< &Back", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Next >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Finish", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "Cancel", IDCANCEL,178,138,50,14
PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_Es.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_Es.rc,v
retrieving revision 1.6
diff -u -r1.6 comctl_Es.rc
--- dlls/comctl32/comctl_Es.rc 16 Feb 2005 21:11:01 -0000 1.6
+++ dlls/comctl32/comctl_Es.rc 14 Jul 2005 17:29:27 -0000
@@ -36,9 +36,9 @@
CAPTION "Ayudante"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "Terminar", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Siguiente >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< &Anterior", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Siguiente >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Terminar", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14
PUSHBUTTON "Ayuda", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_Fr.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_Fr.rc,v
retrieving revision 1.5
diff -u -r1.5 comctl_Fr.rc
--- dlls/comctl32/comctl_Fr.rc 20 Sep 2004 19:13:36 -0000 1.5
+++ dlls/comctl32/comctl_Fr.rc 14 Jul 2005 17:29:43 -0000
@@ -40,9 +40,9 @@
CAPTION "Assistant"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "Terminer", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Suivant >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< &Précédent", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Suivant >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Terminer", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "Annuler", IDCANCEL,178,138,50,14
PUSHBUTTON "Aide", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_It.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_It.rc,v
retrieving revision 1.6
diff -u -r1.6 comctl_It.rc
--- dlls/comctl32/comctl_It.rc 20 Sep 2004 19:13:36 -0000 1.6
+++ dlls/comctl32/comctl_It.rc 14 Jul 2005 17:29:59 -0000
@@ -37,9 +37,9 @@
CAPTION "Wizard"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "Fine", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Avanti >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< &Indietro", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Avanti >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Fine", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "Anulla", IDCANCEL,178,138,50,14
PUSHBUTTON "Aiuto", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_Ja.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_Ja.rc,v
retrieving revision 1.6
diff -u -r1.6 comctl_Ja.rc
--- dlls/comctl32/comctl_Ja.rc 20 Sep 2004 19:13:36 -0000 1.6
+++ dlls/comctl32/comctl_Ja.rc 14 Jul 2005 17:30:11 -0000
@@ -36,9 +36,9 @@
CAPTION "Wizard"
FONT 9, "MS UI Gothic"
BEGIN
- DEFPUSHBUTTON "Š®—¹", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "i‚Þ(&N) >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< –ß‚é(&B)", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "i‚Þ(&N) >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Š®—¹", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL,178,138,50,14
PUSHBUTTON "ƒwƒ‹ƒv", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_Ko.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_Ko.rc,v
retrieving revision 1.5
diff -u -r1.5 comctl_Ko.rc
--- dlls/comctl32/comctl_Ko.rc 20 Sep 2004 19:13:36 -0000 1.5
+++ dlls/comctl32/comctl_Ko.rc 14 Jul 2005 17:32:59 -0000
@@ -36,9 +36,9 @@
CAPTION "Wizard"
FONT 9, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "Á¾·á", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "´ÙÀ½(&N) >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< ÀÌÀü(&B)", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "´ÙÀ½(&N) >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Á¾·á", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "Ãë¼Ò", IDCANCEL,178,138,50,14
PUSHBUTTON "µµ¿ò¸»", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_Nl.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_Nl.rc,v
retrieving revision 1.5
diff -u -r1.5 comctl_Nl.rc
--- dlls/comctl32/comctl_Nl.rc 20 Sep 2004 19:13:36 -0000 1.5
+++ dlls/comctl32/comctl_Nl.rc 14 Jul 2005 17:37:45 -0000
@@ -38,9 +38,9 @@
CAPTION "Assistent"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "Beëindigen", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Volgende >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< V&orige", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Volgende >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Beëindigen", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "Annuleren", IDCANCEL,178,138,50,14
PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_Pl.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_Pl.rc,v
retrieving revision 1.5
diff -u -r1.5 comctl_Pl.rc
--- dlls/comctl32/comctl_Pl.rc 20 Sep 2004 19:13:36 -0000 1.5
+++ dlls/comctl32/comctl_Pl.rc 14 Jul 2005 17:38:00 -0000
@@ -37,9 +37,9 @@
CAPTION "Kreator"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "Zakoñcz", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Dalej >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< &Wstecz", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Dalej >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Zakoñcz", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "Anuluj", IDCANCEL,178,138,50,14
PUSHBUTTON "Pomoc", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_Pt.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_Pt.rc,v
retrieving revision 1.5
diff -u -r1.5 comctl_Pt.rc
--- dlls/comctl32/comctl_Pt.rc 20 Sep 2004 19:13:36 -0000 1.5
+++ dlls/comctl32/comctl_Pt.rc 14 Jul 2005 17:38:12 -0000
@@ -36,9 +36,9 @@
CAPTION "Assistente"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "Finalizar", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Avançar >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< &Voltar", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Avançar >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Finalizar", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14
PUSHBUTTON "Ajuda", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_Ru.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_Ru.rc,v
retrieving revision 1.5
diff -u -r1.5 comctl_Ru.rc
--- dlls/comctl32/comctl_Ru.rc 20 Sep 2004 19:13:36 -0000 1.5
+++ dlls/comctl32/comctl_Ru.rc 14 Jul 2005 17:38:30 -0000
@@ -38,9 +38,9 @@
CAPTION "Ìàñòåð"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "Çàâåðøèòü", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Äàëåå >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< &Íàçàä", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Äàëåå >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Çàâåðøèòü", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "Îòìåíà", IDCANCEL,178,138,50,14
PUSHBUTTON "&Ñïðàâêà", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_Si.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_Si.rc,v
retrieving revision 1.6
diff -u -r1.6 comctl_Si.rc
--- dlls/comctl32/comctl_Si.rc 20 Sep 2004 19:13:36 -0000 1.6
+++ dlls/comctl32/comctl_Si.rc 14 Jul 2005 17:38:40 -0000
@@ -36,9 +36,9 @@
CAPTION "Èarovnik"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "Dokonèaj", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Naprej >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< Na&zaj", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "Naprej >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Dokonèaj", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "Preklièi", IDCANCEL,178,138,50,14
PUSHBUTTON "Pomoè", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_Sv.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_Sv.rc,v
retrieving revision 1.1
diff -u -r1.1 comctl_Sv.rc
--- dlls/comctl32/comctl_Sv.rc 13 Apr 2005 11:04:49 -0000 1.1
+++ dlls/comctl32/comctl_Sv.rc 14 Jul 2005 17:38:50 -0000
@@ -36,9 +36,9 @@
CAPTION "Guide"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "Slutför", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Nästa >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< &Föregående", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Nästa >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Slutför", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "Avbryt", IDCANCEL,178,138,50,14
PUSHBUTTON "Hjälp", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_Th.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_Th.rc,v
retrieving revision 1.5
diff -u -r1.5 comctl_Th.rc
--- dlls/comctl32/comctl_Th.rc 20 Sep 2004 19:13:36 -0000 1.5
+++ dlls/comctl32/comctl_Th.rc 14 Jul 2005 17:39:01 -0000
@@ -36,9 +36,9 @@
CAPTION "Wizard"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "·íÒãËéàÊÃç¨", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "µèÍä» >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< Âé͹¡ÅѺ", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "µèÍä» >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "·íÒãËéàÊÃç¨", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "¡àÅÔ¡", IDCANCEL,178,138,50,14
PUSHBUTTON "ªèÇÂàËÅÕÍ", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/comctl_Uk.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl_Uk.rc,v
retrieving revision 1.5
diff -u -r1.5 comctl_Uk.rc
--- dlls/comctl32/comctl_Uk.rc 20 Sep 2004 19:13:36 -0000 1.5
+++ dlls/comctl32/comctl_Uk.rc 14 Jul 2005 17:39:11 -0000
@@ -38,9 +38,9 @@
CAPTION "Ìàñòåð"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "&Çàâåðøèòè", IDC_FINISH_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Äàë³ >", IDC_NEXT_BUTTON,121,138,50,14
PUSHBUTTON "< &Íàçàä", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Äàë³ >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "&Çàâåðøèòè", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "&³äì³íà", IDCANCEL,178,138,50,14
PUSHBUTTON "&Äîâ³äêà", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
Index: dlls/comctl32/propsheet.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/propsheet.c,v
retrieving revision 1.130
diff -u -r1.130 propsheet.c
--- dlls/comctl32/propsheet.c 6 Jul 2005 19:03:33 -0000 1.130
+++ dlls/comctl32/propsheet.c 14 Jul 2005 19:04:44 -0000
@@ -45,7 +45,6 @@
* o PSN_QUERYINITIALFOCUS
* o PSN_TRANSLATEACCELERATOR
* - Styles:
- * o PSH_WIZARDHASFINISH
* o PSH_RTLREADING
* o PSH_STRETCHWATERMARK
* o PSH_USEPAGELANG
@@ -121,6 +120,7 @@
BOOL isModeless;
BOOL hasHelp;
BOOL hasApply;
+ BOOL hasFinish;
BOOL useCallback;
BOOL restartWindows;
BOOL rebootSystem;
@@ -233,13 +233,11 @@
/*
* unhandled header flags:
- * PSH_WIZARDHASFINISH 0x00000010
* PSH_RTLREADING 0x00000800
* PSH_STRETCHWATERMARK 0x00040000
* PSH_USEPAGELANG 0x00200000
*/
- add_flag(PSH_WIZARDHASFINISH);
add_flag(PSH_RTLREADING);
add_flag(PSH_STRETCHWATERMARK);
add_flag(PSH_USEPAGELANG);
@@ -341,6 +339,7 @@
psInfo->hasHelp = dwFlags & PSH_HASHELP;
psInfo->hasApply = !(dwFlags & PSH_NOAPPLYNOW);
+ psInfo->hasFinish = dwFlags & PSH_WIZARDHASFINISH;
psInfo->useCallback = (dwFlags & PSH_USECALLBACK )&& (lppsh->pfnCallback);
psInfo->isModeless = dwFlags & PSH_MODELESS;
@@ -396,6 +395,7 @@
psInfo->hasHelp = dwFlags & PSH_HASHELP;
psInfo->hasApply = !(dwFlags & PSH_NOAPPLYNOW);
+ psInfo->hasFinish = dwFlags & PSH_WIZARDHASFINISH;
psInfo->useCallback = (dwFlags & PSH_USECALLBACK) && (lppsh->pfnCallback);
psInfo->isModeless = dwFlags & PSH_MODELESS;
@@ -1004,6 +1004,8 @@
if (psInfo->hasHelp)
num_buttons++;
+ if (psInfo->hasFinish)
+ num_buttons++;
/*
* Obtain the size of the buttons.
@@ -1024,40 +1026,47 @@
* All buttons will be at this y coordinate.
*/
y = rcSheet.bottom - (padding.y + buttonHeight);
-
+
/*
- * Position the Next and the Finish buttons.
+ * Position the Back button.
*/
- hwndButton = GetDlgItem(hwndParent, IDC_NEXT_BUTTON);
+ hwndButton = GetDlgItem(hwndParent, IDC_BACK_BUTTON);
- x = rcSheet.right - ((padding.x + buttonWidth) * (num_buttons - 1));
+ x = rcSheet.right - ((padding.x + buttonWidth) * (num_buttons - 1)) - buttonWidth;
SetWindowPos(hwndButton, 0, x, y, 0, 0,
SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
- hwndButton = GetDlgItem(hwndParent, IDC_FINISH_BUTTON);
-
+ /*
+ * Position the Next button.
+ */
+ hwndButton = GetDlgItem(hwndParent, IDC_NEXT_BUTTON);
+
+ x += buttonWidth;
+
SetWindowPos(hwndButton, 0, x, y, 0, 0,
SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
- ShowWindow(hwndButton, SW_HIDE);
-
/*
- * Position the Back button.
+ * Position the Finish button.
*/
- hwndButton = GetDlgItem(hwndParent, IDC_BACK_BUTTON);
-
- x -= buttonWidth;
+ hwndButton = GetDlgItem(hwndParent, IDC_FINISH_BUTTON);
+
+ if (psInfo->hasFinish)
+ x += padding.x + buttonWidth;
SetWindowPos(hwndButton, 0, x, y, 0, 0,
SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
+ if (!psInfo->hasFinish)
+ ShowWindow(hwndButton, SW_HIDE);
+
/*
* Position the Cancel button.
*/
hwndButton = GetDlgItem(hwndParent, IDCANCEL);
- x = rcSheet.right - ((padding.x + buttonWidth) * (num_buttons - 2));
+ x += padding.x + buttonWidth;
SetWindowPos(hwndButton, 0, x, y, 0, 0,
SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -1069,7 +1078,7 @@
if (psInfo->hasHelp)
{
- x = rcSheet.right - (padding.x + buttonWidth);
+ x += padding.x + buttonWidth;
SetWindowPos(hwndButton, 0, x, y, 0, 0,
SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -2436,6 +2445,8 @@
*/
static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags)
{
+ PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwndDlg,
+ PropSheetInfoStr);
HWND hwndBack = GetDlgItem(hwndDlg, IDC_BACK_BUTTON);
HWND hwndNext = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON);
HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON);
@@ -2451,8 +2462,11 @@
if (dwFlags & PSWIZB_NEXT)
{
- /* Hide the Finish button */
- ShowWindow(hwndFinish, SW_HIDE);
+ if (!psInfo->hasFinish)
+ {
+ /* Hide the Finish button */
+ ShowWindow(hwndFinish, SW_HIDE);
+ }
/* Show and enable the Next button */
ShowWindow(hwndNext, SW_SHOW);
@@ -2462,20 +2476,27 @@
SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0);
}
- if ((dwFlags & PSWIZB_FINISH) || (dwFlags & PSWIZB_DISABLEDFINISH))
+ if (!psInfo->hasFinish)
{
- /* Hide the Next button */
- ShowWindow(hwndNext, SW_HIDE);
-
- /* Show the Finish button */
- ShowWindow(hwndFinish, SW_SHOW);
+ if ((dwFlags & PSWIZB_FINISH) || (dwFlags & PSWIZB_DISABLEDFINISH))
+ {
+ /* Hide the Next button */
+ ShowWindow(hwndNext, SW_HIDE);
+
+ /* Show the Finish button */
+ ShowWindow(hwndFinish, SW_SHOW);
- if (dwFlags & PSWIZB_FINISH)
- EnableWindow(hwndFinish, TRUE);
+ if (!(dwFlags & PSWIZB_DISABLEDFINISH))
+ {
+ EnableWindow(hwndFinish, TRUE);
- /* Set the Finish button as the default pushbutton */
- SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0);
+ /* Set the Finish button as the default pushbutton */
+ SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0);
+ }
+ }
}
+ else if (!(dwFlags & PSWIZB_DISABLEDFINISH))
+ EnableWindow(hwndFinish, TRUE);
}
/******************************************************************************
More information about the wine-patches
mailing list