GTK2 is now the default for builds.

Removed the "p"(re) from the version number.

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

diff --git a/wxPython/b b/wxPython/b
index ffbfea4b233704c2ba659caa9273b8f671695259..3b8cb02e584ce8a411d31dacb7208b3e40e2d606 100755 (executable)
--- a/wxPython/b
+++ b/wxPython/b
@@ -36,8 +36,8 @@ OTHERFLAGS=""
 PORTFLAGS=""
 
 
-if [ "$1" = "gtk1" ]; then 
-    PORTFLAGS=""
+if [ "$1" = "gtk1" -o "$1" = "gtk" ]; then 
+    PORTFLAGS="WXPORT=gtk UNICODE=0"
     shift
 elif [ "$1" = "gtk2" ]; then 
     PORTFLAGS="WXPORT=gtk2 UNICODE=1"

diff --git a/wxPython/config.py b/wxPython/config.py
index af86694f6da42958c262a6641bce72f35ecb76e3..5276113974eef2921a4b19c9c744b9f075e90769 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -39,7 +39,7 @@ VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 2
 VER_SUBREL       = 3      # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS        = "p"     # release flags, such as prerelease num, unicode, etc.
+VER_FLAGS        = ""     # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
@@ -129,7 +129,7 @@ WX_CONFIG = None   # Usually you shouldn't need to touch this, but you can set
                    # version, port, etc. and it will be looked for on the
                    # default $PATH.
 
-WXPORT = 'gtk'     # On Linux/Unix there are several ports of wxWidgets available.
+WXPORT = 'gtk2'    # On Linux/Unix there are several ports of wxWidgets available.
                    # Setting this value lets you select which will be used for
                    # the wxPython build.  Possibilites are 'gtk', 'gtk2' and
                    # 'x11'.  Curently only gtk and gtk2 works.

diff --git a/wxPython/docs/BUILD.txt b/wxPython/docs/BUILD.txt
index 7d9700ba8c041f4d69b82755b6ae237e199d1901..729fb81e95ee55734bf5a017ab65149f21f5c8ac 100644 (file)
--- a/wxPython/docs/BUILD.txt
+++ b/wxPython/docs/BUILD.txt
@@ -85,9 +85,16 @@ place, then do the same for wxPython.
                       
 
    On OS X of course you'll want to use --with-mac instead of
-   --with-gtk.  For GTK2 and unicode add::
+   --with-gtk.  
+
+   By default GTK2 will be selected if it is on your build system.  To
+   force the use of GTK 1.2.x then add::
+
+                     --disable-gtk2 \
+
+   To make the wxWidgets build be Unicode enabled (strongly
+   recommended if you are building with GTK2) then add::
                          
-                      --enable-gtk2 \
                       --enable-unicode \
 
    Notice that I used a prefix of /opt/wx/2.5.  You can use whatever
@@ -168,10 +175,17 @@ place, then do the same for wxPython.
 
          WX_CONFIG=/opt/wx/2.5/bin/wx-config
 
-   If you are building with GTK2 then add the following flags to the
-   command line::
+   By default setup.py will assume that you built wxWidgets to use
+   GTK2.  If you built wxWidgets to use GTK 1.2.x then you should add
+   this flag to the command-line::
 
-         WXPORT=gtk2 UNICODE=1
+        WXPORT=gtk2 
+
+   If you woudl like to do a Unicode enabled build (all strings sent
+   to or retruned from wx functions are Unicode objects) and your
+   wxWidgets was built with unicod enabled then add this flag::
+
+         UNICODE=1
 
    If you are wanting to have the source files regenerated with swig,
    then you need to turn on the USE_SWIG flag and optionally tell it