From 7ff12d75adf3d8555f542d56af62b1bde37c0741 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 16 Apr 2004 09:21:06 +0000
Subject: [PATCH] Updates for Inno Setup 4

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@26828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/innobott.txt    |  1 +
 distrib/msw/innotop.txt     | 10 +++++-----
 distrib/msw/zipdistinno.bat |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/distrib/msw/innobott.txt b/distrib/msw/innobott.txt
index f1f5e91878..f2be36c7ed 100644
--- a/distrib/msw/innobott.txt
+++ b/distrib/msw/innobott.txt
@@ -9,6 +9,7 @@
 ;    Name: {group}\Tutorial; Filename: {app}\docs\pdf\wxTutorial.pdf; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Document Index; Filename: {app}\docs\html\index.htm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Widgets Sample; Filename: {app}\bin\widgets.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\widgets.exe; IconIndex: 0
+    Name: "{group}\Uninstall wxWindows 2.4.2"; Filename: "{uninstallexe}"
 
 [INI]
 
diff --git a/distrib/msw/innotop.txt b/distrib/msw/innotop.txt
index 5a39849304..0091bf6fc2 100644
--- a/distrib/msw/innotop.txt
+++ b/distrib/msw/innotop.txt
@@ -27,18 +27,18 @@
     DisableStartupPrompt=0
     CreateAppDir=1
     DisableProgramGroupPage=0
-    AlwaysCreateUninstallIcon=1
-    UninstallIconName=Uninstall wxWindows 2.4.2
+;    AlwaysCreateUninstallIcon=1
+;    UninstallIconName=Uninstall wxWindows 2.4.2
     Uninstallable=1
     DefaultDirName=c:\wxWindows-2.4.2
     DefaultGroupName=wxWindows 2.4.2
     LicenseFile=C:\wx24\wxWindows\docs\licence.txt
     InfoBeforeFile=C:\wx24\wxWindows\docs\readme.txt
     InfoAfterFile=C:\wx24\wxWindows\docs\msw\install.txt
-    MessagesFile=compiler:default.isl
+;    MessagesFile=compiler:default.isl
     DiskSpanning=1
-    DiskSize=1457664
-    DiskClusterSize=512
+;    DiskSize=1457664
+;    DiskClusterSize=512
     ReserveBytes=0
     UseSetupLdr=1
     SourceDir=c:\wx24\wxWindows\deliver\wxWindows-2.4.2
diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index afd34b8fa6..3b08c6cc65 100755
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -328,7 +328,7 @@ call %WXWIN\distrib\msw\makeinno.bat
 erase /Y %dest\setup.*
 
 rem Now invoke Inno Setup on the new wxwin2.iss
-set innocmd="C:\Program Files\Inno Setup 2\compil32.exe" /cc %WXWIN\distrib\msw\wxwin2.iss
+set innocmd="C:\Program Files\Inno Setup 4\compil32.exe" /cc %WXWIN\distrib\msw\wxwin2.iss
 echo Invoking %innocmd...
 start "Inno Setup" /w %innocmd%
 Rem pause Press any key to continue with the wxWindows distribution...