Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor wxPython changes for wxWin 2.0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-03-05 07:23:42 +00:00
parent 9f68a1f235
commit 62abd41ede
7 changed files with 85 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
utils/wxPython/distrib/wxPython.wse
View File

@@ -9,7 +9,7 @@ item: Global
Progress Bar DLL=%_WISE_%\Progress\WIZ%_EXE_OS_TYPE_%.DLL Progress Bar DLL=%_WISE_%\Progress\WIZ%_EXE_OS_TYPE_%.DLL
Start Gradient=128 128 255 Start Gradient=128 128 255
End Gradient=64 0 128 End Gradient=64 0 128
Windows Flags=00000100000000010010110000001000 Windows Flags=00000100000000010010110000011000
Log Pathname=%MAINDIR%\INSTALL.LOG Log Pathname=%MAINDIR%\INSTALL.LOG
Message Font=MS Sans Serif Message Font=MS Sans Serif
Font Size=8 Font Size=8
@@ -17,7 +17,7 @@ item: Global
Patch Flags=0000000000001001 Patch Flags=0000000000001001
Patch Threshold=85 Patch Threshold=85
Patch Memory=4000 Patch Memory=4000
EXE Filename=wxPython-2.0b5.exe EXE Filename=wxPython-2.0b6.exe
FTP Cluster Size=20 FTP Cluster Size=20
Per-User Version ID=1 Per-User Version ID=1
Dialogs Version=6 Dialogs Version=6
@@ -74,6 +74,9 @@ end
item: Check Configuration item: Check Configuration
Flags=10111011 Flags=10111011
end end
item: Remark
Text= 1.5 and 1.5.1 have a CurrentVersion key
end
item: Get Registry Key Value item: Get Registry Key Value
Variable=PYTHONVER Variable=PYTHONVER
Key=SOFTWARE\Python\PythonCore\CurrentVersion Key=SOFTWARE\Python\PythonCore\CurrentVersion
@@ -84,12 +87,12 @@ item: If/While Statement
Variable=PYTHONVER Variable=PYTHONVER
Value=None Value=None
end end
item: Display Message item: Remark
Title=Installation Error Text= Just try 1.5 since 1.5.2b2 doesn't set CurrentVersion but uses 1.5
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
end end
item: Exit Installation item: Set Variable
Variable=PYTHONVER
Value=1.5
end end
item: End Block item: End Block
end end
@@ -98,6 +101,19 @@ item: Get Registry Key Value
Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\InstallPath Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\InstallPath
Flags=00000100 Flags=00000100
end 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 item: Set Variable
Variable=MAINDIR Variable=MAINDIR
Value=%PYTHONDIR% Value=%PYTHONDIR%
@@ -961,19 +977,14 @@ item: Install File
Flags=0000001010010010 Flags=0000001010010010
end end
item: Install File item: Install File
Source=e:\Projects\wxPython\tests\bitmaps\tog1.bmp Source=c:\WINNT\System32\Msvcirt.dll
Destination=%MAINDIR%\wxPython\demo\bitmaps\tog1.bmp Destination=%SYS%\Msvcirt.dll
Flags=0000000010000010 Flags=0000001010000011
end end
item: Install File item: Install File
Source=e:\Projects\wxPython\tests\bitmaps\test2.bmp Source=c:\WINNT\System32\Msvcrt.dll
Destination=%MAINDIR%\wxPython\demo\bitmaps\test2.bmp Destination=%SYS%\Msvcrt.dll
Flags=0000000010000010 Flags=0000001010000011
end
item: Install File
Source=e:\Projects\wxPython\tests\bitmaps\tog2.bmp
Destination=%MAINDIR%\wxPython\demo\bitmaps\tog2.bmp
Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wxPython\__init__.py Source=e:\Projects\wxPython\__init__.py
@@ -1040,6 +1051,11 @@ item: Install File
Destination=%MAINDIR%\wxPython\windows3.py Destination=%MAINDIR%\wxPython\windows3.py
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File
Source=e:\Projects\wxPython\controls.py
Destination=%MAINDIR%\wxPython\controls.py
Flags=0000000010000010
end
item: Install File item: Install File
Source=e:\Projects\wxPython\wx.py Source=e:\Projects\wxPython\wx.py
Destination=%MAINDIR%\wxPython\wx.py Destination=%MAINDIR%\wxPython\wx.py
@@ -1095,6 +1111,11 @@ item: Install File
Destination=%MAINDIR%\wxPython\demo\wxSlash.py Destination=%MAINDIR%\wxPython\demo\wxSlash.py
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File
Source=E:\PROJECTS\wxPython\tests\wxPlotCanvas.py
Destination=%MAINDIR%\wxPython\demo\wxPlotCanvas.py
Flags=0000000010000010
end
item: Install File item: Install File
Source=e:\Projects\wxPython\tests\bitmaps\copy.bmp Source=e:\Projects\wxPython\tests\bitmaps\copy.bmp
Destination=%MAINDIR%\wxPython\demo\bitmaps\copy.bmp Destination=%MAINDIR%\wxPython\demo\bitmaps\copy.bmp
@@ -1126,8 +1147,18 @@ item: Install File
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wxPython\controls.py Source=e:\Projects\wxPython\tests\bitmaps\tog1.bmp
Destination=%MAINDIR%\wxPython\controls.py 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 Flags=0000000010000010
end end
item: End Block item: End Block

