wxFloatbar fixes

[wxWidgets.git] / utils / wxPython / distrib / wxPython.wse

diff --git a/utils/wxPython/distrib/wxPython.wse b/utils/wxPython/distrib/wxPython.wse
index 5b76837f9ee7c2ca52fb73d03e0d03058e1b4335..81bc8ccee0768e49b3484cbcf2afc1473620cb4a 100644 (file)
--- a/utils/wxPython/distrib/wxPython.wse
+++ b/utils/wxPython/distrib/wxPython.wse
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
   Version=6.01
 Document Type: WSE
 item: Global
   Version=6.01

-  Title=wxPython 2.0 Installation
+  Title=wxPython 2.1 Installation

   Flags=10010111
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
   Japanese Font Name=MS Gothic
   Flags=10010111
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
   Japanese Font Name=MS Gothic


@@ -9,7 +9,7 @@ item: Global
   Progress Bar DLL=%_WISE_%\Progress\WIZ%_EXE_OS_TYPE_%.DLL
   Start Gradient=128 128 255
   End Gradient=64 0 128
   Progress Bar DLL=%_WISE_%\Progress\WIZ%_EXE_OS_TYPE_%.DLL
   Start Gradient=128 128 255
   End Gradient=64 0 128

-  Windows Flags=00000100000000010010110000001000
+  Windows Flags=00000100000000010010110000011000

   Log Pathname=%MAINDIR%\INSTALL.LOG
   Message Font=MS Sans Serif
   Font Size=8
   Log Pathname=%MAINDIR%\INSTALL.LOG
   Message Font=MS Sans Serif
   Font Size=8


@@ -17,7 +17,7 @@ item: Global
   Patch Flags=0000000000001001
   Patch Threshold=85
   Patch Memory=4000
   Patch Flags=0000000000001001
   Patch Threshold=85
   Patch Memory=4000

-  EXE Filename=wxPython-2.0b5.exe
+  EXE Filename=wxPython-2.1.11.exe

   FTP Cluster Size=20
   Per-User Version ID=1
   Dialogs Version=6
   FTP Cluster Size=20
   Per-User Version ID=1
   Dialogs Version=6


@@ -55,11 +55,12 @@ item: End Block
 end
 item: Set Variable
   Variable=APPTITLE
 end
 item: Set Variable
   Variable=APPTITLE

-  Value=wxPython 2.0
+  Value=wxPython 2.1

   Flags=10000000
 end
 item: Set Variable
   Variable=GROUP
   Flags=10000000
 end
 item: Set Variable
   Variable=GROUP

+  Value=wxPython 2.1

   Flags=10000000
 end
 item: Set Variable
   Flags=10000000
 end
 item: Set Variable


@@ -74,6 +75,9 @@ end
 item: Check Configuration
   Flags=10111011
 end
 item: Check Configuration
   Flags=10111011
 end

+item: Remark
+  Text=     1.5 and 1.5.1 have a CurrentVersion key
+end

 item: Get Registry Key Value
   Variable=PYTHONVER
   Key=SOFTWARE\Python\PythonCore\CurrentVersion
 item: Get Registry Key Value
   Variable=PYTHONVER
   Key=SOFTWARE\Python\PythonCore\CurrentVersion


@@ -84,12 +88,12 @@ item: If/While Statement
   Variable=PYTHONVER
   Value=None
 end
   Variable=PYTHONVER
   Value=None
 end

-item: Display Message
-  Title=Installation Error
-  Text=Existing Python installation was not found, wxPython installation can not proceed.  Please download and install the Python core interpreter and library (version 1.5.1 or greater) from http://www.python.org/download/
-  Flags=00001000
+item: Remark
+  Text=     Just try 1.5 since 1.5.2b2 doesn't set CurrentVersion but uses 1.5

 end
 end

-item: Exit Installation
+item: Set Variable
+  Variable=PYTHONVER
+  Value=1.5

 end
 item: End Block
 end
 end
 item: End Block
 end


@@ -98,6 +102,19 @@ item: Get Registry Key Value
   Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\InstallPath
   Flags=00000100
 end
   Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\InstallPath
   Flags=00000100
 end

