Merge branch 'master' into release-prep

Author: RobinD42

CHANGES.rst

@@ -115,6 +115,18 @@ Changes in this release include the following:
 * Allow extra CLI args to be passed to build.py by setting WXPYTHON_BUILD_ARGS
   in the environment.
 
+* Added context manager methods to wx.DC that explicitly destroys the C++
+  part of the DC upon exit. Using DCs as context managers is not required, but
+  can be handy in the rare cases where something holds on to a DC for too
+  long, perhaps unintentionally. (#680)
+
+* Fixed crash due to too aggressive management of wxModules when we load
+  subordinate extensions that have their own wxModules (wx.html, wx.adv, etc.)
+  (#688)
+
+* Fixed StyledTextCtrl.MarkerDefineRGBAImage and RegisterRGBAImage methods to
+  be able to accept any Python buffer compatible object for the pixel data. (#716)
+
 
 
 
@@ -212,14 +224,6 @@ Changes in this release include the following:
   point values to integers, and a couple other possible incorrect
   conversions.  (#536)
 
-* Added context manager methods to wx.DC that explicitly destroys the C++
-  part of the DC upon exit. Using DCs as context managers is not required, but
-  can be handy in the rare cases where something holds on to a DC for too
-  long, perhaps unintentionally. (#680)
-
-* Fixed crash due to too aggressive management of wxModules when we load
-  subordinate extensions that have their own wxModules (wx.html, wx.adv, etc.)
-  (#688)
 
 
 

etg/_stc.py

@@ -64,6 +64,7 @@ def run():
     #-----------------------------------------------------------------
 
     module.addHeaderCode('#include <wx/stc/stc.h>')
+    module.addHeaderCode('#include "wxpybuffer.h"')
 
 
     c = module.find('wxStyledTextCtrl')
@@ -162,6 +163,29 @@ def run():
     c.find('ShowNativeCaret').ignore()
     c.find('HideNativeCaret').ignore()
 
+    # Change the *RGBAImage methods to accept any buffer object
+    c.find('MarkerDefineRGBAImage').ignore()
+    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. 
+            """,
+        body="""\
+            self->MarkerDefineRGBAImage(markerNumber, (unsigned char*)pixels->m_ptr);
+            """)
+
+    c.find('RegisterRGBAImage').ignore()
+    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 
+            ensure that the buffer is at least width*height*4 bytes long.
+            """,
+        body="""\
+            self->RegisterRGBAImage(type, (unsigned char*)pixels->m_ptr);
+            """)
+
 
     # TODO:  Add the UTF8 PyMethods from classic (see _stc_utf8_methods.py)
 

wx/lib/pydocview.py

@@ -3013,6 +3013,7 @@ def BuildWindowMenu(self, currentFrame):
             currentFrame = wx.GetApp().GetTopWindow()
 
         windowMenuIndex = currentFrame.GetMenuBar().FindMenu(_("&Window"))
+        assert windowMenuIndex != wx.NOT_FOUND, "Menu not found in MenuBar for {}".format(_("&Window"))
         windowMenu = currentFrame.GetMenuBar().GetMenu(windowMenuIndex)
 
         if self.GetDocumentManager().GetFlags() & wx.lib.docview.DOC_SDI: