Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for bug #22284 -creating a new GlobalText type to handle static text that can be obtained from global variables

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@64379 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
varada%netscape.com
2000-03-28 19:48:46 +00:00
parent a78233e404
commit be298cb559
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/cck/driver/SumDlg.cpp
View File

@@ -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"

2
mozilla/cck/driver/WizardMachine.cpp
View File

@@ -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" )

8
mozilla/cck/driver/WizardUI.cpp
View File

@@ -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);