+item: If/While Statement
+  Variable=PYTHONDIR
+  Value=None
+end
+item: Display Message
+  Title=Installation Error
+  Text=An existing Python installation was not found, wxPython installation can not proceed.  Please download and install the Python core interpreter and library (version 1.5.1 or greater) from http://www.python.org/download/
+  Flags=00001000
+end
+item: Exit Installation
+end
+item: End Block
+end

 item: Set Variable
   Variable=MAINDIR
   Value=%PYTHONDIR%
 item: Set Variable
   Variable=MAINDIR
   Value=%PYTHONDIR%


@@ -140,7 +157,6 @@ item: Set Variable
 end
 item: Set Variable
   Variable=COMPONENTS
 end
 item: Set Variable
   Variable=COMPONENTS

-  Value=A

   Flags=10000000
 end
 item: Set Variable
   Flags=10000000
 end
 item: Set Variable


@@ -175,7 +191,7 @@ end
 item: End Block
 end
 item: Display Graphic
 item: End Block
 end
 item: Display Graphic

-  Pathname=e:\Projects\wxPython\distrib\wxPython.BMP
+  Pathname=e:\Projects\wx\utils\wxPython\distrib\wxPython.BMP

   X Position=32784
   Y Position=16
   Flags=0000001010000000
   X Position=32784
   Y Position=16
   Flags=0000001010000000


@@ -212,7 +228,7 @@ item: Custom Dialog Set
     Title=Welcome
     Title French=Bienvenue
     Title German=Willkommen
     Title=Welcome
     Title French=Bienvenue
     Title German=Willkommen

-    Title Portuguese=Bem-vindo 
+    Title Portuguese=Bem-vindo

     Title Spanish=Bienvenido
     Title Italian=Benvenuto
     Title Danish=Velkommen
     Title Spanish=Bienvenido
     Title Italian=Benvenuto
     Title Danish=Velkommen


@@ -298,9 +314,9 @@ item: Custom Dialog Set
       Text=
       Text=Click Cancel to quit Setup and close any programs you have running.  Click Next to continue with the Setup program .
       Text=
       Text=
       Text=Click Cancel to quit Setup and close any programs you have running.  Click Next to continue with the Setup program .
       Text=

-      Text=WARNING: This program is protected by copyright law and international treaties.
+      Text=WARNING: Although this program is OpenSource, it is still protected by copyright law and international treaties.  See wxWindows Library Licence, Version 3 for details.
+      Text=

       Text=
       Text=

-      Text=Unauthorized reproduction or distribution of this program, or any portion of it, may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law.

       Text French=Il vous est fortement recommandé de fermer tous les programmes Windows avant d'exécuter le Programme d'Installation
       Text French=
       Text French=Cliquez sur Annuler pour quitter l'Installation et fermez tous les programmes actuellement utilisés. Cliquez sur Suivant pour continuer l'installation
       Text French=Il vous est fortement recommandé de fermer tous les programmes Windows avant d'exécuter le Programme d'Installation
       Text French=
       Text French=Cliquez sur Annuler pour quitter l'Installation et fermez tous les programmes actuellement utilisés. Cliquez sur Suivant pour continuer l'installation


@@ -308,11 +324,11 @@ item: Custom Dialog Set
       Text French=ATTENTION : Ce programme est protégé par la loi sur les droits d'exploitation et par les traités internationaux
       Text French=
       Text French=Toute reproduction ou distribution, même partielle, de ce programme qui n'aura pas reçu d'autorisation préalable fera l'objet de poursuites et sera sévèrement sanctionnée par le droit civil et pénal
       Text French=ATTENTION : Ce programme est protégé par la loi sur les droits d'exploitation et par les traités internationaux
       Text French=
       Text French=Toute reproduction ou distribution, même partielle, de ce programme qui n'aura pas reçu d'autorisation préalable fera l'objet de poursuites et sera sévèrement sanctionnée par le droit civil et pénal

-      Text German=Wir empfehlen nachdrücklich, vor Ausführen dieses Installationsprogramms alle Windows-Programme zu beenden. 
+      Text German=Wir empfehlen nachdrücklich, vor Ausführen dieses Installationsprogramms alle Windows-Programme zu beenden.

       Text German=
       Text German=Auf Abbrechen klicken, um die Installation zu beenden und alle laufenden Programme zu schließen. Auf Weiter klicken, um mit dem Installationsprogramm beginnen.
       Text German=
       Text German=
       Text German=Auf Abbrechen klicken, um die Installation zu beenden und alle laufenden Programme zu schließen. Auf Weiter klicken, um mit dem Installationsprogramm beginnen.
       Text German=

-      Text German=WARNUNG: Dieses Programm ist urheberrechtlich sowie durch internationale Verträge geschützt. 
+      Text German=WARNUNG: Dieses Programm ist urheberrechtlich sowie durch internationale Verträge geschützt.

       Text German=
       Text German=Die unzulässige Vervielfältigung oder Verbreitung dieses Programms, ob ganz oder auszugsweise, kann schwere zivil- und strafrechtliche Konsequenzen nach sich ziehen und wird unter voller Ausschöpfung der Rechtsmittel geahndet.
       Text Portuguese=Recomenda-se insistentemente que saia de todos os programas do Windows antes de executar este Programa de Configuração.
       Text German=
       Text German=Die unzulässige Vervielfältigung oder Verbreitung dieses Programms, ob ganz oder auszugsweise, kann schwere zivil- und strafrechtliche Konsequenzen nach sich ziehen und wird unter voller Ausschöpfung der Rechtsmittel geahndet.
       Text Portuguese=Recomenda-se insistentemente que saia de todos os programas do Windows antes de executar este Programa de Configuração.


@@ -340,7 +356,7 @@ item: Custom Dialog Set
       Text Danish=
       Text Danish=Klik på Annuller for at forlade installationsprogrammet og lukke alle igangværende programmer. Klik på Næste for at fortsætte med installationsprogrammet.
       Text Danish=
       Text Danish=
       Text Danish=Klik på Annuller for at forlade installationsprogrammet og lukke alle igangværende programmer. Klik på Næste for at fortsætte med installationsprogrammet.
       Text Danish=

-      Text Danish=ADVARSEL: Dette program er beskyttet af copyright og internationale traktater. 
+      Text Danish=ADVARSEL: Dette program er beskyttet af copyright og internationale traktater.

       Text Danish=
       Text Danish=Uautoriseret gengivelse eller videresalg af dette program eller dele heraf kan føre til streng civil- og/eller kriminel stra. Retsforfølgning heraf vil finde sted i det videste omfang der hjemles muligt.
       Text Dutch=Het wordt aangeraden om alle Windows programma's af te sluiten voordat u met de installatie van dit programma begint.
       Text Danish=
       Text Danish=Uautoriseret gengivelse eller videresalg af dette program eller dele heraf kan føre til streng civil- og/eller kriminel stra. Retsforfølgning heraf vil finde sted i det videste omfang der hjemles muligt.
       Text Dutch=Het wordt aangeraden om alle Windows programma's af te sluiten voordat u met de installatie van dit programma begint.


@@ -356,7 +372,7 @@ item: Custom Dialog Set
       Text Norwegian=
       Text Norwegian=ADVARSEL: Dette programmet er beskyttet i henhold til lover om opphavsrett og internasjonale konvensjoner.
       Text Norwegian=
       Text Norwegian=
       Text Norwegian=ADVARSEL: Dette programmet er beskyttet i henhold til lover om opphavsrett og internasjonale konvensjoner.
       Text Norwegian=

-      Text Norwegian=Uautorisert kopiering eller distribuering av dette programmet eller deler av det, vil resultere i alvorlig sivil og kriminell straff og vil føre til saksmål i høyest mulig utstrekning i henhold til loven. 
+      Text Norwegian=Uautorisert kopiering eller distribuering av dette programmet eller deler av det, vil resultere i alvorlig sivil og kriminell straff og vil føre til saksmål i høyest mulig utstrekning i henhold til loven.

       Text Swedish=Du tillråds bestämt att gå ur alla Windows-program innan du kör installationsprogrammet.
       Text Swedish=
       Text Swedish=Klicka på Avbryt för att gå ur installationsprogrammet och stäng eventuella program som du har laddade. Klicka på Nästa för att fortsätta med installationen.
       Text Swedish=Du tillråds bestämt att gå ur alla Windows-program innan du kör installationsprogrammet.
       Text Swedish=
       Text Swedish=Klicka på Avbryt för att gå ur installationsprogrammet och stäng eventuella program som du har laddade. Klicka på Nästa för att fortsätta med installationen.


@@ -443,7 +459,7 @@ item: Custom Dialog Set
       Create Flags=01010000000000000000000000000000
       Text=Setup will install %APPTITLE% in the following folder.
       Text=
       Create Flags=01010000000000000000000000000000
       Text=Setup will install %APPTITLE% in the following folder.
       Text=

