Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GTK2 is now the default for builds.

Browse Source 
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
This commit is contained in:
Robin Dunn
2004-08-06 00:22:50 +00:00
parent 08ecc92023
commit 5924e48d2e
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/b
View File

@@ -36,8 +36,8 @@ OTHERFLAGS=""
PORTFLAGS="" PORTFLAGS=""
if [ "$1" = "gtk1" ]; then if [ "$1" = "gtk1" -o "$1" = "gtk" ]; then
PORTFLAGS="" PORTFLAGS="WXPORT=gtk UNICODE=0"
shift shift
elif [ "$1" = "gtk2" ]; then elif [ "$1" = "gtk2" ]; then
PORTFLAGS="WXPORT=gtk2 UNICODE=1" PORTFLAGS="WXPORT=gtk2 UNICODE=1"

4
wxPython/config.py
View File

@@ -39,7 +39,7 @@ VER_MAJOR = 2 # The first three must match wxWidgets
VER_MINOR = 5 VER_MINOR = 5
VER_RELEASE = 2 VER_RELEASE = 2
VER_SUBREL = 3 # wxPython release num for x.y.z release of wxWidgets 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" DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn" 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 # version, port, etc. and it will be looked for on the
# default $PATH. # 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 # Setting this value lets you select which will be used for
# the wxPython build. Possibilites are 'gtk', 'gtk2' and # the wxPython build. Possibilites are 'gtk', 'gtk2' and
# 'x11'. Curently only gtk and gtk2 works. # 'x11'. Curently only gtk and gtk2 works.

24
wxPython/docs/BUILD.txt
View File

@@ -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 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 \ --enable-unicode \
Notice that I used a prefix of /opt/wx/2.5. You can use whatever 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 WX_CONFIG=/opt/wx/2.5/bin/wx-config
If you are building with GTK2 then add the following flags to the By default setup.py will assume that you built wxWidgets to use
command line:: 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, 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 then you need to turn on the USE_SWIG flag and optionally tell it