BIN
utils/wxPython/distrib/wxPython.wsm
View File

Binary file not shown.

6
utils/wxPython/src/makefile.vc
View File

@@ -9,7 +9,7 @@
# Copyright: (c) 1998 by Total Control Software # Copyright: (c) 1998 by Total Control Software
# Licence: wxWindows license # Licence: wxWindows license
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
VERSION=2.0b5 VERSION=2.0b6
# Set WXDIR to the root wxWindows directory for your system # Set WXDIR to the root wxWindows directory for your system
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
@@ -276,7 +276,11 @@ dist:
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
# $Log$ # $Log$
# Revision 1.4 1999/03/05 07:22:30 RD
# Minor wxPython changes for wxWin 2.0
#
# Revision 1.3 1999/02/25 07:08:33 RD # Revision 1.3 1999/02/25 07:08:33 RD
#
# wxPython version 2.0b5 # wxPython version 2.0b5
# #
# Revision 1.2 1999/02/20 09:03:00 RD # Revision 1.2 1999/02/20 09:03:00 RD

8
utils/wxPython/src/msw/wx.cpp
View File

@@ -33,8 +33,8 @@
* and things like that. * and things like that.
* *
* $Log$ * $Log$
* Revision 1.7 1999/02/25 07:09:28 RD * Revision 1.8 1999/03/05 07:23:03 RD
* wxPython version 2.0b5 * Minor wxPython changes for wxWin 2.0
* *
************************************************************************/ ************************************************************************/
@@ -1313,6 +1313,8 @@ SWIGEXPORT(void,initwxc)() {
PyDict_SetItemString(d,"wxCB_READONLY", PyInt_FromLong((long) wxCB_READONLY)); PyDict_SetItemString(d,"wxCB_READONLY", PyInt_FromLong((long) wxCB_READONLY));
PyDict_SetItemString(d,"wxRA_HORIZONTAL", PyInt_FromLong((long) wxRA_HORIZONTAL)); PyDict_SetItemString(d,"wxRA_HORIZONTAL", PyInt_FromLong((long) wxRA_HORIZONTAL));
PyDict_SetItemString(d,"wxRA_VERTICAL", PyInt_FromLong((long) wxRA_VERTICAL)); PyDict_SetItemString(d,"wxRA_VERTICAL", PyInt_FromLong((long) wxRA_VERTICAL));
PyDict_SetItemString(d,"wxRA_SPECIFY_ROWS", PyInt_FromLong((long) wxRA_SPECIFY_ROWS));
PyDict_SetItemString(d,"wxRA_SPECIFY_COLS", PyInt_FromLong((long) wxRA_SPECIFY_COLS));
PyDict_SetItemString(d,"wxRB_GROUP", PyInt_FromLong((long) wxRB_GROUP)); PyDict_SetItemString(d,"wxRB_GROUP", PyInt_FromLong((long) wxRB_GROUP));
PyDict_SetItemString(d,"wxGA_PROGRESSBAR", PyInt_FromLong((long) wxGA_PROGRESSBAR)); PyDict_SetItemString(d,"wxGA_PROGRESSBAR", PyInt_FromLong((long) wxGA_PROGRESSBAR));
PyDict_SetItemString(d,"wxGA_HORIZONTAL", PyInt_FromLong((long) wxGA_HORIZONTAL)); PyDict_SetItemString(d,"wxGA_HORIZONTAL", PyInt_FromLong((long) wxGA_HORIZONTAL));
@@ -1753,7 +1755,7 @@ SWIGEXPORT(void,initwxc)() {
PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING)); PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING));
PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED));
PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)); PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING));
PyDict_SetItemString(d,"__version__", PyString_FromString("2.0b5")); PyDict_SetItemString(d,"__version__", PyString_FromString("2.0b6"));
PyDict_SetItemString(d,"cvar", SWIG_globals); PyDict_SetItemString(d,"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set); SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set);
SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set); SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set);

