Added ability to use xml resource files. Still need to add ability to
subclass wxXmlResourceHandler, etc... Added wxGridAutoEditMixin to the mixins library package. Made ColourSelect be derived from wxButton. Fixed a few bugs here and there, added some missing methods, etc. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
|
||||
# flags and values that affect this script
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
VERSION = "2.3.0"
|
||||
VERSION = "2.3.1b1"
|
||||
DESCRIPTION = "Cross platform GUI toolkit for Python"
|
||||
AUTHOR = "Robin Dunn"
|
||||
AUTHOR_EMAIL = "robin@alldunn.com"
|
||||
@@ -32,6 +32,8 @@ BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
|
||||
BUILD_OGL = 1 # If true, build the contrib/ogl extension module
|
||||
BUILD_STC = 1 # If true, build the contrib/stc extension module
|
||||
BUILD_IEWIN = 0 # Internet Explorer wrapper (experimental)
|
||||
BUILD_XRC = 1 # XML based resource system
|
||||
|
||||
|
||||
CORE_ONLY = 0 # if true, don't build any of the above
|
||||
GL_ONLY = 0 # Only used when making the -gl RPM. See the "b" script
|
||||
@@ -62,7 +64,7 @@ HYBRID = 0 # If set and not debug or FINAL, then build a
|
||||
# wxWindows must have been built with /MD, not /MDd
|
||||
# (using FINAL=hybrid will do it.)
|
||||
|
||||
WXDLLVER = '23_0' # Version part of DLL name
|
||||
WXDLLVER = '23_1' # Version part of DLL name
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
@@ -570,6 +572,98 @@ if not GL_ONLY and BUILD_IEWIN:
|
||||
wxpExtensions.append(ext)
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# Define the XRC extension module
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
if not GL_ONLY and BUILD_XRC:
|
||||
print 'Preparing XRC...'
|
||||
location = 'contrib/xrc'
|
||||
XMLLOC = location + '/contrib/src/xrc'
|
||||
XMLINC = location + '/contrib/include'
|
||||
|
||||
swig_files = ['xrc.i']
|
||||
|
||||
swig_sources = run_swig(swig_files, location, '', PKGDIR,
|
||||
USE_SWIG, swig_force, swig_args)
|
||||
|
||||
xmlres_includes = includes[:]
|
||||
xmlres_includes.append('%s/expat/xmlparse' % XMLLOC)
|
||||
xmlres_includes.append('%s/expat/xmltok' % XMLLOC)
|
||||
xmlres_includes.append(XMLINC)
|
||||
|
||||
|
||||
# make sure local copy of contrib files are up to date
|
||||
if IN_CVS_TREE:
|
||||
contrib_copy_tree(WXDIR + '/contrib/include/wx/xrc', XMLINC+'/wx/xrc')
|
||||
contrib_copy_tree(WXDIR + '/contrib/src/xrc', XMLLOC)
|
||||
|
||||
ext = Extension('xrcc', ['%s/expat/xmlparse/xmlparse.c' % XMLLOC,
|
||||
'%s/expat/xmltok/xmlrole.c' % XMLLOC,
|
||||
'%s/expat/xmltok/xmltok.c' % XMLLOC,
|
||||
|
||||
'%s/xh_bmp.cpp' % XMLLOC,
|
||||
'%s/xh_bmpbt.cpp' % XMLLOC,
|
||||
'%s/xh_bttn.cpp' % XMLLOC,
|
||||
'%s/xh_cald.cpp' % XMLLOC,
|
||||
'%s/xh_chckb.cpp' % XMLLOC,
|
||||
|
||||
'%s/xh_chckl.cpp' % XMLLOC,
|
||||
'%s/xh_choic.cpp' % XMLLOC,
|
||||
'%s/xh_combo.cpp' % XMLLOC,
|
||||
'%s/xh_dlg.cpp' % XMLLOC,
|
||||
'%s/xh_frame.cpp' % XMLLOC,
|
||||
|
||||
'%s/xh_gauge.cpp' % XMLLOC,
|
||||
'%s/xh_html.cpp' % XMLLOC,
|
||||
'%s/xh_listb.cpp' % XMLLOC,
|
||||
'%s/xh_listc.cpp' % XMLLOC,
|
||||
'%s/xh_menu.cpp' % XMLLOC,
|
||||
|
||||
'%s/xh_notbk.cpp' % XMLLOC,
|
||||
'%s/xh_panel.cpp' % XMLLOC,
|
||||
'%s/xh_radbt.cpp' % XMLLOC,
|
||||
'%s/xh_radbx.cpp' % XMLLOC,
|
||||
'%s/xh_scrol.cpp' % XMLLOC,
|
||||
|
||||
'%s/xh_sizer.cpp' % XMLLOC,
|
||||
'%s/xh_slidr.cpp' % XMLLOC,
|
||||
'%s/xh_spin.cpp' % XMLLOC,
|
||||
'%s/xh_stbmp.cpp' % XMLLOC,
|
||||
'%s/xh_stbox.cpp' % XMLLOC,
|
||||
|
||||
'%s/xh_stlin.cpp' % XMLLOC,
|
||||
'%s/xh_sttxt.cpp' % XMLLOC,
|
||||
'%s/xh_text.cpp' % XMLLOC,
|
||||
'%s/xh_toolb.cpp' % XMLLOC,
|
||||
'%s/xh_tree.cpp' % XMLLOC,
|
||||
|
||||
'%s/xh_unkwn.cpp' % XMLLOC,
|
||||
'%s/xml.cpp' % XMLLOC,
|
||||
'%s/xmlbin.cpp' % XMLLOC,
|
||||
'%s/xmlbinz.cpp' % XMLLOC,
|
||||
'%s/xmlexpat.cpp' % XMLLOC,
|
||||
|
||||
'%s/xmlres.cpp' % XMLLOC,
|
||||
'%s/xmlrsall.cpp' % XMLLOC,
|
||||
'%s/xmlwrite.cpp' % XMLLOC,
|
||||
|
||||
] + swig_sources,
|
||||
|
||||
include_dirs = xmlres_includes,
|
||||
define_macros = defines,
|
||||
|
||||
library_dirs = libdirs,
|
||||
libraries = libs,
|
||||
|
||||
extra_compile_args = cflags,
|
||||
extra_link_args = lflags,
|
||||
)
|
||||
|
||||
wxpExtensions.append(ext)
|
||||
|
||||
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# Do the Setup/Build/Install/Whatever
|
||||
|
Reference in New Issue
Block a user