-      Text=To install into a different folder, click Browse, and select another folder. 
+      Text=To install into a different folder, click Browse, and select another folder.

       Text=
       Text=You can choose not to install %APPTITLE% by clicking Cancel to exit Setup.
       Text French=%APPTITLE% va être installé dans le répertoire ci-dessous
       Text=
       Text=You can choose not to install %APPTITLE% by clicking Cancel to exit Setup.
       Text French=%APPTITLE% va être installé dans le répertoire ci-dessous


@@ -615,177 +631,15 @@ item: Custom Dialog Set
       Flags=0000000000000001
       Text=Cancel
       Text French=Annuler
       Flags=0000000000000001
       Text=Cancel
       Text French=Annuler

-      Text German=Abbrechen 
-      Text Portuguese=Cancelar
-      Text Spanish=Cancelar
-      Text Italian=Annulla
-      Text Danish=Slet
-      Text Dutch=Annuleren
-      Text Norwegian=Avbryt
-      Text Swedish=Avbryt
-    end
-  end
-end
-item: Custom Dialog Set
-  Name=Select Components
-  Display Variable=DISPLAY
-  Flags=00000001
-  item: Dialog
-    Title=Select Components 
-    Title French=Sélectionner les éléments
-    Title German=Komponenten auswählen
-    Title Portuguese=Seleccionar Componentes
-    Title Spanish=Seleccione los Componentes
-    Title Italian=Seleziona Componenti
-    Title Danish=Vælg komponenter
-    Title Dutch=Selecteer onderdelen
-    Title Norwegian=Velg komponenter
-    Title Swedish=Välj komponenter
-    Width=280
-    Height=224
-    Font Name=Helv
-    Font Size=8
-    item: Push Button
-      Rectangle=172 185 214 199
-      Variable=DIRECTION
-      Value=N
-      Create Flags=01010000000000010000000000000001
-      Text=&Next >
-      Text French=&Suivant>
-      Text German=&Weiter>
-      Text Portuguese=&Próximo>
-      Text Spanish=&Siguiente >
-      Text Italian=&Avanti >
-      Text Danish=&Næste>
-      Text Dutch=&Volgende>
-      Text Norwegian=&Neste>
-      Text Swedish=&Nästa >
-    end
-    item: Push Button
-      Rectangle=130 185 172 199
-      Variable=DIRECTION
-      Value=B
-      Create Flags=01010000000000010000000000000000
-      Text=< &Back
-      Text French=<&Retour
-      Text German=<&Zurück
-      Text Portuguese=<&Retornar
-      Text Spanish=<&Retroceder
-      Text Italian=< &Indietro
-      Text Danish=<&Tilbage
-      Text Dutch=<&Terug
-      Text Norwegian=<&Tilbake
-      Text Swedish=< &Tillbaka
-    end
-    item: Push Button
-      Rectangle=222 185 264 199
-      Action=3
-      Create Flags=01010000000000010000000000000000
-      Text=Cancel
-      Text French=Annuler

       Text German=Abbrechen
       Text Portuguese=Cancelar
       Text Spanish=Cancelar
       Text Italian=Annulla
       Text German=Abbrechen
       Text Portuguese=Cancelar
       Text Spanish=Cancelar
       Text Italian=Annulla

-      Text Danish=Annuller
+      Text Danish=Slet

       Text Dutch=Annuleren
       Text Norwegian=Avbryt
       Text Swedish=Avbryt
     end
       Text Dutch=Annuleren
       Text Norwegian=Avbryt
       Text Swedish=Avbryt
     end

