Merge pull request #1199 from RobinD42/sip-4.19.16

Update sip to version 4.19.16

(cherry picked from commit 7383d34fce)
This commit is contained in:
Robin Dunn
2019-04-15 16:56:23 -07:00
parent 0378328d45
commit 96c41be226
12 changed files with 228 additions and 137 deletions

View File

@@ -43,24 +43,28 @@ def run():
c.find('GetGeneric').mustHaveApp()
c.find('GetDefault').mustHaveApp()
c.find('Set').mustHaveApp()
#virtual void DrawTitleBarBitmap(wxWindow *win,
# wxDC& dc,
# const wxRect& rect,
# wxTitleBarButton button,
# int flags = 0) = 0;
c.find('DrawTitleBarBitmap').setCppCode("""\
#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
self->DrawTitleBarBitmap(win, *dc, *rect, button, flags);
#endif
""")
c.find('DrawTitleBarBitmap').ignore()
draw_tb_bmp_doc = c.find('DrawTitleBarBitmap').briefDoc
c = module.find('wxDelegateRendererNative')
c.mustHaveApp()
c.addPrivateCopyCtor()
#virtual void DrawTitleBarBitmap(wxWindow *win,
# wxDC& dc,
# const wxRect& rect,
# wxTitleBarButton button,
# int flags = 0);
c.addCppMethod('void', 'DrawTitleBarBitmap',
'(wxWindow* win, wxDC& dc, const wxRect& rect, wxTitleBarButton button, int flags = 0)',
doc=draw_tb_bmp_doc,
body="""\
#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
self->DrawTitleBarBitmap(win, *dc, *rect, button, flags);
#else
wxPyRaiseNotImplemented();
#endif
""")
#-----------------------------------------------------------------
tools.doCommonTweaks(module)
@@ -70,4 +74,3 @@ def run():
#---------------------------------------------------------------------------
if __name__ == '__main__':
run()