Fixed wxImage GetData and SetData to properly use String objects for

[wxWidgets.git] / utils / wxPython / src / Makefile.pre.in

diff --git a/utils/wxPython/src/Makefile.pre.in b/utils/wxPython/src/Makefile.pre.in
index 7a08b85a75cbe61f465355979b4c7f33acf36dc4..ebdfe367218b2d33d009a3375290416335812efd 100644 (file)
--- a/utils/wxPython/src/Makefile.pre.in
+++ b/utils/wxPython/src/Makefile.pre.in
@@ -324,7 +324,7 @@ distclean:  clobber
 # Custom rules and dependencies added for wxPython
 #
 
-WXP_VERSION=2.0b9
+WXP_VERSION=2.1b2
 
 SWIGFLAGS=-c++ -shadow -python -dnone -D__WXGTK__ $(SEPARATE)
 
@@ -334,10 +334,11 @@ PYMODULES = $(GENCODEDIR)/wx.py        $(GENCODEDIR)/events.py    \
            $(GENCODEDIR)/gdi.py       $(GENCODEDIR)/mdi.py       \
            $(GENCODEDIR)/controls.py  $(GENCODEDIR)/controls2.py \
             $(GENCODEDIR)/windows2.py  $(GENCODEDIR)/cmndlgs.py   \
-            $(GENCODEDIR)/frames.py    $(GENCODEDIR)/stattool.py   \
-           $(GENCODEDIR)/utils.py     $(GENCODEDIR)/windows3.py  \
-           $(GENCODEDIR)/image.py     $(GENCODEDIR)/glcanvas.py  \
-           __init__.py
+           $(GENCODEDIR)/stattool.py  $(GENCODEDIR)/frames.py    \
+           $(GENCODEDIR)/windows3.py  __init__.py                \
+           $(GENCODEDIR)/utils.py     $(GENCODEDIR)/image.py     \
+           $(GENCODEDIR)/printfw.py   $(GENCODEDIR)/misc2.py     \
+            $(GENCODEDIR)/glcanvas.py
 
 
 # Implicit rules to run SWIG
@@ -359,6 +360,7 @@ $(GENCODEDIR)/windows2.cpp  $(GENCODEDIR)/windows2.py  : windows2.i   my_typemap
 $(GENCODEDIR)/windows3.cpp  $(GENCODEDIR)/windows3.py  : windows3.i   my_typemaps.i _defs.i
 $(GENCODEDIR)/events.cpp    $(GENCODEDIR)/events.py    : events.i     my_typemaps.i _defs.i
 $(GENCODEDIR)/misc.cpp      $(GENCODEDIR)/misc.py      : misc.i       my_typemaps.i _defs.i
+$(GENCODEDIR)/misc2.cpp     $(GENCODEDIR)/misc2.py     : misc2.i      my_typemaps.i _defs.i
 $(GENCODEDIR)/gdi.cpp       $(GENCODEDIR)/gdi.py       : gdi.i        my_typemaps.i _defs.i
 $(GENCODEDIR)/mdi.cpp       $(GENCODEDIR)/mdi.py       : mdi.i        my_typemaps.i _defs.i
 $(GENCODEDIR)/controls.cpp  $(GENCODEDIR)/controls.py  : controls.i   my_typemaps.i _defs.i
@@ -368,6 +370,7 @@ $(GENCODEDIR)/frames.cpp    $(GENCODEDIR)/frames.py    : frames.i     my_typemap
 $(GENCODEDIR)/stattool.cpp  $(GENCODEDIR)/stattool.py  : stattool.i   my_typemaps.i _defs.i
 $(GENCODEDIR)/image.cpp     $(GENCODEDIR)/image.py     : image.i      my_typemaps.i _defs.i
 $(GENCODEDIR)/utils.cpp     $(GENCODEDIR)/utils.py     : utils.i      my_typemaps.i _defs.i
+$(GENCODEDIR)/printfw.cpp   $(GENCODEDIR)/printfw.py   : printfw.i    my_typemaps.i _defs.i
 $(GENCODEDIR)/glcanvas.cpp  $(GENCODEDIR)/glcanvas.py  : glcanvas.i   my_typemaps.i _defs.i
 
 $(GENCODEDIR)/helpers.cpp:
@@ -387,13 +390,18 @@ wxInstall :       sharedmods $(PYMODULES)
        -for i in $(PYMODULES); do \
                cp $$i $(TARGETDIR); \
        done
-       if [ "$(TARGETDIR)" != ".." ]; then        \
-               mkdir $(TARGETDIR)/lib;            \
-               mkdir $(TARGETDIR)/demo;           \
-               cp ../lib/*.py $(TARGETDIR)/lib;   \
-               cp ../demo/*.py $(TARGETDIR)/demo; \
-               cp ../lib/*.txt $(TARGETDIR)/lib;  \
-               cp ../demo/*.txt $(TARGETDIR)/demo;\
+       if [ "$(TARGETDIR)" != ".." ]; then                     \
+               mkdir $(TARGETDIR)/lib;                         \
+               mkdir $(TARGETDIR)/lib/sizers;                  \
+               mkdir $(TARGETDIR)/demo;                        \
+               mkdir $(TARGETDIR)/demo/bitmaps;                \
+               cp ../lib/*.py $(TARGETDIR)/lib;                \
+               cp ../lib/sizers/*.py $(TARGETDIR)/lib/sizers;  \
+               cp ../demo/*.py $(TARGETDIR)/demo;              \
+               cp ../lib/*.txt $(TARGETDIR)/lib;               \
+               cp ../lib/sizers/*.txt $(TARGETDIR)/lib/sizers; \
+               cp ../demo/*.txt $(TARGETDIR)/demo;             \
+               cp ../demo/bitmaps/[a-z]* $(TARGETDIR)/demo/bitmaps;    \
        fi
        if [ "$(TARGETDIR)" != ".." ]; then      \
                python $(LIBDEST)/compileall.py $(TARGETDIR);      \