diff --git a/mozilla/cck/driver/SumDlg.cpp b/mozilla/cck/driver/SumDlg.cpp index 19786d8096e..ef497fb05cc 100644 --- a/mozilla/cck/driver/SumDlg.cpp +++ b/mozilla/cck/driver/SumDlg.cpp @@ -69,6 +69,7 @@ BOOL CSumDlg::OnInitDialog() && GlobalWidgetArray[i].type != "RadioGroup" && GlobalWidgetArray[i].type != "Text" && GlobalWidgetArray[i].type != "BoldText" + && GlobalWidgetArray[i].type != "GlobalText" && GlobalWidgetArray[i].type != "Button" && GlobalWidgetArray[i].type != "GroupBox" && GlobalWidgetArray[i].type != "BoldGroup" diff --git a/mozilla/cck/driver/WizardMachine.cpp b/mozilla/cck/driver/WizardMachine.cpp index e975e4c94f3..49b3b256aa8 100644 --- a/mozilla/cck/driver/WizardMachine.cpp +++ b/mozilla/cck/driver/WizardMachine.cpp @@ -1171,6 +1171,7 @@ void CWizardMachineApp::CreateNewCache() && GlobalWidgetArray[i].type != "RadioGroup" && GlobalWidgetArray[i].type != "Text" && GlobalWidgetArray[i].type != "BoldText" + && GlobalWidgetArray[i].type != "GlobalText" && GlobalWidgetArray[i].type != "Button" && GlobalWidgetArray[i].type != "GroupBox" && GlobalWidgetArray[i].type != "BoldGroup" @@ -1187,6 +1188,7 @@ void CWizardMachineApp::CreateNewCache() && GlobalWidgetArray[i].type != "RadioGroup" && GlobalWidgetArray[i].type != "Text" && GlobalWidgetArray[i].type != "BoldText" + && GlobalWidgetArray[i].type != "GlobalText" && GlobalWidgetArray[i].type != "Button" && GlobalWidgetArray[i].type != "GroupBox" && GlobalWidgetArray[i].type != "BoldGroup" ) diff --git a/mozilla/cck/driver/WizardUI.cpp b/mozilla/cck/driver/WizardUI.cpp index 416112a2166..f740006af58 100644 --- a/mozilla/cck/driver/WizardUI.cpp +++ b/mozilla/cck/driver/WizardUI.cpp @@ -318,7 +318,7 @@ BOOL CWizardUI::SortList(WIDGET *curWidget) BOOL CWizardUI::SetDescription(WIDGET *w) { WIDGET *t = findWidget((char *) (LPCTSTR) w->target); - if (!t || (t->type != "Text" && t->type != "BoldText")) + if (!t || (t->type != "Text" && t->type != "BoldText" && t->type != "GlobalText")) return FALSE; int selected = 0; @@ -560,6 +560,12 @@ void CWizardUI::CreateControls() curWidget->control = new CStatic; rv = ((CStatic*)curWidget->control)->Create(curWidget->value, SS_LEFT, tmpRect, this, ID); } + else if (widgetType == "GlobalText") { + curWidget->control = new CStatic; + curWidget->value = theInterpreter->replaceVars(curWidget->value,NULL); + rv = ((CStatic*)curWidget->control)->Create(curWidget->value, SS_LEFT, tmpRect, this, ID); + } + else if (widgetType == "DynamicText") { curWidget->control = new CStatic; curWidget->display = theInterpreter->GetTrimFile(curWidget->value);