-    item: Static
-      Rectangle=9 177 263 178
-      Action=3
-      Create Flags=01010000000000000000000000000111
-    end
-    item: Static
-      Rectangle=205 156 253 166
-      Variable=COMPONENTS
-      Value=MAINDIR
-      Create Flags=01010000000000000000000000000010
-    end
-    item: Static
-      Rectangle=205 148 253 157
-      Variable=COMPONENTS
-      Create Flags=01010000000000000000000000000010
-    end
-    item: Static
-      Rectangle=95 147 184 158
-      Create Flags=01010000000000000000000000000000
-      Text=Disk Space Required:
-      Text French=Espace disque requis
-      Text German=Benötigter Festplattenspeicher:
-      Text Portuguese=Espaço de disco necessário:
-      Text Spanish=Espacio de Disco Requerido:
-      Text Italian=Spazio su disco richiesto:
-      Text Danish=Nødvendig diskplads:
-      Text Dutch=Vereiste hoeveelheid schijfruimte
-      Text Norwegian=Diskplass nødvendig:
-      Text Swedish=Erforderligt diskutrymme
-    end
-    item: Static
-      Rectangle=95 157 190 167
-      Create Flags=01010000000000000000000000000000
-      Text=Disk Space Remaining:
-      Text French=Espace disque disponible
-      Text German=Verbleibender Festplattenspeicher:
-      Text Portuguese=Espaço de disco restante:
-      Text Spanish=Espacio de Disco Remanente:
-      Text Italian=Spazio su disco rimanente:
-      Text Danish=Ledig diskplads:
-      Text Dutch=Resterende schijfruimte
-      Text Norwegian=Ledig diskplass:
-      Text Swedish=Återstående diskutrymme
-    end
-    item: Static
-      Rectangle=90 138 264 168
-      Action=1
-      Create Flags=01010000000000000000000000000111
-    end
-    item: Static
-      Rectangle=90 8 260 41
-      Create Flags=01010000000000000000000000000000
-      Text=In the options list below, select the checkboxes for the options that you would like to have installed.  The disk space fields reflect the requirements of the options you have selected.
-      Text French=Dans la liste d'options suivante, veuillez sélectionner les cases des options que vous désirez installer. Le champ d'espace disque indique les conditions requises pour les options choisies
-      Text German=Wählen Sie in der Optionenliste unten die Kontrollkästchen für diejenigen Optionen, die Sie installieren möchten. Die Speicherfelder zeigen die benötigte Speicherkapazität für die gewählten Optionen an.
-      Text Portuguese=Na lista de opções abaixo, seleccione as caixas de verificação para as opções que gostaria de ter instalado. Os campos de espaço de disco reflectem os requerimentos das opções que seleccionou.
-      Text Spanish=En la lista de opciones que se ofrece a continuación, seleccione las casillas de comprobación para las opciones que desea instalar. Los campos del espacio en el disco reflejan los requerimientos de las opciones que ha seleccionado.
-      Text Italian=Nell\92elenco delle opzioni sotto, marca le caselle di controllo delle opzioni che vuoi installare. I campi dello spazio sul disco riflettono i requisiti delle opzioni selezionate.
-      Text Danish=Marker afkrydsningsfelterne for de komponenter, der skal installeres, på listen herunder. Diskpladsfelterne angiver pladskravene for de valgte komponenter.
-      Text Dutch=Kruis in de onderstaande lijst het vakje aan naast de opties die u wilt installeren. Achter elke optie staat de benodigde schijfruimte vermeld.
-      Text Norwegian=I listen over alternativer nedenfor, klikk i kontrollrutene for de alternativene du ønsker å installere. Diskplassfeltene gjenspeiler kravene for de alternativene du har valgt.
-      Text Swedish=Kryssa för i rutorna nedan vilka alternativ du vill få installerade. I diskutrymmesfälten anges utrymmesbehoven för de alternativ du väljer.
-    end
-    item: Listbox
-      Rectangle=90 42 263 133
-      Variable=COMPONENTS
-      Create Flags=01010000101000010000000101010001
-      Flags=0000010001000111
-      Text=wxPython package
-      Text=wxPython documentation
-      Text=
-      Text French=wxPython package
-      Text French=wxPython documentation
-      Text French=
-      Text German=wxPython package
-      Text German=wxPython documentation
-      Text German=
-      Text Portuguese=%1%
-      Text Portuguese=
-      Text Spanish=wxPython package
-      Text Spanish=wxPython documentation
-      Text Spanish=
-      Text Italian=wxPython package
-      Text Italian=wxPython documentation
-      Text Italian=
-      Text Danish=%1%
-      Text Danish=
-      Text Dutch=%1%
-      Text Dutch=
-      Text Norwegian=%1%
-      Text Norwegian=
-      Text Swedish=%1%
-      Text Swedish=
-    end

   end
 end
 item: Custom Dialog Set
   end
 end
 item: Custom Dialog Set


@@ -950,207 +804,163 @@ item: Check Disk Space
 end
 item: Remark
 end
 end
 item: Remark
 end

