*** empty log message ***

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/wxPython/README.txt b/utils/wxPython/README.txt
index e8f69cf50991a8d713676ac36208dfda604c0f6c..d62970972e9fe2a57db2876b221f110de276bbe4 100644 (file)
--- a/utils/wxPython/README.txt
+++ b/utils/wxPython/README.txt
@@ -32,7 +32,8 @@ Python.  For example, some methods that return mutliple values via
 argument pointers in C++ will return a tuple of values in Python.
 These differences have not been documented yet so if something isn't
 working the same as described in the wxWindows documents the best
-thing to do is to scan through the wxPython sources.
+thing to do is to scan through the wxPython sources, especially the .i
+files, as that is where the interfaces for wxPython are defined.
 
 Currently this extension module is designed such that the entire
 application will be written in Python.  I havn't tried it yet, but I
@@ -41,14 +42,32 @@ application will cause problems.  However there is a plan to support
 this in the future.
 
 
+
+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 acting weirdly and it soon seg-faults.  And on
-Linux ???????  (I don't know.  I can't get wxGTK to build right now.
-I'll have to look into that... :-)
+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.
 
@@ -63,12 +82,19 @@ 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 in the src directory.
+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 playaround with this the patches are in
+wxPython/SWIG.patches and they should be applied to the 1.1p5 version
+of SWIG.  These new patches are documented at
+http://starship.skyport.net/crew/robind/python/#swig, and they should
+also end up in the 1.2 version of SWIG.
 
 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 bulid process will dump
+be named wxPython.)  You can control where the build process will dump
 wxPython by setting the TARGETDIR makefile variable.  The default is
 $(WXWIN)/utils/wxPython, where this README.txt is located.  If you
 leave it here then you should add $(WXWIN)/utils to your PYTHONPATH.
@@ -112,15 +138,11 @@ version of Python either from the command line or from a shortcut.
 Unix
 ----
 
-NOTE:  I don't have wxPython working yet with wxGTK, so if you aren't
-using Win32 you can skip the rest of this file and check back in a
-week or so.
-
-
 1. Change into the $(WXWIN)/utils/wxPython/src directory.
 
 2. Edit Setup.in and ensure that the flags, directories, and toolkit
-options are correct.  See the above commentary about TARGETDIR.
+options are correct.  See the above commentary about TARGETDIR.  There
+are a few sample Setup.in.[platform] files provided.
 
 3. Run this command to generate a makefile:
 
@@ -146,3 +168,6 @@ module:
 
 Robin Dunn
 robin@alldunn.com
+
+
+

diff --git a/utils/wxPython/src/Setup.in.solaris b/utils/wxPython/src/Setup.in.solaris
new file mode 100644 (file)
index 0000000..8784196
--- /dev/null
+++ b/utils/wxPython/src/Setup.in.solaris
@@ -0,0 +1,45 @@
+# This file gives the details of what is needed to build this extension
+# module so the Makefile can be created.
+
+###
+### This file should be created by configure.  Currently it is tweaked by hand.
+###
+
+#*shared*
+
+CCC=c++
+WXWIN=../../..
+GENCODEDIR=gtk
+srcdir=$(GENCODEDIR)
+
+# Depending on how your Python was built, you may have to set this
+# value to use the C++ driver to link with instead of the default
+# C driver.  For example:
+#MY_LDSHARED=$(CCC) -shared
+
+# Same as above, but for statically linking Python and wxPython together,
+# in other words, if you comment out the *shared* above.  If this is the
+# case then you should ensure that the main() function is Python's, not
+# wxWindows'.  You can rebuild $(WXWIN)/src/gtk/app.cpp with NOMAIN defined
+# to force this...
+MY_LINKCC=$(CCC)
+
+
+## Pick one of these, or set your own.  This is where the
+## wxPython module should be installed.  It should be a
+## subdirectory named wxPython.
+TARGETDIR=..
+#TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
+
+
+wxpc   wxp.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
+       mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
+       frames.cpp stattool.cpp \
+       # CFLAGS
+       -I. -I$(WXWIN)/include -I/usr/local/lib/glib/include -I$(WXWIN)/src \
+       -I/usr/X/include -DSWIG_GLOBAL -D__WXGTK__ \
+       #-D__WXDEBUG__ \
+       # LFLAGS
+       -L$(WXWIN)/lib/solaris2.6 -L/usr/X/lib \
+       -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.6/2.8.1 \
+       -lwx_gtk -lgtk -lgdk -lglib -lXext -lX11 -lstdc++ -lgcc