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 affb0aef1bd69aff22712c4f20acd3964f2aa8f0..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.1b1
+WXP_VERSION=2.1b2
 
 SWIGFLAGS=-c++ -shadow -python -dnone -D__WXGTK__ $(SEPARATE)
 
@@ -390,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);      \