Merged wxPython 2.2.2 over to the main branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-10-30 21:08:42 +00:00
parent 7874bf5430
commit c368d904fc
193 changed files with 21992 additions and 4366 deletions

View File

@@ -17,7 +17,7 @@ item: Global
Patch Flags=0000000000001001
Patch Threshold=85
Patch Memory=4000
EXE Filename=wxPython-2.2.0.exe
EXE Filename=wxPython-2.2.2.exe
FTP Cluster Size=20
Per-User Version ID=1
Dialogs Version=6
@@ -72,40 +72,37 @@ item: Set Variable
Value=wxPython
Flags=10000000
end
item: Set Variable
Variable=DLLVER
Value=wx21_16
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
Default=None
Flags=00000100
end
item: If/While Statement
Variable=PYTHONVER
Value=None
end
item: Remark
Text= Just try 1.5 since 1.5.2b2 doesn't set CurrentVersion but uses 1.5
end
item: Set Variable
Variable=PYTHONVER
Value=1.5
Value=2.0
end
item: End Block
item: Set Variable
Variable=SAMEDIR
Value=1
end
item: Remark
end
item: Get Registry Key Value
Variable=PYTHONDIR
Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\InstallPath
Flags=00000100
end
remarked item: If/While Statement
Variable=PYTHONDIR
Value=None
end
remarked item: Get Registry Key Value
Variable=PYTHONDIR
Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\InstallPath
Flags=00000010
end
remarked item: End Block
end
item: If/While Statement
Variable=PYTHONDIR
Value=None
@@ -123,6 +120,8 @@ item: Set Variable
Variable=MAINDIR
Value=%PYTHONDIR%
end
item: Remark
end
item: Set Variable
Variable=EXPLORER
Value=1
@@ -818,11 +817,24 @@ item: Install File
Destination=%SYS%\Msvcrt.dll
Flags=0000001010000011
end
item: If/While Statement
Variable=SAMEDIR
Value=0
end
item: Install File
Source=c:\projects\wx\lib\wx22_0.dll
Destination=%SYS%\wx22_0.dll
Source=c:\projects\wx\lib\wx22_2.dll
Destination=%SYS%\wx22_2.dll
Flags=0000001010010010
end
item: Else Statement
end
item: Install File
Source=c:\projects\wx\lib\wx22_2.dll
Destination=%MAINDIR%\wxPython\wx22_2.dll
Flags=0000000010010010
end
item: End Block
end
item: Install File
Source=c:\Projects\wx\wxPython\wxPython\*.py
Destination=%MAINDIR%\wxPython
@@ -848,13 +860,13 @@ item: Install File
Flags=0000000010000010
end
item: Install File
Source=c:\Projects\wx\wxPython\wxPython\lib\sizers\*.py
Destination=%MAINDIR%\wxPython\lib\sizers
Source=c:\Projects\wx\wxPython\wxPython\lib\editor\*.py
Destination=%MAINDIR%\wxPython\lib\editor
Description=wxPython Standard Library
Flags=0000000010000010
end
item: Install File
Source=c:\Projects\wx\wxPython\wxPython\lib\editor\*.py
Source=c:\Projects\wx\wxPython\wxPython\lib\editor\*.txt
Destination=%MAINDIR%\wxPython\lib\editor
Description=wxPython Standard Library
Flags=0000000010000010
@@ -913,6 +925,18 @@ item: Install File
Description=Demos
Flags=0000000010000010
end
item: Install File
Source=c:\Projects\wx\wxPython\demo\data\*.htm
Destination=%MAINDIR%\wxPython\demo\data
Description=Demos
Flags=0000000010000010
end
item: Install File
Source=c:\Projects\wx\wxPython\demo\data\*.py
Destination=%MAINDIR%\wxPython\demo\data
Description=Demos
Flags=0000000010000010
end
item: Install File
Source=c:\Projects\wx\wxPython\demo\data\*.png
Destination=%MAINDIR%\wxPython\demo\data
@@ -937,14 +961,16 @@ item: Install File
Description=Demos
Flags=0000000010000010
end
item: Remark
end
item: Install File
Source=C:\PROJECTS\wx\wxPython\README.txt
Destination=%MAINDIR%\wxPython\README.txt
Source=C:\PROJECTS\wx\wxPython\*.txt
Destination=%MAINDIR%\wxPython\docs\
Flags=0000000010000010
end
item: Install File
Source=C:\PROJECTS\wx\wxPython\CHANGES.txt
Destination=%MAINDIR%\wxPython\CHANGES.txt
Source=C:\PROJECTS\wx\wxPython\licence\*.txt
Destination=%MAINDIR%\wxPython\docs\licence\
Flags=0000000010000010
end
item: Remark
@@ -961,36 +987,6 @@ item: Install File
Description=wxPython documentation
Flags=0000000010000010
end
item: Install File
Source=c:\PROJECTS\wx\docs\preamble.txt
Destination=%MAINDIR%\wxPython\docs\preamble.txt
Description=wxPython documentation
Flags=0000000010000010
end
item: Install File
Source=c:\PROJECTS\wx\docs\licence.txt
Destination=%MAINDIR%\wxPython\docs\licence.txt
Description=wxPython documentation
Flags=0000000010000010
end
item: Install File
Source=c:\PROJECTS\wx\docs\licendoc.txt
Destination=%MAINDIR%\wxPython\docs\licendoc.txt
Description=wxPython documentation
Flags=0000000010000010
end
item: Install File
Source=c:\PROJECTS\wx\docs\lgpl.txt
Destination=%MAINDIR%\wxPython\docs\lgpl.txt
Description=wxPython documentation
Flags=0000000010000010
end
item: Install File
Source=c:\PROJECTS\wx\docs\gpl.txt
Destination=%MAINDIR%\wxPython\docs\gpl.txt
Description=wxPython documentation
Flags=0000000010000010
end
item: Remark
end
item: Remark
@@ -1165,21 +1161,21 @@ item: Create Shortcut
Flags=00000001
end
item: Create Shortcut
Source=%MAINDIR%\wxPython\docs\licence.txt
Source=%MAINDIR%\wxPython\docs\licence\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
Source=%MAINDIR%\wxPython\docs\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
Source=%MAINDIR%\wxPython\docs\CHANGES.txt
Destination=%CGROUPDIR%\%CGROUP_SAVE%\Changes.lnk
Icon Number=0
Key Type=1536
@@ -1214,7 +1210,7 @@ end
item: Self-Register OCXs/DLLs
Description=Updating System Configuration, Please Wait...
end
item: Edit Registry
remarked item: Edit Registry
Total Keys=1
Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\PythonPath\wxPython
New Value=%MAINDIR%
@@ -1359,7 +1355,7 @@ item: Custom Dialog Set
end
item: Push Button
Rectangle=90 68 153 82
Alternate=0%MAINDIR%\wxPython\README.txt
Alternate=0%MAINDIR%\wxPython\docs\README.txt
Action=6
Enabled Color=00000000000000001111111111111111
Create Flags=01010000000000010000000000000000