From 41be300c4649685fd4a7211737c6aff9aa1da8eb Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 28 Sep 2018 12:11:32 +0800 Subject: [PATCH] Merge pull request #1022 from RobinD42/fix-issue972 Declare DeleteAllPages in the notebook subclasses (cherry picked from commit 4b0f0e82c2030827b9777ef45cb483f6e83290d8) --- CHANGES.rst | 3 +++ etgtools/tweaker_tools.py | 1 + 2 files changed, 4 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 1b1345e5..267d4a70 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -118,6 +118,9 @@ Changes in this release include the following: positioning the Window (a small image) on the left of text in a CustomTreeItem. (#PR886). +* Declared DeleteAllPages in the notebook subclasses, so the proper C++ + implementation will be called. (#972) + * Removed wx.lib.floatbar, which has been deprecated forever and probably hasn't been working in nearly as long. (#976) diff --git a/etgtools/tweaker_tools.py b/etgtools/tweaker_tools.py index e103d9de..a70f3ab8 100644 --- a/etgtools/tweaker_tools.py +++ b/etgtools/tweaker_tools.py @@ -338,6 +338,7 @@ def fixBookctrlClass(klass): ("ChangeSelection", "virtual int ChangeSelection(size_t page);"), ("HitTest", "virtual int HitTest(const wxPoint& pt, long* flags /Out/ = NULL) const;"), ("InsertPage", "virtual bool InsertPage(size_t index, wxWindow * page, const wxString & text, bool select = false, int imageId = NO_IMAGE);"), + ("DeleteAllPages", "virtual bool DeleteAllPages();") ] for name, decl in methods: