This commit was manufactured by cvs2svn to create tag

'wxPython-2_1b3'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPython-2_1b3@3555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxPython/.cvsignore

@@ -0,0 +1,117 @@
+*.py
+*.pyc
+*.pyc
+*.pyd
+*.pyd
+*.pyo
+*.pyo
+*.zip
+.cvsignore
+.emacs.desktop
+__init__.py
+__init__.py
+__init__.pyc
+__init__.pyc
+__init__.pyo
+__init__.pyo
+build.local
+cmndlgs.py
+cmndlgs.py
+cmndlgs.pyc
+cmndlgs.pyc
+cmndlgs.pyo
+cmndlgs.pyo
+controls.py
+controls.py
+controls.pyc
+controls.pyc
+controls.pyo
+controls.pyo
+controls2.py
+controls2.py
+controls2.pyc
+controls2.pyc
+controls2.pyo
+controls2.pyo
+docs
+events.py
+events.py
+events.pyc
+events.pyc
+events.pyo
+events.pyo
+filelist
+frames.py
+frames.py
+frames.pyc
+frames.pyc
+frames.pyo
+frames.pyo
+gdi.py
+gdi.py
+gdi.pyc
+gdi.pyc
+gdi.pyo
+gdi.pyo
+glcanvas.py
+glcanvas.pyc
+glcanvasc.ilk
+glcanvasc.pyd
+image.py
+image.pyc
+mdi.py
+mdi.py
+mdi.pyc
+mdi.pyc
+mdi.pyo
+mdi.pyo
+misc.py
+misc.py
+misc.pyc
+misc.pyc
+misc.pyo
+misc.pyo
+printfw.py
+stattool.py
+stattool.py
+stattool.pyc
+stattool.pyc
+stattool.pyo
+stattool.pyo
+utils.py
+utils.py
+utils.pyc
+utils.pyc
+utils.pyo
+utilsc.ilk
+utilsc.pyd
+windows.py
+windows.py
+windows.pyc
+windows.pyc
+windows.pyo
+windows.pyo
+windows2.py
+windows2.py
+windows2.pyc
+windows2.pyc
+windows2.pyo
+windows2.pyo
+windows3.py
+windows3.pyc
+windows3.pyo
+wx.py
+wx.py
+wx.pyc
+wx.pyc
+wx.pyo
+wxPython.doc
+wxc.ilk
+wxc.pdb
+wxc.pyd
+wxp.py
+wxp.pyc
+wxp.pyo
+wxpc.ilk
+wxpc.pdb
+wxpc.pyd

utils/wxPython/README.txt

@@ -0,0 +1,411 @@
+wxPython README
+---------------
+
+Welcome to the wonderful world of wxPython!
+
+Once you have installed the wxPython extension module, you can try it
+out by going to the [install dir]\wxPython\demo directory and typing:
+
+    python demo.py
+
+There are also some other sample files there for you to play with and
+learn from.
+
+If you selected to install the documentation then point your browser
+to [install dir]\wxPython\docs\index.htm and you will then be looking
+at the docs for wxWindows.  For the most part you can use the C++ docs
+as most classes and methods are used identically.  Where there are
+differences they are documented with a "wxPython Note."
+
+On Win32 systems the binary self-installer creates a program group on
+the Start Menu that contains a link to running the demo and a link to
+the help file.  To help you save disk space I'm now using Microsoft's
+HTML Help format.  If your system doesn't know what to do with the help
+file, you can install the HTML Help Viewer as part of IE 4+, NT
+Service Pack 4+, or the HTML Workshop at
+
+http://msdn.microsoft.com/workshop/author/htmlhelp/download.asp.
+
+
+
+Getting Help
+------------
+
+Since wxPython is a blending of multiple technologies, help comes from
+multiple sources.  See the http://alldunn.com/wxPython for details on
+various sources of help, but probably the best source is the
+wxPython-users mail list.  You can view the archive or subscribe by
+going to
+
+       http://starship.python.net/mailman/listinfo/wxpython-users
+
+Or you can send mail directly to the list using this address:
+
+       wxpython-users@starship.python.net
+
+----------------------------------------------------------------------
+
+What's new in 2.1b3
+--------------------
+
+This release is syncronized with release 2.1 snapshot 9 of wxWindows.
+
+Switched to using SWIG from CVS (see http://swig.cs.uchicago.edu/cvs.html)
+for some of the new features and such.  Also they have encorporated my
+patches so there is really no reason to stick with the current (very
+old) release...  This version of SWIG gives the following new
+features:
+
+    1. Keyword arguments.  You no longer have to specify all the
+       parameters with defaults to a method just to specify a
+       non-default value on the end.  You can now do this instead:
+
+	  win = wxWindow(parent, -1, style = mystyle)
+
+    2. There is now an an equivalence between Python's None and C++'s
+       NULL.  This means that any methods that might return NULL will
+       now return None and you can use none where wxWindows might be
+       expecting NULL.  This makes things much more snake-ish.
+
+
+There is a new build system based on a new Python program instead of
+raw makefiles.  Now wxPython builds are virtually the same on MSW or
+Unix systems.  See the end of this file for new build instructions and
+see distrib/build.py for more details.
+
+wxDC.Bilt now includes the useMask parameter, and has been split into
+two different versions.  wxDC.BlitXY is like what was there before and
+takes raw coordinants and sizes, and the new wxDC.Blit is for the new
+interface using wxPoints and a wxSize.
+
+
+
+
+
+What's new in 2.1b2
+--------------------
+
+Added the missing wxWindow.GetUpdateRegion() method.
+
+Made a new change in SWIG (update your patches everybody) that
+provides a fix for global shadow objects that get an exception in
+their __del__ when their extension module has already been deleted.
+It was only a 1 line change in .../SWIG/Modules/pycpp.cxx at about
+line 496 if you want to do it by hand.
+
+It is now possible to run through MainLoop more than once in any one
+process.  The cleanup that used to happen as MainLoop completed (and
+prevented it from running again) has been delayed until the wxc module
+is being unloaded by Python.
+
+I fixed a bunch of stuff in the C++ version of wxGrid so it wouldn't
+make wxPython look bad.
+
+wxWindow.PopupMenu() now takes a wxPoint instead of  x,y.  Added
+wxWindow.PopupMenuXY to be consistent with some other methods.
+
+Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace.
+
+You can now provide your own app.MainLoop method.  See
+wxPython/demo/demoMainLoop.py for an example and some explaination.
+
+Got the in-place-edit for the wxTreeCtrl fixed and added some demo
+code to show how to use it.
+
+Put the wxIcon constructor back in for GTK as it now has one that
+matches MSW's.
+
+Added wxGrid.GetCells
+
+Added wxSystemSettings static methods as functions with names like
+wxSystemSettings_GetSystemColour.
+
+Removed wxPyMenu since using menu callbacks have been depreciated in
+wxWindows.  Use wxMenu and events instead.
+
+Added alternate wxBitmap constructor (for MSW only) as
+      wxBitmapFromData(data, type, width, height, depth = 1)
+
+Added a helper function named wxPyTypeCast that can convert shadow
+objects of one type into shadow objects of another type.  (Like doing
+a down-cast.)  See the implementation in wx.py for some docs.
+
+Fixed wxImage GetData and SetData to properly use String objects for
+data transfer.
+
+Added access methods to wxGridEvent.
+
+New Makefile/Setup files supporting multiple dynamic extension modules
+for unix systems.
+
+Fixes for the wxGLCanvas demo to work around a strange bug in gtk.
+
+SWIG support routines now compiled separately instead of being bundled
+in wx.cpp.
+
+
+
+
+
+What's new in 2.1b1
+--------------------
+Fixed wxComboBox.SetSelection so that it actually sets the selected
+item.  (Actually just removed it from wxPython and let it default to
+wxChoice.SetSelection which was already doing the right thing.)
+
+Added the Printing Framework.
+
+Switched back to using the wxWindows DLL for the pre-built Win32
+version.  The problem was needing to reinitialize static class info
+data after loading each extension module.
+
+Lots of little tweaks and additions to reflect changes to various
+wxWindows classes.
+
+Fixed a bug with attaching objects to tree items.  Actually was a
+symptom of a larger problem with not obtaining the interpreter lock
+when doing any Py_DECREFs.
+
+wxSizer and friends.  Sizers are layout tools that manage a colection
+of windows and sizers.  Different types of sizers apply different
+types of layout algorithms.  You saw it here first!  These classes are
+not even in the wxWindows C++ library yet!
+
+
+
+What's new in 2.0b9
+-------------------
+Bug fix for ListCtrl in test4.py (Was a missing file...  DSM!)
+
+Bug fix for occassional GPF on Win32 systems upon termination of a
+wxPython application.
+
+Added wxListBox.GetSelections returning selections as a Tuple.
+
+Added a wxTreeItemData that is able to hold any Python object and be
+associated with items in a wxTreeCtrl.  Added test pytree.py to show
+this feature off.
+
+Added wxSafeYield function.
+
+OpenGL Canvas can be optionally compiled in to wxPython.
+
+Awesome new Demo Framework for showing off wxPython and for learning
+how it all works.
+
+The pre-built Win32 version is no longer distributing the wxWindows
+DLL.  It is statically linked with the wxWindows library instead.
+
+Added a couple missing items from the docs.
+
+Added wxImage, wxImageHandler, wxPNGHandler, wxJPEGHandler,
+wxGIFHandler and wxBMPHandler.
+
+Added new methods to wxTextCtrl.
+
+Fixed some problems with how SWIG was wrapping some wxTreeCtrl
+methods.
+
+
+
+What's new in 2.0b8
+-------------------
+Support for using Python threads in wxPython apps.
+
+Several missing methods from various classes.
+
+Various bug fixes.
+
+
+
+What's new in 2.0b7
+-------------------
+Added DLG_PNT and DLG_SZE convienience methods to wxWindow class.
+
+Added missing constructor and other methods for wxMenuItem.
+
+
+
+What's new in 2.0b6
+-------------------
+Just a quickie update to fix the self-installer to be compatible with
+Python 1.5.2b2's Registry settings.
+
+
+What's new in 2.0b5
+-------------------
+Well obviously the numbering scheme has changed.  I did this to
+reflect the fact that this truly is the second major revision of
+wxPython, (well the third actually if you count the one I did for
+wxWindows 1.68 and then threw away...) and also that it is associated
+with the 2.0 version of wxWindows.
+
+I have finally started documenting wxPython.  There are several pages
+in the wxWindows documentation tree specifically about wxPython, and I
+have added notes within the class references about where and how wxPython
+diverges from wxWindows.
+
+Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+window handle.  If you can get the window handle into the python code,
+it should just work...  More news on this later.
+
+Added wxImageList, wxToolTip.
+
+Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+wxRegConfig class.
+
+As usual, some bug fixes, tweaks, etc.
+
+
+
+What's new in 0.5.3
+-------------------
+Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
+
+Various cleanup, tweaks, minor additions, etc. to maintain
+compatibility with the current wxWindows.
+
+
+
+What's new in 0.5.0
+-------------------
+Changed the import semantics from "from wxPython import *" to "from
+wxPython.wx import *"  This is for people who are worried about
+namespace pollution, they can use "from wxPython import wx" and then
+prefix all the wxPython identifiers with "wx."
+
+Added wxTaskbarIcon for wxMSW.
+
+Made the events work for wxGrid.
+
+Added wxConfig.
+
+Added wxMiniFrame for wxGTK.
+
+Changed many of the args and return values that were pointers to gdi
+objects to references to reflect changes in the wxWindows API.
+
+Other assorted fixes and additions.
+
+
+
+
+What's new in 0.4.2
+-------------------
+
+wxPython on wxGTK works!!!  Both dynamic and static on Linux and
+static on Solaris have been tested.  Many thanks go to Harm
+<H.v.d.Heijden@phys.tue.nl> for his astute detective work on tracking
+down a nasty DECREF bug.  Okay so I have to confess that it was just a
+DSM (Dumb Stupid Mistake) on my part but it was nasty none the less
+because the behavior was so different on different platforms.
+
+The dynamicly loaded module on Solaris is still segfaulting, so it
+must have been a different issue all along...
+
+
+
+What's New in 0.4
+-----------------
+
+1. Worked on wxGTK compatibility.  It is partially working.  On a
+Solaris/Sparc box wxPython is working but only when it is statically
+linked with the Python interpreter.  When built as a dyamically loaded
+extension module, things start acting weirdly and it soon seg-faults.
+And on Linux both the statically linked and the dynamically linked
+version segfault shortly after starting up.
+
+2. Added Toolbar, StatusBar and SplitterWindow classes.
+
+3. Varioius bug fixes, enhancements, etc.
+
+----------------------------------------------------------------------
+
+
+
+Build Instructions
+------------------
+I used SWIG (http://www.swig.org) to create the source code for the
+extension module.  This enabled me to only have to deal with a small
+amount of code and only have to bother with the exceptional issues.
+SWIG takes care of the rest and generates all the repetative code for
+me.  You don't need SWIG to build the extension module as all the
+generated C++ code is included under the src directory.
+
+I added a few minor features to SWIG to control some of the code
+generation.  If you want to play around with this you will need to get
+a recent version of SWIG from their CVS or from a daily build.  See
+http://www.swig.org/ for details.
+
+wxPython is organized as a Python package.  This means that the
+directory containing the results of the build process should be a
+subdirectory of a directory on the PYTHONPATH.  (And preferably should
+be named wxPython.)  You can control where the build process will dump
+wxPython by setting the TARGETDIR variable for the build utility, (see
+below.)
+
+
+1. Build wxWindows as described in its BuildCVS.txt file.  For *nix
+   systems I run configure with these flags:
+
+                --with-gtk
+                --with-libjpeg
+                --without-odbc
+                --enable-unicode=no
+                --enable-threads=yes
+                --enable-socket=yes
+                --enable-static=no
+                --enable-shared=yes
+                --disable-std_iostreams
+
+   You can use whatever flags you want, but I know these work.
+
+   For Win32 systems I use Visual C++ 6.0, but 5.0 should work.  The
+   build utility currently does not support any other win32 compilers.
+
+2. At this point you may want to make an alias or symlink, script,
+   batch file, whatever on the PATH that invokes
+   $(WXWIN)/utils/wxPython/distrib/build.py to help simplify matters
+   somewhat.  For example, on my win32 system I have a file named
+   build.bat in a directory on the PATH that contains:
+
+   python $(WXWIN)/utils/wxPython/distrib/build.py %1 %2 %3 %4 %5 %6
+
+
+3. Change into the $(WXWIN)/utils/wxPython/src directory.
+
+4. Type "build -b" to build wxPython and "build -i" to install it.
+
+   The build.py script actually generates a Makefile based on what it
+   finds on your system and information found in the build.cfg file.
+   If you have troubles building or you want it built or installed in
+   a different way, take a look at the docstring in build.py.  You may
+   be able to override configuration options in a file named
+   build.local.
+
+5. To build and install the add-on modules, change to the appropriate
+   directory under $(WXWIN)/utils/wxPython/modules and run the build
+   utility again.
+
+6. Change to the $(WXWIN)/utils/wxPython/demo directory.
+
+7. Try executing the demo program.  For example:
+
+    python demo.py
+
+To run it without requiring a console on win32, you can use the
+pythonw.exe version of Python either from the command line or from a
+shortcut.
+
+
+
+----------------
+Robin Dunn
+robin@alldunn.com
+
+
+
+
+
+
+

utils/wxPython/SWIG.patches/Include.patch

@@ -0,0 +1,139 @@
+*** swig.h.old	Wed Feb 04 15:59:40 1998
+--- swig.h	Fri Aug 28 15:46:32 1998
+***************
+*** 178,185 ****
+--- 178,211 ----
+    char  *firstkey();
+    char  *nextkey();
+  };
+
++ // -------------------------------------------------------------------
++ // Simple Vector class
++ // User is responsible for deleting contents before deleteing Vector
++ // -------------------------------------------------------------------
++
++ class Vector {
++ public:
++     Vector(size_t allocSize=8);
++     ~Vector();
++
++     size_t size()                      { return m_size;  }
++     size_t count()                     { return m_count; }
++     size_t append(void* object);
++     size_t extend(size_t newSize);
++
++     void*& operator[] (size_t idx);
++
++     static void*    s_nullPtr;
++
++ private:
++     size_t          m_size;
++     size_t          m_count;
++     void**          m_data;
++ };
++
++
+  /************************************************************************
+   * class DataType
+   *
+   * Defines the basic datatypes supported by the translator.
+***************
+*** 684,691 ****
+--- 710,761 ----
+  extern char  *name_get(char *vname, int suppress=0);
+  extern char  *name_set(char *vname, int suppress=0);
+  extern char  *name_construct(char *classname, int suppress=0);
+  extern char  *name_destroy(char *classname, int suppress=0);
++
++ // ----------------------------------------------------------------------
++ // class CPP_class
++ //
++ // Class for managing class members (internally)
++ // ----------------------------------------------------------------------
++
++ class CPP_member;
++
++ class CPP_class {
++ public:
++   char        *classname;             // Real class name
++   char        *classrename;           // New name of class (if applicable)
++   char        *classtype;             // class type (struct, union, class)
++   int          strip;                 // Strip off class declarator
++   int          wextern;               // Value of extern wrapper variable for this class
++   int          have_constructor;      // Status bit indicating if we've seen a constructor
++   int          have_destructor;       // Status bit indicating if a destructor has been seen
++   int          is_abstract;           // Status bit indicating if this is an abstract class
++   int          generate_default;      // Generate default constructors
++   int          objective_c;           // Set if this is an objective C class
++   int          error;                 // Set if this class can't be generated
++   int          line;                  // Line number
++   char        **baseclass;            // Base classes (if any)
++   Hash        *local;                 // Hash table for local types
++   Hash        *scope;                 // Local scope hash table
++   DocEntry    *de;                    // Documentation entry of class
++   CPP_member  *members;               // Linked list of members
++   CPP_class   *next;                  // Next class
++   static CPP_class *classlist;        // List of all classes stored
++
++   Vector      addPragmas;
++
++   CPP_class(char *name, char *ctype);
++   void add_member(CPP_member *m);
++   CPP_member *search_member(char *name);
++   void inherit_decls(int mode);
++   void emit_decls();
++   static CPP_class *search(char *name);
++   void create_default();
++   static void create_all();
++ };
++
++ extern CPP_class     *current_class;
+
+  /***********************************************************************
+   * -- Revision History
+   * $Log$
+   * Revision 1.2  1999/07/31 07:54:05  RD
+   * wxPython 2.1b1:
+   *
+   * 	Added the missing wxWindow.GetUpdateRegion() method.
+   *
+   * 	Made a new change in SWIG (update your patches everybody) that
+   * 	provides a fix for global shadow objects that get an exception in
+   * 	their __del__ when their extension module has already been deleted.
+   * 	It was only a 1 line change in .../SWIG/Modules/pycpp.cxx at about
+   * 	line 496 if you want to do it by hand.
+   *
+   * 	It is now possible to run through MainLoop more than once in any one
+   * 	process.  The cleanup that used to happen as MainLoop completed (and
+   * 	prevented it from running again) has been delayed until the wxc module
+   * 	is being unloaded by Python.
+   *
+   * 	wxWindow.PopupMenu() now takes a wxPoint instead of  x,y.  Added
+   * 	wxWindow.PopupMenuXY to be consistent with some other methods.
+   *
+   * 	Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace.
+   *
+   * 	You can now provide your own app.MainLoop method.  See
+   * 	wxPython/demo/demoMainLoop.py for an example and some explaination.
+   *
+   * 	Got the in-place-edit for the wxTreeCtrl fixed and added some demo
+   * 	code to show how to use it.
+   *
+   * 	Put the wxIcon constructor back in for GTK as it now has one that
+   * 	matches MSW's.
+   *
+   * 	Added wxGrid.GetCells
+   *
+   * 	Added wxSystemSettings static methods as functions with names like
+   * 	wxSystemSettings_GetSystemColour.
+   *
+   * 	Removed wxPyMenu since using menu callbacks have been depreciated in
+   * 	wxWindows.  Use wxMenu and events instead.
+   *
+   * 	Added alternate wxBitmap constructor (for MSW only) as
+   * 	      wxBitmapFromData(data, type, width, height, depth = 1)
+   *
+   * 	Added a helper function named wxPyTypeCast that can convert shadow
+   * 	objects of one type into shadow objects of another type.  (Like doing
+   * 	a down-cast.)  See the implementation in wx.py for some docs.
+   *

utils/wxPython/SWIG.patches/Modules.patch

@@ -0,0 +1,202 @@
+*** python.cxx.old	Fri Jan 02 23:17:40 1998
+--- python.cxx	Fri Aug 28 15:49:18 1998
+***************
+*** 1678,1685 ****
+--- 1678,1702 ----
+  		fprintf(stderr,"%s : Line %d. Unable to locate file %s\n", input_file, line_number, value);
+  	      }
+  	    }
+  	  }
++         } else if (strcmp(cmd, "addtomethod") == 0) {
++             // parse value, expected to be in the form "methodName:line"
++             char* txtptr = strchr(value, ':');
++             if (txtptr) {
++                 // add name and line to a list in current_class
++                 *txtptr = 0;
++                 txtptr++;
++                 AddPragmaData* apData = new AddPragmaData(value, txtptr);
++                 current_class->addPragmas.append(apData);
++
++             } else {
++                 fprintf(stderr,"%s : Line %d. Malformed addtomethod pragma.  Should be \"methodName:text\"\n",
++                         input_file, line_number);
++             }
++         } else if (strcmp(cmd, "addtoclass") == 0) {
++                 AddPragmaData* apData = new AddPragmaData("__class__", value);
++                 current_class->addPragmas.append(apData);
+  	} else {
+  	  fprintf(stderr,"%s : Line %d. Unrecognized pragma.\n", input_file, line_number);
+  	}
+      }
+*** python.h.old	Thu Jul 24 23:18:50 1997
+--- python.h	Fri Aug 28 15:46:08 1998
+***************
+*** 184,191 ****
+--- 184,203 ----
+    void cpp_declare_const(char *name, char *iname, DataType *type, char *value);
+    void cpp_class_decl(char *, char *,char *);
+    void pragma(char *, char *, char *);
+    void add_typedef(DataType *t, char *name);
++
++   void emitAddPragmas(String& output, char* name, char* spacing);
+  };
+
+  #define PYSHADOW_MEMBER  0x2
++
++ struct AddPragmaData {
++     String      m_method;
++     String      m_text;
++
++     AddPragmaData(char* method, char* text)
++         : m_method(method),
++           m_text(text)
++         {}
++ };
+
+*** pycpp.cxx.old	Fri Jan 02 21:23:22 1998
+--- pycpp.cxx	Tue Jul 20 14:34:36 1999
+***************
+*** 275,282 ****
+--- 275,283 ----
+  #endif
+        }
+      }
+      //    if ((t->type != T_VOID) || (t->is_pointer))
++     emitAddPragmas(*pyclass, realname, tab8);
+      *pyclass << tab8 << "return val\n";
+
+      // Change the usage string to reflect our shadow class
+
+***************
+*** 393,400 ****
+--- 394,402 ----
+  	}
+        }
+        *construct << ")\n";
+        *construct << tab8 << "self.thisown = 1\n";
++       emitAddPragmas(*construct, "__init__", tab8);
+        have_constructor = 1;
+      } else {
+
+        // Hmmm. We seem to be creating a different constructor.  We're just going to create a
+***************
+*** 490,503 ****
+        if (class_renamed) realname = class_name;
+        else realname = name;
+      }
+
+!     *pyclass << tab4 << "def __del__(self):\n"
+  	     << tab8 << "if self.thisown == 1 :\n"
+  	     << tab8 << tab4 << module << "." << name_destroy(realname) << "(self.this)\n";
+!
+      have_destructor = 1;
+-
+      if (doc_entry) {
+        doc_entry->usage = "";
+        doc_entry->usage << "del this";
+      }
+--- 492,504 ----
+        if (class_renamed) realname = class_name;
+        else realname = name;
+      }
+
+!     *pyclass << tab4 << "def __del__(self, " << module << "=" << module << "):\n"
+  	     << tab8 << "if self.thisown == 1 :\n"
+  	     << tab8 << tab4 << module << "." << name_destroy(realname) << "(self.this)\n";
+!     emitAddPragmas(*pyclass, "__del__", tab8);
+      have_destructor = 1;
+      if (doc_entry) {
+        doc_entry->usage = "";
+        doc_entry->usage << "del this";
+      }
+***************
+*** 551,558 ****
+--- 552,561 ----
+        repr << tab4 << "def __repr__(self):\n"
+  	   << tab8 << "return \"<C " << class_name <<" instance>\"\n";
+
+        classes << repr;
++       emitAddPragmas(classes, "__class__", tab4);
++
+      }
+
+      // Now build the real class with a normal constructor
+
+***************
+*** 746,753 ****
+--- 749,778 ----
+      hash.add(name,copy_string((char *) hash.lookup(t->name)));
+    }
+  }
+
++ // --------------------------------------------------------------------------------
++ // PYTHON::emitAddPragmas(String& output, char* name, char* spacing);
++ //
++ // Search the current_class->addPragmas vector for any text belonging to name.
++ // Append the text properly spcaed to the output string.
++ //
++ // --------------------------------------------------------------------------------
++
++ void PYTHON::emitAddPragmas(String& output, char* name, char* spacing)
++ {
++     AddPragmaData*      apData;
++     size_t              count;
++     int                 i;
++
++     count = current_class->addPragmas.count();
++     for (i=0; i<count; i++) {
++         apData = (AddPragmaData*)current_class->addPragmas[i];
++         if (strcmp(apData->m_method, name) == 0) {
++             output << spacing << apData->m_text << "\n";
++         }
++     }
++ }
+
+  /*********************************************************************************
+   *
+   * $Log$
+   * Revision 1.2  1999/07/31 07:54:05  RD
+   * wxPython 2.1b1:
+   *
+   * 	Added the missing wxWindow.GetUpdateRegion() method.
+   *
+   * 	Made a new change in SWIG (update your patches everybody) that
+   * 	provides a fix for global shadow objects that get an exception in
+   * 	their __del__ when their extension module has already been deleted.
+   * 	It was only a 1 line change in .../SWIG/Modules/pycpp.cxx at about
+   * 	line 496 if you want to do it by hand.
+   *
+   * 	It is now possible to run through MainLoop more than once in any one
+   * 	process.  The cleanup that used to happen as MainLoop completed (and
+   * 	prevented it from running again) has been delayed until the wxc module
+   * 	is being unloaded by Python.
+   *
+   * 	wxWindow.PopupMenu() now takes a wxPoint instead of  x,y.  Added
+   * 	wxWindow.PopupMenuXY to be consistent with some other methods.
+   *
+   * 	Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace.
+   *
+   * 	You can now provide your own app.MainLoop method.  See
+   * 	wxPython/demo/demoMainLoop.py for an example and some explaination.
+   *
+   * 	Got the in-place-edit for the wxTreeCtrl fixed and added some demo
+   * 	code to show how to use it.
+   *
+   * 	Put the wxIcon constructor back in for GTK as it now has one that
+   * 	matches MSW's.
+   *
+   * 	Added wxGrid.GetCells
+   *
+   * 	Added wxSystemSettings static methods as functions with names like
+   * 	wxSystemSettings_GetSystemColour.
+   *
+   * 	Removed wxPyMenu since using menu callbacks have been depreciated in
+   * 	wxWindows.  Use wxMenu and events instead.
+   *
+   * 	Added alternate wxBitmap constructor (for MSW only) as
+   * 	      wxBitmapFromData(data, type, width, height, depth = 1)
+   *
+   * 	Added a helper function named wxPyTypeCast that can convert shadow
+   * 	objects of one type into shadow objects of another type.  (Like doing
+   * 	a down-cast.)  See the implementation in wx.py for some docs.
+   *

utils/wxPython/SWIG.patches/SWIG.patch

@@ -0,0 +1,530 @@
+*** cplus.cxx.old	Mon Feb 02 15:55:42 1998
+--- cplus.cxx	Fri Aug 28 13:02:50 1998
+***************
+*** 581,612 ****
+  // Class for managing class members (internally)
+  // ----------------------------------------------------------------------
+
+  static char   *inherit_base_class = 0;
+
+- class CPP_class {
+- public:
+-   char        *classname;             // Real class name
+-   char        *classrename;           // New name of class (if applicable)
+-   char        *classtype;             // class type (struct, union, class)
+-   int          strip;                 // Strip off class declarator
+-   int          wextern;               // Value of extern wrapper variable for this class
+-   int          have_constructor;      // Status bit indicating if we've seen a constructor
+-   int          have_destructor;       // Status bit indicating if a destructor has been seen
+-   int          is_abstract;           // Status bit indicating if this is an abstract class
+-   int          generate_default;      // Generate default constructors
+-   int          objective_c;           // Set if this is an objective C class
+-   int          error;                 // Set if this class can't be generated
+-   int          line;                  // Line number
+-   char        **baseclass;            // Base classes (if any)
+-   Hash        *local;                 // Hash table for local types
+-   Hash        *scope;                 // Local scope hash table
+-   DocEntry    *de;                    // Documentation entry of class
+-   CPP_member  *members;               // Linked list of members
+-   CPP_class   *next;                  // Next class
+-   static CPP_class *classlist;        // List of all classes stored
+
+!   CPP_class(char *name, char *ctype) {
+      CPP_class *c;
+      classname = copy_string(name);
+      classtype = copy_string(ctype);
+      classrename = 0;
+--- 581,593 ----
+  // Class for managing class members (internally)
+  // ----------------------------------------------------------------------
+
+  static char   *inherit_base_class = 0;
++ CPP_class *CPP_class::classlist = 0;
++ CPP_class     *current_class;
+
+
+! CPP_class::CPP_class(char *name, char *ctype) {
+    CPP_class *c;
+    classname = copy_string(name);
+    classtype = copy_string(ctype);
+    classrename = 0;
+***************
+*** 642,650 ****
+    // ------------------------------------------------------------------------------
+    // Add a new C++ member to this class
+    // ------------------------------------------------------------------------------
+
+!   void add_member(CPP_member *m) {
+      CPP_member *cm;
+
+      // Set base class where this was defined
+      if (inherit_base_class)
+--- 623,631 ----
+  // ------------------------------------------------------------------------------
+  // Add a new C++ member to this class
+  // ------------------------------------------------------------------------------
+
+! void CPP_class::add_member(CPP_member *m) {
+    CPP_member *cm;
+
+    // Set base class where this was defined
+    if (inherit_base_class)
+***************
+*** 664,672 ****
+    // ------------------------------------------------------------------------------
+    // Search for a member with the given name. Returns the member on success, 0 on failure
+    // ------------------------------------------------------------------------------
+
+!   CPP_member *search_member(char *name) {
+      CPP_member *m;
+      char *c;
+      m = members;
+      while (m) {
+--- 645,653 ----
+  // ------------------------------------------------------------------------------
+  // Search for a member with the given name. Returns the member on success, 0 on failure
+  // ------------------------------------------------------------------------------
+
+! CPP_member *CPP_class::search_member(char *name) {
+    CPP_member *m;
+    char *c;
+    m = members;
+    while (m) {
+***************
+*** 680,688 ****
+    // ------------------------------------------------------------------------------
+    // Inherit.  Put all the declarations associated with this class into the current
+    // ------------------------------------------------------------------------------
+
+!   void inherit_decls(int mode) {
+      CPP_member *m;
+      m = members;
+      while (m) {
+        inherit_base_class = m->base;
+--- 661,669 ----
+  // ------------------------------------------------------------------------------
+  // Inherit.  Put all the declarations associated with this class into the current
+  // ------------------------------------------------------------------------------
+
+! void CPP_class::inherit_decls(int mode) {
+    CPP_member *m;
+    m = members;
+    while (m) {
+      inherit_base_class = m->base;
+***************
+*** 696,704 ****
+    // ------------------------------------------------------------------------------
+    // Emit all of the declarations associated with this class
+    // ------------------------------------------------------------------------------
+
+!   void emit_decls() {
+      CPP_member    *m = members;
+      int  last_scope = name_scope(0);
+      abstract = is_abstract;
+      while (m) {
+--- 677,685 ----
+  // ------------------------------------------------------------------------------
+  // Emit all of the declarations associated with this class
+  // ------------------------------------------------------------------------------
+
+! void CPP_class::emit_decls() {
+    CPP_member    *m = members;
+    int  last_scope = name_scope(0);
+    abstract = is_abstract;
+    while (m) {
+***************
+*** 713,721 ****
+    // ------------------------------------------------------------------------------
+    // Search for a given class in the list
+    // ------------------------------------------------------------------------------
+
+!   static CPP_class *search(char *name) {
+      CPP_class *c;
+      c = classlist;
+      if (!name) return 0;
+      while (c) {
+--- 694,702 ----
+  // ------------------------------------------------------------------------------
+  // Search for a given class in the list
+  // ------------------------------------------------------------------------------
+
+! CPP_class *CPP_class::search(char *name) {
+    CPP_class *c;
+    c = classlist;
+    if (!name) return 0;
+    while (c) {
+***************
+*** 729,737 ****
+    // Add default constructors and destructors
+    //
+    // ------------------------------------------------------------------------------
+
+!   void create_default() {
+      if (!generate_default) return;
+
+      // Try to generate a constructor if not available.
+
+--- 710,718 ----
+  // Add default constructors and destructors
+  //
+  // ------------------------------------------------------------------------------
+
+! void CPP_class::create_default() {
+    if (!generate_default) return;
+
+    // Try to generate a constructor if not available.
+
+***************
+*** 751,764 ****
+    // ------------------------------------------------------------------------------
+    // Dump *all* of the classes saved out to the various
+    // language modules (this does what cplus_close_class used to do)
+    // ------------------------------------------------------------------------------
+-   static void create_all();
+- };
+-
+- CPP_class *CPP_class::classlist = 0;
+- static CPP_class     *current_class;
+-
+  void CPP_class::create_all() {
+    CPP_class *c;
+    c = classlist;
+    while (c) {
+--- 732,739 ----
+*** vector.cxx.old	Fri Aug 28 15:23:16 1998
+--- vector.cxx	Fri Aug 28 15:46:52 1998
+***************
+*** 0 ****
+--- 1,182 ----
++
++ /*******************************************************************************
++  * Simplified Wrapper and Interface Generator  (SWIG)
++  *
++  * Dave Beazley
++  *
++  * Department of Computer Science        Theoretical Division (T-11)
++  * University of Utah                    Los Alamos National Laboratory
++  * Salt Lake City, Utah  84112           Los Alamos, New Mexico  87545
++  * beazley@cs.utah.edu                   beazley@lanl.gov
++  *
++  * Copyright (c) 1995-1997
++  * The University of Utah and the Regents of the University of California
++  * All Rights Reserved
++  *
++  * Permission is hereby granted, without written agreement and without
++  * license or royalty fees, to use, copy, modify, and distribute this
++  * software and its documentation for any purpose, provided that
++  * (1) The above copyright notice and the following two paragraphs
++  * appear in all copies of the source code and (2) redistributions
++  * including binaries reproduces these notices in the supporting
++  * documentation.   Substantial modifications to this software may be
++  * copyrighted by their authors and need not follow the licensing terms
++  * described here, provided that the new terms are clearly indicated in
++  * all files where they apply.
++  *
++  * IN NO EVENT SHALL THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, THE
++  * UNIVERSITY OF UTAH OR DISTRIBUTORS OF THIS SOFTWARE BE LIABLE TO ANY
++  * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
++  * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION,
++  * EVEN IF THE AUTHORS OR ANY OF THE ABOVE PARTIES HAVE BEEN ADVISED OF
++  * THE POSSIBILITY OF SUCH DAMAGE.
++  *
++  * THE AUTHOR, THE UNIVERSITY OF CALIFORNIA, AND THE UNIVERSITY OF UTAH
++  * SPECIFICALLY DISCLAIM ANY WARRANTIES,INCLUDING, BUT NOT LIMITED TO,
++  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++  * PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND
++  * THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE,
++  * SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
++  *
++  *******************************************************************************/
++
++ #include "internal.h"
++
++ /*******************************************************************************
++  * $Header$
++  *
++  * File : vector.cxx
++  *
++  * A very simple Vector class.  Allways assumes that memory allocations are
++  * successful.  Should be made more robust...
++  *
++  *******************************************************************************/
++
++ void* Vector::s_nullPtr = NULL;
++
++ // -----------------------------------------------------------------------------
++ // Vector::Vector(size_t allocSize = 8)
++ //
++ // Constructor.  Creates a new Vector.
++ //
++ // Inputs : initial allocation size (optional)
++ //
++ // Output : New Vector object.
++ //
++ // Side Effects : None
++ // -----------------------------------------------------------------------------
++
++ Vector::Vector(size_t allocSize)
++     : m_size(allocSize),
++       m_count(0),
++       m_data(0)
++ {
++     if (m_size) {
++         m_data = new void*[m_size];
++         int i;
++         for (i=0; i<m_size;i++)
++             m_data[i] = 0;
++     }
++ }
++
++
++ // -----------------------------------------------------------------------------
++ // Vector::~Vector
++ //
++ // Destructor.  Only cleans up the vector, not its contents!
++ //
++ // -----------------------------------------------------------------------------
++
++
++ Vector::~Vector() {
++     if (m_data) {
++         delete [] m_data;
++     }
++
++     m_data = 0;
++     m_size = m_count = 0;
++ }
++
++
++
++ // -----------------------------------------------------------------------------
++ // size_t Vector::extend(size_t newSize)
++ //
++ // Extends the vector to at least newSize length.  Won't do anything if newSize
++ // is smaller than the current size of the vector.
++ //
++ // Returns the new allocated size.
++ //
++ // -----------------------------------------------------------------------------
++
++ #define GRANULARITY     16
++
++ size_t Vector::extend(size_t newSize) {
++
++     if (newSize > m_size) {
++         newSize = newSize + (GRANULARITY - (newSize % GRANULARITY));
++
++         void** temp = new void*[newSize];
++         memcpy(temp, m_data, m_size*sizeof(void*));
++
++         int i;
++         for (i=m_size; i<newSize; i++)
++             temp[i] = 0;
++
++         delete [] m_data;
++         m_data = temp;
++         m_size = newSize;
++     }
++     return m_size;
++ }
++
++
++ // -----------------------------------------------------------------------------
++ // Vector::append(void* object)
++ //
++ // Appends the object pointer to vector at index m_count.  Increments m_count.
++ // Returns the new count.
++ // -----------------------------------------------------------------------------
++
++ size_t Vector::append(void* object) {
++     if (m_count >= m_size) {
++         extend(m_count + 1);
++     }
++
++     m_data[m_count] = object;
++     m_count += 1;
++
++     return m_count;
++ }
++
++
++ // -----------------------------------------------------------------------------
++ // Vector::operator[] (size_t idx)
++ //
++ // Returns a reference to the void pointer at idx.  If idx is beyond the range
++ // of the vector, returns a reference to s_nullPtr.
++ //
++ // -----------------------------------------------------------------------------
++
++ void*& Vector::operator[] (size_t idx) {
++     if (idx >= m_size) {
++         s_nullPtr = 0;
++         return s_nullPtr;
++     }
++
++     return m_data[idx];
++ }
++
++
++ /***********************************************************************
++  *
++  * -- Revision History
++  * $Log$
++  * Revision 1.3  1999/07/31 07:54:05  RD
++  * wxPython 2.1b1:
++  *
++  * 	Added the missing wxWindow.GetUpdateRegion() method.
++  *
++  * 	Made a new change in SWIG (update your patches everybody) that
++  * 	provides a fix for global shadow objects that get an exception in
++  * 	their __del__ when their extension module has already been deleted.
++  * 	It was only a 1 line change in .../SWIG/Modules/pycpp.cxx at about
++  * 	line 496 if you want to do it by hand.
++  *
++  * 	It is now possible to run through MainLoop more than once in any one
++  * 	process.  The cleanup that used to happen as MainLoop completed (and
++  * 	prevented it from running again) has been delayed until the wxc module
++  * 	is being unloaded by Python.
++  *
++  * 	wxWindow.PopupMenu() now takes a wxPoint instead of  x,y.  Added
++  * 	wxWindow.PopupMenuXY to be consistent with some other methods.
++  *
++  * 	Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace.
++  *
++  * 	You can now provide your own app.MainLoop method.  See
++  * 	wxPython/demo/demoMainLoop.py for an example and some explaination.
++  *
++  * 	Got the in-place-edit for the wxTreeCtrl fixed and added some demo
++  * 	code to show how to use it.
++  *
++  * 	Put the wxIcon constructor back in for GTK as it now has one that
++  * 	matches MSW's.
++  *
++  * 	Added wxGrid.GetCells
++  *
++  * 	Added wxSystemSettings static methods as functions with names like
++  * 	wxSystemSettings_GetSystemColour.
++  *
++  * 	Removed wxPyMenu since using menu callbacks have been depreciated in
++  * 	wxWindows.  Use wxMenu and events instead.
++  *
++  * 	Added alternate wxBitmap constructor (for MSW only) as
++  * 	      wxBitmapFromData(data, type, width, height, depth = 1)
++  *
++  * 	Added a helper function named wxPyTypeCast that can convert shadow
++  * 	objects of one type into shadow objects of another type.  (Like doing
++  * 	a down-cast.)  See the implementation in wx.py for some docs.
++  *
++  *
++  ***********************************************************************/
++
++
++
++
++
++
+*** makefile.msc.old	Mon Jun 23 16:15:32 1997
+--- makefile.msc	Fri Aug 28 11:21:58 1998
+***************
+*** 33,50 ****
+  # Normally, you shouldn't have to change anything below this point     #
+  ########################################################################
+
+  LIBOBJS = main.obj scanner.obj symbol.obj include.obj types.obj parms.obj emit.obj newdoc.obj ascii.obj \
+!           html.obj latex.obj cplus.obj lang.obj hash.obj sstring.obj wrapfunc.obj getopt.obj comment.obj typemap.obj naming.obj
+
+  LIBSRCS = main.cxx scanner.cxx symbol.cxx include.cxx types.cxx parms.cxx emit.cxx \
+! 	  newdoc.cxx ascii.cxx html.cxx latex.cxx cplus.cxx lang.cxx hash.cxx \
+            sstring.cxx wrapfunc.cxx getopt.cxx comment.cxx typemap.cxx naming.cxx
+
+  LIBHEADERS = internal.h ../Include/swig.h latex.h ascii.h html.h nodoc.h
+  LIBNAME      = ..\libswig.lib
+  INCLUDE  = -I../Include -I$(STD_INC)
+! CFLAGS   = -Zi -nologo -DSWIG_LIB="\"$(SWIG_LIB)\"" -DSWIG_CC="\"$(CC)\""  -DMSDOS -DSTDC_HEADERS=1 -DHAVE_LIBDL=1 $(SWIG_OPTS)
+  LD_FLAGS    =  -VERBOSE
+
+
+  #
+--- 33,50 ----
+  # Normally, you shouldn't have to change anything below this point     #
+  ########################################################################
+
+  LIBOBJS = main.obj scanner.obj symbol.obj include.obj types.obj parms.obj emit.obj newdoc.obj ascii.obj \
+!           html.obj latex.obj cplus.obj lang.obj hash.obj vector.obj sstring.obj wrapfunc.obj getopt.obj comment.obj typemap.obj naming.obj
+
+  LIBSRCS = main.cxx scanner.cxx symbol.cxx include.cxx types.cxx parms.cxx emit.cxx \
+! 	  newdoc.cxx ascii.cxx html.cxx latex.cxx cplus.cxx lang.cxx hash.cxx vector.cxx \
+            sstring.cxx wrapfunc.cxx getopt.cxx comment.cxx typemap.cxx naming.cxx
+
+  LIBHEADERS = internal.h ../Include/swig.h latex.h ascii.h html.h nodoc.h
+  LIBNAME      = ..\libswig.lib
+  INCLUDE  = -I../Include -I$(STD_INC)
+! CFLAGS   = -Zi -nologo -DSWIG_LIB="\"$(SWIG_LIB)\"" -DSWIG_CC="\"$(CC)\""  -DMSDOS -DSTDC_HEADERS=1 -DHAVE_LIBDL=1 $(SWIG_OPTS) $(OTHERFLAGS)
+  LD_FLAGS    =  -VERBOSE
+
+
+  #
+*** makefile.bc.old	Sun Jan 04 13:49:24 1998
+--- makefile.bc	Fri Aug 28 15:42:58 1998
+***************
+*** 34,47 ****
+  ########################################################################
+
+  LIBOBJS = main.obj scanner.obj symbol.obj include.obj types.obj parms.obj \
+            emit.obj newdoc.obj ascii.obj \
+!           html.obj latex.obj cplus.obj lang.obj hash.obj sstring.obj \
+            wrapfunc.obj getopt.obj comment.obj typemap.obj naming.obj
+
+  LIBSRCS = main.cxx scanner.cxx symbol.cxx include.cxx types.cxx parms.cxx \
+            emit.cxx newdoc.cxx ascii.cxx html.cxx latex.cxx cplus.cxx lang.cxx hash.cxx \
+!           sstring.cxx wrapfunc.cxx getopt.cxx comment.cxx typemap.cxx naming.cxx
+
+  LIBHEADERS = internal.h ../Include/swig.h latex.h ascii.h html.h nodoc.h
+  LIBNAME      = ..\libswig.lib
+  INCLUDE  = -I../Include -I$(STD_INC)
+--- 34,47 ----
+  ########################################################################
+
+  LIBOBJS = main.obj scanner.obj symbol.obj include.obj types.obj parms.obj \
+            emit.obj newdoc.obj ascii.obj \
+!           html.obj latex.obj cplus.obj lang.obj hash.obj vector.obj sstring.obj \
+            wrapfunc.obj getopt.obj comment.obj typemap.obj naming.obj
+
+  LIBSRCS = main.cxx scanner.cxx symbol.cxx include.cxx types.cxx parms.cxx \
+            emit.cxx newdoc.cxx ascii.cxx html.cxx latex.cxx cplus.cxx lang.cxx hash.cxx \
+!           vector.cxx sstring.cxx wrapfunc.cxx getopt.cxx comment.cxx typemap.cxx naming.cxx
+
+  LIBHEADERS = internal.h ../Include/swig.h latex.h ascii.h html.h nodoc.h
+  LIBNAME      = ..\libswig.lib
+  INCLUDE  = -I../Include -I$(STD_INC)
+*** Makefile.in.old	Wed May 28 23:56:56 1997
+--- Makefile.in	Fri Aug 28 15:43:36 1998
+***************
+*** 51,63 ****
+  # Normally, you shouldn't have to change anything below this point     #
+  ########################################################################
+
+  LIBOBJS = main.o scanner.o symbol.o include.o types.o parms.o emit.o newdoc.o ascii.o \
+!           html.o latex.o cplus.o lang.o hash.o sstring.o wrapfunc.o getopt.o comment.o \
+            typemap.o naming.o
+
+  LIBSRCS = main.cxx scanner.cxx symbol.cxx include.cxx types.cxx parms.cxx emit.cxx \
+! 	  newdoc.cxx ascii.cxx html.cxx latex.cxx cplus.cxx lang.cxx hash.cxx \
+            sstring.cxx wrapfunc.cxx getopt.cxx comment.cxx typemap.cxx naming.cxx
+
+  LIBHEADERS = internal.h ../Include/swig.h latex.h ascii.h html.h nodoc.h
+  LIB      = ../libswig.a
+--- 51,63 ----
+  # Normally, you shouldn't have to change anything below this point     #
+  ########################################################################
+
+  LIBOBJS = main.o scanner.o symbol.o include.o types.o parms.o emit.o newdoc.o ascii.o \
+!           html.o latex.o cplus.o lang.o hash.o vector.o sstring.o wrapfunc.o getopt.o comment.o \
+            typemap.o naming.o
+
+  LIBSRCS = main.cxx scanner.cxx symbol.cxx include.cxx types.cxx parms.cxx emit.cxx \
+! 	  newdoc.cxx ascii.cxx html.cxx latex.cxx cplus.cxx lang.cxx hash.cxx vector.cxx \
+            sstring.cxx wrapfunc.cxx getopt.cxx comment.cxx typemap.cxx naming.cxx
+
+  LIBHEADERS = internal.h ../Include/swig.h latex.h ascii.h html.h nodoc.h
+  LIB      = ../libswig.a

utils/wxPython/demo/.cvsignore

@@ -2,5 +2,4 @@
 .emacs.desktop
 hangman_dict.txt
 setup.bat
-test.out
 tmphtml.txt

utils/wxPython/demo/DialogUnits.py

@@ -29,7 +29,6 @@ class MyFrame(wxFrame):
         # Associate some events with methods of this class
         EVT_SIZE(self, self.OnSize)
         EVT_MOVE(self, self.OnMove)
-        EVT_CLOSE(self, self.OnCloseWindow)
 
         # Add a panel and some controls to display the size and position
         panel = wxPanel(self, -1)
@@ -47,8 +46,8 @@ class MyFrame(wxFrame):
                                   wxDLG_SZE(panel, wxSize(36, -1)),
                                   wxTE_READONLY)
 
-        #print wxDLG_PNT(panel, wxPoint(24, 4)), wxDLG_SZE(panel, wxSize(36, -1))
-        #print wxDLG_PNT(panel, wxPoint(24, 16)),wxDLG_SZE(panel, wxSize(36, -1))
+        print wxDLG_PNT(panel, wxPoint(24, 4)), wxDLG_SZE(panel, wxSize(36, -1))
+        print wxDLG_PNT(panel, wxPoint(24, 16)),wxDLG_SZE(panel, wxSize(36, -1))
 
 
     # This method is called automatically when the CLOSE event is

utils/wxPython/demo/Main.py

@@ -0,0 +1,336 @@
+#!/bin/env python
+#----------------------------------------------------------------------------
+# Name:         Main.py
+# Purpose:      Testing lots of stuff, controls, window types, etc.
+#
+# Author:       Robin Dunn & Gary Dumer
+#
+# Created:
+# RCS-ID:       $Id$
+# Copyright:    (c) 1999 by Total Control Software
+# Licence:      wxWindows license
+#----------------------------------------------------------------------------
+
+import sys, os
+from   wxPython.wx import *
+
+
+#---------------------------------------------------------------------------
+
+
+_treeList = [
+    ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']),
+
+    ('Miscellaneous Windows', ['wxGrid', 'wxSashWindow',
+                               'wxScrolledWindow', 'wxSplitterWindow',
+                               'wxStatusBar', 'wxToolBar', 'wxNotebook']),
+
+    ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',
+                        'wxSingleChoiceDialog', 'wxTextEntryDialog',
+                        'wxFontDialog', 'wxPageSetupDialog', 'wxPrintDialog',
+                        'wxMessageDialog', 'wxProgressDialog']),
+
+    ('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice',
+                  'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl',
+                  'wxTreeCtrl', 'wxSpinButton', 'wxStaticText', 'wxStaticBitmap',
+                  'wxRadioBox', 'wxSlider']),
+
+    ('Window Layout', ['wxLayoutConstraints', 'Sizers']),
+
+    ('Miscellaneous', ['wxTimer', 'wxGLCanvas', 'DialogUnits', 'wxImage',
+                      'PrintFramework']),
+
+    ('wxPython Library', ['Sizers', 'Layoutf', 'wxScrolledMessageDialog',
+                          'wxMultipleChoiceDialog', 'wxPlotCanvas']),
+
+    ('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']),
+
+    ]
+
+#---------------------------------------------------------------------------
+
+class wxPythonDemo(wxFrame):
+    def __init__(self, parent, id, title):
+        wxFrame.__init__(self, parent, -1, title,
+                         wxDefaultPosition, wxSize(700, 550))
+        if wxPlatform == '__WXMSW__':
+            self.icon = wxIcon('bitmaps/mondrian.ico', wxBITMAP_TYPE_ICO)
+            self.SetIcon(self.icon)
+
+        self.otherWin = None
+        EVT_IDLE(self, self.OnIdle)
+
+        self.Centre(wxBOTH)
+        self.CreateStatusBar(1, wxST_SIZEGRIP)
+        splitter = wxSplitterWindow(self, -1)
+        splitter2 = wxSplitterWindow(splitter, -1)
+
+        # Prevent TreeCtrl from displaying all items after destruction
+        self.dying = false
+
+        # Make a File menu
+        self.mainmenu = wxMenuBar()
+        menu = wxMenu()
+        mID = NewId()
+        menu.Append(mID, 'E&xit', 'Get the heck outta here!')
+        EVT_MENU(self, mID, self.OnFileExit)
+        self.mainmenu.Append(menu, '&File')
+
+        # Make a Help menu
+        mID = NewId()
+        menu = wxMenu()
+        menu.Append(mID, '&About', 'wxPython RULES!!!')
+        EVT_MENU(self, mID, self.OnHelpAbout)
+        self.mainmenu.Append(menu, '&Help')
+        self.SetMenuBar(self.mainmenu)
+
+        selectedDemo = None
+        selectedDemoName = "Nada"
+        if len(sys.argv) == 2:
+            selectedDemoName = sys.argv[1]
+
+        # Create a TreeCtrl
+        tID = NewId()
+        self.tree = wxTreeCtrl(splitter, tID)
+        root = self.tree.AddRoot("Overview")
+        for item in _treeList:
+            child = self.tree.AppendItem(root, item[0])
+            for childItem in item[1]:
+                theDemo = self.tree.AppendItem(child, childItem)
+                if childItem == selectedDemoName:
+                    selectedDemo = theDemo
+
+        self.tree.Expand(root)
+        EVT_TREE_ITEM_EXPANDED   (self.tree, tID, self.OnItemExpanded)
+        EVT_TREE_ITEM_COLLAPSED  (self.tree, tID, self.OnItemCollapsed)
+        EVT_TREE_SEL_CHANGED     (self.tree, tID, self.OnSelChanged)
+
+        # Create a Notebook
+        self.nb = wxNotebook(splitter2, -1)
+
+        # Set up a TextCtrl on the Overview Notebook page
+        self.ovr = wxTextCtrl(self.nb, -1, style = wxTE_MULTILINE|wxTE_READONLY)
+        self.nb.AddPage(self.ovr, "Overview")
+
+
+        # Set up a TextCtrl on the Demo Code Notebook page
+        self.txt = wxTextCtrl(self.nb, -1,
+                              style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
+        self.txt.SetFont(wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false))
+        self.nb.AddPage(self.txt, "Demo Code")
+
+
+        # Set up a log on the View Log Notebook page
+        self.log = wxTextCtrl(splitter2, -1,
+                              style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
+        (w, self.charHeight) = self.log.GetTextExtent('X')
+        #self.WriteText('wxPython Demo Log:\n')
+
+
+        # add the windows to the splitter and split it.
+        splitter.SplitVertically(self.tree, splitter2)
+        splitter.SetSashPosition(180, true)
+        splitter.SetMinimumPaneSize(20)
+
+        splitter2.SplitHorizontally(self.nb, self.log)
+        splitter2.SetSashPosition(360, true)
+        splitter2.SetMinimumPaneSize(20)
+
+        # make our log window be stdout
+        #sys.stdout = self
+
+        # select initial items
+        self.nb.SetSelection(0)
+        self.tree.SelectItem(root)
+        if selectedDemo:
+            self.tree.SelectItem(selectedDemo)
+            self.tree.EnsureVisible(selectedDemo)
+
+    #---------------------------------------------
+    def WriteText(self, text):
+        self.log.WriteText(text)
+        w, h = self.log.GetClientSizeTuple()
+        numLines = h/self.charHeight
+        x, y = self.log.PositionToXY(self.log.GetLastPosition())
+        self.log.ShowPosition(self.log.XYToPosition(x, y-numLines))
+        ##self.log.ShowPosition(self.log.GetLastPosition())
+        self.log.SetInsertionPointEnd()
+
+    def write(self, txt):
+        self.WriteText(txt)
+
+    #---------------------------------------------
+    def OnItemExpanded(self, event):
+        item = event.GetItem()
+        self.log.WriteText("OnItemExpanded: %s\n" % self.tree.GetItemText(item))
+
+    #---------------------------------------------
+    def OnItemCollapsed(self, event):
+        item = event.GetItem()
+        self.log.WriteText("OnItemCollapsed: %s\n" % self.tree.GetItemText(item))
+
+    #---------------------------------------------
+    def OnSelChanged(self, event):
+        if self.dying:
+            return
+
+        if self.nb.GetPageCount() == 3:
+            if self.nb.GetSelection() == 2:
+                self.nb.SetSelection(0)
+            self.nb.DeletePage(2)
+
+        item = event.GetItem()
+        itemText = self.tree.GetItemText(item)
+
+        if itemText == 'Overview':
+            self.GetDemoFile('Main.py')
+            self.SetOverview('Overview', overview)
+            #self.nb.ResizeChildren();
+            self.nb.Refresh();
+            #wxYield()
+
+        else:
+            if os.path.exists(itemText + '.py'):
+                self.GetDemoFile(itemText + '.py')
+                module = __import__(itemText, globals())
+                self.SetOverview(itemText, module.overview)
+
+                # in case runTest is modal, make sure things look right...
+                self.nb.Refresh();
+                wxYield()
+
+                window = module.runTest(self, self.nb, self)
+                if window:
+                    self.nb.AddPage(window, 'Demo')
+                    self.nb.SetSelection(2)
+                    self.nb.ResizeChildren();
+
+            else:
+                self.ovr.Clear()
+                self.txt.Clear()
+
+
+    #---------------------------------------------
+    # Get the Demo files
+    def GetDemoFile(self, filename):
+        self.txt.Clear()
+        #if not self.txt.LoadFile(filename):
+        #    self.txt.WriteText("Cannot open %s file." % filename)
+        try:
+            self.txt.SetValue(open(filename).read())
+        except IOError:
+            self.txt.WriteText("Cannot open %s file." % filename)
+
+
+        self.txt.SetInsertionPoint(0)
+        self.txt.ShowPosition(0)
+
+    #---------------------------------------------
+    def SetOverview(self, name, text):
+        self.ovr.Clear()
+        self.ovr.WriteText(text)
+        self.nb.SetPageText(0, name)
+        self.ovr.SetInsertionPoint(0)
+        self.ovr.ShowPosition(0)
+
+    #---------------------------------------------
+    # Menu methods
+    def OnFileExit(self, event):
+        self.Close()
+
+
+    def OnHelpAbout(self, event):
+        about = wxMessageDialog(self,
+                                "wxPython is a Python extension module that\n"
+                                "encapsulates the wxWindows GUI classes.\n\n"
+                                "This demo shows off some of the capabilities\n"
+                                "of wxPython.\n\n"
+                                "          Developed by Robin Dunn",
+                               "About wxPython", wxOK)
+        about.ShowModal()
+        about.Destroy()
+
+
+    #---------------------------------------------
+    def OnCloseWindow(self, event):
+        self.dying = true
+        self.Destroy()
+
+    #---------------------------------------------
+    def OnIdle(self, event):
+        if self.otherWin:
+            self.otherWin.Raise()
+            self.otherWin = None
+
+
+#---------------------------------------------------------------------------
+#---------------------------------------------------------------------------
+
+class MyApp(wxApp):
+    def OnInit(self):
+        wxImage_AddHandler(wxJPEGHandler())
+        wxImage_AddHandler(wxPNGHandler())
+        wxImage_AddHandler(wxGIFHandler())
+        frame = wxPythonDemo(NULL, -1, "wxPython: (A Demonstration)")
+        frame.Show(true)
+        self.SetTopWindow(frame)
+        return true
+
+#---------------------------------------------------------------------------
+
+def main():
+    app = MyApp(0)
+    app.MainLoop()
+
+
+#---------------------------------------------------------------------------
+
+
+
+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
+--------------------
+
+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.
+"""
+
+
+
+
+
+
+
+#----------------------------------------------------------------------------
+#----------------------------------------------------------------------------
+
+if __name__ == '__main__':
+    main()
+
+#----------------------------------------------------------------------------
+
+
+
+
+
+
+

utils/wxPython/demo/PrintFramework.py

@@ -1,5 +1,6 @@
 
 from wxPython.wx         import *
+from wxPython.lib.sizers import *
 from wxScrolledWindow    import MyCanvas
 
 #----------------------------------------------------------------------
@@ -96,29 +97,31 @@ class TestPrintPanel(wxPanel):
         self.printData = wxPrintData()
         self.printData.SetPaperId(wxPAPER_LETTER)
 
-        self.box = wxBoxSizer(wxVERTICAL)
+        self.box = box.wxBoxSizer(wxVERTICAL)
         self.canvas = MyCanvas(self)
-        self.box.Add(self.canvas, 1, wxGROW)
+        self.box.Add(self.canvas, 1)
 
         subbox = wxBoxSizer(wxHORIZONTAL)
         btn = wxButton(self, 1201, "Print Setup")
         EVT_BUTTON(self, 1201, self.OnPrintSetup)
-        subbox.Add(btn, 1, wxGROW | wxALL, 2)
+        subbox.Add(btn, 1)
 
         btn = wxButton(self, 1202, "Print Preview")
         EVT_BUTTON(self, 1202, self.OnPrintPreview)
-        subbox.Add(btn, 1, wxGROW | wxALL, 2)
+        subbox.Add(btn, 1)
 
         btn = wxButton(self, 1203, "Print")
         EVT_BUTTON(self, 1203, self.OnDoPrint)
-        subbox.Add(btn, 1, wxGROW | wxALL, 2)
+        subbox.Add(btn, 1)
 
-        self.box.Add(subbox, 0, wxGROW)
+        self.box.Add(subbox)
 
-        self.SetAutoLayout(true)
-        self.SetSizer(self.box)
 
 
+    def OnSize(self, event):
+        size = self.GetClientSize()
+        self.box.Layout(size)
+
     def OnPrintSetup(self, event):
         printerDialog = wxPrintDialog(self)
         printerDialog.GetPrintDialogData().SetPrintData(self.printData)

utils/wxPython/demo/Sizers.py

@@ -106,34 +106,6 @@ def makeSimpleBorder3(win):
     return bdr
 
 #----------------------------------------------------------------------
-
-def makeShapes(win):
-    box =wxBoxSizer(wxVERTICAL)
-    box.Add(wxStaticLine(win, -1), 0)
-    for line in (
-                 (wxANCHOR_NW, "NorthWest"),
-                 (wxANCHOR_NORTH, "North"),
-                 (wxANCHOR_NE, "NorthEast")
-                ), (
-                 (wxANCHOR_WEST, "West"),
-                 (wxANCHOR_NONE, "Center"),
-                 (wxANCHOR_EAST, "East")
-                ), (
-                 (wxANCHOR_SW, "SouthWest"),
-                 (wxANCHOR_SOUTH, "South"),
-                 (wxANCHOR_SE, "SouthEast")
-                ):
-        linebox =wxBoxSizer(wxHORIZONTAL)
-        linebox.Add(wxStaticLine(win, -1, style=wxVERTICAL), 0)
-        for (anchor, label) in line:
-            sizer =wxShapeSizer(anchor)
-            sizer.Add(wxButton(win, -1, label, size=wxSize(100, 50)))
-            linebox.Add(sizer, 1)
-            linebox.Add(wxStaticLine(win, -1, style=wxVERTICAL), 0)
-        box.Add(linebox, 1)
-        box.Add(wxStaticLine(win, -1), 0)
-    return box
-
 #----------------------------------------------------------------------
 
 def makeBoxInBox(win):
@@ -258,13 +230,6 @@ theTests = [
 
     ("", None, ""),
 
-
-    ("Proportional resize", makeShapes,
-     "The wxShapeSizer preserves the original proportions of the window."
-     ),
-
-    ("", None, ""),
-
     ("Boxes inside of boxes", makeBoxInBox,
      "This one shows nesting of boxes within boxes within boxes, using both "
      "orientations.  Notice also that button seven has a greater weighting "
@@ -292,8 +257,6 @@ class TestFrame(wxFrame):
         self.CreateStatusBar()
         self.SetStatusText("Resize this frame to see how the sizers respond...")
         self.sizer.FitWindow(self)
-        EVT_CLOSE(self, self.OnCloseWindow)
-        EVT_SIZE(self, self.OnSize)
 
 
     def OnSize(self, event):
@@ -312,7 +275,7 @@ class TestFrame(wxFrame):
 
 
 class TestSelectionPanel(wxPanel):
-    def __init__(self, parent, frame=NULL):
+    def __init__(self, parent, frame):
         wxPanel.__init__(self, parent, -1)
         self.frame = frame
 
@@ -378,9 +341,8 @@ if __name__ == '__main__':
 	    mainmenu.Append(menu, "&File")
 	    self.SetMenuBar(mainmenu)
             EVT_MENU(self, 200, self.OnExit)
-            self.panel = TestSelectionPanel(self, self)
+            self.panel = TestSelectionPanel(self)
             self.SetSize(wxSize(400, 380))
-            EVT_CLOSE(self, self.OnCloseWindow)
 
         def OnCloseWindow(self, event):
             self.Destroy()

utils/wxPython/demo/SlashDot.py

@@ -43,7 +43,6 @@ class HTMLTextView(wxFrame):
         wxFrame.__init__(self, parent, id, title, wxPyDefaultPosition,
                          wxSize(600,400))
 
-        EVT_CLOSE(self, self.OnCloseWindow)
         self.mainmenu = wxMenuBar()
 
         menu = wxMenu()
@@ -156,7 +155,6 @@ class AppStatusBar(wxStatusBar):
         self.SetStatusWidths([-1, 100])
         self.but = wxButton(self, 1001, "Refresh")
         EVT_BUTTON(self, 1001, parent.OnViewRefresh)
-        EVT_SIZE(self, self.OnSize)
         self.OnSize(None)
 
     def logprint(self,x):
@@ -229,7 +227,8 @@ class AppFrame(wxFrame):
 	self.sb = AppStatusBar(self)
         self.SetStatusBar(self.sb)
 
-        self.list = wxListCtrl(self, 1100, style=wxLC_REPORT)
+        self.list = wxListCtrl(self, 1100)
+	self.list.SetSingleStyle(wxLC_REPORT)
 	self.list.InsertColumn(0, 'Subject')
 	self.list.InsertColumn(1, 'Date')
 	self.list.InsertColumn(2, 'Posted by')

utils/wxPython/demo/XMLtreeview.py

@@ -26,8 +26,7 @@ else:
 
         # Define a handler for start element events
         def StartElement(self, name, attrs ):
-            id = self.AppendItem(self.nodeStack[-1], name)
-            self.nodeStack.append(id)
+            self.nodeStack.append(self.AppendItem(self.nodeStack[-1], name))
 
         def EndElement(self,  name ):
             self.nodeStack = self.nodeStack[:-1]

utils/wxPython/demo/hangman.py

@@ -124,8 +124,6 @@ class HangmanWnd(wxWindow):
         else:
             self.font = wxFont(10, wxMODERN, wxNORMAL, wxNORMAL)
         self.SetFocus()
-        EVT_PAINT(self, self.OnPaint)
-
 
     def StartGame(self, word):
         self.word = word
@@ -254,7 +252,6 @@ class HangmanDemoFrame(wxFrame):
     def __init__(self, wf, parent, id, pos, size):
         wxFrame.__init__(self, parent, id, "Hangman demo", pos, size)
         self.demo = HangmanDemo(wf, self, -1, wxDefaultPosition, wxDefaultSize)
-        EVT_CLOSE(self, self.OnCloseWindow)
 
     def OnCloseWindow(self, event):
         self.demo.timer.Stop()

utils/wxPython/demo/htmlview.py

@@ -0,0 +1,77 @@
+from wxPython.wx import *
+from wxPython.html import *
+import sys
+
+default_page = """
+<H1>HTML Viewer</H1>Please select <I>File->Open</I>
+to open a HTML file, or edit this page in the
+text control below and select <I>File->Update</I>
+<P>
+The python source can be seen
+<a href="%s">here</a>.
+""" % (sys.argv[0], )
+
+class HtmlViewer(wxFrame):
+	def __init__(self, parent, id, title, pos = wxDefaultPosition, size = wxSize(400,400)):
+		wxFrame.__init__(self, parent, id, title, pos, size)
+                self.CreateStatusBar(1)
+                split = wxSplitterWindow(self, -1)
+                self.html = wxHtmlWindow(split)
+                self.html.SetRelatedFrame(self, "HTML Viewer:  \%s")
+                self.html.SetRelatedStatusBar(0)
+                self.txt = wxTextCtrl(split, -1, default_page,
+                                      wxDefaultPosition, wxDefaultSize,
+                                      wxTE_MULTILINE)
+                split.SplitHorizontally(self.html, self.txt, size.y/2)
+		mbar = wxMenuBar()
+		menu = wxMenu()
+		menu.Append(1500, "Open")
+                menu.Append(1501, "Reset")
+                menu.Append(1502, "Update HTML")
+		menu.AppendSeparator()
+		menu.Append(1503, "Exit")
+		mbar.Append(menu, "File")
+                menu = wxMenu()
+                menu.Append(1510, "Back")
+                menu.Append(1511, "Forward")
+                mbar.Append(menu, "Go")
+		self.SetMenuBar(mbar)
+		self.filename = ""
+                EVT_MENU(self, 1500, self.OnFileOpen)
+                EVT_MENU(self, 1501, self.OnFileReset)
+                EVT_MENU(self, 1502, self.OnFileUpdate)
+                EVT_MENU(self, 1503, self.OnClose)
+                EVT_MENU(self, 1510, self.OnGoBack)
+                EVT_MENU(self, 1511, self.OnGoForward)
+                # A default opening text
+                self.html.SetPage( default_page )
+        def OnFileOpen(self, event):
+		dlg = wxFileDialog(NULL, "Open file")
+		if dlg.ShowModal() == wxID_OK:
+			self.filename = dlg.GetPath()
+                        self.html.LoadPage(self.filename)
+        def OnFileReset(self, event):
+                self.html.SetPage( default_page )
+                self.txt.SetValue( default_page )
+        def OnFileUpdate(self, event):
+                self.html.SetPage( self.txt.GetValue() )
+        def OnGoBack(self, event):
+                self.html.HistoryBack()
+        def OnGoForward(self, event):
+                self.html.HistoryForward()
+	def OnClose(self,event):
+		self.Destroy()
+
+class MyApp(wxApp):
+	def OnInit(self):
+		frame = HtmlViewer(NULL, -1, "HTML Viewer")
+		frame.Show(TRUE)
+		self.SetTopWindow(frame)
+		return TRUE
+
+wxImage_AddHandler(wxPNGHandler())
+wxImage_AddHandler(wxGIFHandler())
+wxImage_AddHandler(wxJPEGHandler())
+
+theApp = MyApp(0)
+theApp.MainLoop()

utils/wxPython/demo/htmlwidget.py

@@ -0,0 +1,97 @@
+from wxPython.wx import *
+from wxPython.html import *
+import sys,string
+
+# A bunch of simple widgets, all somehow derived from wxWindow
+class Widget1(wxWindow):
+    def __init__(self, parent, param):
+	wxWindow.__init__(self, parent, -1)
+	self.text = wxTextCtrl(self, -1, param['param_str'], wxPoint(5,5),
+	                   wxSize(200,150), wxTE_MULTILINE)
+	but = wxButton(self, 1001, "Click me", wxPoint(50,160), wxSize(100,30))
+	EVT_BUTTON(self, 1001, self.OnButton)
+	self.SetSize(wxSize(210,200))
+    def OnButton(self, event):
+	self.text.AppendText( "Click!\n" )
+
+class Widget2(wxButton):
+    def __init__(self, parent, param):
+	wxButton.__init__(self, parent, int(param['id']), param['title'])
+
+class Widget3(wxTextCtrl):
+    def __init__(self, parent, param):
+	wxTextCtrl.__init__(self, parent, -1, "No clicks")
+	self.clicked = 0;
+	EVT_BUTTON(parent, int(param['button_id']), self.OnButton)
+    def OnButton(self, event):
+	self.clicked = self.clicked + 1
+	self.SetValue("%d clicks" % (self.clicked,))
+
+# make the widgets known in the widget module (aka htmlc)
+widget.Widget1 = Widget1
+widget.Widget2 = Widget2
+widget.Widget3 = Widget3
+
+# our default page
+default_page = """
+<H2>wxPython widgets go HTML</H2>
+A bunch of wxPython widgets are scattered on this HTML page.
+Here's one:
+<center><python class="Widget1" greeting="Hello World"></center>
+<hr>
+Here's another:
+<center><python class="Widget2" float=70 id=1002 title="Button A"></center>
+It should always take up 70% of the page width.
+<p>And then there's this, listening to button A:
+<python class="Widget3" button_id=1002></p>
+"""
+
+# our explanation
+apology = """
+For some bizarre reason, it takes forever and a day to display the
+widgets if they are constructed in the frame's constructor. This
+only happens in MSW, wxGTK works fine.
+<p>Select <I>File->Show it</I> to draw the widgets."""
+
+default_page = default_page + "The HTML code for this page is\n <pre>" + default_page + "</pre>"
+
+
+class HtmlViewer(wxFrame):
+	def __init__(self, parent, id, title, pos = wxDefaultPosition, size = wxSize(400,400)):
+		wxFrame.__init__(self, parent, id, title, pos, size)
+                self.CreateStatusBar(1)
+                self.html = wxHtmlWindow(self)
+                self.html.SetRelatedFrame(self, "HTML Viewer:  \%s")
+                self.html.SetRelatedStatusBar(0)
+		mbar = wxMenuBar()
+		menu = wxMenu()
+                menu.Append(1500, "Show it")
+		menu.Append(1503, "Exit")
+		mbar.Append(menu, "File")
+                EVT_MENU(self, 1500, self.OnShowIt)
+                EVT_MENU(self, 1503, self.OnClose)
+                self.SetMenuBar(mbar)
+                # change apology below to default_page, if you dare!
+                self.html.SetPage( default_page )
+	def OnClose(self,event):
+		self.Destroy()
+        def OnShowIt(self,event):
+                self.html.SetPage( default_page )
+                # now quickly remove the menu option, to hide that
+                # other bug; namely that widgets aren't removed when the
+                # HTML page is.
+                self.GetMenuBar().Enable(1500, FALSE)        
+
+class MyApp(wxApp):
+	def OnInit(self):
+		frame = HtmlViewer(NULL, -1, "HTML Viewer")
+		frame.Show(TRUE)
+                self.SetTopWindow(frame)
+		return TRUE
+
+wxImage_AddHandler(wxPNGHandler())
+wxImage_AddHandler(wxGIFHandler())
+wxImage_AddHandler(wxJPEGHandler())
+
+theApp = MyApp(0)
+theApp.MainLoop()

utils/wxPython/demo/wxButton.py

@@ -8,22 +8,13 @@ class TestPanel(wxPanel):
         wxPanel.__init__(self, parent, -1)
         self.log = log
 
-        b = wxButton(self, 10, "Hello", wxPoint(20, 20))
+        wxButton(self, 10, "Hello", wxPoint(20, 20)).SetDefault()
         EVT_BUTTON(self, 10, self.OnClick)
-        b.SetBackgroundColour(wxBLUE)
-        b.SetForegroundColour(wxWHITE)
-        b.SetDefault()
 
         wxButton(self, 20, "HELLO AGAIN!", wxPoint(20, 60), wxSize(90, 45))
         EVT_BUTTON(self, 20, self.OnClick)
 
         bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
-
-        mask = wxMaskColour(bmp, wxBLUE)
-        bmp.SetMask(mask)
-
-        print bmp.GetWidth(), bmp.GetHeight()
-
         wxBitmapButton(self, 30, bmp, wxPoint(140, 20),
                        wxSize(bmp.GetWidth()+10, bmp.GetHeight()+10))
         EVT_BUTTON(self, 30, self.OnClick)

utils/wxPython/demo/wxComboBox.py

@@ -18,15 +18,11 @@ class TestComboBox(wxPanel):
         wxComboBox(self, 500, "default value", wxPoint(80, 50), wxSize(95, -1),
                    sampleList, wxCB_DROPDOWN)
         EVT_COMBOBOX(self, 500, self.EvtComboBox)
-        EVT_TEXT(self, 500, self.EvtText)
 
 
     def EvtComboBox(self, event):
         self.log.WriteText('EvtComboBox: %s\n' % event.GetString())
 
-    def EvtText(self, event):
-        self.log.WriteText('EvtText: %s\n' % event.GetString())
-
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):

utils/wxPython/demo/wxFileDialog.py

@@ -4,10 +4,9 @@ from wxPython.wx import *
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
-    dlg = wxFileDialog(frame, "Choose a file", ".", "", "*.*", wxOPEN|wxMULTIPLE)
+    dlg = wxFileDialog(frame, "Choose a file", ".", "", "*.*", wxOPEN)
     if dlg.ShowModal() == wxID_OK:
-        for path in dlg.GetPaths():
-            log.WriteText('You selected: %s\n' % path)
+        log.WriteText('You selected: %s\n' % dlg.GetPath())
     dlg.Destroy()
 
 #---------------------------------------------------------------------------

utils/wxPython/demo/wxFontDialog.py

@@ -4,8 +4,7 @@ from wxPython.wx import *
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
-    data = wxFontData()
-    dlg = wxFontDialog(frame, data)
+    dlg = wxFontDialog(frame)
     if dlg.ShowModal() == wxID_OK:
         data = dlg.GetFontData()
         font = data.GetChosenFont()
@@ -34,7 +33,7 @@ This class represents the font chooser dialog.
 wxFontDialog()
 ----------------------------
 
-wxFontDialog(wxWindow* parent, wxFontData* data)
+wxFontDialog(wxWindow* parent, wxFontData* data = NULL)
 
-Constructor. Pass a parent window and a font data object, which will be copied to the font dialog's font data.
+Constructor. Pass a parent window, and optionally a pointer to a block of font data, which will be copied to the font dialog's font data.
 """

utils/wxPython/demo/wxFrame.py

@@ -11,8 +11,6 @@ class MyFrame(wxFrame):
         button = wxButton(panel, 1003, "Close Me")
         button.SetPosition(wxPoint(15, 15))
         EVT_BUTTON(self, 1003, self.OnCloseMe)
-        EVT_CLOSE(self, self.OnCloseWindow)
-
 
     def OnCloseMe(self, event):
         self.Close(true)

utils/wxPython/demo/wxGLCanvas.py

@@ -0,0 +1,158 @@
+
+from wxPython.wx       import *
+try:
+    from wxPython.glcanvas import *
+    haveGLCanvas = true
+except ImportError:
+    haveGLCanvas = false
+
+#----------------------------------------------------------------------
+
+if not haveGLCanvas:
+    def runTest(frame, nb, log):
+        dlg = wxMessageDialog(frame, 'The wxGLCanvas has not been included with this build of wxPython!',
+                          'Sorry', wxOK | wxICON_INFORMATION)
+        dlg.ShowModal()
+        dlg.Destroy()
+
+else:
+
+
+    def runTest(frame, nb, log):
+        #win = TestGLCanvas(nb)
+        #return win
+        win = wxFrame(frame, -1, "GL Cube", wxDefaultPosition, wxSize(400,300))
+        canvas = TestGLCanvas(win)
+        frame.otherWin = win
+        win.Show(true)
+        return None
+
+
+
+    class TestGLCanvas(wxGLCanvas):
+        def __init__(self, parent):
+            wxGLCanvas.__init__(self, parent, -1)
+            EVT_ERASE_BACKGROUND(self, self.OnEraseBackground)
+            self.init = false
+
+        def OnEraseBackground(self, event):
+            pass # Do nothing, to avoid flashing.
+
+
+        def OnSize(self, event):
+            size = self.GetClientSize()
+            if self.GetContext() != 'NULL':
+                self.SetCurrent()
+                glViewport(0, 0, size.width, size.height)
+
+
+        def OnPaint(self, event):
+            dc = wxPaintDC(self)
+
+            ctx = self.GetContext()
+            if ctx == "NULL": return
+
+            self.SetCurrent()
+
+
+            if not self.init:
+                self.InitGL()
+                self.init = true
+
+            # clear color and depth buffers
+            glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+            # draw six faces of a cube
+            glBegin(GL_QUADS)
+            glNormal3f( 0.0, 0.0, 1.0)
+            glVertex3f( 0.5, 0.5, 0.5)
+            glVertex3f(-0.5, 0.5, 0.5)
+            glVertex3f(-0.5,-0.5, 0.5)
+            glVertex3f( 0.5,-0.5, 0.5)
+
+            glNormal3f( 0.0, 0.0,-1.0)
+            glVertex3f(-0.5,-0.5,-0.5)
+            glVertex3f(-0.5, 0.5,-0.5)
+            glVertex3f( 0.5, 0.5,-0.5)
+            glVertex3f( 0.5,-0.5,-0.5)
+
+            glNormal3f( 0.0, 1.0, 0.0)
+            glVertex3f( 0.5, 0.5, 0.5)
+            glVertex3f( 0.5, 0.5,-0.5)
+            glVertex3f(-0.5, 0.5,-0.5)
+            glVertex3f(-0.5, 0.5, 0.5)
+
+            glNormal3f( 0.0,-1.0, 0.0)
+            glVertex3f(-0.5,-0.5,-0.5)
+            glVertex3f( 0.5,-0.5,-0.5)
+            glVertex3f( 0.5,-0.5, 0.5)
+            glVertex3f(-0.5,-0.5, 0.5)
+
+            glNormal3f( 1.0, 0.0, 0.0)
+            glVertex3f( 0.5, 0.5, 0.5)
+            glVertex3f( 0.5,-0.5, 0.5)
+            glVertex3f( 0.5,-0.5,-0.5)
+            glVertex3f( 0.5, 0.5,-0.5)
+
+            glNormal3f(-1.0, 0.0, 0.0)
+            glVertex3f(-0.5,-0.5,-0.5)
+            glVertex3f(-0.5,-0.5, 0.5)
+            glVertex3f(-0.5, 0.5, 0.5)
+            glVertex3f(-0.5, 0.5,-0.5)
+            glEnd()
+
+            self.SwapBuffers()
+
+
+        def InitGL(self):
+            # set viewing projection
+            glMatrixMode(GL_PROJECTION);
+            glFrustum(-0.5, 0.5, -0.5, 0.5, 1.0, 3.0);
+
+            # position viewer
+            glMatrixMode(GL_MODELVIEW);
+            glTranslatef(0.0, 0.0, -2.0);
+
+            # position object
+            glRotatef(30.0, 1.0, 0.0, 0.0);
+            glRotatef(30.0, 0.0, 1.0, 0.0);
+
+            glEnable(GL_DEPTH_TEST);
+            glEnable(GL_LIGHTING);
+            glEnable(GL_LIGHT0);
+
+
+
+
+
+
+
+
+
+
+
+
+
+overview = """\
+"""
+
+
+
+
+
+#----------------------------------------------------------------------
+
+def _test():
+    class MyApp(wxApp):
+        def OnInit(self):
+            frame = wxFrame(NULL, -1, "GL Cube", wxDefaultPosition, wxSize(400,300))
+            win = TestGLCanvas(frame)
+            frame.Show(TRUE)
+            self.SetTopWindow(frame)
+            return TRUE
+
+    app = MyApp(0)
+    app.MainLoop()
+
+if __name__ == '__main__':
+    _test()

utils/wxPython/demo/wxGrid.py

@@ -0,0 +1,79 @@
+
+from wxPython.wx import *
+
+#---------------------------------------------------------------------------
+
+class TestGrid(wxGrid):
+    def __init__(self, parent, log):
+        wxGrid.__init__(self, parent, -1)
+        self.log = log
+
+        self.CreateGrid(16, 16)
+        self.SetColumnWidth(3, 200)
+        self.SetRowHeight(4, 45)
+        self.SetCellValue("First cell", 0, 0)
+        self.SetCellValue("Another cell", 1, 1)
+        self.SetCellValue("Yet another cell", 2, 2)
+        self.SetCellTextFont(wxFont(12, wxROMAN, wxITALIC, wxNORMAL), 0, 0)
+        self.SetCellTextColour(wxRED, 1, 1)
+        self.SetCellBackgroundColour(wxCYAN, 2, 2)
+        self.UpdateDimensions()
+        self.AdjustScrollbars()
+
+        EVT_GRID_SELECT_CELL(self, self.OnSelectCell)
+        EVT_GRID_CELL_CHANGE(self, self.OnCellChange)
+        EVT_GRID_CELL_LCLICK(self, self.OnCellClick)
+        EVT_GRID_LABEL_LCLICK(self, self.OnLabelClick)
+
+        self.SetEditInPlace(true)
+        #print self.GetCells()
+
+
+    def OnSelectCell(self, event):
+        self.log.WriteText("OnSelectCell: (%d, %d)\n" % (event.m_row, event.m_col))
+
+    def OnCellChange(self, event):
+        self.log.WriteText("OnCellChange: (%d, %d)\n" % (event.m_row, event.m_col))
+
+    def OnCellClick(self, event):
+        self.log.WriteText("OnCellClick: (%d, %d)\n" % (event.m_row, event.m_col))
+
+    def OnLabelClick(self, event):
+        self.log.WriteText("OnLabelClick: (%d, %d)\n" % (event.m_row, event.m_col))
+
+#---------------------------------------------------------------------------
+
+def runTest(frame, nb, log):
+    win = TestGrid(nb, log)
+    return win
+
+#---------------------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+overview = """\
+wxGrid is a class for displaying and editing tabular information.
+
+wxGrid()
+-----------------
+
+wxGrid(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style=0, const wxString& name="grid")
+
+Constructor. Before using a wxGrid object, you must call CreateGrid to set up the required rows and columns.
+"""

utils/wxPython/demo/wxLayoutConstraints.py

@@ -3,14 +3,14 @@ from wxPython.wx import *
 
 #---------------------------------------------------------------------------
 
-class TestLayoutConstraints(wxPanel):
+class TestLayoutConstraints(wxWindow):
     def __init__(self, parent):
-        wxPanel.__init__(self, parent, -1)
+        wxWindow.__init__(self, parent, -1)
+        self.SetBackgroundColour(wxNamedColour("MEDIUM ORCHID"))
+
         self.SetAutoLayout(true)
         EVT_BUTTON(self, 100, self.OnButton)
 
-        self.SetBackgroundColour(wxNamedColour("MEDIUM ORCHID"))
-
         self.panelA = wxWindow(self, -1, wxDefaultPosition, wxDefaultSize,
                                wxSIMPLE_BORDER)
         self.panelA.SetBackgroundColour(wxBLUE)
@@ -86,8 +86,6 @@ class TestLayoutConstraints(wxPanel):
         self.panelD.SetConstraints(lc);
 
 
-
-
     def OnButton(self, event):
         wxBell()
 

utils/wxPython/demo/wxListBox.py

@@ -37,7 +37,6 @@ class TestListBox(wxPanel):
 
     def EvtListBoxDClick(self, event):
         self.log.WriteText('EvtListBoxDClick: %s\n' % self.lb1.GetSelection())
-        self.lb1.Delete(self.lb1.GetSelection())
 
     def EvtMultiListBox(self, event):
         self.log.WriteText('EvtMultiListBox: %s\n' % str(self.lb2.GetSelections()))

utils/wxPython/demo/wxListCtrl.py

@@ -15,49 +15,6 @@ from wxPython.wx import *
 
 #---------------------------------------------------------------------------
 
-musicdata = {
-1 : ("Bad English", "The Price Of Love", "Rock"),
-2 : ("DNA featuring Suzanne Vega", "Tom's Diner", "Rock"),
-3 : ("George Michael", "Praying For Time", "Rock"),
-4 : ("Gloria Estefan", "Here We Are", "Rock"),
-5 : ("Linda Ronstadt", "Don't Know Much", "Rock"),
-6 : ("Michael Bolton", "How Am I Supposed To Live Without You", "Blues"),
-7 : ("Paul Young", "Oh Girl", "Rock"),
-8 : ("Paula Abdul", "Opposites Attract", "Rock"),
-9 : ("Richard Marx", "Should've Known Better", "Rock"),
-10: ("Rod Stewart", "Forever Young", "Rock"),
-11: ("Roxette", "Dangerous", "Rock"),
-12: ("Sheena Easton", "The Lover In Me", "Rock"),
-13: ("Sinead O'Connor", "Nothing Compares 2 U", "Rock"),
-14: ("Stevie B.", "Because I Love You", "Rock"),
-15: ("Taylor Dayne", "Love Will Lead You Back", "Rock"),
-16: ("The Bangles", "Eternal Flame", "Rock"),
-17: ("Wilson Phillips", "Release Me", "Rock"),
-18: ("Billy Joel", "Blonde Over Blue", "Rock"),
-19: ("Billy Joel", "Famous Last Words", "Rock"),
-20: ("Billy Joel", "Lullabye (Goodnight, My Angel)", "Rock"),
-21: ("Billy Joel", "The River Of Dreams", "Rock"),
-22: ("Billy Joel", "Two Thousand Years", "Rock"),
-23: ("Janet Jackson", "Alright", "Rock"),
-24: ("Janet Jackson", "Black Cat", "Rock"),
-25: ("Janet Jackson", "Come Back To Me", "Rock"),
-26: ("Janet Jackson", "Escapade", "Rock"),
-27: ("Janet Jackson", "Love Will Never Do (Without You)", "Rock"),
-28: ("Janet Jackson", "Miss You Much", "Rock"),
-29: ("Janet Jackson", "Rhythm Nation", "Rock"),
-30: ("Janet Jackson", "State Of The World", "Rock"),
-31: ("Janet Jackson", "The Knowledge", "Rock"),
-32: ("Spyro Gyra", "End of Romanticism", "Jazz"),
-33: ("Spyro Gyra", "Heliopolis", "Jazz"),
-34: ("Spyro Gyra", "Jubilee", "Jazz"),
-35: ("Spyro Gyra", "Little Linda", "Jazz"),
-36: ("Spyro Gyra", "Morning Dance", "Jazz"),
-37: ("Spyro Gyra", "Song for Lorraine", "Jazz"),
-38: ("Yes", "Owner Of A Lonely Heart", "Rock"),
-39: ("Yes", "Rhythm Of Love", "Rock"),
-}
-
-
 class TestListCtrlPanel(wxPanel):
     def __init__(self, parent, log):
         wxPanel.__init__(self, parent, -1)
@@ -66,7 +23,7 @@ class TestListCtrlPanel(wxPanel):
         tID = NewId()
 
         self.il = wxImageList(16, 16)
-        idx1 = self.il.Add(wxBitmap('bitmaps/smiles.bmp', wxBITMAP_TYPE_BMP))
+        idx1 = self.il.Add(wxNoRefBitmap('bitmaps/smiles.bmp', wxBITMAP_TYPE_BMP))
 
         self.list = wxListCtrl(self, tID, wxDefaultPosition, wxDefaultSize,
                                wxLC_REPORT|wxSUNKEN_BORDER)
@@ -75,28 +32,23 @@ class TestListCtrlPanel(wxPanel):
         self.list.SetToolTip(wxToolTip("This is a ToolTip!"))
         wxToolTip_Enable(true)
 
-        self.list.InsertColumn(0, "Artist")
-        self.list.InsertColumn(1, "Title")
-        self.list.InsertColumn(2, "Genre")
-        items = musicdata.items()
-        for x in range(len(items)):
-            key, data = items[x]
-            self.list.InsertImageStringItem(x, data[0], idx1)
-            self.list.SetStringItem(x, 1, data[1])
-            self.list.SetStringItem(x, 2, data[2])
-            self.list.SetItemData(x, key)
+        self.list.InsertColumn(0, "Column 0")
+        self.list.InsertColumn(1, "Column 1")
+        self.list.InsertColumn(2, "One More Column (2)")
+        for x in range(50):
+            self.list.InsertImageStringItem(x, "This is item %d" % x, idx1)
+            self.list.SetStringItem(x, 1, "Col 1, item %d" % x)
+            self.list.SetStringItem(x, 2, "item %d in column 2" % x)
 
         self.list.SetColumnWidth(0, wxLIST_AUTOSIZE)
         self.list.SetColumnWidth(1, wxLIST_AUTOSIZE)
-        ##self.list.SetColumnWidth(2, wxLIST_AUTOSIZE)
+        self.list.SetColumnWidth(2, wxLIST_AUTOSIZE)
 
         self.list.SetItemState(5, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED)
 
         self.currentItem = 0
-        EVT_SIZE(self, self.OnSize)
         EVT_LIST_ITEM_SELECTED(self, tID, self.OnItemSelected)
         EVT_LIST_DELETE_ITEM(self, tID, self.OnItemDelete)
-        EVT_LIST_COL_CLICK(self, tID, self.OnColClick)
         EVT_LEFT_DCLICK(self.list, self.OnDoubleClick)
         EVT_RIGHT_DOWN(self.list, self.OnRightDown)
 
@@ -120,18 +72,6 @@ class TestListCtrlPanel(wxPanel):
     def OnItemDelete(self, event):
         self.log.WriteText("OnItemDelete\n")
 
-    def OnColClick(self, event):
-        self.log.WriteText("OnColClick: %d\n" % event.m_col)
-        self.col = event.m_col
-        self.list.SortItems(self.ColumnSorter)
-
-    def ColumnSorter(self, key1, key2):
-        item1 = musicdata[key1][self.col]
-        item2 = musicdata[key2][self.col]
-        if item1 == item2:  return 0
-        elif item1 < item2: return -1
-        else:               return 1
-
 
     def OnDoubleClick(self, event):
         self.log.WriteText("OnDoubleClick item %s\n" % self.list.GetItemText(self.currentItem))
@@ -139,24 +79,20 @@ class TestListCtrlPanel(wxPanel):
 
     def OnRightClick(self, event):
         self.log.WriteText("OnRightClick %s\n" % self.list.GetItemText(self.currentItem))
-        menu = wxMenu()
+        self.menu = wxMenu()
         tPopupID1 = 0
         tPopupID2 = 1
         tPopupID3 = 2
         tPopupID4 = 3
-        tPopupID5 = 5
-        menu.Append(tPopupID1, "One")
-        menu.Append(tPopupID2, "Two")
-        menu.Append(tPopupID3, "Three")
-        menu.Append(tPopupID4, "DeleteAllItems")
-        menu.Append(tPopupID5, "GetItem")
+        self.menu.Append(tPopupID1, "One")
+        self.menu.Append(tPopupID2, "Two")
+        self.menu.Append(tPopupID3, "Three")
+        self.menu.Append(tPopupID4, "DeleteAllItems")
         EVT_MENU(self, tPopupID1, self.OnPopupOne)
         EVT_MENU(self, tPopupID2, self.OnPopupTwo)
         EVT_MENU(self, tPopupID3, self.OnPopupThree)
         EVT_MENU(self, tPopupID4, self.OnPopupFour)
-        EVT_MENU(self, tPopupID5, self.OnPopupFive)
-        self.PopupMenu(menu, wxPoint(self.x, self.y))
-        menu.Destroy()
+        self.PopupMenu(self.menu, wxPoint(self.x, self.y))
 
     def OnPopupOne(self, event):
         self.log.WriteText("Popup one\n")
@@ -170,10 +106,6 @@ class TestListCtrlPanel(wxPanel):
     def OnPopupFour(self, event):
         self.list.DeleteAllItems()
 
-    def OnPopupFive(self, event):
-        item = self.list.GetItem(self.currentItem)
-        print item.m_text, item.m_itemId, self.list.GetItemData(self.currentItem)
-
     def OnSize(self, event):
         w,h = self.GetClientSizeTuple()
         self.list.SetDimensions(0, 0, w, h)

utils/wxPython/demo/wxMessageDialog.py

@@ -6,7 +6,6 @@ from wxPython.wx import *
 def runTest(frame, nb, log):
     dlg = wxMessageDialog(frame, 'Hello from Python and wxPython!',
                           'A Message Box', wxOK | wxICON_INFORMATION)
-                          #wxYES_NO | wxNO_DEFAULT | wxCANCEL | wxICON_INFORMATION)
     dlg.ShowModal()
     dlg.Destroy()
 

utils/wxPython/demo/wxMiniFrame.py

@@ -10,7 +10,6 @@ class MyMiniFrame(wxMiniFrame):
         button = wxButton(panel, 1003, "Close Me")
         button.SetPosition(wxPoint(15, 15))
         EVT_BUTTON(self, 1003, self.OnCloseMe)
-        EVT_CLOSE(self, self.OnCloseWindow)
 
     def OnCloseMe(self, event):
         self.Close(true)

utils/wxPython/demo/wxNotebook.py

@@ -0,0 +1,84 @@
+
+from   wxPython.wx import *
+import ColorPanel
+
+#----------------------------------------------------------------------------
+
+def runTest(frame, nb, log):
+
+    testWin = wxNotebook(nb, -1)
+
+    win = ColorPanel.ColoredPanel(testWin, wxBLUE)
+    testWin.AddPage(win, "Blue")
+    st = wxStaticText(win, -1,
+                      "You can put nearly any type of window here!",
+                      wxPoint(10, 10))
+    st.SetForegroundColour(wxWHITE)
+    st.SetBackgroundColour(wxBLUE)
+
+    win = ColorPanel.ColoredPanel(testWin, wxRED)
+    testWin.AddPage(win, "Red")
+
+    win = ColorPanel.ColoredPanel(testWin, wxGREEN)
+    testWin.AddPage(win, "Green")
+
+    win = ColorPanel.ColoredPanel(testWin, wxCYAN)
+    testWin.AddPage(win, "Cyan")
+
+    win = ColorPanel.ColoredPanel(testWin, wxWHITE)
+    testWin.AddPage(win, "White")
+
+    win = ColorPanel.ColoredPanel(testWin, wxBLACK)
+    testWin.AddPage(win, "Black")
+
+    win = ColorPanel.ColoredPanel(testWin, wxNamedColour('MIDNIGHT BLUE'))
+    testWin.AddPage(win, "MIDNIGHT BLUE")
+
+    win = ColorPanel.ColoredPanel(testWin, wxNamedColour('INDIAN RED'))
+    testWin.AddPage(win, "INDIAN RED")
+
+    return testWin
+
+#----------------------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+overview = """\
+This class represents a notebook control, which manages multiple windows with associated tabs.
+
+To use the class, create a wxNotebook object and call AddPage or InsertPage, passing a window to be used as the page. Do not explicitly delete the window for a page that is currently managed by wxNotebook.
+
+wxNotebook()
+-------------------------
+
+Default constructor.
+
+wxNotebook(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size, long style = 0, const wxString& name = "notebook")
+
+Constructs a notebook control.
+
+Parameters
+-------------------
+
+parent = The parent window. Must be non-NULL.
+
+id = The window identifier.
+
+pos = The window position.
+
+size = The window size.
+
+style = The window style. Its value is a bit list of zero or more of wxTC_MULTILINE, wxTC_RIGHTJUSTIFY, wxTC_FIXEDWIDTH and wxTC_OWNERDRAW.
+"""

utils/wxPython/demo/wxRadioBox.py

@@ -7,7 +7,6 @@ class TestRadioButtons(wxPanel):
     def __init__(self, parent, log):
         self.log = log
         wxPanel.__init__(self, parent, -1)
-        #self.SetBackgroundColour(wxBLUE)
 
         sampleList = ['zero', 'one', 'two', 'three', 'four', 'five',
                       'six', 'seven', 'eight']
@@ -15,15 +14,11 @@ class TestRadioButtons(wxPanel):
         rb = wxRadioBox(self, 30, "wxRadioBox", wxPoint(35, 30), wxDefaultSize,
                         sampleList, 3, wxRA_SPECIFY_COLS)
         EVT_RADIOBOX(self, 30, self.EvtRadioBox)
-        #rb.SetBackgroundColour(wxBLUE)
-        rb.SetToolTip(wxToolTip("This is a ToolTip!"))
 
-        wxRadioButton(self, 32, "wxRadioButton", (235, 35))
-        wxRadioButton(self, 33, "wxRadioButton", (235, 55))
 
-        rb = wxRadioBox(self, 35, "", wxPoint(35, 120), wxDefaultSize,
+        rb = wxRadioBox(self, 30, "wxRadioBox", wxPoint(35, 120), wxDefaultSize,
                         sampleList, 3, wxRA_SPECIFY_COLS | wxNO_BORDER)
-        EVT_RADIOBOX(self, 35, self.EvtRadioBox)
+        EVT_RADIOBOX(self, 30, self.EvtRadioBox)
 
 
     def EvtRadioBox(self, event):

utils/wxPython/demo/wxSashWindow.py

@@ -17,7 +17,6 @@ class TestSashWindow(wxPanel):
 
         EVT_SASH_DRAGGED_RANGE(self, self.ID_WINDOW_TOP,
                                self.ID_WINDOW_BOTTOM, self.OnSashDrag)
-        EVT_SIZE(self, self.OnSize)
 
 
         # Create some layout windows

utils/wxPython/demo/wxScrolledWindow.py

@@ -4,25 +4,20 @@ from wxPython.wx import *
 #---------------------------------------------------------------------------
 
 class MyCanvas(wxScrolledWindow):
-    def __init__(self, parent, id = -1, size = wxDefaultSize):
-        wxScrolledWindow.__init__(self, parent, id, wxPoint(0, 0), size, wxSUNKEN_BORDER)
+    def __init__(self, parent):
+        wxScrolledWindow.__init__(self, parent, -1, wxPoint(0, 0), wxPyDefaultSize, wxSUNKEN_BORDER)
 
         self.lines = []
         self.maxWidth  = 1000
         self.maxHeight = 1000
 
         self.SetBackgroundColour(wxNamedColor("WHITE"))
-        EVT_LEFT_DOWN(self, self.OnLeftButtonEvent)
-        EVT_LEFT_UP(self,   self.OnLeftButtonEvent)
-        EVT_MOTION(self,    self.OnLeftButtonEvent)
-
-        EVT_PAINT(self, self.OnPaint)
-
+        self.Connect(-1, -1, wxEVT_LEFT_DOWN, self.OnLeftButtonEvent)
+        self.Connect(-1, -1, wxEVT_LEFT_UP,   self.OnLeftButtonEvent)
+        self.Connect(-1, -1, wxEVT_MOTION,    self.OnLeftButtonEvent)
 
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
         bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
-        mask = wxMaskColour(bmp, wxBLUE)
-        bmp.SetMask(mask)
         self.bmp = bmp
 
         self.SetScrollbars(20, 20, self.maxWidth/20, self.maxHeight/20)
@@ -66,29 +61,14 @@ class MyCanvas(wxScrolledWindow):
         dc.SetPen(wxGREEN_PEN)
         dc.DrawSpline(lst+[(100,100)])
 
-        dc.DrawBitmap(self.bmp, 200, 20, true)
+        dc.DrawBitmap(self.bmp, 200, 20)
         dc.SetTextForeground(wxColour(0, 0xFF, 0x80))
         dc.DrawText("a bitmap", 200, 85)
 
-        font = wxFont(20, wxSWISS, wxNORMAL, wxNORMAL)
-        dc.SetFont(font)
-        dc.SetTextForeground(wxBLACK)
-        for a in range(0, 360, 45):
-            dc.DrawRotatedText("Rotated text...", 300, 300, a)
-
-        dc.SetPen(wxTRANSPARENT_PEN)
-        dc.SetBrush(wxBLUE_BRUSH)
-        dc.DrawRectangle(50,500,50,50)
-        dc.DrawRectangle(100,500,50,50)
-
-        #from wxPython import dch
-        #dch.FillRect(dc, wxRect(50, 400, 50, 50), wxBLACK)
-
         self.DrawSavedLines(dc)
         dc.EndDrawing()
 
 
-
     def DrawSavedLines(self, dc):
         dc.SetPen(wxPen(wxNamedColour('MEDIUM FOREST GREEN'), 4))
         for line in self.lines:
@@ -109,7 +89,6 @@ class MyCanvas(wxScrolledWindow):
         if event.LeftDown():
             self.SetXY(event)
             self.curLine = []
-            self.CaptureMouse()
 
         elif event.Dragging():
             dc = wxClientDC(self)
@@ -125,7 +104,6 @@ class MyCanvas(wxScrolledWindow):
         elif event.LeftUp():
             self.lines.append(self.curLine)
             self.curLine = []
-            self.ReleaseMouse()
 
 #---------------------------------------------------------------------------
 

utils/wxPython/demo/wxSpinButton.py

@@ -17,8 +17,7 @@ class TestPanel(wxPanel):
 
         self.text = wxTextCtrl(self, -1, "1", wxPoint(30, 50), wxSize(60, -1))
         h = self.text.GetSize().height
-        self.spin = wxSpinButton(self, 20, wxPoint(92, 50), wxSize(h, h),
-                                 wxSP_VERTICAL)
+        self.spin = wxSpinButton(self, 20, wxPoint(92, 50), wxSize(h*2, h))
         self.spin.SetRange(1, 100)
         self.spin.SetValue(1)
 

utils/wxPython/demo/wxSplitterWindow.py

@@ -2,21 +2,10 @@
 from wxPython.wx import *
 
 
-#---------------------------------------------------------------------------
-
-class MySplitter(wxSplitterWindow):
-    def __init__(self, parent, ID, log):
-        wxSplitterWindow.__init__(self, parent, ID)
-        self.log = log
-        EVT_SPLITTER_SASH_POS_CHANGED(self, self.GetId(), self.OnSashChanged)
-
-    def OnSashChanged(self, evt):
-        self.log.WriteText("sash changed to " + str(evt.GetSashPosition()))
-
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
-    splitter = MySplitter(nb, -1, log)
+    splitter = wxSplitterWindow(nb, -1)
 
     p1 = wxWindow(splitter, -1)
     p1.SetBackgroundColour(wxRED)
@@ -26,9 +15,9 @@ def runTest(frame, nb, log):
     p2.SetBackgroundColour(wxBLUE)
     wxStaticText(p2, -1, "Panel Two", wxPoint(5,5)).SetBackgroundColour(wxBLUE)
 
-    splitter.SetMinimumPaneSize(20)
     splitter.SplitVertically(p1, p2)
     splitter.SetSashPosition(100)
+    splitter.SetMinimumPaneSize(20)
 
     return splitter
 

utils/wxPython/demo/wxStatusBar.py

@@ -10,7 +10,6 @@ class CustomStatusBar(wxStatusBar):
         wxStatusBar.__init__(self, parent, -1)
         self.SetFieldsCount(3)
         self.log = log
-        EVT_SIZE(self, self.OnSize)
 
         self.SetStatusText("A Custom StatusBar...", 0)
 
@@ -63,7 +62,6 @@ class TestCustomStatusBar(wxFrame):
 
         self.sb = CustomStatusBar(self, log)
         self.SetStatusBar(self.sb)
-        EVT_CLOSE(self, self.OnCloseWindow)
 
     def OnCloseWindow(self, event):
         self.sb.timer.Stop()

utils/wxPython/demo/wxTextCtrl.py

@@ -9,8 +9,7 @@ class TestPanel(wxPanel):
         self.log = log
 
         wxStaticText(self, -1, "wxTextCtrl", wxPoint(5, 25), wxSize(75, 20))
-        t = wxTextCtrl(self, 10, "Test it out and see", wxPoint(80, 25), wxSize(150, 20))
-        t.SetInsertionPoint(0)
+        wxTextCtrl(self, 10, "", wxPoint(80, 25), wxSize(150, 20))
         EVT_TEXT(self, 10, self.EvtText)
 
         wxStaticText(self, -1, "Passsword", wxPoint(5, 50), wxSize(75, 20))
@@ -18,8 +17,7 @@ class TestPanel(wxPanel):
         EVT_TEXT(self, 20, self.EvtText)
 
         wxStaticText(self, -1, "Multi-line", wxPoint(5, 75), wxSize(75, 20))
-        t = wxTextCtrl(self, 30, "How does it work with a long line of text set in the control", wxPoint(80, 75), wxSize(200, 150), wxTE_MULTILINE)
-        t.SetInsertionPoint(0)
+        wxTextCtrl(self, 30, "", wxPoint(80, 75), wxSize(200, 150), wxTE_MULTILINE)
         EVT_TEXT(self, 30, self.EvtText)
 
     def EvtText(self, event):

utils/wxPython/demo/wxToolBar.py

@@ -11,51 +11,48 @@ class TestToolBar(wxFrame):
 
         wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
 
-        tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER) #|wxTB_FLAT)
+        tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER)
         #tb = wxToolBar(self, -1, wxDefaultPosition, wxDefaultSize,
         #               wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT)
         #self.SetToolBar(tb)
 
         self.CreateStatusBar()
 
-        tb.AddSimpleTool(10, wxBitmap('bitmaps/new.bmp',   wxBITMAP_TYPE_BMP),
-                         "New", "Long help for 'New'")
+        tb.AddTool(10, wxNoRefBitmap('bitmaps/new.bmp',   wxBITMAP_TYPE_BMP),
+                        wxNullBitmap, false, -1, -1, "New", "Long help for 'New'")
         EVT_TOOL(self, 10, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)
 
-        tb.AddSimpleTool(20, wxBitmap('bitmaps/open.bmp',  wxBITMAP_TYPE_BMP), "Open")
+        tb.AddTool(20, wxNoRefBitmap('bitmaps/open.bmp',  wxBITMAP_TYPE_BMP),
+                        wxNullBitmap, false, -1, -1, "Open")
         EVT_TOOL(self, 20, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 20, self.OnToolRClick)
 
         tb.AddSeparator()
-        tb.AddSimpleTool(30, wxBitmap('bitmaps/copy.bmp',  wxBITMAP_TYPE_BMP), "Copy")
+        tb.AddTool(30, wxNoRefBitmap('bitmaps/copy.bmp',  wxBITMAP_TYPE_BMP),
+                        wxNullBitmap, false, -1, -1, "Copy")
         EVT_TOOL(self, 30, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 30, self.OnToolRClick)
 
-        tb.AddSimpleTool(40, wxBitmap('bitmaps/paste.bmp', wxBITMAP_TYPE_BMP), "Paste")
+        tb.AddTool(40, wxNoRefBitmap('bitmaps/paste.bmp', wxBITMAP_TYPE_BMP),
+                        wxNullBitmap, false, -1, -1, "Paste")
         EVT_TOOL(self, 40, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick)
 
         tb.AddSeparator()
 
-        tool = tb.AddTool(50, wxBitmap('bitmaps/tog1.bmp', wxBITMAP_TYPE_BMP),
-                          shortHelpString="Toggle this", toggle=true)
+        tb.AddTool(50, wxNoRefBitmap('bitmaps/tog1.bmp', wxBITMAP_TYPE_BMP),
+                        wxNullBitmap, true, -1, -1, "Toggle this")
         EVT_TOOL(self, 50, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 50, self.OnToolRClick)
 
-        tb.AddTool(60, wxBitmap('bitmaps/tog1.bmp', wxBITMAP_TYPE_BMP),
-                   wxBitmap('bitmaps/tog2.bmp', wxBITMAP_TYPE_BMP),
-                   shortHelpString="Toggle with 2 bitmaps", toggle=true)
+        tb.AddTool(60, wxNoRefBitmap('bitmaps/tog1.bmp', wxBITMAP_TYPE_BMP),
+                        wxNoRefBitmap('bitmaps/tog2.bmp', wxBITMAP_TYPE_BMP),
+                        true, -1, -1, "Toggle with 2 bitmaps")
         EVT_TOOL(self, 60, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 60, self.OnToolRClick)
 
-
-        tb.AddSeparator()
-        tb.AddControl(wxComboBox(tb, -1, "", choices=["", "This", "is a", "wxComboBox"],
-                                 size=(150,-1), style=wxCB_DROPDOWN))
-
         tb.Realize()
-        EVT_CLOSE(self, self.OnCloseWindow)
 
 
     def OnCloseWindow(self, event):

utils/wxPython/demo/wxTreeCtrl.py

@@ -5,62 +5,23 @@ import string
 
 #---------------------------------------------------------------------------
 
-class MyTreeCtrl(wxTreeCtrl):
-    def __init__(self, parent, id, pos, size, style):
-        wxTreeCtrl.__init__(self, parent, id, pos, size, style)
-
-
-    def OnCompareItems(self, item1, item2):
-        t1 = self.GetItemText(item1)
-        t2 = self.GetItemText(item2)
-        if t1 < t2: return -1
-        if t1 == t2: return 0
-        return 1
-
-#---------------------------------------------------------------------------
-
 class TestTreeCtrlPanel(wxPanel):
     def __init__(self, parent, log):
         wxPanel.__init__(self, parent, -1)
-        EVT_SIZE(self, self.OnSize)
 
         self.log = log
         tID = NewId()
 
-        self.tree = MyTreeCtrl(self, tID, wxDefaultPosition, wxDefaultSize,
-                               wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS)# | wxTR_MULTIPLE)
-
-        #il = wxImageList(16, 16)
-        #idx1 = il.Add(wxBitmap('bitmaps/smiles.bmp', wxBITMAP_TYPE_BMP))
-        #idx2 = il.Add(wxBitmap('bitmaps/open.bmp', wxBITMAP_TYPE_BMP))
-        #idx3 = il.Add(wxBitmap('bitmaps/new.bmp', wxBITMAP_TYPE_BMP))
-        #idx4 = il.Add(wxBitmap('bitmaps/copy.bmp', wxBITMAP_TYPE_BMP))
-        #idx5 = il.Add(wxBitmap('bitmaps/paste.bmp', wxBITMAP_TYPE_BMP))
-
-        #self.tree.SetImageList(il)
-        #self.il = il
-
-        # NOTE:  For some reason tree items have to have a data object in
-        #        order to be sorted.  Since our compare just uses the labels
-        #        we don't need any real data, so we'll just use None.
+        self.tree = wxTreeCtrl(self, tID, wxDefaultPosition, wxDefaultSize,
+                               wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS)
 
         self.root = self.tree.AddRoot("The Root Item")
-        self.tree.SetPyData(self.root, None)
-        #self.tree.SetItemImage(self.root, idx1)
-
         for x in range(15):
             child = self.tree.AppendItem(self.root, "Item %d" % x)
-            self.tree.SetPyData(child, None)
-            #self.tree.SetItemImage(child, idx2)
-            #self.tree.SetItemSelectedImage(child, idx3)
             for y in range(5):
                 last = self.tree.AppendItem(child, "item %d-%s" % (x, chr(ord("a")+y)))
-                self.tree.SetPyData(last, None)
-                #self.tree.SetItemImage(last, idx4)
-                #self.tree.SetItemSelectedImage(last, idx5)
                 for z in range(5):
-                    item = self.tree.AppendItem(last,  "item %d-%s-%d" % (x, chr(ord("a")+y), z))
-                    self.tree.SetPyData(item, None)
+                    self.tree.AppendItem(last,  "item %d-%s-%d" % (x, chr(ord("a")+y), z))
 
         self.tree.Expand(self.root)
         EVT_TREE_ITEM_EXPANDED  (self, tID, self.OnItemExpanded)
@@ -73,19 +34,15 @@ class TestTreeCtrlPanel(wxPanel):
         EVT_RIGHT_DOWN(self.tree, self.OnRightClick)
         EVT_RIGHT_UP(self.tree, self.OnRightUp)
 
-
     def OnRightClick(self, event):
-        pt = event.GetPosition();
-        item, flags = self.tree.HitTest(pt)
-        self.log.WriteText("OnRightClick: %s, %s\n" % (self.tree.GetItemText(item),
-                                                       type(item)))
+        (x,y) = event.Position();
+        item = self.tree.HitTest(wxPoint(x,y))
+        self.log.WriteText("OnRightClick: %s\n" % self.tree.GetItemText(item))
         self.tree.SelectItem(item)
 
-
-
     def OnRightUp(self, event):
-        pt = event.GetPosition();
-        item, flags = self.tree.HitTest(pt)
+        (x,y) = event.Position();
+        item = self.tree.HitTest(wxPoint(x,y))
         self.log.WriteText("OnRightUp: %s (manually starting label edit)\n"
                            % self.tree.GetItemText(item))
         self.tree.EditLabel(item)
@@ -110,13 +67,11 @@ class TestTreeCtrlPanel(wxPanel):
                 return
 
 
+
     def OnLeftDClick(self, event):
-        pt = event.GetPosition();
-        item, flags = self.tree.HitTest(pt)
+        (x,y) = event.Position();
+        item = self.tree.HitTest(wxPoint(x,y))
         self.log.WriteText("OnLeftDClick: %s\n" % self.tree.GetItemText(item))
-        parent = self.tree.GetItemParent(item)
-        self.tree.SortChildren(parent)
-        event.Skip()
 
 
     def OnSize(self, event):
@@ -135,10 +90,6 @@ class TestTreeCtrlPanel(wxPanel):
     def OnSelChanged(self, event):
         self.item = event.GetItem()
         self.log.WriteText("OnSelChanged: %s\n" % self.tree.GetItemText(self.item))
-        self.log.WriteText("BoundingRect: %s\n" %
-                           self.tree.GetBoundingRect(self.item, true))
-
-
 
 #---------------------------------------------------------------------------
 

utils/wxPython/distrib/.cvsignore

@@ -3,4 +3,5 @@
 *.zip
 build.pyc
 filelist
+wxPython.spec
 wxp2.wse

utils/wxPython/distrib/.rpmrc

@@ -0,0 +1,5 @@
+sourcedir        : .
+builddir         : .
+rpmdir           : .
+srcrpmdir        : .
+

utils/wxPython/distrib/build.py

@@ -92,7 +92,6 @@ Configuration Options
     OTHERTARGETS     Other targets to be placed on the default rule line
     OTHERINSTALLTARGETS
                      Other targets to be placed on the install rule line
-    OTHERDEFS        Text to place near the begining of the Makefile
     OTHERRULES       This text is placed at the end of the makefile and
                      will typically be used for adding rules and such
     DEFAULTRULE      Text to be used for the default rule in the makefile
@@ -120,10 +119,7 @@ import sys, os, string, getopt
 # This is really the wxPython version number, and will be placed in the
 # Makefiles for use with the distribution related targets.
 
-major_version = '2.1'
-build_version = '16'
-
-__version__ = major_version + '.' + build_version
+__version__ = '2.1b3'
 
 #----------------------------------------------------------------------------
 
@@ -167,10 +163,10 @@ def main(args):
                          runClean = runClean,
                          runUninstall = runUninstall)
 
-    err = 0
     if config.readConfigFiles(args):
         config.doFixups()
         config.makeMakefile()
+        err = 0
 
         if config.runBuild:
             cmd = "%s -f %s" % (config.MAKE, config.MAKEFILE)
@@ -193,7 +189,6 @@ def main(args):
             print "Running:", cmd
             err = os.system(cmd)
 
-    return err/256
 
 
 #----------------------------------------------------------------------------
@@ -222,12 +217,7 @@ class BuildConfig:
 
     #------------------------------------------------------------
     def setDefaults(self):
-        base = os.path.split(sys.argv[0])[0]
-        base = os.path.join(base, '..')
-        self.WXPYDIR = os.path.abspath(base)
         self.VERSION = __version__
-        self.MAJVER = major_version
-        self.BLDVER = build_version
         self.MODULE = ''
         self.SWIGFILES = []
         self.SWIGFLAGS = '-c++ -shadow -python -keyword -dnone -I$(WXPSRCDIR)'
@@ -242,7 +232,7 @@ class BuildConfig:
         self.OTHERINSTALLTARGETS = ''
         self.OTHERUNINSTALLTARGETS = ''
         self.OTHERRULES = ''
-        self.DEFAULTRULE = 'default: $(GENCODEDIR) $(TARGET) $(BUILDDIR)/$(TARGET) bldpycfiles'
+        self.DEFAULTRULE = 'default: $(GENCODEDIR) $(TARGET)'
         self.PYVERSION = sys.version[:3]
         self.PYPREFIX  = sys.prefix
         self.EXECPREFIX = sys.exec_prefix
@@ -251,10 +241,7 @@ class BuildConfig:
         self.WXP_USE_THREAD = '1'
         self.WXUSINGDLL = '1'
         self.OTHERDEP = ''
-        self.WXPSRCDIR = '$(WXPYDIR)/src'
-        self.SWIGDEPS = ''
-        self.OTHERDEPS = ''
-        self.OTHERDEFS = ''
+        self.WXPSRCDIR = '$(WXDIR)/utils/wxPython/src'
 
 
         if sys.platform == 'win32':
@@ -273,7 +260,6 @@ class BuildConfig:
             self.OVERRIDEFLAGS = '/GX-'
             self.RMCMD  = '-erase '
             self.WXPSRCDIR = os.path.normpath(self.WXPSRCDIR)
-            self.CRTFLAG = ''
 
 
         else:
@@ -285,14 +271,13 @@ class BuildConfig:
             self.TARGET = '$(MODULE)module$(SO)'
             self.OBJEXT = '.o'
             self.HELPERLIB = 'wxPyHelpers'
-            self.HELPERLIBDIR = '$(EXECPREFIX)/lib'
+            self.HELPERLIBDIR = '/usr/local/lib'
             self.CFLAGS = '-DSWIG_GLOBAL -DHAVE_CONFIG_H $(THREAD) -I. '\
-                          '`$(WXCONFIG) --cflags` -I$(PYINCLUDE) -I$(EXECINCLUDE) '\
+                          '`wx-config --cflags` -I$(PYINCLUDE) -I$(EXECINCLUDE) '\
                           '-I$(WXPSRCDIR)'
-            self.LFLAGS = '-L$(WXPSRCDIR) `$(WXCONFIG) --libs`'
+            self.LFLAGS = '-L$(WXPSRCDIR) `wx-config --libs`'
+            self.LIBS   = '-l$(HELPERLIB)'
             self.RMCMD  = '-rm -f '
-            self.WXCONFIG = 'wx-config'
-            self.USE_SONAME = '1'
 
             # **** What to do when I start supporting Motif, etc.???
             self.GENCODEDIR = 'gtk'
@@ -332,13 +317,9 @@ class BuildConfig:
         # This is called after the config files have been evaluated
         # so we can do some sanity checking...
         if sys.platform != 'win32':
-	    if not self.CCC:
-                self.CCC = os.popen('%(WXCONFIG)s --cxx' % self.__dict__, 'r').read()[:-1]
 	    if not self.CCC:
 		print "Warning: C++ compiler not specified (CCC). Assuming c++"
 		self.CCC = 'c++'
-            if not self.CC:
-                self.CCC = os.popen('%(WXCONFIG)s --cc' % self.__dict__, 'r').read()[:-1]
 	    if not self.CC:
 		print "Warning: C compiler not specified (CC). Assuming cc"
 		self.CC = 'cc'
@@ -370,45 +351,27 @@ class BuildConfig:
         # now build the text for the dependencies
         depends = ""
         for name in self.SWIGFILES:
-            rootname = os.path.splitext(name)[0]
-            text = '$(GENCODEDIR)/%s.cpp $(GENCODEDIR)/%s.py : %s.i %s\n' \
-                   '$(TARGETDIR)\\%s.py : $(GENCODEDIR)\\%s.py\n' \
-                   '$(BUILDDIR)\\%s.py : $(GENCODEDIR)\\%s.py\n' % \
-                   (rootname, rootname, rootname, self.SWIGDEPS,
-                    rootname, rootname, rootname, rootname)
-            depends = depends + text
-            if self.OTHERDEPS:
-                text = '%s%s : %s\n' % \
-                       (os.path.splitext(name)[0], self.OBJEXT, self.OTHERDEPS)
+            text = '$(GENCODEDIR)/%s.cpp $(GENCODEDIR)/%s.py : %s.i\n' \
+                   '$(TARGETDIR)\\%s.py : $(GENCODEDIR)\\%s.py\n' % \
+                   tuple([os.path.splitext(name)[0]] * 5)
             depends = depends + text
         for name in self.PYFILES:
             text = '$(TARGETDIR)\\%s.py : %s.py\n' % \
                    tuple([os.path.splitext(name)[0]] * 2)
             depends = depends + text
-        if self.OTHERDEPS:
-            for name in self.SOURCES:
-                name = os.path.basename(name)
-                text = '%s%s : %s\n' % \
-                       (os.path.splitext(name)[0], self.OBJEXT, self.OTHERDEPS)
-                depends = depends + text
-
         self.DEPENDS = swapslash(depends)
 
 
         # and the list of .py files
         pymodules = ""
-        bldpymodules = ""
         for name in self.SWIGFILES:
             pymodules = pymodules + '$(TARGETDIR)\\%s.py ' % os.path.splitext(name)[0]
-            bldpymodules = bldpymodules + '$(BUILDDIR)\\%s.py ' % os.path.splitext(name)[0]
         for name in self.PYFILES:
             pymodules = pymodules + '$(TARGETDIR)\\%s.py ' % os.path.splitext(name)[0]
-            bldpymodules = bldpymodules + '$(BUILDDIR)\\%s.py ' % os.path.splitext(name)[0]
         self.PYMODULES = splitlines(swapslash(pymodules))
-        self.BLDPYMODULES = splitlines(swapslash(bldpymodules))
 
 
-        # now make a list of the python files that would need cleaned up
+        # now make a list of the python files that would need uninstalled
         pycleanup = ""
         for name in self.SWIGFILES:
             pycleanup = pycleanup + self.makeCleanupList(name)
@@ -417,15 +380,6 @@ class BuildConfig:
         self.PYCLEANUP = swapslash(pycleanup)
 
 
-        # now make a list of the python files that would need uninstalled
-        pyUninstall = ""
-        for name in self.SWIGFILES:
-            pyUninstall = pyUninstall + self.makeUninstallList(name)
-        for name in self.PYFILES:
-            pyUninstall = pyUninstall + self.makeUninstallList(name)
-        self.PYUNINSTALL = swapslash(pyUninstall)
-
-
         # finally, build the makefile
         if sys.platform == 'win32':
             if self.RESFILE:
@@ -444,7 +398,7 @@ class BuildConfig:
 
 
     #------------------------------------------------------------
-    def makeUninstallList(self, name):
+    def makeCleanupList(self, name):
         st = ""
         st = st + '\t%s$(TARGETDIR)\\%s.py\n' % (self.RMCMD, os.path.splitext(name)[0])
         st = st + '\t%s$(TARGETDIR)\\%s.pyc\n' % (self.RMCMD, os.path.splitext(name)[0])
@@ -452,15 +406,6 @@ class BuildConfig:
         return st
 
 
-    #------------------------------------------------------------
-    def makeCleanupList(self, name):
-        st = ""
-        st = st + '\t%s$(BUILDDIR)\\%s.py\n' % (self.RMCMD, os.path.splitext(name)[0])
-        st = st + '\t%s$(BUILDDIR)\\%s.pyc\n' % (self.RMCMD, os.path.splitext(name)[0])
-        st = st + '\t%s$(BUILDDIR)\\%s.pyo\n' % (self.RMCMD, os.path.splitext(name)[0])
-        return st
-
-
     #------------------------------------------------------------
     def readConfigFiles(self, args):
         return self.processFile(self.bldCfg, 1) and \
@@ -496,7 +441,7 @@ class BuildConfig:
             for st in args:
                 pair = string.split(st, '=')
                 name = pair[0]
-                value = string.join(pair[1:], '=')
+                value = pair[1]
                 self.__dict__[name] = value
         except:
             print "Error parsing command-line: %s" % st
@@ -523,8 +468,6 @@ win32Template = '''
 
 WXDIR = %(WXDIR)s
 VERSION = %(VERSION)s
-MAJVER = %(MAJVER)s
-BLDVER = %(BLDVER)s
 MODULE = %(MODULE)s
 SWIGFLAGS = %(SWIGFLAGS)s %(SWIGTOOLKITFLAG)s %(OTHERSWIGFLAGS)s
 CFLAGS = %(CFLAGS)s
@@ -539,15 +482,12 @@ WXUSINGDLL = %(WXUSINGDLL)s
 GENCODEDIR = %(GENCODEDIR)s
 RESFILE = %(RESFILE)s
 WXPSRCDIR = %(WXPSRCDIR)s
-%(OTHERDEFS)s
 
-WXPYDIR   = %(WXPYDIR)s
-BUILDDIR  = $(WXPYDIR)\\wxPython
+
 TARGETDIR = %(TARGETDIR)s
 
 OBJECTS = %(OBJECTS)s
 PYMODULES = %(PYMODULES)s
-BLDPYMODULES = %(BLDPYMODULES)s
 TARGET = %(TARGET)s
 
 
@@ -572,8 +512,6 @@ EXTRAFLAGS = $(CFLAGS) %(OTHERCFLAGS)s
 LFLAGS = %(LFLAGS)s %(OTHERLFLAGS)s
 EXTRALIBS = %(LIBS)s %(OTHERLIBS)s
 
-CRTFLAG=%(CRTFLAG)s
-
 #----------------------------------------------------------------------
 
 !include $(WXDIR)\\src\\makevc.env
@@ -584,7 +522,7 @@ CRTFLAG=%(CRTFLAG)s
 
 
 
-install: default $(TARGETDIR) $(TARGETDIR)\\$(TARGET) pycfiles %(OTHERINSTALLTARGETS)s
+install: $(TARGETDIR) $(TARGETDIR)\\$(TARGET) pycfiles %(OTHERINSTALLTARGETS)s
 
 clean:
 	-erase *.obj
@@ -598,13 +536,11 @@ clean:
 	-erase $(MODULE).lib
 	-erase $(MODULE).ilk
 	-erase $(TARGET)
-	-erase $(BUILDDIR)\$(TARGET)
-%(PYCLEANUP)s
 
 
 uninstall: %(OTHERUNINSTALLTARGETS)s
 	-erase $(TARGETDIR)\\$(TARGET)
-%(PYUNINSTALL)s
+%(PYCLEANUP)s
 
 
 #----------------------------------------------------------------------
@@ -641,19 +577,12 @@ $(CPPFLAGS) /c $<
 {}.py{$(TARGETDIR)}.py:
 	copy $< $@
 
-
-{$(GENCODEDIR)}.py{$(BUILDDIR)}.py:
-	copy $< $@
-
-{}.py{$(BUILDDIR)}.py:
-	copy $< $@
-
 #----------------------------------------------------------------------
 
 $(TARGET) : $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(RESFILE)
 	$(link) @<<
 /out:$@
-$(LFLAGS) /export:init$(MODULE) /implib:./$(MODULE).lib
+$(LFLAGS) /def:$(MODULE).def /implib:./$(MODULE).lib
 $(DUMMYOBJ) $(OBJECTS) $(RESFILE)
 $(LIBS)
 <<
@@ -665,16 +594,11 @@ $(LIBS)
 $(TARGETDIR)\\$(TARGET) : $(TARGET)
 	copy $(TARGET) $@
 
-$(BUILDDIR)\\$(TARGET) : $(TARGET)
-	copy $(TARGET) $@
-
 
 pycfiles : $(PYMODULES)
 	$(EXECPREFIX)\\python $(PYPREFIX)\\Lib\\compileall.py -l $(TARGETDIR)
 	$(EXECPREFIX)\\python -O $(PYPREFIX)\Lib\\compileall.py -l $(TARGETDIR)
 
-bldpycfiles : $(BLDPYMODULES)
-
 
 $(TARGETDIR) :
 	mkdir $(TARGETDIR)
@@ -693,8 +617,7 @@ showflags:
 	@echo $(CPPFLAGS)
 	@echo LFLAGS:
 	@echo $(LFLAGS)
-        @echo BUILDDIR:
-        @echo $(BUILDDIR)
+
 
 
 %(OTHERRULES)s
@@ -710,15 +633,15 @@ unixTemplate = '''
 # lost if the generator is run again.  You have been warned.
 #----------------------------------------------------------------------
 
+
+
 WXDIR = %(WXDIR)s
 VERSION = %(VERSION)s
-MAJVER = %(MAJVER)s
-BLDVER = %(BLDVER)s
 MODULE = %(MODULE)s
 SWIGFLAGS = %(SWIGFLAGS)s %(SWIGTOOLKITFLAG)s %(OTHERSWIGFLAGS)s
 CFLAGS = %(CFLAGS)s $(OPT) %(OTHERCFLAGS)s
 LFLAGS = %(LFLAGS)s %(OTHERLFLAGS)s
-
+LIBS = %(LIBS)s %(OTHERLIBS)s
 PYVERSION = %(PYVERSION)s
 PYPREFIX = %(PYPREFIX)s
 EXECPREFIX = %(EXECPREFIX)s
@@ -733,12 +656,8 @@ GENCODEDIR = %(GENCODEDIR)s
 WXPSRCDIR = %(WXPSRCDIR)s
 HELPERLIB = %(HELPERLIB)s
 HELPERLIBDIR = %(HELPERLIBDIR)s
-WXCONFIG=%(WXCONFIG)s
 
-WXPYDIR   = %(WXPYDIR)s
-BUILDDIR  = $(WXPYDIR)/wxPython
 TARGETDIR = %(TARGETDIR)s
-%(OTHERDEFS)s
 
 
 CCC = %(CCC)s
@@ -751,7 +670,6 @@ CCSHARED = %(CCSHARED)s
 
 OBJECTS = %(OBJECTS)s
 PYMODULES = %(PYMODULES)s
-BLDPYMODULES = %(BLDPYMODULES)s
 TARGET = %(TARGET)s
 
 
@@ -759,28 +677,19 @@ ifeq ($(WXP_USE_THREAD), 1)
 THREAD=-DWXP_USE_THREAD
 endif
 
-USE_SONAME = %(USE_SONAME)s
-ifeq ($(USE_SONAME), 1)
-LIBS = -l$(HELPERLIB) %(OTHERLIBS)s
-else
-LIBS = $(WXPSRCDIR)/lib$(HELPERLIB)$(SO) %(OTHERLIBS)s
-endif
-
 #----------------------------------------------------------------------
 
 %(DEFAULTRULE)s %(OTHERTARGETS)s
 
-install: default $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles %(OTHERINSTALLTARGETS)s
+install: $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles %(OTHERINSTALLTARGETS)s
 
 clean:
-	-rm -f *.o *$(SO) *$(SO).* *~
+	-rm -f *.o *$(SO) *~
 	-rm -f $(TARGET)
-	-rm -f $(BUILDDIR)/$(TARGET)
-%(PYCLEANUP)s
 
 uninstall: %(OTHERUNINSTALLTARGETS)s
 	-rm -f $(TARGETDIR)/$(TARGET)
-%(PYUNINSTALL)s
+%(PYCLEANUP)s
 
 
 #----------------------------------------------------------------------
@@ -797,15 +706,12 @@ uninstall: %(OTHERUNINSTALLTARGETS)s
 %%.o : $(GENCODEDIR)/%%.c
 	$(CC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $<
 
-ifndef NOSWIG
 $(GENCODEDIR)/%%.cpp : %%.i
 	swig $(SWIGFLAGS) -c -o $@ $<
 
 $(GENCODEDIR)/%%.py : %%.i
 	swig $(SWIGFLAGS) -c -o $(GENCODEDIR)/tmp_wrap.cpp $<
 	rm $(GENCODEDIR)/tmp_wrap.cpp
-endif
-
 
 $(TARGETDIR)/%% : %%
 	cp -f $< $@
@@ -813,12 +719,6 @@ $(TARGETDIR)/%% : %%
 $(TARGETDIR)/%% : $(GENCODEDIR)/%%
 	cp -f $< $@
 
-$(BUILDDIR)/%% : %%
-	cp -f $< $@
-
-$(BUILDDIR)/%% : $(GENCODEDIR)/%%
-	cp -f $< $@
-
 #----------------------------------------------------------------------
 
 %(DEPENDS)s
@@ -829,15 +729,14 @@ $(TARGET) : $(OBJECTS)
 	$(LDSHARED) $(OBJECTS) $(LFLAGS) $(LIBS) $(OTHERLIBS) -o $(TARGET)
 
 
+
 pycfiles : $(PYMODULES)
 	$(EXECPREFIX)/bin/python $(PYLIB)/compileall.py -l $(TARGETDIR)
 	$(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py -l $(TARGETDIR)
 
-bldpycfiles : $(BLDPYMODULES)
-
 
 $(TARGETDIR) :
-	mkdir -p $(TARGETDIR)
+	mkdir $(TARGETDIR)
 
 $(GENCODEDIR):
 	mkdir $(GENCODEDIR)
@@ -848,13 +747,21 @@ $(GENCODEDIR):
 %(OTHERRULES)s
 
 
+
 '''
 
 
 #----------------------------------------------------------------------------
 
 if __name__ == '__main__':
-    err = main(sys.argv)
-    sys.exit(err)
+    main(sys.argv)
 
 #----------------------------------------------------------------------------
+
+
+
+
+
+
+
+

utils/wxPython/distrib/makerpm

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+if [ -z $1 ]; then
+    echo "Please specify a version number on the command line."
+    exit 1
+fi
+
+if [ ! -f wxPython.spec.in ]; then
+    echo "Please run this script from the directory containing the wxPython.spec.in file."
+    exit 1
+fi
+
+
+
+strip /usr/lib/python1.5/site-packages/wxPython/*.so
+strip /usr/lib/libwxPyHelpers.so
+
+cat wxPython.spec.in | sed s/__VERSION__/$1/g > wxPython.spec
+
+mkdir /usr/doc/wxPython-$1
+cp ../README.txt /usr/doc/wxPython-$1
+cp ../../../docs/preamble.txt /usr/doc/wxPython-$1
+cp ../../../docs/licence.txt /usr/doc/wxPython-$1
+cp ../../../docs/licendoc.txt /usr/doc/wxPython-$1
+cp ../../../docs/lgpl.txt /usr/doc/wxPython-$1
+cp ../../../docs/gpl.txt /usr/doc/wxPython-$1
+
+rpm -bb wxPython.spec
+
+mv /usr/src/redhat/RPMS/*/wxPython*.rpm .
+
+rm -r /usr/doc/wxPython-$1

utils/wxPython/distrib/maketgz

@@ -0,0 +1,36 @@
+#!/bin/bash
+#----------------------------------------------------------------------
+# Make a source distribution as a tar.gz file.  This script should be
+# run from the directory that holds the wxPython dir (../..) and be
+# given a version number as an parameter.  The best way to do this is
+# run "make dist" in the wxPython/src/ directory.
+#----------------------------------------------------------------------
+
+if [ -z $1 ]; then
+    echo "Please specify a version number on the command line."
+    exit 1
+fi
+
+if [ ! -d wxPython ]; then
+    echo "Please run this script from the directory containing the wxPython sources."
+    exit 1
+fi
+
+
+rm -f wxPython/distrib/filelist
+for x in `cat wxPython/distrib/wxPython.rsp`; do
+    ls $x >> wxPython/distrib/filelist
+done
+
+
+tar cf wxPython/distrib/dist-temp.tar -T wxPython/distrib/filelist
+cd wxPython/distrib
+tar xf dist-temp.tar
+rm dist-temp.tar
+mv wxPython wxPython-$1
+
+tar cvf wxPython-$1.tar wxPython-$1
+gzip wxPython-$1.tar
+
+rm -rf wxPython-$1
+

utils/wxPython/distrib/wxPython.rsp

@@ -0,0 +1,102 @@
+wxPython/*.txt
+
+wxPython/demo/*.py
+wxPython/demo/bitmaps/*.bmp
+wxPython/demo/bitmaps/*.ico
+wxPython/demo/bitmaps/*.gif
+wxPython/demo/bitmaps/*.png
+wxPython/demo/bitmaps/*.jpg
+wxPython/demo/README.txt
+wxPython/demo/*.xml
+
+wxPython/distrib/build.py
+
+wxPython/lib/*.py
+wxPython/lib/*.txt
+wxPython/lib/sizers/*.py
+wxPython/lib/sizers/*.txt
+
+
+wxPython/src/build.cfg
+wxPython/src/*.i
+wxPython/src/*.py
+wxPython/src/*.cpp
+wxPython/src/*.c
+wxPython/src/*.h
+wxPython/src/*.ico
+wxPython/src/*.def
+wxPython/src/*.rc
+
+wxPython/src/msw/*.cpp
+wxPython/src/msw/*.h
+wxPython/src/msw/*.py
+
+wxPython/src/gtk/*.cpp
+wxPython/src/gtk/*.h
+wxPython/src/gtk/*.py
+
+wxpython/src/motif/*.cpp
+wxPython/src/motif/*.h
+wxPython/src/motif/*.py
+
+
+wxPython/modules/html/build.cfg
+wxPython/modules/html/*.i
+wxPython/modules/html/*.py
+wxPython/modules/html/*.cpp
+wxPython/modules/html/*.c
+wxPython/modules/html/*.h
+wxPython/modules/html/*.def
+wxPython/modules/html/*.rc
+wxPython/modules/html/msw/*.cpp
+wxPython/modules/html/msw/*.h
+wxPython/modules/html/msw/*.py
+wxPython/modules/html/gtk/*.cpp
+wxPython/modules/html/gtk/*.h
+wxPython/modules/html/gtk/*.py
+
+wxPython/modules/glcanvas/build.cfg
+wxPython/modules/glcanvas/*.i
+wxPython/modules/glcanvas/*.py
+wxPython/modules/glcanvas/*.cpp
+wxPython/modules/glcanvas/*.c
+wxPython/modules/glcanvas/*.h
+wxPython/modules/glcanvas/*.def
+wxPython/modules/glcanvas/*.rc
+wxPython/modules/glcanvas/msw/*.cpp
+wxPython/modules/glcanvas/msw/*.h
+wxPython/modules/glcanvas/msw/*.py
+wxPython/modules/glcanvas/gtk/*.cpp
+wxPython/modules/glcanvas/gtk/*.h
+wxPython/modules/glcanvas/gtk/*.py
+
+wxPython/modules/utils/build.cfg
+wxPython/modules/utils/*.i
+wxPython/modules/utils/*.py
+wxPython/modules/utils/*.cpp
+wxPython/modules/utils/*.c
+wxPython/modules/utils/*.h
+wxPython/modules/utils/*.def
+wxPython/modules/utils/*.rc
+wxPython/modules/utils/msw/*.cpp
+wxPython/modules/utils/msw/*.h
+wxPython/modules/utils/msw/*.py
+wxPython/modules/utils/gtk/*.cpp
+wxPython/modules/utils/gtk/*.h
+wxPython/modules/utils/gtk/*.py
+
+wxPython/modules/ogl/build.cfg
+wxPython/modules/ogl/*.i
+wxPython/modules/ogl/*.py
+wxPython/modules/ogl/*.cpp
+wxPython/modules/ogl/*.c
+wxPython/modules/ogl/*.h
+wxPython/modules/ogl/*.def
+wxPython/modules/ogl/*.rc
+wxPython/modules/ogl/msw/*.cpp
+wxPython/modules/ogl/msw/*.h
+wxPython/modules/ogl/msw/*.py
+wxPython/modules/ogl/gtk/*.cpp
+wxPython/modules/ogl/gtk/*.h
+wxPython/modules/ogl/gtk/*.py
+

utils/wxPython/distrib/wxPython.spec.in

@@ -0,0 +1,53 @@
+Summary: Cross platform GUI toolkit for use with the Python language.
+Name: wxPython
+Version: __VERSION__
+Release: 1
+Copyright: wxWindows
+Group: Development/Languages/Python
+Source: http://alldunn.com/wxPython/wxPython-__VERSION__.tar.gz
+Packager: Robin Dunn <robin@alldunn.com>
+Vendor: Total Control Software
+Requires: python >= 1.5.1
+Prefix: /usr/lib/python1.5/site-packages
+
+%description
+
+This Python package consists of an extension module that wraps around the
+wxWindows C++ class library and provides a cross platform GUI toolkit for
+use with Python.  Currently supported platforms are Win32 and Unix/GTK/X.
+
+Python is an interpreted, interactive, object-oriented programming language.
+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.
+
+#%prep
+#%setup
+#cd wxPython-__VERSION__
+#make -f Makefile.pre.in boot
+#
+#%build
+#make
+#
+#
+#%install
+#make install
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%files
+%doc /usr/doc/wxPython-__VERSION__
+/usr/lib/libwxPyHelpers.so
+/usr/lib/python1.5/site-packages/wxPython
+
+
+
+
+
+

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.16.exe
+  EXE Filename=wxPython-2.1b3.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=C:\Tools\Wise
+  Variable Default2=E:\Tools\Wise
   Variable Flags2=00001000
   Variable Name3=_ODBC16_
   Variable Default3=C:\WINNT\System32
@@ -72,10 +72,6 @@ item: Set Variable
   Value=wxPython
   Flags=10000000
 end
-item: Set Variable
-  Variable=DLLVER
-  Value=wx21_16
-end
 item: Check Configuration
   Flags=10111011
 end
@@ -195,7 +191,7 @@ end
 item: End Block
 end
 item: Display Graphic
-  Pathname=C:\PROJECTS\wx\wxPython\distrib\wxPython.bmp
+  Pathname=e:\Projects\wx\utils\wxPython\distrib\wxPython.BMP
   X Position=32784
   Y Position=16
   Flags=0000001010000000
@@ -808,191 +804,165 @@ item: Check Disk Space
 end
 item: Remark
 end
+remarked item: If/While Statement
+  Variable=COMPONENTS
+  Value=A
+  Flags=00001010
+end
+remarked item: End Block
+end
 item: Install File
-  Source=c:\WINNT\System32\Msvcirt.dll
+  Source=d:\WINNT\System32\Msvcirt.dll
   Destination=%SYS%\Msvcirt.dll
   Flags=0000001010000011
 end
 item: Install File
-  Source=c:\WINNT\System32\Msvcrt.dll
+  Source=d:\WINNT\System32\Msvcrt.dll
   Destination=%SYS%\Msvcrt.dll
   Flags=0000001010000011
 end
 item: Install File
-  Source=c:\projects\wx\lib\wx21_16.dll
-  Destination=%SYS%\wx21_16.dll
+  Source=e:\projects\wx\lib\wx21b9.dll
+  Destination=%SYS%\wx21b9.dll
   Flags=0000001010010010
 end
 item: Install File
-  Source=c:\Projects\wx\wxPython\wxPython\*.py
+  Source=e:\Projects\wx\utils\wxPython\*.py
   Destination=%MAINDIR%\wxPython
   Description=wxPython shadow class modules
   Flags=0000000010000010
 end
 item: Install File
-  Source=c:\Projects\wx\wxPython\wxPython\*.pyd
-  Destination=%MAINDIR%\wxPython
+  Source=e:\Projects\wx\utils\wxPython\*.pyd
+  Destination=%MAINDIR%\wxPython\
   Description=wxPython extension modules
   Flags=0000000010000010
 end
 item: Install File
-  Source=c:\Projects\wx\wxPython\wxPython\*.txt
-  Destination=%MAINDIR%\wxPython
+  Source=e:\Projects\wx\utils\wxPython\README.txt
+  Destination=%MAINDIR%\wxPython\README.txt
   Description=README file
   Flags=0000000010000010
 end
 item: Install File
-  Source=c:\Projects\wx\wxPython\wxPython\lib\*.py
+  Source=e:\Projects\wx\utils\wxPython\lib\*.py
   Destination=%MAINDIR%\wxPython\lib
   Description=wxPython Standard Library
   Flags=0000000010000010
 end
 item: Install File
-  Source=c:\Projects\wx\wxPython\wxPython\lib\sizers\*.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
-  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\demo\*.py
+  Source=e:\Projects\wx\utils\wxPython\demo\*.py
   Destination=%MAINDIR%\wxPython\demo
   Description=Demos
   Flags=0000000010000010
 end
 item: Install File
-  Source=c:\Projects\wx\wxPython\demo\README.txt
-  Destination=%MAINDIR%\wxPython\demo\README.txt
-  Description=Demos
-  Flags=0000000010000010
-end
-item: Install File
-  Source=c:\Projects\wx\wxPython\demo\*.xml
+  Source=E:\Projects\wx\utils\wxPython\demo\README.txt
   Destination=%MAINDIR%\wxPython\demo
   Description=Demos
   Flags=0000000010000010
 end
 item: Install File
-  Source=c:\Projects\wx\wxPython\demo\bitmaps\*.bmp
+  Source=e:\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
   Destination=%MAINDIR%\wxPython\demo\bitmaps
   Description=Demos
   Flags=0000000010000010
 end
 item: Install File
-  Source=c:\Projects\wx\wxPython\demo\bitmaps\*.gif
+  Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.gif
   Destination=%MAINDIR%\wxPython\demo\bitmaps
   Description=Demos
   Flags=0000000010000010
 end
 item: Install File
-  Source=c:\Projects\wx\wxPython\demo\bitmaps\*.jpg
+  Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.jpg
   Destination=%MAINDIR%\wxPython\demo\bitmaps
   Description=Demos
   Flags=0000000010000010
 end
 item: Install File
-  Source=c:\Projects\wx\wxPython\demo\bitmaps\*.png
+  Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.png
   Destination=%MAINDIR%\wxPython\demo\bitmaps
   Description=Demos
   Flags=0000000010000010
 end
 item: Install File
-  Source=c:\Projects\wx\wxPython\demo\bitmaps\*.ico
+  Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.ico
   Destination=%MAINDIR%\wxPython\demo\bitmaps
   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\*.png
-  Destination=%MAINDIR%\wxPython\demo\data
-  Description=Demos
-  Flags=0000000010000010
-end
-item: Install File
-  Source=c:\Projects\wx\wxPython\demo\data\grid.i
-  Destination=%MAINDIR%\wxPython\demo\data\grid.i
-  Description=Demos
-  Flags=0000000010000010
-end
-item: Install File
-  Source=c:\Projects\wx\wxPython\demo\data\stc.h
-  Destination=%MAINDIR%\wxPython\demo\data\stc.h
-  Description=Demos
-  Flags=0000000010000010
-end
-item: Install File
-  Source=c:\Projects\wx\wxPython\demo\data\tips.txt
-  Destination=%MAINDIR%\wxPython\demo\data\tips.txt
-  Description=Demos
-  Flags=0000000010000010
-end
-item: Install File
-  Source=C:\PROJECTS\wx\wxPython\README.txt
-  Destination=%MAINDIR%\wxPython\README.txt
-  Flags=0000000010000010
-end
-item: Install File
-  Source=C:\PROJECTS\wx\wxPython\CHANGES.txt
-  Destination=%MAINDIR%\wxPython\CHANGES.txt
-  Flags=0000000010000010
-end
 item: Remark
 end
 item: Install File
-  Source=C:\PROJECTS\wx\docs\htmlhelp\wx.chm
+  Source=E:\PROJECTS\wx\docs\html\wx\wx.chm
   Destination=%MAINDIR%\wxPython\docs\wx.chm
   Description=wxPython documentation
   Flags=0000000010000010
 end
 item: Install File
-  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=c:\PROJECTS\wx\docs\preamble.txt
+  Source=E:\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
+  Source=E:\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
+  Source=E:\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
+  Source=E:\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
+  Source=E:\PROJECTS\wx\docs\gpl.txt
   Destination=%MAINDIR%\wxPython\docs\gpl.txt
   Description=wxPython documentation
   Flags=0000000010000010
 end
 item: Remark
 end
+remarked item: If/While Statement
+  Variable=COMPONENTS
+  Value=B
+  Flags=00001010
+end
+remarked item: Install File
+  Source=e:\projects\wx\docs\html\wx\*.*
+  Destination=%MAINDIR%\wxPython\docs
+  Description=wxPython documentation
+  Flags=0000000010000010
+end
+remarked item: Install File
+  Source=e:\projects\wx\docs\html\wx\wx.htm
+  Destination=%MAINDIR%\wxPython\docs\index.htm
+  Description=wxPython documentation
+  Flags=0000000010000010
+end
+remarked item: End Block
+end
 item: Remark
 end
 item: Remark
@@ -1144,53 +1114,23 @@ item: Set Variable
   Value=%GROUPDIR%\%GROUP%
 end
 item: Create Shortcut
-  Source=%PYTHONDIR%\pythonw.exe
+  Source=%UNINSTALL_PATH%
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\Uninstall %APPTITLE%.lnk
+  Command Options=%INST_LOG_PATH%
+  Icon Number=0
+end
+item: Create Shortcut
+  Source=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: Add ProgMan Icon

utils/wxPython/distrib/zipit.bat

@@ -0,0 +1,17 @@
+
+@echo off
+
+
+zip -@ -r wxPython\wxPython-src-%1.zip < wxPython\distrib\wxPython.rsp
+
+mkdir wxPython\docs
+copy %WXWIN%\docs\html\wx\*.gif wxPython\docs
+copy %WXWIN%\docs\html\wx\*.htm wxPython\docs
+copy wxPython\docs\wx.htm wxPython\docs\index.htm
+
+zip -r wxPython\wxPython-docs-%1.zip wxPython\docs
+
+del /y wxPython\docs\*.*
+rmdir wxPython\docs
+
+move /R wxPython\*.zip wxPython\distrib

utils/wxPython/lib/dialogs.py

@@ -48,7 +48,6 @@ class wxMultipleChoiceDialog(wxDialog):
         self.SetAutoLayout(TRUE)
         self.lst = lst
         self.Layout()
-        EVT_SIZE(self, self.OnSize)
 
     def OnSize(self, event):
         self.Layout()

utils/wxPython/lib/layoutf.py

@@ -200,7 +200,6 @@ if __name__=='__main__':
         def __init__(self, parent):
             wxFrame.__init__(self, parent, -1, 'Test Layout Constraints',
                              wxPyDefaultPosition, wxSize(500, 300))
-            EVT_CLOSE(self, self.OnCloseWindow)
 
             self.SetAutoLayout(true)
             EVT_BUTTON(self, 100, self.OnButton)

utils/wxPython/lib/sizers/__init__.py

@@ -0,0 +1,18 @@
+#----------------------------------------------------------------------------
+# Name:         __init__.py
+# Purpose:      The presence of this file turns this directory into a
+#               Python package.
+#
+# Author:       Robin Dunn
+#
+# Created:      18-May-1999
+# RCS-ID:       $Id$
+# Copyright:    (c) 1998 by Total Control Software
+# Licence:      wxWindows license
+#----------------------------------------------------------------------------
+
+from sizer   import *
+from box     import *
+from border  import *
+
+#----------------------------------------------------------------------------