-item: If/While Statement
-  Variable=COMPONENTS
-  Value=A
-  Flags=00001010
-end
-item: Install File
-  Source=e:\Projects\wx\lib\wx200.dll
-  Destination=%SYS%\wx200.dll
-  Flags=0000001010010010
-end
-item: Install File
-  Source=e:\Projects\wxPython\tests\bitmaps\tog1.bmp
-  Destination=%MAINDIR%\wxPython\demo\bitmaps\tog1.bmp
-  Flags=0000000010000010
-end
-item: Install File
-  Source=e:\Projects\wxPython\tests\bitmaps\test2.bmp
-  Destination=%MAINDIR%\wxPython\demo\bitmaps\test2.bmp
-  Flags=0000000010000010
-end
-item: Install File
-  Source=e:\Projects\wxPython\tests\bitmaps\tog2.bmp
-  Destination=%MAINDIR%\wxPython\demo\bitmaps\tog2.bmp
-  Flags=0000000010000010
-end
-item: Install File
-  Source=e:\Projects\wxPython\__init__.py
-  Destination=%MAINDIR%\wxPython\__init__.py
-  Flags=0000000010000010
-end
-item: Install File
-  Source=e:\Projects\wxPython\cmndlgs.py
-  Destination=%MAINDIR%\wxPython\cmndlgs.py
-  Flags=0000000010000010
-end
-item: Install File
-  Source=e:\Projects\wxPython\controls2.py
-  Destination=%MAINDIR%\wxPython\controls2.py
-  Flags=0000000010000010
-end
-item: Install File
-  Source=e:\Projects\wxPython\events.py
-  Destination=%MAINDIR%\wxPython\events.py
-  Flags=0000000010000010
-end

 item: Install File
 item: Install File

-  Source=e:\Projects\wxPython\frames.py
-  Destination=%MAINDIR%\wxPython\frames.py
-  Flags=0000000010000010
+  Source=d:\WINNT\System32\Msvcirt.dll
+  Destination=%SYS%\Msvcirt.dll
+  Flags=0000001010000011

 end
 item: Install File
 end
 item: Install File

-  Source=e:\Projects\wxPython\gdi.py
-  Destination=%MAINDIR%\wxPython\gdi.py
-  Flags=0000000010000010
+  Source=d:\WINNT\System32\Msvcrt.dll
+  Destination=%SYS%\Msvcrt.dll
+  Flags=0000001010000011

 end
 item: Install File
 end
 item: Install File

-  Source=e:\Projects\wxPython\mdi.py
-  Destination=%MAINDIR%\wxPython\mdi.py
-  Flags=0000000010000010
+  Source=e:\projects\wx\lib\wx21_11.dll
+  Destination=%SYS%\wx21_11.dll
+  Flags=0000001010010010

 end
 item: Install File
 end
 item: Install File

