Added wxDllWidget from Vaclav Slavik which allows wx widgets derived
from wxWindow to be loaded from a C++ .dll (or .so) and be used in a wxPython program, without the widget having to be SWIGged first. Various updates for distribs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -33,11 +33,13 @@ BUILD_OGL = 1      # If true, build the contrib/ogl extension module
 | 
			
		||||
BUILD_STC = 1      # If true, build the contrib/stc extension module
 | 
			
		||||
BUILD_XRC = 1      # XML based resource system
 | 
			
		||||
BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library
 | 
			
		||||
BUILD_DLLWIDGET = 1# Build a module for the gizmos contrib library
 | 
			
		||||
 | 
			
		||||
BUILD_IEWIN = 0    # Internet Explorer wrapper (experimental)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
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
 | 
			
		||||
                   # for the ugly details
 | 
			
		||||
 | 
			
		||||
@@ -113,6 +115,7 @@ if bcpp_compiling:
 | 
			
		||||
#----------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
 | 
			
		||||
             'BUILD_GIZMOS', 'BUILD_DLLWIDGET',
 | 
			
		||||
             'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE',
 | 
			
		||||
             'FINAL', 'HYBRID', ]:
 | 
			
		||||
    for x in range(len(sys.argv)):
 | 
			
		||||
@@ -554,7 +557,7 @@ if not GL_ONLY and BUILD_STC:
 | 
			
		||||
                            swig_args + ['-I'+STC_H, '-I'+location],
 | 
			
		||||
                            [opj(STC_H, 'stc.h')])
 | 
			
		||||
 | 
			
		||||
    # copy a project specific py module to the main package dir
 | 
			
		||||
    # copy a contrib project specific py module to the main package dir
 | 
			
		||||
    copy_file(opj(location, 'stc.py'), PKGDIR, update=1, verbose=0)
 | 
			
		||||
 | 
			
		||||
    # add some include dirs to the standard set
 | 
			
		||||
@@ -793,6 +796,39 @@ if not GL_ONLY and BUILD_GIZMOS:
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#----------------------------------------------------------------------
 | 
			
		||||
# Define the DLLWIDGET  extension module
 | 
			
		||||
#----------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
if not GL_ONLY and BUILD_DLLWIDGET:
 | 
			
		||||
    msg('Preparing DLLWIDGET...')
 | 
			
		||||
    location = 'contrib/dllwidget'
 | 
			
		||||
    swig_files = ['dllwidget_.i']
 | 
			
		||||
 | 
			
		||||
    swig_sources = run_swig(swig_files, location, '', PKGDIR,
 | 
			
		||||
                            USE_SWIG, swig_force, swig_args)
 | 
			
		||||
 | 
			
		||||
    # copy a contrib project specific py module to the main package dir
 | 
			
		||||
    copy_file(opj(location, 'dllwidget.py'), PKGDIR, update=1, verbose=0)
 | 
			
		||||
 | 
			
		||||
    ext = Extension('dllwidget_c', [
 | 
			
		||||
                                '%s/dllwidget.cpp' % location,
 | 
			
		||||
                             ] + swig_sources,
 | 
			
		||||
 | 
			
		||||
                    include_dirs =  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