Merge pull request #1035 from RobinD42/fix-issue961

include wxpy_api.h

CHANGES.rst

@@ -114,6 +114,9 @@ Changes in this release include the following:
   features are not part of the build. So far, stubs are available for
   wx.Accessible, wx.glcanvas, wx.media and wx.html2.
 
+* Moved the wxpy_api.h file into the wx package at wx/include/wxPython so it
+  will be included in the wheel file. (#961)
+
 
 
 

MANIFEST.in

@@ -8,6 +8,7 @@
 
 recursive-include   wx  **
 recursive-include   wx/locale **
+recursive-include   wx/include **
 recursive-include   license  *.txt
 include             LICENSE.txt
 graft               docs

buildtools/config.py

@@ -111,7 +111,8 @@ class Configuration(object):
         self.WXDIR = wxDir()
 
         self.includes = [phoenixDir() + '/sip/siplib',  # to get our version of sip.h
-                         phoenixDir() + '/src',         # for any hand-written headers
+                         phoenixDir() + '/wx/include',  # for the wxPython API
+                         phoenixDir() + '/src',         # for other hand-written headers
                          ]
 
         self.DOXY_XML_DIR = os.path.join(self.WXDIR, 'docs/doxygen/out/xml')

etg/_adv.py

@@ -77,7 +77,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addHeaderCode('#include <wx/help.h>')
 
     module.addImport('_core')

etg/_aui.py

@@ -58,7 +58,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
 

etg/_core.py

@@ -259,7 +259,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
 
     module.addInclude(INCLUDES)
     module.includePyCode('src/core_ex.py', order=10)

etg/_dataview.py

@@ -58,7 +58,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
 

etg/_glcanvas.py

@@ -50,7 +50,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode('import wx', order=10)
     module.addInclude(INCLUDES)

etg/_grid.py

@@ -54,7 +54,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
 

etg/_html.py

@@ -73,7 +73,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
     module.addInclude(INCLUDES)

etg/_html2.py

@@ -55,7 +55,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode('import wx', order=10)
     module.addInclude(INCLUDES)

etg/_media.py

@@ -59,7 +59,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode('import wx', order=10)
     module.addInclude(INCLUDES)

etg/_msw.py

@@ -53,7 +53,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode('import wx', order=10)
     module.addInclude(INCLUDES)

etg/_propgrid.py

@@ -56,7 +56,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
 

etg/_ribbon.py

@@ -59,7 +59,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
 

etg/_richtext.py

@@ -64,7 +64,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
     module.addImport('_xml')

etg/_stc.py

@@ -52,7 +52,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode('''\
     import wx
@@ -168,8 +168,8 @@ def run():
     c.addCppMethod('void', 'MarkerDefineRGBAImage', '(int markerNumber, wxPyBuffer* pixels)',
         doc="""\
             Define a marker from RGBA data.\n
-            It has the width and height from RGBAImageSetWidth/Height. You must 
-            ensure that the buffer is at least width*height*4 bytes long. 
+            It has the width and height from RGBAImageSetWidth/Height. You must
+            ensure that the buffer is at least width*height*4 bytes long.
             """,
         body="""\
             self->MarkerDefineRGBAImage(markerNumber, (unsigned char*)pixels->m_ptr);
@@ -179,7 +179,7 @@ def run():
     c.addCppMethod('void', 'RegisterRGBAImage', '(int type, wxPyBuffer* pixels)',
         doc="""\
             Register an RGBA image for use in autocompletion lists.\n
-            It has the width and height from RGBAImageSetWidth/Height. You must 
+            It has the width and height from RGBAImageSetWidth/Height. You must
             ensure that the buffer is at least width*height*4 bytes long.
             """,
         body="""\

etg/_webkit.py

@@ -52,7 +52,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode('import wx', order=10)
     module.addInclude(INCLUDES)

etg/_xml.py

@@ -54,7 +54,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode('import wx', order=10)
     module.addInclude(INCLUDES)

etg/_xrc.py

@@ -51,7 +51,7 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addImport('_core')
     module.addImport('_xml')
     module.addPyCode('''\

setup.py

@@ -319,7 +319,7 @@ ENTRY_POINTS = {
         "img2xpm = wx.tools.img2xpm:main",
         "pywxrc = wx.tools.pywxrc:main",
 #        ],
-#    'gui_scripts' : [  # TODO: Why was this done?
+#    'gui_scripts' : [  # TODO: Why was this commented out?
         "wxget = wx.tools.wxget:main",  # New wx wget
         "wxdocs = wx.tools.wxget_docs_demo:docs_main",  # Get/Launch Docs
         "wxdemo = wx.tools.wxget_docs_demo:demo_main",  # Get/Launch Demo

src/wacky_ints.sip

@@ -20,7 +20,7 @@
 %MappedType size_t {
 
     %TypeHeaderCode
-    #include <wxpy_api.h>
+    #include <wxPython/wxpy_api.h>
     %End
 
     %ConvertToTypeCode
@@ -48,7 +48,7 @@
 
     %TypeHeaderCode
     #include <wx/setup.h>
-    #include <wxpy_api.h>
+    #include <wxPython/wxpy_api.h>
     %End
 
     %ConvertToTypeCode
@@ -84,7 +84,7 @@
 
     %TypeHeaderCode
     #include <wx/setup.h>
-    #include <wxpy_api.h>
+    #include <wxPython/wxpy_api.h>
     %End
 
     %ConvertToTypeCode

src/wxpy_api.sip

@@ -12,7 +12,7 @@
 
 
 %ModuleHeaderCode
-#include "wxpy_api.h"
+#include <wxPython/wxpy_api.h>
 %End
 
 //--------------------------------------------------------------------------

wscript

@@ -104,7 +104,7 @@ def configure(conf):
     conf.env.msvc_relwithdebug = conf.options.msvc_relwithdebug
 
     # Ensure that the headers in siplib and Phoenix's src dir can be found
-    conf.env.INCLUDES_WXPY = ['sip/siplib', 'src']
+    conf.env.INCLUDES_WXPY = ['sip/siplib', 'wx/include', 'src']
 
     if isWindows:
         # Windows/MSVC specific stuff