-  Source=e:\Projects\wxPython\misc.py
-  Destination=%MAINDIR%\wxPython\misc.py
+  Source=e:\Projects\wx\utils\wxPython\*.py
+  Destination=%MAINDIR%\wxPython
+  Description=wxPython shadow class modules

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\stattool.py
-  Destination=%MAINDIR%\wxPython\stattool.py
+  Source=e:\Projects\wx\utils\wxPython\*.pyd
+  Destination=%MAINDIR%\wxPython
+  Description=wxPython extension modules

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\utils.py
-  Destination=%MAINDIR%\wxPython\utils.py
+  Source=e:\Projects\wx\utils\wxPython\*.txt
+  Destination=%MAINDIR%\wxPython
+  Description=README file

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\windows.py
-  Destination=%MAINDIR%\wxPython\windows.py
+  Source=e:\Projects\wx\utils\wxPython\lib\*.py
+  Destination=%MAINDIR%\wxPython\lib
+  Description=wxPython Standard Library

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\windows2.py
-  Destination=%MAINDIR%\wxPython\windows2.py
+  Source=e:\Projects\wx\utils\wxPython\lib\sizers\*.py
+  Destination=%MAINDIR%\wxPython\lib\sizers
+  Description=wxPython Standard Library

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\windows3.py
-  Destination=%MAINDIR%\wxPython\windows3.py
+  Source=e:\Projects\wx\utils\wxPython\lib\editor\*.py
+  Destination=%MAINDIR%\wxPython\lib\editor
+  Description=wxPython Standard Library

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\wx.py
-  Destination=%MAINDIR%\wxPython\wx.py
+  Source=e:\Projects\wx\utils\wxPython\demo\*.py
+  Destination=%MAINDIR%\wxPython\demo
+  Description=Demos

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\wxc.pyd
-  Destination=%MAINDIR%\wxPython\wxc.pyd
+  Source=E:\Projects\wx\utils\wxPython\demo\README.txt
+  Destination=%MAINDIR%\wxPython\demo\README.txt
+  Description=Demos

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\distrib\SelfInst-README.txt
-  Destination=%MAINDIR%\wxPython\README.txt
+  Source=e:\Projects\wx\utils\wxPython\demo\*.xml
+  Destination=%MAINDIR%\wxPython\demo
+  Description=Demos

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\tests\test1.py
-  Destination=%MAINDIR%\wxPython\demo\test1.py
+  Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.bmp
+  Destination=%MAINDIR%\wxPython\demo\bitmaps
+  Description=Demos

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\tests\test2.py
-  Destination=%MAINDIR%\wxPython\demo\test2.py
+  Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.gif
+  Destination=%MAINDIR%\wxPython\demo\bitmaps
+  Description=Demos

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\tests\test3.py
-  Destination=%MAINDIR%\wxPython\demo\test3.py
+  Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.jpg
+  Destination=%MAINDIR%\wxPython\demo\bitmaps
+  Description=Demos

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\tests\test4.py
-  Destination=%MAINDIR%\wxPython\demo\test4.py
+  Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.png
+  Destination=%MAINDIR%\wxPython\demo\bitmaps
+  Description=Demos

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\tests\test5.py
-  Destination=%MAINDIR%\wxPython\demo\test5.py
+  Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.ico
+  Destination=%MAINDIR%\wxPython\demo\bitmaps
+  Description=Demos

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\tests\test6.py
-  Destination=%MAINDIR%\wxPython\demo\test6.py
+  Source=e:\Projects\wx\utils\wxPython\demo\data\*.htm
+  Destination=%MAINDIR%\wxPython\demo\data
+  Description=Demos

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\tests\test7.py
-  Destination=%MAINDIR%\wxPython\demo\test7.py
+  Source=e:\Projects\wx\utils\wxPython\demo\data\*.png
+  Destination=%MAINDIR%\wxPython\demo\data
+  Description=Demos

   Flags=0000000010000010
 end
   Flags=0000000010000010
 end

-item: Install File
-  Source=e:\Projects\wxPython\tests\wxSlash.py
-  Destination=%MAINDIR%\wxPython\demo\wxSlash.py
-  Flags=0000000010000010
+item: Remark

 end
 item: Install File
 end
 item: Install File

-  Source=e:\Projects\wxPython\tests\bitmaps\copy.bmp
-  Destination=%MAINDIR%\wxPython\demo\bitmaps\copy.bmp
+  Source=E:\PROJECTS\wx\docs\html\wx\wx.chm
+  Destination=%MAINDIR%\wxPython\docs\wx.chm
+  Description=wxPython documentation

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\tests\bitmaps\mondrian.ico
-  Destination=%MAINDIR%\wxPython\demo\bitmaps\mondrian.ico
+  Source=E:\PROJECTS\wx\docs\html\ogl\ogl.chm
+  Destination=%MAINDIR%\wxPython\docs\ogl.chm
+  Description=wxPython documentation

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\tests\bitmaps\new.bmp
-  Destination=%MAINDIR%\wxPython\demo\bitmaps\new.bmp
+  Source=E:\PROJECTS\wx\docs\preamble.txt
+  Destination=%MAINDIR%\wxPython\docs\preamble.txt
+  Description=wxPython documentation

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\tests\bitmaps\open.bmp
-  Destination=%MAINDIR%\wxPython\demo\bitmaps\open.bmp
+  Source=E:\PROJECTS\wx\docs\licence.txt
+  Destination=%MAINDIR%\wxPython\docs\licence.txt
+  Description=wxPython documentation

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\tests\bitmaps\paste.bmp
-  Destination=%MAINDIR%\wxPython\demo\bitmaps\paste.bmp
+  Source=E:\PROJECTS\wx\docs\licendoc.txt
+  Destination=%MAINDIR%\wxPython\docs\licendoc.txt
+  Description=wxPython documentation

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\tests\bitmaps\smiles.ico
-  Destination=%MAINDIR%\wxPython\demo\bitmaps\smiles.ico
+  Source=E:\PROJECTS\wx\docs\lgpl.txt
+  Destination=%MAINDIR%\wxPython\docs\lgpl.txt
+  Description=wxPython documentation

   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\controls.py
