diff --git a/utils/wxPython/demo/Main.py b/utils/wxPython/demo/Main.py index c7fe6811f4..c9e2d97847 100644 --- a/utils/wxPython/demo/Main.py +++ b/utils/wxPython/demo/Main.py @@ -281,10 +281,12 @@ class wxPythonDemo(wxFrame): else: if os.path.exists(itemText + '.py'): wxBeginBusyCursor() - self.GetDemoFile(itemText + '.py') - module = __import__(itemText, globals()) - self.SetOverview(itemText, module.overview) - wxEndBusyCursor() + try: + self.GetDemoFile(itemText + '.py') + module = __import__(itemText, globals()) + self.SetOverview(itemText, module.overview) + finally: + wxEndBusyCursor() # in case runTest is modal, make sure things look right... self.nb.Refresh(); @@ -413,30 +415,29 @@ def main(): -overview = """\ - -

Python

+overview = """ +

Python

-Python is an interpreted, interactive, object-oriented programming language often compared to Tcl, Perl, Scheme, or Java. -

-Python combines remarkable power with very clear syntax. It has modules, classes, exceptions, very high level dynamic data types, and dynamic typing. There are interfaces to many system calls and libraries, and new built-in modules are easily written in C or C++. Python is also usable as an extension language for applications that need a programmable interface. -

-

wxWindows

+ Python is an interpreted, interactive, object-oriented programming language often compared to Tcl, Perl, Scheme, or Java. +

+ Python combines remarkable power with very clear syntax. It has modules, classes, exceptions, very high level dynamic data types, and dynamic typing. There are interfaces to many system calls and libraries, and new built-in modules are easily written in C or C++. Python is also usable as an extension language for applications that need a programmable interface. +

+

wxWindows

-wxWindows is a free C++ framework designed to make cross-platform programming child's play. Well, almost. wxWindows 2 supports Windows 3.1/95/98/NT, Unix with GTK/Motif/Lesstif, with a Mac version underway. Other ports are under consideration. -

-wxWindows is a set of libraries that allows C++ applications to compile and run on several different types of computers, with minimal source code changes. There is one library per supported GUI (such as Motif, or Windows). As well as providing a common API (Application Programming Interface) for GUI functionality, it provides functionality for accessing some commonly-used operating system facilities, such as copying or deleting files. wxWindows is a 'framework' in the sense that it provides a lot of built-in functionality, which the application can use or replace as required, thus saving a great deal of coding effort. Basic data structures such as strings, linked lists and hash tables are also supported. -

-

wxPython

+ wxWindows is a free C++ framework designed to make cross-platform programming child's play. Well, almost. wxWindows 2 supports Windows 3.1/95/98/NT, Unix with GTK/Motif/Lesstif, with a Mac version underway. Other ports are under consideration. +

+ wxWindows is a set of libraries that allows C++ applications to compile and run on several different types of computers, with minimal source code changes. There is one library per supported GUI (such as Motif, or Windows). As well as providing a common API (Application Programming Interface) for GUI functionality, it provides functionality for accessing some commonly-used operating system facilities, such as copying or deleting files. wxWindows is a 'framework' in the sense that it provides a lot of built-in functionality, which the application can use or replace as required, thus saving a great deal of coding effort. Basic data structures such as strings, linked lists and hash tables are also supported. +

+

wxPython

-wxPython is a Python extension module that encapsulates the wxWindows GUI classes. Currently it is only available for the Win32 and GTK ports of wxWindows, but as soon as the other ports are brought up to the same level as Win32 and GTK, it should be fairly trivial to enable wxPython to be used with the new GUI. -

-The wxPython extension module attempts to mirror the class heiarchy of wxWindows as closely as possible. This means that there is a wxFrame class in wxPython that looks, smells, tastes and acts almost the same as the wxFrame class in the C++ version. Unfortunately, because of differences in the languages, wxPython doesn't match wxWindows exactly, but the differences should be easy to absorb because they are natural to Python. For example, some methods that return multiple values via argument pointers in C++ will return a tuple of values in Python. -

-There is still much to be done for wxPython, many classes still need to be mirrored. Also, wxWindows is still somewhat of a moving target so it is a bit of an effort just keeping wxPython up to date. On the other hand, there are enough of the core classes completed that useful applications can be written. -

-wxPython is close enough to the C++ version that the majority of the wxPython documentation is actually just notes attached to the C++ documents that describe the places where wxPython is different. There is also a series of sample programs included, and a series of documentation pages that assist the programmer in getting started with wxPython. -""" + wxPython is a Python extension module that encapsulates the wxWindows GUI classes. Currently it is only available for the Win32 and GTK ports of wxWindows, but as soon as the other ports are brought up to the same level as Win32 and GTK, it should be fairly trivial to enable wxPython to be used with the new GUI. +

+ The wxPython extension module attempts to mirror the class heiarchy of wxWindows as closely as possible. This means that there is a wxFrame class in wxPython that looks, smells, tastes and acts almost the same as the wxFrame class in the C++ version. Unfortunately, because of differences in the languages, wxPython doesn't match wxWindows exactly, but the differences should be easy to absorb because they are natural to Python. For example, some methods that return multiple values via argument pointers in C++ will return a tuple of values in Python. +

+ There is still much to be done for wxPython, many classes still need to be mirrored. Also, wxWindows is still somewhat of a moving target so it is a bit of an effort just keeping wxPython up to date. On the other hand, there are enough of the core classes completed that useful applications can be written. +

+ wxPython is close enough to the C++ version that the majority of the wxPython documentation is actually just notes attached to the C++ documents that describe the places where wxPython is different. There is also a series of sample programs included, and a series of documentation pages that assist the programmer in getting started with wxPython. + """ diff --git a/utils/wxPython/demo/wxStyledTextCtrl_2.py b/utils/wxPython/demo/wxStyledTextCtrl_2.py index 0dd1456e01..e3b57e8e78 100644 --- a/utils/wxPython/demo/wxStyledTextCtrl_2.py +++ b/utils/wxPython/demo/wxStyledTextCtrl_2.py @@ -184,11 +184,8 @@ class PythonSTC(wxStyledTextCtrl): if expanding: self.SetFoldExpanded(lineNum, true) - print lineNum, lineNum = self.Expand(lineNum, true) - print lineNum, lineNum = lineNum - 1 - print lineNum else: lastChild = self.GetLastChild(lineNum, -1) self.SetFoldExpanded(lineNum, false) diff --git a/utils/wxPython/distrib/autobuild.py b/utils/wxPython/distrib/autobuild.py index 4ebe489a0a..417ee89b63 100644 --- a/utils/wxPython/distrib/autobuild.py +++ b/utils/wxPython/distrib/autobuild.py @@ -4,10 +4,10 @@ import sys, os, string, time from ftplib import FTP -logfile = 'e:\\temp\\autobuild.log' +logfile = 'c:\\temp\\autobuild.log' WXDIR = os.environ['WXWIN'] -dllVer = '21_14' -wxpVer = '2.1.14' +dllVer = '21_15' +wxpVer = '2.1.15' dateSt = time.strftime("%Y%m%d", time.localtime(time.time())) #---------------------------------------------------------------------- @@ -57,39 +57,43 @@ def main(): logTruncate() try: -## logSeparator("Cleanup") -## os.chdir(WXDIR + '/src/msw') -## do('make cleandll FINAL=1') -## os.chdir(WXDIR + '/utils/ogl/src') -## do('wxm clean FINAL=1') -## os.chdir(WXDIR + '/utils/glcanvas/win') -## do('wxm clean FINAL=1') + logSeparator("Cleanup") + os.chdir(WXDIR + '/src/msw') + do('make cleandll FINAL=1') + do('makeaddons clean FINAL=1') -## logSeparator("Building Documentation...") -## os.chdir(WXDIR + '/src/msw') -## do('make touchmanual htmlhelp') -## validateFile(WXDIR + '/docs/html/wx/wx.chm') + #os.chdir(WXDIR + '/utils/ogl/src') + #do('wxm clean FINAL=1') + #os.chdir(WXDIR + '/utils/glcanvas/win') + #do('wxm clean FINAL=1') -## logSeparator("Building wxWindows and libraries...") -## os.chdir(WXDIR + '/src/msw') -## do('make dll pch FINAL=1') -## validateFile(WXDIR + '/lib/wx'+dllVer+'.dll') + logSeparator("Building Documentation...") + os.chdir(WXDIR + '/src/msw') + do('make touchmanual htmlhelp') + validateFile(WXDIR + '/docs/htmlhelp/wx.chm') - os.chdir(WXDIR + '/contrib/src/ogl') - do('wxm FINAL=1') + logSeparator("Building wxWindows and other libraries...") + os.chdir(WXDIR + '/src/msw') + do('make dll pch FINAL=1') + validateFile(WXDIR + '/lib/wx'+dllVer+'.dll') + + do('makeaddons FINAL=1') + #os.chdir(WXDIR + '/contrib/src/ogl') + #do('wxm FINAL=1') validateFile(WXDIR + '/contrib/lib/ogl.lib') + validateFile(WXDIR + '/contrib/lib/stc.lib') logSeparator("Cleaning wxPython build directory...") os.chdir(WXDIR + '/utils/wxPython') do("del /sxy *.*") logSeparator("Copying wxPython workspace to build directory...") - do("copy /s %s %s" % ('e:\\projects\\wxPython\*.*', WXDIR+'\\utils\\wxPython')) + do("copy /s %s %s" % ('c:\\projects\\wxPython\\*.*', WXDIR+'\\utils\\wxPython')) os.chdir(WXDIR + '/utils/wxPython') f = open("build.local", "w") f.write(""" -TARGETDIR = 'e:\\projects\\wx\\utils\\wxPython' -WXPSRCDIR = 'e:\\projects\\wx\\utils\\wxPython\\src' +TARGETDIR = 'c:\\projects\\wx\\utils\\wxPython' +WXPSRCDIR = 'c:\\projects\\wx\\utils\\wxPython\\src' CRTFLAG='/MD' FINAL=1 """) @@ -116,6 +120,7 @@ FINAL=1 validateFile(WXDIR+'\\utils\\wxPython\\htmlc.pyd') validateFile(WXDIR+'\\utils\\wxPython\\glcanvasc.pyd') validateFile(WXDIR+'\\utils\\wxPython\\oglc.pyd') + validateFile(WXDIR+'\\utils\\wxPython\\stc_c.pyd') logSeparator("Building installer executable...") @@ -129,7 +134,7 @@ FINAL=1 os.rename(srcName, destName) validateFile(destName) except: - pass + logSeparator("****** UNABLE TO RENAME FILE ******") logSeparator("Building source and docs zip files...") @@ -153,12 +158,12 @@ FINAL=1 # #*#*#*#*#* Comment this out to allow upload... - #return + return logSeparator("Uploading to website...") - do('python d:\util32\sendwxp.py %s' % destName) - do('python d:\util32\sendwxp.py %s' % destZName) - do('python d:\util32\sendwxp.py %s' % destDName) + do('python c:\\utils\\sendwxp.py %s' % destName) + do('python c:\\utils\\sendwxp.py %s' % destZName) + do('python c:\\utils\\sendwxp.py %s' % destDName) os.unlink(destName) os.unlink(destZName) diff --git a/utils/wxPython/distrib/wise.aut b/utils/wxPython/distrib/wise.aut index 6abb399e38..8f97040c2d 100644 --- a/utils/wxPython/distrib/wise.aut +++ b/utils/wxPython/distrib/wise.aut @@ -1,5 +1,5 @@ -run, e:\\Tools\\Wise\\WISE32.EXE wxPython.wse +run, c:\\Tools\\Wise\\WISE32.EXE wxPython.wse winwaitactive, wxPython.wse - Wise Installation System send, !ic sleep, 1000 diff --git a/utils/wxPython/distrib/wxPython.rsp b/utils/wxPython/distrib/wxPython.rsp index 1687e5000f..e3f1090e5d 100644 --- a/utils/wxPython/distrib/wxPython.rsp +++ b/utils/wxPython/distrib/wxPython.rsp @@ -56,9 +56,6 @@ wxPython/modules/html/*.c wxPython/modules/html/*.h wxPython/modules/html/*.def wxPython/modules/html/*.rc -wxPython/modules/html/*.cpp -wxPython/modules/html/*.h -wxPython/modules/html/*.py wxPython/modules/glcanvas/build.cfg wxPython/modules/glcanvas/*.i @@ -99,13 +96,9 @@ wxPython/modules/ogl/*.c wxPython/modules/ogl/*.h wxPython/modules/ogl/*.def wxPython/modules/ogl/*.rc -wxPython/modules/ogl/*.cpp -wxPython/modules/ogl/*.h -wxPython/modules/ogl/*.py wxPython/modules/ogl/contrib/include/wx/ogl/*.h wxPython/modules/ogl/contrib/src/ogl/*.cpp - wxPython/modules/stc/build.cfg wxPython/modules/stc/*.txt wxPython/modules/stc/*.i diff --git a/utils/wxPython/distrib/wxPython.wse b/utils/wxPython/distrib/wxPython.wse index a30d010828..d8d92772b4 100644 --- a/utils/wxPython/distrib/wxPython.wse +++ b/utils/wxPython/distrib/wxPython.wse @@ -17,7 +17,7 @@ item: Global Patch Flags=0000000000001001 Patch Threshold=85 Patch Memory=4000 - EXE Filename=wxPython-2.1.14.exe + EXE Filename=wxPython-2.1.15.exe FTP Cluster Size=20 Per-User Version ID=1 Dialogs Version=6 @@ -25,7 +25,7 @@ item: Global Variable Default1=C:\WINNT\System32 Variable Flags1=00001000 Variable Name2=_WISE_ - Variable Default2=E:\Tools\Wise + Variable Default2=C:\Tools\Wise Variable Flags2=00001000 Variable Name3=_ODBC16_ Variable Default3=C:\WINNT\System32 @@ -191,7 +191,7 @@ end item: End Block end item: Display Graphic - Pathname=e:\Projects\wx\utils\wxPython\distrib\wxPython.BMP + Pathname=c:\Projects\wx\utils\wxPython\distrib\wxPython.BMP X Position=32784 Y Position=16 Flags=0000001010000000 @@ -805,156 +805,168 @@ end item: Remark end item: Install File - Source=d:\WINNT\System32\Msvcirt.dll + Source=c:\WINNT\System32\Msvcirt.dll Destination=%SYS%\Msvcirt.dll Flags=0000001010000011 end item: Install File - Source=d:\WINNT\System32\Msvcrt.dll + Source=c:\WINNT\System32\Msvcrt.dll Destination=%SYS%\Msvcrt.dll Flags=0000001010000011 end item: Install File - Source=e:\projects\wx\lib\wx21_14.dll - Destination=%SYS%\wx21_14.dll + Source=c:\projects\wx\lib\wx21_15.dll + Destination=%SYS%\wx21_15.dll Flags=0000001010010010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\*.py + Source=c:\Projects\wx\utils\wxPython\*.py Destination=%MAINDIR%\wxPython Description=wxPython shadow class modules Flags=0000000010000010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\*.pyd + Source=c:\Projects\wx\utils\wxPython\*.pyd Destination=%MAINDIR%\wxPython Description=wxPython extension modules Flags=0000000010000010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\*.txt + Source=c:\Projects\wx\utils\wxPython\*.txt Destination=%MAINDIR%\wxPython Description=README file Flags=0000000010000010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\lib\*.py + Source=c:\Projects\wx\utils\wxPython\lib\*.py Destination=%MAINDIR%\wxPython\lib Description=wxPython Standard Library Flags=0000000010000010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\lib\sizers\*.py + Source=c:\Projects\wx\utils\wxPython\lib\sizers\*.py Destination=%MAINDIR%\wxPython\lib\sizers Description=wxPython Standard Library Flags=0000000010000010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\lib\editor\*.py + Source=c:\Projects\wx\utils\wxPython\lib\editor\*.py Destination=%MAINDIR%\wxPython\lib\editor Description=wxPython Standard Library Flags=0000000010000010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\demo\*.py + Source=c:\Projects\wx\utils\wxPython\demo\*.py Destination=%MAINDIR%\wxPython\demo Description=Demos Flags=0000000010000010 end item: Install File - Source=E:\Projects\wx\utils\wxPython\demo\README.txt + Source=c:\Projects\wx\utils\wxPython\demo\README.txt Destination=%MAINDIR%\wxPython\demo\README.txt Description=Demos Flags=0000000010000010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\demo\*.xml + Source=c:\Projects\wx\utils\wxPython\demo\*.xml Destination=%MAINDIR%\wxPython\demo Description=Demos Flags=0000000010000010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.bmp + Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.bmp Destination=%MAINDIR%\wxPython\demo\bitmaps Description=Demos Flags=0000000010000010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.gif + Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.gif Destination=%MAINDIR%\wxPython\demo\bitmaps Description=Demos Flags=0000000010000010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.jpg + Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.jpg Destination=%MAINDIR%\wxPython\demo\bitmaps Description=Demos Flags=0000000010000010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.png + Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.png Destination=%MAINDIR%\wxPython\demo\bitmaps Description=Demos Flags=0000000010000010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.ico + Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.ico Destination=%MAINDIR%\wxPython\demo\bitmaps Description=Demos Flags=0000000010000010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\demo\data\*.htm + Source=c:\Projects\wx\utils\wxPython\demo\data\*.htm Destination=%MAINDIR%\wxPython\demo\data Description=Demos Flags=0000000010000010 end item: Install File - Source=e:\Projects\wx\utils\wxPython\demo\data\*.png + Source=c:\Projects\wx\utils\wxPython\demo\data\*.png Destination=%MAINDIR%\wxPython\demo\data Description=Demos Flags=0000000010000010 end +item: Install File + Source=C:\PROJECTS\wx\utils\wxPython\demo\data\grid.i + Destination=%MAINDIR%\wxPython\demo\data\grid.i + Description=Demos + Flags=0000000010000010 +end +item: Install File + Source=C:\PROJECTS\wx\utils\wxPython\demo\data\stc.h + Destination=%MAINDIR%\wxPython\demo\data\stc.h + Description=Demos + Flags=0000000010000010 +end item: Remark end item: Install File - Source=E:\PROJECTS\wx\docs\html\wx\wx.chm + Source=C:\PROJECTS\wx\docs\htmlhelp\wx.chm Destination=%MAINDIR%\wxPython\docs\wx.chm Description=wxPython documentation Flags=0000000010000010 end item: Install File - Source=E:\PROJECTS\wx\docs\html\ogl\ogl.chm + Source=c:\PROJECTS\wx\docs\html\ogl\ogl.chm Destination=%MAINDIR%\wxPython\docs\ogl.chm Description=wxPython documentation Flags=0000000010000010 end item: Install File - Source=E:\PROJECTS\wx\docs\preamble.txt + Source=c:\PROJECTS\wx\docs\preamble.txt Destination=%MAINDIR%\wxPython\docs\preamble.txt Description=wxPython documentation Flags=0000000010000010 end item: Install File - Source=E:\PROJECTS\wx\docs\licence.txt + Source=c:\PROJECTS\wx\docs\licence.txt Destination=%MAINDIR%\wxPython\docs\licence.txt Description=wxPython documentation Flags=0000000010000010 end item: Install File - Source=E:\PROJECTS\wx\docs\licendoc.txt + Source=c:\PROJECTS\wx\docs\licendoc.txt Destination=%MAINDIR%\wxPython\docs\licendoc.txt Description=wxPython documentation Flags=0000000010000010 end item: Install File - Source=E:\PROJECTS\wx\docs\lgpl.txt + Source=c:\PROJECTS\wx\docs\lgpl.txt Destination=%MAINDIR%\wxPython\docs\lgpl.txt Description=wxPython documentation Flags=0000000010000010 end item: Install File - Source=E:\PROJECTS\wx\docs\gpl.txt + Source=c:\PROJECTS\wx\docs\gpl.txt Destination=%MAINDIR%\wxPython\docs\gpl.txt Description=wxPython documentation Flags=0000000010000010 diff --git a/utils/wxPython/modules/stc/.cvsignore b/utils/wxPython/modules/stc/.cvsignore index f3c7a7c5da..cfb938e6d3 100644 --- a/utils/wxPython/modules/stc/.cvsignore +++ b/utils/wxPython/modules/stc/.cvsignore @@ -1 +1,5 @@ Makefile +Makefile +stc_c.exp +stc_c.ilk +stc_c.pch