6
utils/wxPython/src/msw/wx.py
View File

@@ -185,6 +185,8 @@ wxCB_SORT = wxc.wxCB_SORT
wxCB_READONLY = wxc.wxCB_READONLY wxCB_READONLY = wxc.wxCB_READONLY
wxRA_HORIZONTAL = wxc.wxRA_HORIZONTAL wxRA_HORIZONTAL = wxc.wxRA_HORIZONTAL
wxRA_VERTICAL = wxc.wxRA_VERTICAL wxRA_VERTICAL = wxc.wxRA_VERTICAL
wxRA_SPECIFY_ROWS = wxc.wxRA_SPECIFY_ROWS
wxRA_SPECIFY_COLS = wxc.wxRA_SPECIFY_COLS
wxRB_GROUP = wxc.wxRB_GROUP wxRB_GROUP = wxc.wxRB_GROUP
wxGA_PROGRESSBAR = wxc.wxGA_PROGRESSBAR wxGA_PROGRESSBAR = wxc.wxGA_PROGRESSBAR
wxGA_HORIZONTAL = wxc.wxGA_HORIZONTAL wxGA_HORIZONTAL = wxc.wxGA_HORIZONTAL
@@ -1259,8 +1261,8 @@ class wxApp(wxPyApp):
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# #
# $Log$ # $Log$
# Revision 1.7 1999/02/25 07:09:30 RD # Revision 1.8 1999/03/05 07:23:07 RD
# wxPython version 2.0b5 # Minor wxPython changes for wxWin 2.0
# #
# Revision 1.11 1999/02/20 09:02:55 RD # Revision 1.11 1999/02/20 09:02:55 RD
# Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a # Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a

6
utils/wxPython/src/wx.i
View File

@@ -47,7 +47,7 @@
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#define __version__ "2.0b5" #define __version__ "2.0b6"
wxPoint wxPyDefaultPosition; wxPoint wxPyDefaultPosition;
wxSize wxPyDefaultSize; wxSize wxPyDefaultSize;
@@ -158,7 +158,11 @@ extern "C" SWIGEXPORT(void,initutilsc)();
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// $Log$ // $Log$
// Revision 1.8 1999/03/05 07:22:32 RD
// Minor wxPython changes for wxWin 2.0
//
// Revision 1.7 1999/02/25 07:08:37 RD // Revision 1.7 1999/02/25 07:08:37 RD
//
// wxPython version 2.0b5 // wxPython version 2.0b5
// //
// Revision 1.6 1999/02/20 09:03:04 RD // Revision 1.6 1999/02/20 09:03:04 RD

8
utils/wxPython/tests/test4.py
View File

@@ -25,8 +25,8 @@ class TestSimpleControlsDlg(wxDialog):
wxDefaultPosition, wxSize(350, 350)) wxDefaultPosition, wxSize(350, 350))
sampleList = ['zero', 'one', 'two', 'three', 'four', 'five', sampleList = ["zero", "one", "two", "three", "four", "five",
'six', 'seven', 'eight'] "six", "seven", "eight", "nine", "ten"]
y_pos = 5 y_pos = 5
delta = 25 delta = 25
@@ -1000,7 +1000,11 @@ if __name__ == '__main__':
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# #
# $Log$ # $Log$
# Revision 1.15 1999/03/05 07:23:42 RD
# Minor wxPython changes for wxWin 2.0
#
# Revision 1.14 1999/02/27 04:20:50 RD # Revision 1.14 1999/02/27 04:20:50 RD
#
# minor tweaks for testing # minor tweaks for testing
# #
# Revision 1.13 1999/02/20 09:04:44 RD # Revision 1.13 1999/02/20 09:04:44 RD