Prechádzať zdrojové kódy

Various tweaks and cleanup. Also fix WizardForm's Notebooks help.

Martijn Laan 6 rokov pred
rodič
commit
90d95c453b

+ 0 - 2
Examples/CodeAutomation2.iss

@@ -2,8 +2,6 @@
 ;
 ;
 ; This script shows how to use IUnknown based COM Automation objects.
 ; This script shows how to use IUnknown based COM Automation objects.
 ;
 ;
-; REQUIRES UNICODE INNO SETUP!
-;
 ; Note: some unneeded interface functions which had special types have been replaced
 ; Note: some unneeded interface functions which had special types have been replaced
 ; by dummies to avoid having to define those types. Do not remove these dummies as
 ; by dummies to avoid having to define those types. Do not remove these dummies as
 ; that would change the function indices which is bad. Also, not all function
 ; that would change the function indices which is bad. Also, not all function

+ 0 - 1
Examples/CodeClasses.iss

@@ -5,7 +5,6 @@
 [Setup]
 [Setup]
 AppName=My Program
 AppName=My Program
 AppVersion=1.5
 AppVersion=1.5
-DisableWelcomePage=yes
 CreateAppDir=no
 CreateAppDir=no
 DisableProgramGroupPage=yes
 DisableProgramGroupPage=yes
 DefaultGroupName=My Program
 DefaultGroupName=My Program

+ 1 - 1
Examples/CodeExample1.iss

@@ -1,6 +1,6 @@
 ; -- CodeExample1.iss --
 ; -- CodeExample1.iss --
 ;
 ;
-; This script shows various things you can achieve using a [Code] section
+; This script shows various things you can achieve using a [Code] section.
 
 
 [Setup]
 [Setup]
 AppName=My Program
 AppName=My Program

+ 0 - 5
Examples/Languages.iss

@@ -16,11 +16,6 @@ OutputDir=userdocs:Inno Setup Examples Output
 ; Uncomment the following line to disable the "Select Setup Language"
 ; Uncomment the following line to disable the "Select Setup Language"
 ; dialog and have it rely solely on auto-detection.
 ; dialog and have it rely solely on auto-detection.
 ;ShowLanguageDialog=no
 ;ShowLanguageDialog=no
-; If you want all languages to be listed in the "Select Setup Language"
-; dialog, even those that can't be displayed in the active code page,
-; uncomment the following line. Note: Unicode Inno Setup always displays
-; all languages.
-;ShowUndisplayableLanguages=yes
 
 
 [Languages]
 [Languages]
 Name: en; MessagesFile: "compiler:Default.isl"
 Name: en; MessagesFile: "compiler:Default.isl"

+ 1 - 1
Examples/UnicodeExample1.iss

@@ -1,5 +1,5 @@
 ; -- UnicodeExample1.iss --
 ; -- UnicodeExample1.iss --
-; Demonstrates some Unicode functionality. Requires Unicode Inno Setup.
+; Demonstrates some Unicode functionality.
 ;
 ;
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
 
 

+ 1 - 1
Examples/UninstallCodeExample1.iss

@@ -1,6 +1,6 @@
 ; -- UninstallCodeExample1.iss --
 ; -- UninstallCodeExample1.iss --
 ;
 ;
-; This script shows various things you can achieve using a [Code] section for Uninstall
+; This script shows various things you can achieve using a [Code] section for Uninstall.
 
 
 [Setup]
 [Setup]
 AppName=My Program
 AppName=My Program

+ 1 - 1
ISHelp/isxclasses.header2

@@ -1,6 +1,6 @@
 <body>
 <body>
 
 
-<p>Below is the list of support classes that can be used from within the Pascal script. There are also three support objects available: <tt>MainForm</tt> of type <tt>TMainForm</tt>, <tt>WizardForm</tt> of type <tt>TWizardForm</tt> and <tt>UninstallProgressForm</tt> of type <tt>TUninstallProgressForm</tt> and one special constant: <tt>crHand</tt> of type <tt>TControl.Cursor</tt>. Note: <tt>MainForm</tt> is only visible if <link topic="setup_windowvisible">WindowVisible</link> is set to <tt>yes</tt>.</p>
+<p>Below is the list of support classes that can be used from within the Pascal script. There are also three support objects available: <tt>MainForm</tt> of type <anchorlink name="TMainForm">TMainForm</anchorlink>, <tt>WizardForm</tt> of type <anchorlink name="TWizardForm">TWizardForm</anchorlink> and <tt>UninstallProgressForm</tt> of type <anchorlink name="TUninstallProgressForm">TUninstallProgressForm</anchorlink> and one special constant: <tt>crHand</tt> of type <tt>TControl.Cursor</tt>. Note: <tt>MainForm</tt> is only visible if <link topic="setup_windowvisible">WindowVisible</link> is set to <tt>yes</tt>.</p>
 
 
 <p>Note: you may find it useful to also refer to the Delphi Visual Component Library (VCL) Help files by Embarcadero Technologies, since the classes below are mostly simple wrappers around the VCL classes Inno Setup uses internally. See <extlink href="http://docs.embarcadero.com/products/rad_studio/">http://docs.embarcadero.com/products/rad_studio/</extlink>.</p>
 <p>Note: you may find it useful to also refer to the Delphi Visual Component Library (VCL) Help files by Embarcadero Technologies, since the classes below are mostly simple wrappers around the VCL classes Inno Setup uses internally. See <extlink href="http://docs.embarcadero.com/products/rad_studio/">http://docs.embarcadero.com/products/rad_studio/</extlink>.</p>
 
 

+ 2 - 2
ISHelp/isxclasses.pas

@@ -708,8 +708,8 @@ TWizardForm = class(TSetupForm)
   property CancelButton: TNewButton; read;
   property CancelButton: TNewButton; read;
   property NextButton: TNewButton; read;
   property NextButton: TNewButton; read;
   property BackButton: TNewButton; read;
   property BackButton: TNewButton; read;
-  property Notebook1: TNotebook; read;
-  property Notebook2: TNotebook; read;
+  property OuterNotebook: TNotebook; read;
+  property InnerNotebook: TNotebook; read;
   property WelcomePage: TNewNotebookPage; read;
   property WelcomePage: TNewNotebookPage; read;
   property InnerPage: TNewNotebookPage; read;
   property InnerPage: TNewNotebookPage; read;
   property FinishedPage: TNewNotebookPage; read;
   property FinishedPage: TNewNotebookPage; read;