Przeglądaj źródła

Renamed the WizardForm/etc. function so that real objects can be added which can be inspected.

Martijn Laan 6 lat temu
rodzic
commit
88bd6590b9
2 zmienionych plików z 6 dodań i 6 usunięć
  1. 3 3
      Projects/ScriptFunc.pas
  2. 3 3
      Projects/ScriptFunc_R.pas

+ 3 - 3
Projects/ScriptFunc.pas

@@ -182,8 +182,8 @@ const
   { Main }
   MainTable: array [0..26] of AnsiString =
   (
-    'function WizardForm: TWizardForm;',
-    'function MainForm: TMainForm;',
+    'function GetWizardForm: TWizardForm;',
+    'function GetMainForm: TMainForm;',
     'function ActiveLanguage: String;',
     'function IsComponentSelected(const Components: String): Boolean;',
     'function IsTaskSelected(const Tasks: String): Boolean;',
@@ -336,7 +336,7 @@ const
     'function SaveStringsToFile(const FileName: String; const S: TArrayOfString; const Append: Boolean): Boolean;',
     'function SaveStringsToUTF8File(const FileName: String; const S: TArrayOfString; const Append: Boolean): Boolean;',
     'function EnableFsRedirection(const Enable: Boolean): Boolean;',
-    'function UninstallProgressForm: TUninstallProgressForm;',
+    'function GetUninstallProgressForm: TUninstallProgressForm;',
     'function CreateCallback(Method: AnyMethod): Longword;'
   );
 

+ 3 - 3
Projects/ScriptFunc_R.pas

@@ -974,9 +974,9 @@ begin
   PStart := Stack.Count-1;
   Result := True;
 
-  if Proc.Name = 'WIZARDFORM' then begin
+  if Proc.Name = 'GETWIZARDFORM' then begin
     Stack.SetClass(PStart, GetWizardForm);
-  end else if Proc.Name = 'MAINFORM' then begin
+  end else if Proc.Name = 'GETMAINFORM' then begin
     Stack.SetClass(PStart, GetMainForm);
   end else if Proc.Name = 'ACTIVELANGUAGE' then begin
     Stack.SetString(PStart, ExpandConst('{language}'));
@@ -1883,7 +1883,7 @@ begin
         InternalError('Cannot disable FS redirection on this version of Windows');
       ScriptFuncDisableFsRedir := True;
     end;
-  end else if Proc.Name = 'UNINSTALLPROGRESSFORM' then begin
+  end else if Proc.Name = 'GETUNINSTALLPROGRESSFORM' then begin
     Stack.SetClass(PStart, GetUninstallProgressForm);
   end else if Proc.Name = 'CREATECALLBACK' then begin
    Stack.SetInt(PStart, CreateCallback(Stack.Items[PStart-1]));