projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document the Show/Hide behaviour that wxSplitterWindow does to its children.
[wxWidgets.git]
/
wxPython
/
config.py
diff --git
a/wxPython/config.py
b/wxPython/config.py
index 1a9b4796fbb79c06ab665af0aebd2dd9bef6c7cf..b0801e020598f3b1473b2475a8e8de547c81f71e 100644
(file)
--- a/
wxPython/config.py
+++ b/
wxPython/config.py
@@
-39,8
+39,8
@@
import distutils.command.clean
VER_MAJOR = 2 # The first three must match wxWidgets
VER_MINOR = 5
VER_RELEASE = 3
VER_MAJOR = 2 # The first three must match wxWidgets
VER_MINOR = 5
VER_RELEASE = 3
-VER_SUBREL =
0
# wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS = "p" # release flags, such as prerelease num, unicode, etc.
+VER_SUBREL =
3
# wxPython release num for x.y.z release of wxWidgets
+VER_FLAGS = "p
re
" # release flags, such as prerelease num, unicode, etc.
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
@@
-135,9
+135,10
@@
INSTALL_MULTIVERSION = 1 # Install the packages such that multiple versions
FLAVOUR = "" # Optional flavour string to be appended to VERSION
# in MULTIVERSION installs
FLAVOUR = "" # Optional flavour string to be appended to VERSION
# in MULTIVERSION installs
-EP_ADD_OPTS =
0
# When doing MULTIVERSION installs the wx port and
+EP_ADD_OPTS =
1
# When doing MULTIVERSION installs the wx port and
# ansi/unicode settings can optionally be added to the
# ansi/unicode settings can optionally be added to the
- # subdir path used in site-packages
+ # subdir path used in site-packages
+
WX_CONFIG = None # Usually you shouldn't need to touch this, but you can set
# it to pass an alternate version of wx-config or alternate
WX_CONFIG = None # Usually you shouldn't need to touch this, but you can set
# it to pass an alternate version of wx-config or alternate
@@
-567,8
+568,8
@@
def getExtraPath(shortVer=True, addOpts=False):
ep = "wx-%d.%d" % (VER_MAJOR, VER_MINOR)
# plus release if minor is odd
ep = "wx-%d.%d" % (VER_MAJOR, VER_MINOR)
# plus release if minor is odd
-
#
if VER_MINOR % 2 == 1:
-
#
ep += ".%d" % VER_RELEASE
+ if VER_MINOR % 2 == 1:
+ ep += ".%d" % VER_RELEASE
else:
# long version, full version
else:
# long version, full version
@@
-605,7
+606,7
@@
if debug:
if FINAL:
HYBRID = 0
if FINAL:
HYBRID = 0
-if UNICODE and WXPORT not in ['msw', 'gtk2']:
+if UNICODE and WXPORT not in ['msw', 'gtk2'
, 'mac'
]:
raise SystemExit, "UNICODE mode not currently supported on this WXPORT: "+WXPORT
raise SystemExit, "UNICODE mode not currently supported on this WXPORT: "+WXPORT
@@
-643,7
+644,7
@@
if os.name == 'nt':
(WXPLAT, None),
('WXUSINGDLL', '1'),
(WXPLAT, None),
('WXUSINGDLL', '1'),
- ('SWIG_
GLOBAL', None
),
+ ('SWIG_
TYPE_TABLE', '_wxPython_table'
),
('WXP_USE_THREAD', '1'),
]
('WXP_USE_THREAD', '1'),
]
@@
-697,7
+698,7
@@
if os.name == 'nt':
elif os.name == 'posix':
WXDIR = '..'
includes = ['include', 'src']
elif os.name == 'posix':
WXDIR = '..'
includes = ['include', 'src']
- defines = [('SWIG_
GLOBAL', None
),
+ defines = [('SWIG_
TYPE_TABLE', 'wxPython_type_table'
),
('HAVE_CONFIG_H', None),
('WXP_USE_THREAD', '1'),
]
('HAVE_CONFIG_H', None),
('WXP_USE_THREAD', '1'),
]
@@
-732,7
+733,7
@@
elif os.name == 'posix':
WXPREFIX = os.popen(WX_CONFIG + ' --prefix').read()[:-1]
WXPREFIX = os.popen(WX_CONFIG + ' --prefix').read()[:-1]
- if sys.platform[:6] == "darwin":
+ if sys.platform[:6] == "darwin"
and WXPORT == 'mac'
:
# Flags and such for a Darwin (Max OS X) build of Python
WXPLAT = '__WXMAC__'
GENDIR = 'mac'
# Flags and such for a Darwin (Max OS X) build of Python
WXPLAT = '__WXMAC__'
GENDIR = 'mac'
@@
-812,7
+813,6
@@
swig_args = ['-c++',
'-I' + opj(WXPY_SRC, 'src'),
'-D'+WXPLAT,
'-I' + opj(WXPY_SRC, 'src'),
'-D'+WXPLAT,
- '-noruntime'
]
if UNICODE:
swig_args.append('-DwxUSE_UNICODE')
]
if UNICODE:
swig_args.append('-DwxUSE_UNICODE')
@@
-822,10
+822,7
@@
if FULL_DOCS:
swig_deps = [ opj(WXPY_SRC, 'src/my_typemaps.i'),
swig_deps = [ opj(WXPY_SRC, 'src/my_typemaps.i'),
- opj(WXPY_SRC, 'src/my_fragments.i'),
- opj(WXPY_SRC, 'src/common.swg'),
- opj(WXPY_SRC, 'src/pyrun.swg'),
- opj(WXPY_SRC, 'src/python.swg'),
+ opj(WXPY_SRC, 'src/pyfragments.swg'),
]
depends = [ #'include/wx/wxPython/wxPython.h',
]
depends = [ #'include/wx/wxPython/wxPython.h',