-  Destination=%MAINDIR%\wxPython\controls.py
+  Source=E:\PROJECTS\wx\docs\gpl.txt
+  Destination=%MAINDIR%\wxPython\docs\gpl.txt
+  Description=wxPython documentation

   Flags=0000000010000010
 end
   Flags=0000000010000010
 end

-item: End Block
-end

 item: Remark
 end
 item: Remark
 end

-item: If/While Statement
-  Variable=COMPONENTS
-  Value=B
-  Flags=00001010
-end
-item: Install File
-  Source=e:\projects\wx\docs\html\wx\*.*
-  Destination=%MAINDIR%\wxPython\docs
-  Flags=0000000010000010
-end
-item: Install File
-  Source=e:\projects\wx\docs\html\wx\wx.htm
-  Destination=%MAINDIR%\wxPython\docs\index.htm
-  Flags=0000000010000010
-end
-item: End Block
-end

 item: Remark
 end
 item: Remark
 item: Remark
 end
 item: Remark


@@ -1213,11 +1023,6 @@ item: Edit Registry
 end
 item: Else Statement
 end
 end
 item: Else Statement
 end

-item: Add ProgMan Icon
-  Group=%GROUP%
-  Icon Name=Uninstall %APPTITLE%
-  Command Line=%UNINSTALL_PATH% %INST_LOG_PATH%
-end

 item: End Block
 end
 item: Remark
 item: End Block
 end
 item: Remark


@@ -1306,8 +1111,72 @@ item: Set Variable
   Variable=GROUP
   Value=%GROUPDIR%\%GROUP%
 end
   Variable=GROUP
   Value=%GROUPDIR%\%GROUP%
 end

+item: Create Shortcut
+  Source=%PYTHONDIR%\pythonw.exe
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\Run the DEMO.lnk
+  Command Options=demo.py
+  Working Directory=%MAINDIR%\wxPython\demo
+  Icon Number=0
+  Key Type=1536
+  Flags=00000001
+end
+item: Create Shortcut
+  Source=%MAINDIR%\wxPython\docs\wx.chm
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\wxWindows User Guide.lnk
+  Icon Number=0
+end
+item: Create Shortcut
+  Source=%MAINDIR%\wxPython\docs\ogl.chm
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\wxOGL User Guide.lnk
+  Icon Number=0
+  Key Type=1536
+  Flags=00000001
+end
+item: Create Shortcut
+  Source=%MAINDIR%\wxPython\docs\licence.txt
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\License.lnk
+  Icon Number=0
+  Key Type=1536
+  Flags=00000001
+end
+item: Create Shortcut
+  Source=%MAINDIR%\wxPython\README.txt
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\ReadMe.lnk
+  Icon Number=0
+  Key Type=1536
+  Flags=00000001
+end
+item: Create Shortcut
+  Source=%MAINDIR%\wxPython\CHANGES.txt
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\Changes.lnk
+  Icon Number=0
+  Key Type=1536
+  Flags=00000001
+end
+item: Create Shortcut
+  Source=%UNINSTALL_PATH%
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\Uninstall %APPTITLE%.lnk
+  Command Options=%INST_LOG_PATH%
+  Icon Number=0
+end

 item: Else Statement
 end
 item: Else Statement
 end

+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Uninstall %APPTITLE%
+  Command Line=%UNINSTALL_PATH% %INST_LOG_PATH%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Run the DEMO
+  Command Line=pythonw.exe demo.py
+  Default Directory=%MAINDIR%\wxPython\demo
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=wxWindows User Guide
+  Command Line=%MAINDIR%\wxPython\docs\wx.chm
+end

 item: End Block
 end
 item: Self-Register OCXs/DLLs
 item: End Block
 end
 item: Self-Register OCXs/DLLs


@@ -1336,7 +1205,7 @@ item: Custom Dialog Set
     Title=Installation Complete
     Title French=Installation en cours
     Title German=Installation abgeschlossen
     Title=Installation Complete
     Title French=Installation en cours
     Title German=Installation abgeschlossen

-    Title Portuguese=Instalação Completa 
+    Title Portuguese=Instalação Completa

     Title Spanish=Se ha completado la Instalación
     Title Italian=Installazione completata
     Title Danish=Installation gennemført
     Title Spanish=Se ha completado la Instalación
     Title Italian=Installazione completata
     Title Danish=Installation gennemført