From 920c5c7567a22a0dc6d2076bf3b8e53bc4f9d2d1 Mon Sep 17 00:00:00 2001
From: Joey Yakimowich-Payne <jyapayne@pm.me>
Date: Thu, 16 Feb 2023 07:54:22 -0700
Subject: [PATCH] Add top level and fix app+event

---
 swigtemplates/toplevel.i       | 114 ++++++
 wxheaders/wx/toplevel.h        |   2 +-
 wxheaders/wxext/app_ext.h      | 626 ++++++++++++++++-----------------
 wxheaders/wxext/event_ext.h    | 144 ++++----
 wxheaders/wxext/toplevel_ext.h | 594 ++++++++++++++++++++-----------
 5 files changed, 886 insertions(+), 594 deletions(-)
 create mode 100644 swigtemplates/toplevel.i

diff --git a/swigtemplates/toplevel.i b/swigtemplates/toplevel.i
new file mode 100644
index 0000000..d74da99
--- /dev/null
+++ b/swigtemplates/toplevel.i
@@ -0,0 +1,114 @@
+%module toplevel
+%include <common.i>
+%{
+#include <wx/vidmode.h>
+#include "wxext/toplevel_ext.h"
+%}
+
+%import "object.i"
+%import "string.i"
+%import "validate.i"
+%import "colour.i"
+%import "window.i"
+
+%import "wx/setup.h"
+#undef HAVE_VISIBILITY
+#undef wxUSE_STD_CONTAINERS
+#define wxUSE_STD_CONTAINERS 1
+%import "wx/compiler.h"
+%import "wx/dlimpexp.h"
+%import "wx/platform.h"
+%import "wx/cpp.h"
+%import "wx/types.h"
+%import "wx/defs.h"
+%import "wx/debug.h"
+%import "wx/chartype.h"
+%import "wx/unichar.h"
+%import "wx/wxcrtbase.h"
+%import "wx/buffer.h"
+%import "wx/typeinfo.h"
+%import "wx/strconv.h"
+%import "wx/strvararg.h"
+%import "wx/object.h"
+%import "wx/dynarray.h"
+%import "wx/list.h"
+%import "wx/rtti.h"
+%import "wx/fontenc.h"
+%import "wx/hashmap.h"
+%import "wx/math.h"
+%import "wx/localedefs.h"
+%import "wx/event.h"
+%import "wx/dataobj.h"
+%import "wx/cursor.h"
+%import "wx/dnd.h"
+%import "wx/tooltip.h"
+%import "wx/palette.h"
+%import "wx/variant.h"
+%import "wx/colour.h"
+%import "wx/font.h"
+%import "wx/scrolwin.h"
+%import "wx/sizer.h"
+%import "wx/layout.h"
+%import "wx/accel.h"
+%import "wx/intl.h"
+%import "wx/utils.h"
+%import "wx/textentry.h"
+%import "wx/gdicmn.h"
+%import "wx/vidmode.h"
+%import "wx/cmdargs.h"
+%import "wx/string.h"
+%import "wx/toplevel.h"
+%import "wx/frame.h"
+%include "wx/toplevel.h"
+
+#if defined(__WXMSW__)
+    %include "wx/msw/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowMSW
+#elif defined(__WXGTK20__)
+    %include "wx/gtk/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowGTK
+#elif defined(__WXGTK__)
+    %include "wx/gtk1/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowGTK
+#elif defined(__WXX11__)
+    %include "wx/x11/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowX11
+#elif defined(__WXDFB__)
+    %include "wx/dfb/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowDFB
+#elif defined(__WXMAC__)
+    %include "wx/osx/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowMac
+#elif defined(__WXMOTIF__)
+    %include "wx/motif/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowMotif
+#elif defined(__WXQT__)
+    %include "wx/qt/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowQt
+#endif
+
+#ifdef __WXUNIVERSAL__
+    %include "wx/univ/toplevel.h"
+#else // !__WXUNIVERSAL__
+    class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative
+    {
+    public:
+        // construction
+        wxTopLevelWindow() { }
+        wxTopLevelWindow(wxWindow *parent,
+                   wxWindowID winid,
+                   const wxString& title,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = wxDEFAULT_FRAME_STYLE,
+                   const wxString& name = wxASCII_STR(wxFrameNameStr))
+            : wxTopLevelWindowNative(parent, winid, title,
+                                     pos, size, style, name)
+        {
+        }
+
+        wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTopLevelWindow);
+    };
+#endif // __WXUNIVERSAL__/!__WXUNIVERSAL__
+
+%include "wxext/toplevel_ext.h"
diff --git a/wxheaders/wx/toplevel.h b/wxheaders/wx/toplevel.h
index 74a661c..d3c59ba 100644
--- a/wxheaders/wx/toplevel.h
+++ b/wxheaders/wx/toplevel.h
@@ -286,7 +286,7 @@ public:
     // override some base class virtuals
     virtual bool Destroy() wxOVERRIDE;
     virtual bool IsTopLevel() const wxOVERRIDE { return true; }
-    virtual bool IsTopNavigationDomain(NavigationKind kind) const wxOVERRIDE;
+    virtual bool IsTopNavigationDomain(wxWindowBase::NavigationKind kind) const wxOVERRIDE;
     virtual bool IsVisible() const { return IsShown(); }
 
     // override to do TLW-specific layout: we resize our unique child to fill
diff --git a/wxheaders/wxext/app_ext.h b/wxheaders/wxext/app_ext.h
index f0875df..1ac3875 100644
--- a/wxheaders/wxext/app_ext.h
+++ b/wxheaders/wxext/app_ext.h
@@ -7,259 +7,258 @@
 class wxAppConsoleBaseExt;
 typedef void (*wxAppConsoleBaseExtAddPendingEventwxEventCRFunc)(const wxAppConsoleBaseExt* self, wxEvent const& event);
 typedef void (*wxAppConsoleBaseExtCallEventHandlerwxEvtHandlerPwxEventFunctorRwxEventRFunc)(const wxAppConsoleBaseExt* self, wxEvtHandler* handler, wxEventFunctor& functor, wxEvent& event);
-typedef bool (*wxAppConsoleBaseExtCallOnInitFunc)(const wxAppConsoleBaseExt* self);
+typedef bool (*wxAppConsoleBaseExtCallOnInitFunc)(const wxAppConsoleBaseExt* self, bool res);
 typedef void (*wxAppConsoleBaseExtCleanUpFunc)(const wxAppConsoleBaseExt* self);
-typedef wxObjectRefData* (*wxAppConsoleBaseExtCloneRefDatawxObjectRefDataCPFunc)(const wxAppConsoleBaseExt* self, wxObjectRefData const* data);
-typedef wxObjectRefData* (*wxAppConsoleBaseExtCreateRefDataFunc)(const wxAppConsoleBaseExt* self);
-typedef wxAppTraits* (*wxAppConsoleBaseExtCreateTraitsFunc)(const wxAppConsoleBaseExt* self);
-typedef bool (*wxAppConsoleBaseExtDispatchFunc)(const wxAppConsoleBaseExt* self);
-typedef void* (*wxAppConsoleBaseExtDoGetClientDataFunc)(const wxAppConsoleBaseExt* self);
-typedef wxClientData* (*wxAppConsoleBaseExtDoGetClientObjectFunc)(const wxAppConsoleBaseExt* self);
+typedef wxObjectRefData* (*wxAppConsoleBaseExtCloneRefDatawxObjectRefDataCPFunc)(const wxAppConsoleBaseExt* self, wxObjectRefData const* data, wxObjectRefData* res);
+typedef wxObjectRefData* (*wxAppConsoleBaseExtCreateRefDataFunc)(const wxAppConsoleBaseExt* self, wxObjectRefData* res);
+typedef wxAppTraits* (*wxAppConsoleBaseExtCreateTraitsFunc)(const wxAppConsoleBaseExt* self, wxAppTraits* res);
+typedef bool (*wxAppConsoleBaseExtDispatchFunc)(const wxAppConsoleBaseExt* self, bool res);
+typedef void* (*wxAppConsoleBaseExtDoGetClientDataFunc)(const wxAppConsoleBaseExt* self, void* res);
+typedef wxClientData* (*wxAppConsoleBaseExtDoGetClientObjectFunc)(const wxAppConsoleBaseExt* self, wxClientData* res);
 typedef void (*wxAppConsoleBaseExtDoSetClientDatavoidPFunc)(const wxAppConsoleBaseExt* self, void* data);
 typedef void (*wxAppConsoleBaseExtDoSetClientObjectwxClientDataPFunc)(const wxAppConsoleBaseExt* self, wxClientData* data);
 typedef void (*wxAppConsoleBaseExtExitFunc)(const wxAppConsoleBaseExt* self);
 typedef void (*wxAppConsoleBaseExtExitMainLoopFunc)(const wxAppConsoleBaseExt* self);
 typedef int (*wxAppConsoleBaseExtFilterEventwxEventRFunc)(const wxAppConsoleBaseExt* self, wxEvent& event);
-typedef wxClassInfo* (*wxAppConsoleBaseExtGetClassInfoFunc)(const wxAppConsoleBaseExt* self);
-typedef wxEventHashTable& (*wxAppConsoleBaseExtGetEventHashTableFunc)(const wxAppConsoleBaseExt* self);
-typedef wxEventTable const* (*wxAppConsoleBaseExtGetEventTableFunc)(const wxAppConsoleBaseExt* self);
+typedef wxClassInfo* (*wxAppConsoleBaseExtGetClassInfoFunc)(const wxAppConsoleBaseExt* self, wxClassInfo* res);
+typedef wxEventHashTable& (*wxAppConsoleBaseExtGetEventHashTableFunc)(const wxAppConsoleBaseExt* self, wxEventHashTable& res);
+typedef wxEventTable const* (*wxAppConsoleBaseExtGetEventTableFunc)(const wxAppConsoleBaseExt* self, wxEventTable const* res);
 typedef void (*wxAppConsoleBaseExtHandleEventwxEvtHandlerPwxEventFunctionwxEventRFunc)(const wxAppConsoleBaseExt* self, wxEvtHandler* handler, wxEventFunction func, wxEvent& event);
-typedef bool (*wxAppConsoleBaseExtInitializeintRwxCharPPFunc)(const wxAppConsoleBaseExt* self, int& argc, wxChar** argv);
-typedef bool (*wxAppConsoleBaseExtIsGUIFunc)(const wxAppConsoleBaseExt* self);
-typedef int (*wxAppConsoleBaseExtMainLoopFunc)(const wxAppConsoleBaseExt* self);
+typedef bool (*wxAppConsoleBaseExtInitializeintRwxCharPPFunc)(const wxAppConsoleBaseExt* self, int& argc, wxChar** argv, bool res);
+typedef bool (*wxAppConsoleBaseExtIsGUIFunc)(const wxAppConsoleBaseExt* self, bool res);
+typedef int (*wxAppConsoleBaseExtMainLoopFunc)(const wxAppConsoleBaseExt* self, int res);
 typedef void (*wxAppConsoleBaseExtOnAssertwxCharCPintwxCharCPwxCharCPFunc)(const wxAppConsoleBaseExt* self, wxChar const* file, int line, wxChar const* cond, wxChar const* msg);
 typedef void (*wxAppConsoleBaseExtOnAssertFailurewxCharCPintwxCharCPwxCharCPwxCharCPFunc)(const wxAppConsoleBaseExt* self, wxChar const* file, int line, wxChar const* func, wxChar const* cond, wxChar const* msg);
-typedef bool (*wxAppConsoleBaseExtOnCmdLineErrorwxCmdLineParserRFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser);
-typedef bool (*wxAppConsoleBaseExtOnCmdLineHelpwxCmdLineParserRFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser);
-typedef bool (*wxAppConsoleBaseExtOnCmdLineParsedwxCmdLineParserRFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser);
-typedef bool (*wxAppConsoleBaseExtOnDynamicBindwxDynamicEventTableEntryRFunc)(const wxAppConsoleBaseExt* self, wxDynamicEventTableEntry& param0);
+typedef bool (*wxAppConsoleBaseExtOnCmdLineErrorwxCmdLineParserRFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser, bool res);
+typedef bool (*wxAppConsoleBaseExtOnCmdLineHelpwxCmdLineParserRFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser, bool res);
+typedef bool (*wxAppConsoleBaseExtOnCmdLineParsedwxCmdLineParserRFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser, bool res);
+typedef bool (*wxAppConsoleBaseExtOnDynamicBindwxDynamicEventTableEntryRFunc)(const wxAppConsoleBaseExt* self, wxDynamicEventTableEntry& param0, bool res);
 typedef void (*wxAppConsoleBaseExtOnEventLoopEnterwxEventLoopBasePFunc)(const wxAppConsoleBaseExt* self, wxEventLoopBase* param0);
 typedef void (*wxAppConsoleBaseExtOnEventLoopExitwxEventLoopBasePFunc)(const wxAppConsoleBaseExt* self, wxEventLoopBase* param0);
-typedef bool (*wxAppConsoleBaseExtOnExceptionInMainLoopFunc)(const wxAppConsoleBaseExt* self);
-typedef int (*wxAppConsoleBaseExtOnExitFunc)(const wxAppConsoleBaseExt* self);
+typedef bool (*wxAppConsoleBaseExtOnExceptionInMainLoopFunc)(const wxAppConsoleBaseExt* self, bool res);
+typedef int (*wxAppConsoleBaseExtOnExitFunc)(const wxAppConsoleBaseExt* self, int res);
 typedef void (*wxAppConsoleBaseExtOnFatalExceptionFunc)(const wxAppConsoleBaseExt* self);
-typedef bool (*wxAppConsoleBaseExtOnInitFunc)(const wxAppConsoleBaseExt* self);
+typedef bool (*wxAppConsoleBaseExtOnInitFunc)(const wxAppConsoleBaseExt* self, bool res);
 typedef void (*wxAppConsoleBaseExtOnInitCmdLinewxCmdLineParserRFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser);
 typedef void (*wxAppConsoleBaseExtOnLaunchedFunc)(const wxAppConsoleBaseExt* self);
-typedef int (*wxAppConsoleBaseExtOnRunFunc)(const wxAppConsoleBaseExt* self);
+typedef int (*wxAppConsoleBaseExtOnRunFunc)(const wxAppConsoleBaseExt* self, int res);
 typedef void (*wxAppConsoleBaseExtOnUnhandledExceptionFunc)(const wxAppConsoleBaseExt* self);
-typedef bool (*wxAppConsoleBaseExtPendingFunc)(const wxAppConsoleBaseExt* self);
-typedef bool (*wxAppConsoleBaseExtProcessEventwxEventRFunc)(const wxAppConsoleBaseExt* self, wxEvent& event);
-typedef bool (*wxAppConsoleBaseExtProcessIdleFunc)(const wxAppConsoleBaseExt* self);
+typedef bool (*wxAppConsoleBaseExtPendingFunc)(const wxAppConsoleBaseExt* self, bool res);
+typedef bool (*wxAppConsoleBaseExtProcessEventwxEventRFunc)(const wxAppConsoleBaseExt* self, wxEvent& event, bool res);
+typedef bool (*wxAppConsoleBaseExtProcessIdleFunc)(const wxAppConsoleBaseExt* self, bool res);
 typedef void (*wxAppConsoleBaseExtProcessPendingEventsFunc)(const wxAppConsoleBaseExt* self);
 typedef void (*wxAppConsoleBaseExtQueueEventwxEventPFunc)(const wxAppConsoleBaseExt* self, wxEvent* event);
 typedef void (*wxAppConsoleBaseExtRethrowStoredExceptionFunc)(const wxAppConsoleBaseExt* self);
-typedef bool (*wxAppConsoleBaseExtSearchEventTablewxEventTableRwxEventRFunc)(const wxAppConsoleBaseExt* self, wxEventTable& table, wxEvent& event);
+typedef bool (*wxAppConsoleBaseExtSearchEventTablewxEventTableRwxEventRFunc)(const wxAppConsoleBaseExt* self, wxEventTable& table, wxEvent& event, bool res);
 typedef void (*wxAppConsoleBaseExtSetCLocaleFunc)(const wxAppConsoleBaseExt* self);
 typedef void (*wxAppConsoleBaseExtSetNextHandlerwxEvtHandlerPFunc)(const wxAppConsoleBaseExt* self, wxEvtHandler* handler);
 typedef void (*wxAppConsoleBaseExtSetPreviousHandlerwxEvtHandlerPFunc)(const wxAppConsoleBaseExt* self, wxEvtHandler* handler);
-typedef bool (*wxAppConsoleBaseExtStoreCurrentExceptionFunc)(const wxAppConsoleBaseExt* self);
-typedef bool (*wxAppConsoleBaseExtTryAfterwxEventRFunc)(const wxAppConsoleBaseExt* self, wxEvent& event);
-typedef bool (*wxAppConsoleBaseExtTryBeforewxEventRFunc)(const wxAppConsoleBaseExt* self, wxEvent& event);
-typedef bool (*wxAppConsoleBaseExtUsesEventLoopFunc)(const wxAppConsoleBaseExt* self);
-typedef void* (*wxAppConsoleBaseExtWXReservedApp1voidPFunc)(const wxAppConsoleBaseExt* self, void* param0);
-typedef void* (*wxAppConsoleBaseExtWXReservedApp2voidPFunc)(const wxAppConsoleBaseExt* self, void* param0);
-typedef void* (*wxAppConsoleBaseExtWXReservedEvtHandler1voidPFunc)(const wxAppConsoleBaseExt* self, void* param0);
-typedef void* (*wxAppConsoleBaseExtWXReservedEvtHandler2voidPFunc)(const wxAppConsoleBaseExt* self, void* param0);
+typedef bool (*wxAppConsoleBaseExtStoreCurrentExceptionFunc)(const wxAppConsoleBaseExt* self, bool res);
+typedef bool (*wxAppConsoleBaseExtTryAfterwxEventRFunc)(const wxAppConsoleBaseExt* self, wxEvent& event, bool res);
+typedef bool (*wxAppConsoleBaseExtTryBeforewxEventRFunc)(const wxAppConsoleBaseExt* self, wxEvent& event, bool res);
+typedef bool (*wxAppConsoleBaseExtUsesEventLoopFunc)(const wxAppConsoleBaseExt* self, bool res);
+typedef void* (*wxAppConsoleBaseExtWXReservedApp1voidPFunc)(const wxAppConsoleBaseExt* self, void* param0, void* res);
+typedef void* (*wxAppConsoleBaseExtWXReservedApp2voidPFunc)(const wxAppConsoleBaseExt* self, void* param0, void* res);
+typedef void* (*wxAppConsoleBaseExtWXReservedEvtHandler1voidPFunc)(const wxAppConsoleBaseExt* self, void* param0, void* res);
+typedef void* (*wxAppConsoleBaseExtWXReservedEvtHandler2voidPFunc)(const wxAppConsoleBaseExt* self, void* param0, void* res);
 typedef void (*wxAppConsoleBaseExtWakeUpIdleFunc)(const wxAppConsoleBaseExt* self);
 class wxAppConsoleExt;
 typedef void (*wxAppConsoleExtAddPendingEventwxEventCRFunc)(const wxAppConsoleExt* self, wxEvent const& event);
 typedef void (*wxAppConsoleExtCallEventHandlerwxEvtHandlerPwxEventFunctorRwxEventRFunc)(const wxAppConsoleExt* self, wxEvtHandler* handler, wxEventFunctor& functor, wxEvent& event);
-typedef bool (*wxAppConsoleExtCallOnInitFunc)(const wxAppConsoleExt* self);
+typedef bool (*wxAppConsoleExtCallOnInitFunc)(const wxAppConsoleExt* self, bool res);
 typedef void (*wxAppConsoleExtCleanUpFunc)(const wxAppConsoleExt* self);
-typedef wxObjectRefData* (*wxAppConsoleExtCloneRefDatawxObjectRefDataCPFunc)(const wxAppConsoleExt* self, wxObjectRefData const* data);
-typedef wxObjectRefData* (*wxAppConsoleExtCreateRefDataFunc)(const wxAppConsoleExt* self);
-typedef wxAppTraits* (*wxAppConsoleExtCreateTraitsFunc)(const wxAppConsoleExt* self);
-typedef bool (*wxAppConsoleExtDispatchFunc)(const wxAppConsoleExt* self);
-typedef void* (*wxAppConsoleExtDoGetClientDataFunc)(const wxAppConsoleExt* self);
-typedef wxClientData* (*wxAppConsoleExtDoGetClientObjectFunc)(const wxAppConsoleExt* self);
+typedef wxObjectRefData* (*wxAppConsoleExtCloneRefDatawxObjectRefDataCPFunc)(const wxAppConsoleExt* self, wxObjectRefData const* data, wxObjectRefData* res);
+typedef wxObjectRefData* (*wxAppConsoleExtCreateRefDataFunc)(const wxAppConsoleExt* self, wxObjectRefData* res);
+typedef wxAppTraits* (*wxAppConsoleExtCreateTraitsFunc)(const wxAppConsoleExt* self, wxAppTraits* res);
+typedef bool (*wxAppConsoleExtDispatchFunc)(const wxAppConsoleExt* self, bool res);
+typedef void* (*wxAppConsoleExtDoGetClientDataFunc)(const wxAppConsoleExt* self, void* res);
+typedef wxClientData* (*wxAppConsoleExtDoGetClientObjectFunc)(const wxAppConsoleExt* self, wxClientData* res);
 typedef void (*wxAppConsoleExtDoSetClientDatavoidPFunc)(const wxAppConsoleExt* self, void* data);
 typedef void (*wxAppConsoleExtDoSetClientObjectwxClientDataPFunc)(const wxAppConsoleExt* self, wxClientData* data);
 typedef void (*wxAppConsoleExtExitFunc)(const wxAppConsoleExt* self);
 typedef void (*wxAppConsoleExtExitMainLoopFunc)(const wxAppConsoleExt* self);
-typedef int (*wxAppConsoleExtFilterEventwxEventRFunc)(const wxAppConsoleExt* self, wxEvent& event);
-typedef wxClassInfo* (*wxAppConsoleExtGetClassInfoFunc)(const wxAppConsoleExt* self);
-typedef wxEventHashTable& (*wxAppConsoleExtGetEventHashTableFunc)(const wxAppConsoleExt* self);
-typedef wxEventTable const* (*wxAppConsoleExtGetEventTableFunc)(const wxAppConsoleExt* self);
+typedef int (*wxAppConsoleExtFilterEventwxEventRFunc)(const wxAppConsoleExt* self, wxEvent& event, int res);
+typedef wxClassInfo* (*wxAppConsoleExtGetClassInfoFunc)(const wxAppConsoleExt* self, wxClassInfo* res);
+typedef wxEventHashTable& (*wxAppConsoleExtGetEventHashTableFunc)(const wxAppConsoleExt* self, wxEventHashTable& res);
+typedef wxEventTable const* (*wxAppConsoleExtGetEventTableFunc)(const wxAppConsoleExt* self, wxEventTable const* res);
 typedef void (*wxAppConsoleExtHandleEventwxEvtHandlerPwxEventFunctionwxEventRFunc)(const wxAppConsoleExt* self, wxEvtHandler* handler, wxEventFunction func, wxEvent& event);
-typedef bool (*wxAppConsoleExtInitializeintRwxCharPPFunc)(const wxAppConsoleExt* self, int& argc, wxChar** argv);
-typedef bool (*wxAppConsoleExtIsGUIFunc)(const wxAppConsoleExt* self);
-typedef int (*wxAppConsoleExtMainLoopFunc)(const wxAppConsoleExt* self);
+typedef bool (*wxAppConsoleExtInitializeintRwxCharPPFunc)(const wxAppConsoleExt* self, int& argc, wxChar** argv, bool res);
+typedef bool (*wxAppConsoleExtIsGUIFunc)(const wxAppConsoleExt* self, bool res);
+typedef int (*wxAppConsoleExtMainLoopFunc)(const wxAppConsoleExt* self, int res);
 typedef void (*wxAppConsoleExtOnAssertwxCharCPintwxCharCPwxCharCPFunc)(const wxAppConsoleExt* self, wxChar const* file, int line, wxChar const* cond, wxChar const* msg);
 typedef void (*wxAppConsoleExtOnAssertFailurewxCharCPintwxCharCPwxCharCPwxCharCPFunc)(const wxAppConsoleExt* self, wxChar const* file, int line, wxChar const* func, wxChar const* cond, wxChar const* msg);
-typedef bool (*wxAppConsoleExtOnCmdLineErrorwxCmdLineParserRFunc)(const wxAppConsoleExt* self, wxCmdLineParser& parser);
-typedef bool (*wxAppConsoleExtOnCmdLineHelpwxCmdLineParserRFunc)(const wxAppConsoleExt* self, wxCmdLineParser& parser);
-typedef bool (*wxAppConsoleExtOnCmdLineParsedwxCmdLineParserRFunc)(const wxAppConsoleExt* self, wxCmdLineParser& parser);
-typedef bool (*wxAppConsoleExtOnDynamicBindwxDynamicEventTableEntryRFunc)(const wxAppConsoleExt* self, wxDynamicEventTableEntry& param0);
+typedef bool (*wxAppConsoleExtOnCmdLineErrorwxCmdLineParserRFunc)(const wxAppConsoleExt* self, wxCmdLineParser& parser, bool res);
+typedef bool (*wxAppConsoleExtOnCmdLineHelpwxCmdLineParserRFunc)(const wxAppConsoleExt* self, wxCmdLineParser& parser, bool res);
+typedef bool (*wxAppConsoleExtOnCmdLineParsedwxCmdLineParserRFunc)(const wxAppConsoleExt* self, wxCmdLineParser& parser, bool res);
+typedef bool (*wxAppConsoleExtOnDynamicBindwxDynamicEventTableEntryRFunc)(const wxAppConsoleExt* self, wxDynamicEventTableEntry& param0, bool res);
 typedef void (*wxAppConsoleExtOnEventLoopEnterwxEventLoopBasePFunc)(const wxAppConsoleExt* self, wxEventLoopBase* param0);
 typedef void (*wxAppConsoleExtOnEventLoopExitwxEventLoopBasePFunc)(const wxAppConsoleExt* self, wxEventLoopBase* param0);
-typedef bool (*wxAppConsoleExtOnExceptionInMainLoopFunc)(const wxAppConsoleExt* self);
-typedef int (*wxAppConsoleExtOnExitFunc)(const wxAppConsoleExt* self);
+typedef bool (*wxAppConsoleExtOnExceptionInMainLoopFunc)(const wxAppConsoleExt* self, bool res);
+typedef int (*wxAppConsoleExtOnExitFunc)(const wxAppConsoleExt* self, int res);
 typedef void (*wxAppConsoleExtOnFatalExceptionFunc)(const wxAppConsoleExt* self);
-typedef bool (*wxAppConsoleExtOnInitFunc)(const wxAppConsoleExt* self);
+typedef bool (*wxAppConsoleExtOnInitFunc)(const wxAppConsoleExt* self, bool res);
 typedef void (*wxAppConsoleExtOnInitCmdLinewxCmdLineParserRFunc)(const wxAppConsoleExt* self, wxCmdLineParser& parser);
 typedef void (*wxAppConsoleExtOnLaunchedFunc)(const wxAppConsoleExt* self);
-typedef int (*wxAppConsoleExtOnRunFunc)(const wxAppConsoleExt* self);
+typedef int (*wxAppConsoleExtOnRunFunc)(const wxAppConsoleExt* self, int res);
 typedef void (*wxAppConsoleExtOnUnhandledExceptionFunc)(const wxAppConsoleExt* self);
-typedef bool (*wxAppConsoleExtPendingFunc)(const wxAppConsoleExt* self);
-typedef bool (*wxAppConsoleExtProcessEventwxEventRFunc)(const wxAppConsoleExt* self, wxEvent& event);
-typedef bool (*wxAppConsoleExtProcessIdleFunc)(const wxAppConsoleExt* self);
+typedef bool (*wxAppConsoleExtPendingFunc)(const wxAppConsoleExt* self, bool res);
+typedef bool (*wxAppConsoleExtProcessEventwxEventRFunc)(const wxAppConsoleExt* self, wxEvent& event, bool res);
+typedef bool (*wxAppConsoleExtProcessIdleFunc)(const wxAppConsoleExt* self, bool res);
 typedef void (*wxAppConsoleExtProcessPendingEventsFunc)(const wxAppConsoleExt* self);
 typedef void (*wxAppConsoleExtQueueEventwxEventPFunc)(const wxAppConsoleExt* self, wxEvent* event);
 typedef void (*wxAppConsoleExtRethrowStoredExceptionFunc)(const wxAppConsoleExt* self);
-typedef bool (*wxAppConsoleExtSearchEventTablewxEventTableRwxEventRFunc)(const wxAppConsoleExt* self, wxEventTable& table, wxEvent& event);
+typedef bool (*wxAppConsoleExtSearchEventTablewxEventTableRwxEventRFunc)(const wxAppConsoleExt* self, wxEventTable& table, wxEvent& event, bool res);
 typedef void (*wxAppConsoleExtSetCLocaleFunc)(const wxAppConsoleExt* self);
 typedef void (*wxAppConsoleExtSetNextHandlerwxEvtHandlerPFunc)(const wxAppConsoleExt* self, wxEvtHandler* handler);
 typedef void (*wxAppConsoleExtSetPreviousHandlerwxEvtHandlerPFunc)(const wxAppConsoleExt* self, wxEvtHandler* handler);
-typedef bool (*wxAppConsoleExtStoreCurrentExceptionFunc)(const wxAppConsoleExt* self);
-typedef bool (*wxAppConsoleExtTryAfterwxEventRFunc)(const wxAppConsoleExt* self, wxEvent& event);
-typedef bool (*wxAppConsoleExtTryBeforewxEventRFunc)(const wxAppConsoleExt* self, wxEvent& event);
-typedef bool (*wxAppConsoleExtUsesEventLoopFunc)(const wxAppConsoleExt* self);
-typedef void* (*wxAppConsoleExtWXReservedApp1voidPFunc)(const wxAppConsoleExt* self, void* param0);
-typedef void* (*wxAppConsoleExtWXReservedApp2voidPFunc)(const wxAppConsoleExt* self, void* param0);
-typedef void* (*wxAppConsoleExtWXReservedEvtHandler1voidPFunc)(const wxAppConsoleExt* self, void* param0);
-typedef void* (*wxAppConsoleExtWXReservedEvtHandler2voidPFunc)(const wxAppConsoleExt* self, void* param0);
+typedef bool (*wxAppConsoleExtStoreCurrentExceptionFunc)(const wxAppConsoleExt* self, bool res);
+typedef bool (*wxAppConsoleExtTryAfterwxEventRFunc)(const wxAppConsoleExt* self, wxEvent& event, bool res);
+typedef bool (*wxAppConsoleExtTryBeforewxEventRFunc)(const wxAppConsoleExt* self, wxEvent& event, bool res);
+typedef bool (*wxAppConsoleExtUsesEventLoopFunc)(const wxAppConsoleExt* self, bool res);
+typedef void* (*wxAppConsoleExtWXReservedApp1voidPFunc)(const wxAppConsoleExt* self, void* param0, void* res);
+typedef void* (*wxAppConsoleExtWXReservedApp2voidPFunc)(const wxAppConsoleExt* self, void* param0, void* res);
+typedef void* (*wxAppConsoleExtWXReservedEvtHandler1voidPFunc)(const wxAppConsoleExt* self, void* param0, void* res);
+typedef void* (*wxAppConsoleExtWXReservedEvtHandler2voidPFunc)(const wxAppConsoleExt* self, void* param0, void* res);
 typedef void (*wxAppConsoleExtWakeUpIdleFunc)(const wxAppConsoleExt* self);
 class wxAppBaseExt;
 typedef void (*wxAppBaseExtAddPendingEventwxEventCRFunc)(const wxAppBaseExt* self, wxEvent const& event);
 typedef void (*wxAppBaseExtCallEventHandlerwxEvtHandlerPwxEventFunctorRwxEventRFunc)(const wxAppBaseExt* self, wxEvtHandler* handler, wxEventFunctor& functor, wxEvent& event);
-typedef bool (*wxAppBaseExtCallOnInitFunc)(const wxAppBaseExt* self);
+typedef bool (*wxAppBaseExtCallOnInitFunc)(const wxAppBaseExt* self, bool res);
 typedef void (*wxAppBaseExtCleanUpFunc)(const wxAppBaseExt* self);
-typedef wxObjectRefData* (*wxAppBaseExtCloneRefDatawxObjectRefDataCPFunc)(const wxAppBaseExt* self, wxObjectRefData const* data);
-typedef wxObjectRefData* (*wxAppBaseExtCreateRefDataFunc)(const wxAppBaseExt* self);
-typedef wxAppTraits* (*wxAppBaseExtCreateTraitsFunc)(const wxAppBaseExt* self);
-typedef bool (*wxAppBaseExtDispatchFunc)(const wxAppBaseExt* self);
-typedef void* (*wxAppBaseExtDoGetClientDataFunc)(const wxAppBaseExt* self);
-typedef wxClientData* (*wxAppBaseExtDoGetClientObjectFunc)(const wxAppBaseExt* self);
+typedef wxObjectRefData* (*wxAppBaseExtCloneRefDatawxObjectRefDataCPFunc)(const wxAppBaseExt* self, wxObjectRefData const* data, wxObjectRefData* res);
+typedef wxObjectRefData* (*wxAppBaseExtCreateRefDataFunc)(const wxAppBaseExt* self, wxObjectRefData* res);
+typedef wxAppTraits* (*wxAppBaseExtCreateTraitsFunc)(const wxAppBaseExt* self, wxAppTraits* res);
+typedef bool (*wxAppBaseExtDispatchFunc)(const wxAppBaseExt* self, bool res);
+typedef void* (*wxAppBaseExtDoGetClientDataFunc)(const wxAppBaseExt* self, void* res);
+typedef wxClientData* (*wxAppBaseExtDoGetClientObjectFunc)(const wxAppBaseExt* self, wxClientData* res);
 typedef void (*wxAppBaseExtDoSetClientDatavoidPFunc)(const wxAppBaseExt* self, void* data);
 typedef void (*wxAppBaseExtDoSetClientObjectwxClientDataPFunc)(const wxAppBaseExt* self, wxClientData* data);
 typedef void (*wxAppBaseExtExitFunc)(const wxAppBaseExt* self);
 typedef void (*wxAppBaseExtExitMainLoopFunc)(const wxAppBaseExt* self);
-typedef int (*wxAppBaseExtFilterEventwxEventRFunc)(const wxAppBaseExt* self, wxEvent& event);
-typedef wxClassInfo* (*wxAppBaseExtGetClassInfoFunc)(const wxAppBaseExt* self);
-typedef wxVideoMode (*wxAppBaseExtGetDisplayModeFunc)(const wxAppBaseExt* self);
-typedef wxEventHashTable& (*wxAppBaseExtGetEventHashTableFunc)(const wxAppBaseExt* self);
-typedef wxEventTable const* (*wxAppBaseExtGetEventTableFunc)(const wxAppBaseExt* self);
-typedef wxLayoutDirection (*wxAppBaseExtGetLayoutDirectionFunc)(const wxAppBaseExt* self);
-typedef wxWindow* (*wxAppBaseExtGetTopWindowFunc)(const wxAppBaseExt* self);
+typedef int (*wxAppBaseExtFilterEventwxEventRFunc)(const wxAppBaseExt* self, wxEvent& event, int res);
+typedef wxClassInfo* (*wxAppBaseExtGetClassInfoFunc)(const wxAppBaseExt* self, wxClassInfo* res);
+typedef wxVideoMode (*wxAppBaseExtGetDisplayModeFunc)(const wxAppBaseExt* self, wxVideoMode res);
+typedef wxEventHashTable& (*wxAppBaseExtGetEventHashTableFunc)(const wxAppBaseExt* self, wxEventHashTable& res);
+typedef wxEventTable const* (*wxAppBaseExtGetEventTableFunc)(const wxAppBaseExt* self, wxEventTable const* res);
+typedef wxLayoutDirection (*wxAppBaseExtGetLayoutDirectionFunc)(const wxAppBaseExt* self, wxLayoutDirection res);
+typedef wxWindow* (*wxAppBaseExtGetTopWindowFunc)(const wxAppBaseExt* self, wxWindow* res);
 typedef void (*wxAppBaseExtHandleEventwxEvtHandlerPwxEventFunctionwxEventRFunc)(const wxAppBaseExt* self, wxEvtHandler* handler, wxEventFunction func, wxEvent& event);
-typedef bool (*wxAppBaseExtInitializeintRwxCharPPFunc)(const wxAppBaseExt* self, int& argc, wxChar** argv);
-typedef bool (*wxAppBaseExtIsActiveFunc)(const wxAppBaseExt* self);
-typedef bool (*wxAppBaseExtIsGUIFunc)(const wxAppBaseExt* self);
-typedef int (*wxAppBaseExtMainLoopFunc)(const wxAppBaseExt* self);
+typedef bool (*wxAppBaseExtInitializeintRwxCharPPFunc)(const wxAppBaseExt* self, int& argc, wxChar** argv, bool res);
+typedef bool (*wxAppBaseExtIsActiveFunc)(const wxAppBaseExt* self, bool res);
+typedef bool (*wxAppBaseExtIsGUIFunc)(const wxAppBaseExt* self, bool res);
+typedef int (*wxAppBaseExtMainLoopFunc)(const wxAppBaseExt* self, int res);
 typedef void (*wxAppBaseExtOnAssertwxCharCPintwxCharCPwxCharCPFunc)(const wxAppBaseExt* self, wxChar const* file, int line, wxChar const* cond, wxChar const* msg);
 typedef void (*wxAppBaseExtOnAssertFailurewxCharCPintwxCharCPwxCharCPwxCharCPFunc)(const wxAppBaseExt* self, wxChar const* file, int line, wxChar const* func, wxChar const* cond, wxChar const* msg);
-typedef bool (*wxAppBaseExtOnCmdLineErrorwxCmdLineParserRFunc)(const wxAppBaseExt* self, wxCmdLineParser& parser);
-typedef bool (*wxAppBaseExtOnCmdLineHelpwxCmdLineParserRFunc)(const wxAppBaseExt* self, wxCmdLineParser& parser);
-typedef bool (*wxAppBaseExtOnCmdLineParsedwxCmdLineParserRFunc)(const wxAppBaseExt* self, wxCmdLineParser& parser);
-typedef bool (*wxAppBaseExtOnDynamicBindwxDynamicEventTableEntryRFunc)(const wxAppBaseExt* self, wxDynamicEventTableEntry& param0);
+typedef bool (*wxAppBaseExtOnCmdLineErrorwxCmdLineParserRFunc)(const wxAppBaseExt* self, wxCmdLineParser& parser, bool res);
+typedef bool (*wxAppBaseExtOnCmdLineHelpwxCmdLineParserRFunc)(const wxAppBaseExt* self, wxCmdLineParser& parser, bool res);
+typedef bool (*wxAppBaseExtOnCmdLineParsedwxCmdLineParserRFunc)(const wxAppBaseExt* self, wxCmdLineParser& parser, bool res);
+typedef bool (*wxAppBaseExtOnDynamicBindwxDynamicEventTableEntryRFunc)(const wxAppBaseExt* self, wxDynamicEventTableEntry& param0, bool res);
 typedef void (*wxAppBaseExtOnEventLoopEnterwxEventLoopBasePFunc)(const wxAppBaseExt* self, wxEventLoopBase* param0);
 typedef void (*wxAppBaseExtOnEventLoopExitwxEventLoopBasePFunc)(const wxAppBaseExt* self, wxEventLoopBase* param0);
-typedef bool (*wxAppBaseExtOnExceptionInMainLoopFunc)(const wxAppBaseExt* self);
-typedef int (*wxAppBaseExtOnExitFunc)(const wxAppBaseExt* self);
+typedef bool (*wxAppBaseExtOnExceptionInMainLoopFunc)(const wxAppBaseExt* self, bool res);
+typedef int (*wxAppBaseExtOnExitFunc)(const wxAppBaseExt* self, int res);
 typedef void (*wxAppBaseExtOnFatalExceptionFunc)(const wxAppBaseExt* self);
-typedef bool (*wxAppBaseExtOnInitFunc)(const wxAppBaseExt* self);
+typedef bool (*wxAppBaseExtOnInitFunc)(const wxAppBaseExt* self, bool res);
 typedef void (*wxAppBaseExtOnInitCmdLinewxCmdLineParserRFunc)(const wxAppBaseExt* self, wxCmdLineParser& parser);
-typedef bool (*wxAppBaseExtOnInitGuiFunc)(const wxAppBaseExt* self);
+typedef bool (*wxAppBaseExtOnInitGuiFunc)(const wxAppBaseExt* self, bool res);
 typedef void (*wxAppBaseExtOnLaunchedFunc)(const wxAppBaseExt* self);
-typedef int (*wxAppBaseExtOnRunFunc)(const wxAppBaseExt* self);
+typedef int (*wxAppBaseExtOnRunFunc)(const wxAppBaseExt* self, int res);
 typedef void (*wxAppBaseExtOnUnhandledExceptionFunc)(const wxAppBaseExt* self);
-typedef bool (*wxAppBaseExtPendingFunc)(const wxAppBaseExt* self);
-typedef bool (*wxAppBaseExtProcessEventwxEventRFunc)(const wxAppBaseExt* self, wxEvent& event);
-typedef bool (*wxAppBaseExtProcessIdleFunc)(const wxAppBaseExt* self);
+typedef bool (*wxAppBaseExtPendingFunc)(const wxAppBaseExt* self, bool res);
+typedef bool (*wxAppBaseExtProcessEventwxEventRFunc)(const wxAppBaseExt* self, wxEvent& event, bool res);
+typedef bool (*wxAppBaseExtProcessIdleFunc)(const wxAppBaseExt* self, bool res);
 typedef void (*wxAppBaseExtProcessPendingEventsFunc)(const wxAppBaseExt* self);
 typedef void (*wxAppBaseExtQueueEventwxEventPFunc)(const wxAppBaseExt* self, wxEvent* event);
 typedef void (*wxAppBaseExtRethrowStoredExceptionFunc)(const wxAppBaseExt* self);
-typedef bool (*wxAppBaseExtSafeYieldwxWindowPboolFunc)(const wxAppBaseExt* self, wxWindow* win, bool onlyIfNeeded);
-typedef bool (*wxAppBaseExtSafeYieldForwxWindowPlongFunc)(const wxAppBaseExt* self, wxWindow* win, long eventsToProcess);
-typedef bool (*wxAppBaseExtSearchEventTablewxEventTableRwxEventRFunc)(const wxAppBaseExt* self, wxEventTable& table, wxEvent& event);
+typedef bool (*wxAppBaseExtSafeYieldwxWindowPboolFunc)(const wxAppBaseExt* self, wxWindow* win, bool onlyIfNeeded, bool res);
+typedef bool (*wxAppBaseExtSafeYieldForwxWindowPlongFunc)(const wxAppBaseExt* self, wxWindow* win, long eventsToProcess, bool res);
+typedef bool (*wxAppBaseExtSearchEventTablewxEventTableRwxEventRFunc)(const wxAppBaseExt* self, wxEventTable& table, wxEvent& event, bool res);
 typedef void (*wxAppBaseExtSetActiveboolwxWindowPFunc)(const wxAppBaseExt* self, bool isActive, wxWindow* lastFocus);
 typedef void (*wxAppBaseExtSetCLocaleFunc)(const wxAppBaseExt* self);
-typedef bool (*wxAppBaseExtSetDisplayModewxVideoModeCRFunc)(const wxAppBaseExt* self, wxVideoMode const& param0);
-typedef bool (*wxAppBaseExtSetNativeThemewxStringCRFunc)(const wxAppBaseExt* self, wxString const& param0);
+typedef bool (*wxAppBaseExtSetDisplayModewxVideoModeCRFunc)(const wxAppBaseExt* self, wxVideoMode const& param0, bool res);
+typedef bool (*wxAppBaseExtSetNativeThemewxStringCRFunc)(const wxAppBaseExt* self, wxString const& param0, bool res);
 typedef void (*wxAppBaseExtSetNextHandlerwxEvtHandlerPFunc)(const wxAppBaseExt* self, wxEvtHandler* handler);
 typedef void (*wxAppBaseExtSetPreviousHandlerwxEvtHandlerPFunc)(const wxAppBaseExt* self, wxEvtHandler* handler);
 typedef void (*wxAppBaseExtSetPrintModeintFunc)(const wxAppBaseExt* self, int param0);
-typedef bool (*wxAppBaseExtStoreCurrentExceptionFunc)(const wxAppBaseExt* self);
-typedef bool (*wxAppBaseExtTryAfterwxEventRFunc)(const wxAppBaseExt* self, wxEvent& event);
-typedef bool (*wxAppBaseExtTryBeforewxEventRFunc)(const wxAppBaseExt* self, wxEvent& event);
-typedef bool (*wxAppBaseExtUsesEventLoopFunc)(const wxAppBaseExt* self);
-typedef void* (*wxAppBaseExtWXReservedApp1voidPFunc)(const wxAppBaseExt* self, void* param0);
-typedef void* (*wxAppBaseExtWXReservedApp2voidPFunc)(const wxAppBaseExt* self, void* param0);
-typedef void* (*wxAppBaseExtWXReservedEvtHandler1voidPFunc)(const wxAppBaseExt* self, void* param0);
-typedef void* (*wxAppBaseExtWXReservedEvtHandler2voidPFunc)(const wxAppBaseExt* self, void* param0);
+typedef bool (*wxAppBaseExtStoreCurrentExceptionFunc)(const wxAppBaseExt* self, bool res);
+typedef bool (*wxAppBaseExtTryAfterwxEventRFunc)(const wxAppBaseExt* self, wxEvent& event, bool res);
+typedef bool (*wxAppBaseExtTryBeforewxEventRFunc)(const wxAppBaseExt* self, wxEvent& event, bool res);
+typedef bool (*wxAppBaseExtUsesEventLoopFunc)(const wxAppBaseExt* self, bool res);
+typedef void* (*wxAppBaseExtWXReservedApp1voidPFunc)(const wxAppBaseExt* self, void* param0, void* res);
+typedef void* (*wxAppBaseExtWXReservedApp2voidPFunc)(const wxAppBaseExt* self, void* param0, void* res);
+typedef void* (*wxAppBaseExtWXReservedEvtHandler1voidPFunc)(const wxAppBaseExt* self, void* param0, void* res);
+typedef void* (*wxAppBaseExtWXReservedEvtHandler2voidPFunc)(const wxAppBaseExt* self, void* param0, void* res);
 typedef void (*wxAppBaseExtWakeUpIdleFunc)(const wxAppBaseExt* self);
 class wxAppExt;
 typedef void (*wxAppExtAddPendingEventwxEventCRFunc)(const wxAppExt* self, wxEvent const& event);
 typedef void (*wxAppExtCallEventHandlerwxEvtHandlerPwxEventFunctorRwxEventRFunc)(const wxAppExt* self, wxEvtHandler* handler, wxEventFunctor& functor, wxEvent& event);
-typedef bool (*wxAppExtCallOnInitFunc)(const wxAppExt* self);
+typedef bool (*wxAppExtCallOnInitFunc)(const wxAppExt* self, bool res);
 typedef void (*wxAppExtCleanUpFunc)(const wxAppExt* self);
-typedef wxObjectRefData* (*wxAppExtCloneRefDatawxObjectRefDataCPFunc)(const wxAppExt* self, wxObjectRefData const* data);
-typedef wxObjectRefData* (*wxAppExtCreateRefDataFunc)(const wxAppExt* self);
-typedef wxAppTraits* (*wxAppExtCreateTraitsFunc)(const wxAppExt* self);
-typedef bool (*wxAppExtDispatchFunc)(const wxAppExt* self);
-typedef void* (*wxAppExtDoGetClientDataFunc)(const wxAppExt* self);
-typedef wxClientData* (*wxAppExtDoGetClientObjectFunc)(const wxAppExt* self);
+typedef wxObjectRefData* (*wxAppExtCloneRefDatawxObjectRefDataCPFunc)(const wxAppExt* self, wxObjectRefData const* data, wxObjectRefData* res);
+typedef wxObjectRefData* (*wxAppExtCreateRefDataFunc)(const wxAppExt* self, wxObjectRefData* res);
+typedef wxAppTraits* (*wxAppExtCreateTraitsFunc)(const wxAppExt* self, wxAppTraits* res);
+typedef bool (*wxAppExtDispatchFunc)(const wxAppExt* self, bool res);
+typedef void* (*wxAppExtDoGetClientDataFunc)(const wxAppExt* self, void* res);
+typedef wxClientData* (*wxAppExtDoGetClientObjectFunc)(const wxAppExt* self, wxClientData* res);
 typedef void (*wxAppExtDoSetClientDatavoidPFunc)(const wxAppExt* self, void* data);
 typedef void (*wxAppExtDoSetClientObjectwxClientDataPFunc)(const wxAppExt* self, wxClientData* data);
 typedef void (*wxAppExtExitFunc)(const wxAppExt* self);
 typedef void (*wxAppExtExitMainLoopFunc)(const wxAppExt* self);
-typedef int (*wxAppExtFilterEventwxEventRFunc)(const wxAppExt* self, wxEvent& event);
-typedef wxClassInfo* (*wxAppExtGetClassInfoFunc)(const wxAppExt* self);
-typedef wxVideoMode (*wxAppExtGetDisplayModeFunc)(const wxAppExt* self);
-typedef wxEventHashTable& (*wxAppExtGetEventHashTableFunc)(const wxAppExt* self);
-typedef wxEventTable const* (*wxAppExtGetEventTableFunc)(const wxAppExt* self);
-typedef wxLayoutDirection (*wxAppExtGetLayoutDirectionFunc)(const wxAppExt* self);
-typedef int (*wxAppExtGetPrintModeFunc)(const wxAppExt* self);
-typedef wxWindow* (*wxAppExtGetTopWindowFunc)(const wxAppExt* self);
+typedef int (*wxAppExtFilterEventwxEventRFunc)(const wxAppExt* self, wxEvent& event, int res);
+typedef wxClassInfo* (*wxAppExtGetClassInfoFunc)(const wxAppExt* self, wxClassInfo* res);
+typedef wxVideoMode (*wxAppExtGetDisplayModeFunc)(const wxAppExt* self, wxVideoMode res);
+typedef wxEventHashTable& (*wxAppExtGetEventHashTableFunc)(const wxAppExt* self, wxEventHashTable& res);
+typedef wxEventTable const* (*wxAppExtGetEventTableFunc)(const wxAppExt* self, wxEventTable const* res);
+typedef wxLayoutDirection (*wxAppExtGetLayoutDirectionFunc)(const wxAppExt* self, wxLayoutDirection res);
+typedef int (*wxAppExtGetPrintModeFunc)(const wxAppExt* self, int res);
+typedef wxWindow* (*wxAppExtGetTopWindowFunc)(const wxAppExt* self, wxWindow* res);
 typedef void (*wxAppExtHandleEventwxEvtHandlerPwxEventFunctionwxEventRFunc)(const wxAppExt* self, wxEvtHandler* handler, wxEventFunction func, wxEvent& event);
-typedef bool (*wxAppExtInitializeintRwxCharPPFunc)(const wxAppExt* self, int& argc, wxChar** argv);
-typedef bool (*wxAppExtIsActiveFunc)(const wxAppExt* self);
-typedef bool (*wxAppExtIsGUIFunc)(const wxAppExt* self);
-typedef int (*wxAppExtMainLoopFunc)(const wxAppExt* self);
+typedef bool (*wxAppExtInitializeintRwxCharPPFunc)(const wxAppExt* self, int& argc, wxChar** argv, bool res);
+typedef bool (*wxAppExtIsActiveFunc)(const wxAppExt* self, bool res);
+typedef bool (*wxAppExtIsGUIFunc)(const wxAppExt* self, bool res);
+typedef int (*wxAppExtMainLoopFunc)(const wxAppExt* self, int res);
 typedef void (*wxAppExtOnAssertwxCharCPintwxCharCPwxCharCPFunc)(const wxAppExt* self, wxChar const* file, int line, wxChar const* cond, wxChar const* msg);
 typedef void (*wxAppExtOnAssertFailurewxCharCPintwxCharCPwxCharCPwxCharCPFunc)(const wxAppExt* self, wxChar const* file, int line, wxChar const* func, wxChar const* cond, wxChar const* msg);
-typedef bool (*wxAppExtOnCmdLineErrorwxCmdLineParserRFunc)(const wxAppExt* self, wxCmdLineParser& parser);
-typedef bool (*wxAppExtOnCmdLineHelpwxCmdLineParserRFunc)(const wxAppExt* self, wxCmdLineParser& parser);
-typedef bool (*wxAppExtOnCmdLineParsedwxCmdLineParserRFunc)(const wxAppExt* self, wxCmdLineParser& parser);
-typedef bool (*wxAppExtOnDynamicBindwxDynamicEventTableEntryRFunc)(const wxAppExt* self, wxDynamicEventTableEntry& param0);
+typedef bool (*wxAppExtOnCmdLineErrorwxCmdLineParserRFunc)(const wxAppExt* self, wxCmdLineParser& parser, bool res);
+typedef bool (*wxAppExtOnCmdLineHelpwxCmdLineParserRFunc)(const wxAppExt* self, wxCmdLineParser& parser, bool res);
+typedef bool (*wxAppExtOnCmdLineParsedwxCmdLineParserRFunc)(const wxAppExt* self, wxCmdLineParser& parser, bool res);
+typedef bool (*wxAppExtOnDynamicBindwxDynamicEventTableEntryRFunc)(const wxAppExt* self, wxDynamicEventTableEntry& param0, bool res);
 typedef void (*wxAppExtOnEventLoopEnterwxEventLoopBasePFunc)(const wxAppExt* self, wxEventLoopBase* param0);
 typedef void (*wxAppExtOnEventLoopExitwxEventLoopBasePFunc)(const wxAppExt* self, wxEventLoopBase* param0);
-typedef bool (*wxAppExtOnExceptionInMainLoopFunc)(const wxAppExt* self);
-typedef int (*wxAppExtOnExitFunc)(const wxAppExt* self);
+typedef bool (*wxAppExtOnExceptionInMainLoopFunc)(const wxAppExt* self, bool res);
+typedef int (*wxAppExtOnExitFunc)(const wxAppExt* self, int res);
 typedef void (*wxAppExtOnFatalExceptionFunc)(const wxAppExt* self);
-typedef bool (*wxAppExtOnInitFunc)(const wxAppExt* self);
+typedef bool (*wxAppExtOnInitFunc)(const wxAppExt* self, bool res);
 typedef void (*wxAppExtOnInitCmdLinewxCmdLineParserRFunc)(const wxAppExt* self, wxCmdLineParser& parser);
-typedef bool (*wxAppExtOnInitGuiFunc)(const wxAppExt* self);
+typedef bool (*wxAppExtOnInitGuiFunc)(const wxAppExt* self, bool res);
 typedef void (*wxAppExtOnLaunchedFunc)(const wxAppExt* self);
-typedef int (*wxAppExtOnRunFunc)(const wxAppExt* self);
+typedef int (*wxAppExtOnRunFunc)(const wxAppExt* self, int res);
 typedef void (*wxAppExtOnUnhandledExceptionFunc)(const wxAppExt* self);
-typedef bool (*wxAppExtPendingFunc)(const wxAppExt* self);
-typedef bool (*wxAppExtProcessEventwxEventRFunc)(const wxAppExt* self, wxEvent& event);
-typedef bool (*wxAppExtProcessIdleFunc)(const wxAppExt* self);
+typedef bool (*wxAppExtPendingFunc)(const wxAppExt* self, bool res);
+typedef bool (*wxAppExtProcessEventwxEventRFunc)(const wxAppExt* self, wxEvent& event, bool res);
+typedef bool (*wxAppExtProcessIdleFunc)(const wxAppExt* self, bool res);
 typedef void (*wxAppExtProcessPendingEventsFunc)(const wxAppExt* self);
 typedef void (*wxAppExtQueueEventwxEventPFunc)(const wxAppExt* self, wxEvent* event);
 typedef void (*wxAppExtRethrowStoredExceptionFunc)(const wxAppExt* self);
-typedef bool (*wxAppExtSafeYieldwxWindowPboolFunc)(const wxAppExt* self, wxWindow* win, bool onlyIfNeeded);
-typedef bool (*wxAppExtSafeYieldForwxWindowPlongFunc)(const wxAppExt* self, wxWindow* win, long eventsToProcess);
-typedef bool (*wxAppExtSearchEventTablewxEventTableRwxEventRFunc)(const wxAppExt* self, wxEventTable& table, wxEvent& event);
+typedef bool (*wxAppExtSafeYieldwxWindowPboolFunc)(const wxAppExt* self, wxWindow* win, bool onlyIfNeeded, bool res);
+typedef bool (*wxAppExtSafeYieldForwxWindowPlongFunc)(const wxAppExt* self, wxWindow* win, long eventsToProcess, bool res);
+typedef bool (*wxAppExtSearchEventTablewxEventTableRwxEventRFunc)(const wxAppExt* self, wxEventTable& table, wxEvent& event, bool res);
 typedef void (*wxAppExtSetActiveboolwxWindowPFunc)(const wxAppExt* self, bool isActive, wxWindow* lastFocus);
 typedef void (*wxAppExtSetCLocaleFunc)(const wxAppExt* self);
-typedef bool (*wxAppExtSetDisplayModewxVideoModeCRFunc)(const wxAppExt* self, wxVideoMode const& param0);
-typedef bool (*wxAppExtSetNativeThemewxStringCRFunc)(const wxAppExt* self, wxString const& param0);
+typedef bool (*wxAppExtSetDisplayModewxVideoModeCRFunc)(const wxAppExt* self, wxVideoMode const& param0, bool res);
+typedef bool (*wxAppExtSetNativeThemewxStringCRFunc)(const wxAppExt* self, wxString const& param0, bool res);
 typedef void (*wxAppExtSetNextHandlerwxEvtHandlerPFunc)(const wxAppExt* self, wxEvtHandler* handler);
 typedef void (*wxAppExtSetPreviousHandlerwxEvtHandlerPFunc)(const wxAppExt* self, wxEvtHandler* handler);
 typedef void (*wxAppExtSetPrintModeintFunc)(const wxAppExt* self, int param0);
-typedef bool (*wxAppExtStoreCurrentExceptionFunc)(const wxAppExt* self);
-typedef bool (*wxAppExtTryAfterwxEventRFunc)(const wxAppExt* self, wxEvent& event);
-typedef bool (*wxAppExtTryBeforewxEventRFunc)(const wxAppExt* self, wxEvent& event);
-typedef bool (*wxAppExtUsesEventLoopFunc)(const wxAppExt* self);
-typedef void* (*wxAppExtWXReservedApp1voidPFunc)(const wxAppExt* self, void* param0);
-typedef void* (*wxAppExtWXReservedApp2voidPFunc)(const wxAppExt* self, void* param0);
-typedef void* (*wxAppExtWXReservedEvtHandler1voidPFunc)(const wxAppExt* self, void* param0);
-typedef void* (*wxAppExtWXReservedEvtHandler2voidPFunc)(const wxAppExt* self, void* param0);
+typedef bool (*wxAppExtStoreCurrentExceptionFunc)(const wxAppExt* self, bool res);
+typedef bool (*wxAppExtTryAfterwxEventRFunc)(const wxAppExt* self, wxEvent& event, bool res);
+typedef bool (*wxAppExtTryBeforewxEventRFunc)(const wxAppExt* self, wxEvent& event, bool res);
+typedef bool (*wxAppExtUsesEventLoopFunc)(const wxAppExt* self, bool res);
+typedef void* (*wxAppExtWXReservedApp1voidPFunc)(const wxAppExt* self, void* param0, void* res);
+typedef void* (*wxAppExtWXReservedApp2voidPFunc)(const wxAppExt* self, void* param0, void* res);
+typedef void* (*wxAppExtWXReservedEvtHandler1voidPFunc)(const wxAppExt* self, void* param0, void* res);
+typedef void* (*wxAppExtWXReservedEvtHandler2voidPFunc)(const wxAppExt* self, void* param0, void* res);
 typedef void (*wxAppExtWakeUpIdleFunc)(const wxAppExt* self);
-class wxAppInitializerExt;
 
 class wxAppConsoleBaseExt: public wxAppConsoleBase
 {
@@ -287,7 +286,7 @@ public:
   {
     bool res = wxAppConsoleBase::CallOnInit();
     if (*m_wxAppConsoleBaseExtCallOnInit != NULL){
-      return m_wxAppConsoleBaseExtCallOnInit(this);
+      return m_wxAppConsoleBaseExtCallOnInit(this, res);
     }
     else {
       return res;
@@ -306,7 +305,7 @@ public:
   {
     wxObjectRefData* res = wxAppConsoleBase::CloneRefData(data);
     if (*m_wxAppConsoleBaseExtCloneRefDatawxObjectRefDataCP != NULL){
-      return m_wxAppConsoleBaseExtCloneRefDatawxObjectRefDataCP(this, data);
+      return m_wxAppConsoleBaseExtCloneRefDatawxObjectRefDataCP(this, data, res);
     }
     else {
       return res;
@@ -317,7 +316,7 @@ public:
   {
     wxObjectRefData* res = wxAppConsoleBase::CreateRefData();
     if (*m_wxAppConsoleBaseExtCreateRefData != NULL){
-      return m_wxAppConsoleBaseExtCreateRefData(this);
+      return m_wxAppConsoleBaseExtCreateRefData(this, res);
     }
     else {
       return res;
@@ -328,7 +327,7 @@ public:
   {
     wxAppTraits* res = wxAppConsoleBase::CreateTraits();
     if (*m_wxAppConsoleBaseExtCreateTraits != NULL){
-      return m_wxAppConsoleBaseExtCreateTraits(this);
+      return m_wxAppConsoleBaseExtCreateTraits(this, res);
     }
     else {
       return res;
@@ -339,7 +338,7 @@ public:
   {
     bool res = wxAppConsoleBase::Dispatch();
     if (*m_wxAppConsoleBaseExtDispatch != NULL){
-      return m_wxAppConsoleBaseExtDispatch(this);
+      return m_wxAppConsoleBaseExtDispatch(this, res);
     }
     else {
       return res;
@@ -350,7 +349,7 @@ public:
   {
     void* res = wxAppConsoleBase::DoGetClientData();
     if (*m_wxAppConsoleBaseExtDoGetClientData != NULL){
-      return m_wxAppConsoleBaseExtDoGetClientData(this);
+      return m_wxAppConsoleBaseExtDoGetClientData(this, res);
     }
     else {
       return res;
@@ -361,7 +360,7 @@ public:
   {
     wxClientData* res = wxAppConsoleBase::DoGetClientObject();
     if (*m_wxAppConsoleBaseExtDoGetClientObject != NULL){
-      return m_wxAppConsoleBaseExtDoGetClientObject(this);
+      return m_wxAppConsoleBaseExtDoGetClientObject(this, res);
     }
     else {
       return res;
@@ -402,12 +401,11 @@ public:
   wxAppConsoleBaseExtFilterEventwxEventRFunc m_wxAppConsoleBaseExtFilterEventwxEventR = NULL;
   virtual int FilterEvent(wxEvent& event) override
   {
-    int res = wxAppConsoleBase::FilterEvent(event);
     if (*m_wxAppConsoleBaseExtFilterEventwxEventR != NULL){
       return m_wxAppConsoleBaseExtFilterEventwxEventR(this, event);
     }
     else {
-      return res;
+      return 0;
     }
   }
   wxAppConsoleBaseExtGetClassInfoFunc m_wxAppConsoleBaseExtGetClassInfo = NULL;
@@ -415,7 +413,7 @@ public:
   {
     wxClassInfo* res = wxAppConsoleBase::GetClassInfo();
     if (*m_wxAppConsoleBaseExtGetClassInfo != NULL){
-      return m_wxAppConsoleBaseExtGetClassInfo(this);
+      return m_wxAppConsoleBaseExtGetClassInfo(this, res);
     }
     else {
       return res;
@@ -426,7 +424,7 @@ public:
   {
     wxEventHashTable& res = wxAppConsoleBase::GetEventHashTable();
     if (*m_wxAppConsoleBaseExtGetEventHashTable != NULL){
-      return m_wxAppConsoleBaseExtGetEventHashTable(this);
+      return m_wxAppConsoleBaseExtGetEventHashTable(this, res);
     }
     else {
       return res;
@@ -437,7 +435,7 @@ public:
   {
     wxEventTable const* res = wxAppConsoleBase::GetEventTable();
     if (*m_wxAppConsoleBaseExtGetEventTable != NULL){
-      return m_wxAppConsoleBaseExtGetEventTable(this);
+      return m_wxAppConsoleBaseExtGetEventTable(this, res);
     }
     else {
       return res;
@@ -456,7 +454,7 @@ public:
   {
     bool res = wxAppConsoleBase::Initialize(argc, argv);
     if (*m_wxAppConsoleBaseExtInitializeintRwxCharPP != NULL){
-      return m_wxAppConsoleBaseExtInitializeintRwxCharPP(this, argc, argv);
+      return m_wxAppConsoleBaseExtInitializeintRwxCharPP(this, argc, argv, res);
     }
     else {
       return res;
@@ -467,7 +465,7 @@ public:
   {
     bool res = wxAppConsoleBase::IsGUI();
     if (*m_wxAppConsoleBaseExtIsGUI != NULL){
-      return m_wxAppConsoleBaseExtIsGUI(this);
+      return m_wxAppConsoleBaseExtIsGUI(this, res);
     }
     else {
       return res;
@@ -478,7 +476,7 @@ public:
   {
     int res = wxAppConsoleBase::MainLoop();
     if (*m_wxAppConsoleBaseExtMainLoop != NULL){
-      return m_wxAppConsoleBaseExtMainLoop(this);
+      return m_wxAppConsoleBaseExtMainLoop(this, res);
     }
     else {
       return res;
@@ -505,7 +503,7 @@ public:
   {
     bool res = wxAppConsoleBase::OnCmdLineError(parser);
     if (*m_wxAppConsoleBaseExtOnCmdLineErrorwxCmdLineParserR != NULL){
-      return m_wxAppConsoleBaseExtOnCmdLineErrorwxCmdLineParserR(this, parser);
+      return m_wxAppConsoleBaseExtOnCmdLineErrorwxCmdLineParserR(this, parser, res);
     }
     else {
       return res;
@@ -516,7 +514,7 @@ public:
   {
     bool res = wxAppConsoleBase::OnCmdLineHelp(parser);
     if (*m_wxAppConsoleBaseExtOnCmdLineHelpwxCmdLineParserR != NULL){
-      return m_wxAppConsoleBaseExtOnCmdLineHelpwxCmdLineParserR(this, parser);
+      return m_wxAppConsoleBaseExtOnCmdLineHelpwxCmdLineParserR(this, parser, res);
     }
     else {
       return res;
@@ -527,7 +525,7 @@ public:
   {
     bool res = wxAppConsoleBase::OnCmdLineParsed(parser);
     if (*m_wxAppConsoleBaseExtOnCmdLineParsedwxCmdLineParserR != NULL){
-      return m_wxAppConsoleBaseExtOnCmdLineParsedwxCmdLineParserR(this, parser);
+      return m_wxAppConsoleBaseExtOnCmdLineParsedwxCmdLineParserR(this, parser, res);
     }
     else {
       return res;
@@ -538,7 +536,7 @@ public:
   {
     bool res = wxAppConsoleBase::OnDynamicBind(param0);
     if (*m_wxAppConsoleBaseExtOnDynamicBindwxDynamicEventTableEntryR != NULL){
-      return m_wxAppConsoleBaseExtOnDynamicBindwxDynamicEventTableEntryR(this, param0);
+      return m_wxAppConsoleBaseExtOnDynamicBindwxDynamicEventTableEntryR(this, param0, res);
     }
     else {
       return res;
@@ -565,7 +563,7 @@ public:
   {
     bool res = wxAppConsoleBase::OnExceptionInMainLoop();
     if (*m_wxAppConsoleBaseExtOnExceptionInMainLoop != NULL){
-      return m_wxAppConsoleBaseExtOnExceptionInMainLoop(this);
+      return m_wxAppConsoleBaseExtOnExceptionInMainLoop(this, res);
     }
     else {
       return res;
@@ -576,7 +574,7 @@ public:
   {
     int res = wxAppConsoleBase::OnExit();
     if (*m_wxAppConsoleBaseExtOnExit != NULL){
-      return m_wxAppConsoleBaseExtOnExit(this);
+      return m_wxAppConsoleBaseExtOnExit(this, res);
     }
     else {
       return res;
@@ -595,7 +593,7 @@ public:
   {
     bool res = wxAppConsoleBase::OnInit();
     if (*m_wxAppConsoleBaseExtOnInit != NULL){
-      return m_wxAppConsoleBaseExtOnInit(this);
+      return m_wxAppConsoleBaseExtOnInit(this, res);
     }
     else {
       return res;
@@ -622,7 +620,7 @@ public:
   {
     int res = wxAppConsoleBase::OnRun();
     if (*m_wxAppConsoleBaseExtOnRun != NULL){
-      return m_wxAppConsoleBaseExtOnRun(this);
+      return m_wxAppConsoleBaseExtOnRun(this, res);
     }
     else {
       return res;
@@ -641,7 +639,7 @@ public:
   {
     bool res = wxAppConsoleBase::Pending();
     if (*m_wxAppConsoleBaseExtPending != NULL){
-      return m_wxAppConsoleBaseExtPending(this);
+      return m_wxAppConsoleBaseExtPending(this, res);
     }
     else {
       return res;
@@ -652,7 +650,7 @@ public:
   {
     bool res = wxAppConsoleBase::ProcessEvent(event);
     if (*m_wxAppConsoleBaseExtProcessEventwxEventR != NULL){
-      return m_wxAppConsoleBaseExtProcessEventwxEventR(this, event);
+      return m_wxAppConsoleBaseExtProcessEventwxEventR(this, event, res);
     }
     else {
       return res;
@@ -663,7 +661,7 @@ public:
   {
     bool res = wxAppConsoleBase::ProcessIdle();
     if (*m_wxAppConsoleBaseExtProcessIdle != NULL){
-      return m_wxAppConsoleBaseExtProcessIdle(this);
+      return m_wxAppConsoleBaseExtProcessIdle(this, res);
     }
     else {
       return res;
@@ -698,7 +696,7 @@ public:
   {
     bool res = wxAppConsoleBase::SearchEventTable(table, event);
     if (*m_wxAppConsoleBaseExtSearchEventTablewxEventTableRwxEventR != NULL){
-      return m_wxAppConsoleBaseExtSearchEventTablewxEventTableRwxEventR(this, table, event);
+      return m_wxAppConsoleBaseExtSearchEventTablewxEventTableRwxEventR(this, table, event, res);
     }
     else {
       return res;
@@ -733,7 +731,7 @@ public:
   {
     bool res = wxAppConsoleBase::StoreCurrentException();
     if (*m_wxAppConsoleBaseExtStoreCurrentException != NULL){
-      return m_wxAppConsoleBaseExtStoreCurrentException(this);
+      return m_wxAppConsoleBaseExtStoreCurrentException(this, res);
     }
     else {
       return res;
@@ -744,7 +742,7 @@ public:
   {
     bool res = wxAppConsoleBase::TryAfter(event);
     if (*m_wxAppConsoleBaseExtTryAfterwxEventR != NULL){
-      return m_wxAppConsoleBaseExtTryAfterwxEventR(this, event);
+      return m_wxAppConsoleBaseExtTryAfterwxEventR(this, event, res);
     }
     else {
       return res;
@@ -755,7 +753,7 @@ public:
   {
     bool res = wxAppConsoleBase::TryBefore(event);
     if (*m_wxAppConsoleBaseExtTryBeforewxEventR != NULL){
-      return m_wxAppConsoleBaseExtTryBeforewxEventR(this, event);
+      return m_wxAppConsoleBaseExtTryBeforewxEventR(this, event, res);
     }
     else {
       return res;
@@ -766,7 +764,7 @@ public:
   {
     bool res = wxAppConsoleBase::UsesEventLoop();
     if (*m_wxAppConsoleBaseExtUsesEventLoop != NULL){
-      return m_wxAppConsoleBaseExtUsesEventLoop(this);
+      return m_wxAppConsoleBaseExtUsesEventLoop(this, res);
     }
     else {
       return res;
@@ -777,7 +775,7 @@ public:
   {
     void* res = wxAppConsoleBase::WXReservedApp1(param0);
     if (*m_wxAppConsoleBaseExtWXReservedApp1voidP != NULL){
-      return m_wxAppConsoleBaseExtWXReservedApp1voidP(this, param0);
+      return m_wxAppConsoleBaseExtWXReservedApp1voidP(this, param0, res);
     }
     else {
       return res;
@@ -788,7 +786,7 @@ public:
   {
     void* res = wxAppConsoleBase::WXReservedApp2(param0);
     if (*m_wxAppConsoleBaseExtWXReservedApp2voidP != NULL){
-      return m_wxAppConsoleBaseExtWXReservedApp2voidP(this, param0);
+      return m_wxAppConsoleBaseExtWXReservedApp2voidP(this, param0, res);
     }
     else {
       return res;
@@ -799,7 +797,7 @@ public:
   {
     void* res = wxAppConsoleBase::WXReservedEvtHandler1(param0);
     if (*m_wxAppConsoleBaseExtWXReservedEvtHandler1voidP != NULL){
-      return m_wxAppConsoleBaseExtWXReservedEvtHandler1voidP(this, param0);
+      return m_wxAppConsoleBaseExtWXReservedEvtHandler1voidP(this, param0, res);
     }
     else {
       return res;
@@ -810,7 +808,7 @@ public:
   {
     void* res = wxAppConsoleBase::WXReservedEvtHandler2(param0);
     if (*m_wxAppConsoleBaseExtWXReservedEvtHandler2voidP != NULL){
-      return m_wxAppConsoleBaseExtWXReservedEvtHandler2voidP(this, param0);
+      return m_wxAppConsoleBaseExtWXReservedEvtHandler2voidP(this, param0, res);
     }
     else {
       return res;
@@ -911,7 +909,7 @@ public:
   {
     bool res = wxAppConsole::CallOnInit();
     if (*m_wxAppConsoleExtCallOnInit != NULL){
-      return m_wxAppConsoleExtCallOnInit(this);
+      return m_wxAppConsoleExtCallOnInit(this, res);
     }
     else {
       return res;
@@ -930,7 +928,7 @@ public:
   {
     wxObjectRefData* res = wxAppConsole::CloneRefData(data);
     if (*m_wxAppConsoleExtCloneRefDatawxObjectRefDataCP != NULL){
-      return m_wxAppConsoleExtCloneRefDatawxObjectRefDataCP(this, data);
+      return m_wxAppConsoleExtCloneRefDatawxObjectRefDataCP(this, data, res);
     }
     else {
       return res;
@@ -941,7 +939,7 @@ public:
   {
     wxObjectRefData* res = wxAppConsole::CreateRefData();
     if (*m_wxAppConsoleExtCreateRefData != NULL){
-      return m_wxAppConsoleExtCreateRefData(this);
+      return m_wxAppConsoleExtCreateRefData(this, res);
     }
     else {
       return res;
@@ -952,7 +950,7 @@ public:
   {
     wxAppTraits* res = wxAppConsole::CreateTraits();
     if (*m_wxAppConsoleExtCreateTraits != NULL){
-      return m_wxAppConsoleExtCreateTraits(this);
+      return m_wxAppConsoleExtCreateTraits(this, res);
     }
     else {
       return res;
@@ -963,7 +961,7 @@ public:
   {
     bool res = wxAppConsole::Dispatch();
     if (*m_wxAppConsoleExtDispatch != NULL){
-      return m_wxAppConsoleExtDispatch(this);
+      return m_wxAppConsoleExtDispatch(this, res);
     }
     else {
       return res;
@@ -974,7 +972,7 @@ public:
   {
     void* res = wxAppConsole::DoGetClientData();
     if (*m_wxAppConsoleExtDoGetClientData != NULL){
-      return m_wxAppConsoleExtDoGetClientData(this);
+      return m_wxAppConsoleExtDoGetClientData(this, res);
     }
     else {
       return res;
@@ -985,7 +983,7 @@ public:
   {
     wxClientData* res = wxAppConsole::DoGetClientObject();
     if (*m_wxAppConsoleExtDoGetClientObject != NULL){
-      return m_wxAppConsoleExtDoGetClientObject(this);
+      return m_wxAppConsoleExtDoGetClientObject(this, res);
     }
     else {
       return res;
@@ -1028,7 +1026,7 @@ public:
   {
     int res = wxAppConsole::FilterEvent(event);
     if (*m_wxAppConsoleExtFilterEventwxEventR != NULL){
-      return m_wxAppConsoleExtFilterEventwxEventR(this, event);
+      return m_wxAppConsoleExtFilterEventwxEventR(this, event, res);
     }
     else {
       return res;
@@ -1039,7 +1037,7 @@ public:
   {
     wxClassInfo* res = wxAppConsole::GetClassInfo();
     if (*m_wxAppConsoleExtGetClassInfo != NULL){
-      return m_wxAppConsoleExtGetClassInfo(this);
+      return m_wxAppConsoleExtGetClassInfo(this, res);
     }
     else {
       return res;
@@ -1050,7 +1048,7 @@ public:
   {
     wxEventHashTable& res = wxAppConsole::GetEventHashTable();
     if (*m_wxAppConsoleExtGetEventHashTable != NULL){
-      return m_wxAppConsoleExtGetEventHashTable(this);
+      return m_wxAppConsoleExtGetEventHashTable(this, res);
     }
     else {
       return res;
@@ -1061,7 +1059,7 @@ public:
   {
     wxEventTable const* res = wxAppConsole::GetEventTable();
     if (*m_wxAppConsoleExtGetEventTable != NULL){
-      return m_wxAppConsoleExtGetEventTable(this);
+      return m_wxAppConsoleExtGetEventTable(this, res);
     }
     else {
       return res;
@@ -1080,7 +1078,7 @@ public:
   {
     bool res = wxAppConsole::Initialize(argc, argv);
     if (*m_wxAppConsoleExtInitializeintRwxCharPP != NULL){
-      return m_wxAppConsoleExtInitializeintRwxCharPP(this, argc, argv);
+      return m_wxAppConsoleExtInitializeintRwxCharPP(this, argc, argv, res);
     }
     else {
       return res;
@@ -1091,7 +1089,7 @@ public:
   {
     bool res = wxAppConsole::IsGUI();
     if (*m_wxAppConsoleExtIsGUI != NULL){
-      return m_wxAppConsoleExtIsGUI(this);
+      return m_wxAppConsoleExtIsGUI(this, res);
     }
     else {
       return res;
@@ -1102,7 +1100,7 @@ public:
   {
     int res = wxAppConsole::MainLoop();
     if (*m_wxAppConsoleExtMainLoop != NULL){
-      return m_wxAppConsoleExtMainLoop(this);
+      return m_wxAppConsoleExtMainLoop(this, res);
     }
     else {
       return res;
@@ -1129,7 +1127,7 @@ public:
   {
     bool res = wxAppConsole::OnCmdLineError(parser);
     if (*m_wxAppConsoleExtOnCmdLineErrorwxCmdLineParserR != NULL){
-      return m_wxAppConsoleExtOnCmdLineErrorwxCmdLineParserR(this, parser);
+      return m_wxAppConsoleExtOnCmdLineErrorwxCmdLineParserR(this, parser, res);
     }
     else {
       return res;
@@ -1140,7 +1138,7 @@ public:
   {
     bool res = wxAppConsole::OnCmdLineHelp(parser);
     if (*m_wxAppConsoleExtOnCmdLineHelpwxCmdLineParserR != NULL){
-      return m_wxAppConsoleExtOnCmdLineHelpwxCmdLineParserR(this, parser);
+      return m_wxAppConsoleExtOnCmdLineHelpwxCmdLineParserR(this, parser, res);
     }
     else {
       return res;
@@ -1151,7 +1149,7 @@ public:
   {
     bool res = wxAppConsole::OnCmdLineParsed(parser);
     if (*m_wxAppConsoleExtOnCmdLineParsedwxCmdLineParserR != NULL){
-      return m_wxAppConsoleExtOnCmdLineParsedwxCmdLineParserR(this, parser);
+      return m_wxAppConsoleExtOnCmdLineParsedwxCmdLineParserR(this, parser, res);
     }
     else {
       return res;
@@ -1162,7 +1160,7 @@ public:
   {
     bool res = wxAppConsole::OnDynamicBind(param0);
     if (*m_wxAppConsoleExtOnDynamicBindwxDynamicEventTableEntryR != NULL){
-      return m_wxAppConsoleExtOnDynamicBindwxDynamicEventTableEntryR(this, param0);
+      return m_wxAppConsoleExtOnDynamicBindwxDynamicEventTableEntryR(this, param0, res);
     }
     else {
       return res;
@@ -1189,7 +1187,7 @@ public:
   {
     bool res = wxAppConsole::OnExceptionInMainLoop();
     if (*m_wxAppConsoleExtOnExceptionInMainLoop != NULL){
-      return m_wxAppConsoleExtOnExceptionInMainLoop(this);
+      return m_wxAppConsoleExtOnExceptionInMainLoop(this, res);
     }
     else {
       return res;
@@ -1200,7 +1198,7 @@ public:
   {
     int res = wxAppConsole::OnExit();
     if (*m_wxAppConsoleExtOnExit != NULL){
-      return m_wxAppConsoleExtOnExit(this);
+      return m_wxAppConsoleExtOnExit(this, res);
     }
     else {
       return res;
@@ -1219,7 +1217,7 @@ public:
   {
     bool res = wxAppConsole::OnInit();
     if (*m_wxAppConsoleExtOnInit != NULL){
-      return m_wxAppConsoleExtOnInit(this);
+      return m_wxAppConsoleExtOnInit(this, res);
     }
     else {
       return res;
@@ -1246,7 +1244,7 @@ public:
   {
     int res = wxAppConsole::OnRun();
     if (*m_wxAppConsoleExtOnRun != NULL){
-      return m_wxAppConsoleExtOnRun(this);
+      return m_wxAppConsoleExtOnRun(this, res);
     }
     else {
       return res;
@@ -1265,7 +1263,7 @@ public:
   {
     bool res = wxAppConsole::Pending();
     if (*m_wxAppConsoleExtPending != NULL){
-      return m_wxAppConsoleExtPending(this);
+      return m_wxAppConsoleExtPending(this, res);
     }
     else {
       return res;
@@ -1276,7 +1274,7 @@ public:
   {
     bool res = wxAppConsole::ProcessEvent(event);
     if (*m_wxAppConsoleExtProcessEventwxEventR != NULL){
-      return m_wxAppConsoleExtProcessEventwxEventR(this, event);
+      return m_wxAppConsoleExtProcessEventwxEventR(this, event, res);
     }
     else {
       return res;
@@ -1287,7 +1285,7 @@ public:
   {
     bool res = wxAppConsole::ProcessIdle();
     if (*m_wxAppConsoleExtProcessIdle != NULL){
-      return m_wxAppConsoleExtProcessIdle(this);
+      return m_wxAppConsoleExtProcessIdle(this, res);
     }
     else {
       return res;
@@ -1322,7 +1320,7 @@ public:
   {
     bool res = wxAppConsole::SearchEventTable(table, event);
     if (*m_wxAppConsoleExtSearchEventTablewxEventTableRwxEventR != NULL){
-      return m_wxAppConsoleExtSearchEventTablewxEventTableRwxEventR(this, table, event);
+      return m_wxAppConsoleExtSearchEventTablewxEventTableRwxEventR(this, table, event, res);
     }
     else {
       return res;
@@ -1357,7 +1355,7 @@ public:
   {
     bool res = wxAppConsole::StoreCurrentException();
     if (*m_wxAppConsoleExtStoreCurrentException != NULL){
-      return m_wxAppConsoleExtStoreCurrentException(this);
+      return m_wxAppConsoleExtStoreCurrentException(this, res);
     }
     else {
       return res;
@@ -1368,7 +1366,7 @@ public:
   {
     bool res = wxAppConsole::TryAfter(event);
     if (*m_wxAppConsoleExtTryAfterwxEventR != NULL){
-      return m_wxAppConsoleExtTryAfterwxEventR(this, event);
+      return m_wxAppConsoleExtTryAfterwxEventR(this, event, res);
     }
     else {
       return res;
@@ -1379,7 +1377,7 @@ public:
   {
     bool res = wxAppConsole::TryBefore(event);
     if (*m_wxAppConsoleExtTryBeforewxEventR != NULL){
-      return m_wxAppConsoleExtTryBeforewxEventR(this, event);
+      return m_wxAppConsoleExtTryBeforewxEventR(this, event, res);
     }
     else {
       return res;
@@ -1390,7 +1388,7 @@ public:
   {
     bool res = wxAppConsole::UsesEventLoop();
     if (*m_wxAppConsoleExtUsesEventLoop != NULL){
-      return m_wxAppConsoleExtUsesEventLoop(this);
+      return m_wxAppConsoleExtUsesEventLoop(this, res);
     }
     else {
       return res;
@@ -1401,7 +1399,7 @@ public:
   {
     void* res = wxAppConsole::WXReservedApp1(param0);
     if (*m_wxAppConsoleExtWXReservedApp1voidP != NULL){
-      return m_wxAppConsoleExtWXReservedApp1voidP(this, param0);
+      return m_wxAppConsoleExtWXReservedApp1voidP(this, param0, res);
     }
     else {
       return res;
@@ -1412,7 +1410,7 @@ public:
   {
     void* res = wxAppConsole::WXReservedApp2(param0);
     if (*m_wxAppConsoleExtWXReservedApp2voidP != NULL){
-      return m_wxAppConsoleExtWXReservedApp2voidP(this, param0);
+      return m_wxAppConsoleExtWXReservedApp2voidP(this, param0, res);
     }
     else {
       return res;
@@ -1423,7 +1421,7 @@ public:
   {
     void* res = wxAppConsole::WXReservedEvtHandler1(param0);
     if (*m_wxAppConsoleExtWXReservedEvtHandler1voidP != NULL){
-      return m_wxAppConsoleExtWXReservedEvtHandler1voidP(this, param0);
+      return m_wxAppConsoleExtWXReservedEvtHandler1voidP(this, param0, res);
     }
     else {
       return res;
@@ -1434,7 +1432,7 @@ public:
   {
     void* res = wxAppConsole::WXReservedEvtHandler2(param0);
     if (*m_wxAppConsoleExtWXReservedEvtHandler2voidP != NULL){
-      return m_wxAppConsoleExtWXReservedEvtHandler2voidP(this, param0);
+      return m_wxAppConsoleExtWXReservedEvtHandler2voidP(this, param0, res);
     }
     else {
       return res;
@@ -1535,7 +1533,7 @@ public:
   {
     bool res = wxAppBase::CallOnInit();
     if (*m_wxAppBaseExtCallOnInit != NULL){
-      return m_wxAppBaseExtCallOnInit(this);
+      return m_wxAppBaseExtCallOnInit(this, res);
     }
     else {
       return res;
@@ -1554,7 +1552,7 @@ public:
   {
     wxObjectRefData* res = wxAppBase::CloneRefData(data);
     if (*m_wxAppBaseExtCloneRefDatawxObjectRefDataCP != NULL){
-      return m_wxAppBaseExtCloneRefDatawxObjectRefDataCP(this, data);
+      return m_wxAppBaseExtCloneRefDatawxObjectRefDataCP(this, data, res);
     }
     else {
       return res;
@@ -1565,7 +1563,7 @@ public:
   {
     wxObjectRefData* res = wxAppBase::CreateRefData();
     if (*m_wxAppBaseExtCreateRefData != NULL){
-      return m_wxAppBaseExtCreateRefData(this);
+      return m_wxAppBaseExtCreateRefData(this, res);
     }
     else {
       return res;
@@ -1576,7 +1574,7 @@ public:
   {
     wxAppTraits* res = wxAppBase::CreateTraits();
     if (*m_wxAppBaseExtCreateTraits != NULL){
-      return m_wxAppBaseExtCreateTraits(this);
+      return m_wxAppBaseExtCreateTraits(this, res);
     }
     else {
       return res;
@@ -1587,7 +1585,7 @@ public:
   {
     bool res = wxAppBase::Dispatch();
     if (*m_wxAppBaseExtDispatch != NULL){
-      return m_wxAppBaseExtDispatch(this);
+      return m_wxAppBaseExtDispatch(this, res);
     }
     else {
       return res;
@@ -1598,7 +1596,7 @@ public:
   {
     void* res = wxAppBase::DoGetClientData();
     if (*m_wxAppBaseExtDoGetClientData != NULL){
-      return m_wxAppBaseExtDoGetClientData(this);
+      return m_wxAppBaseExtDoGetClientData(this, res);
     }
     else {
       return res;
@@ -1609,7 +1607,7 @@ public:
   {
     wxClientData* res = wxAppBase::DoGetClientObject();
     if (*m_wxAppBaseExtDoGetClientObject != NULL){
-      return m_wxAppBaseExtDoGetClientObject(this);
+      return m_wxAppBaseExtDoGetClientObject(this, res);
     }
     else {
       return res;
@@ -1652,7 +1650,7 @@ public:
   {
     int res = wxAppBase::FilterEvent(event);
     if (*m_wxAppBaseExtFilterEventwxEventR != NULL){
-      return m_wxAppBaseExtFilterEventwxEventR(this, event);
+      return m_wxAppBaseExtFilterEventwxEventR(this, event, res);
     }
     else {
       return res;
@@ -1663,7 +1661,7 @@ public:
   {
     wxClassInfo* res = wxAppBase::GetClassInfo();
     if (*m_wxAppBaseExtGetClassInfo != NULL){
-      return m_wxAppBaseExtGetClassInfo(this);
+      return m_wxAppBaseExtGetClassInfo(this, res);
     }
     else {
       return res;
@@ -1674,7 +1672,7 @@ public:
   {
     wxVideoMode res = wxAppBase::GetDisplayMode();
     if (*m_wxAppBaseExtGetDisplayMode != NULL){
-      return m_wxAppBaseExtGetDisplayMode(this);
+      return m_wxAppBaseExtGetDisplayMode(this, res);
     }
     else {
       return res;
@@ -1685,7 +1683,7 @@ public:
   {
     wxEventHashTable& res = wxAppBase::GetEventHashTable();
     if (*m_wxAppBaseExtGetEventHashTable != NULL){
-      return m_wxAppBaseExtGetEventHashTable(this);
+      return m_wxAppBaseExtGetEventHashTable(this, res);
     }
     else {
       return res;
@@ -1696,7 +1694,7 @@ public:
   {
     wxEventTable const* res = wxAppBase::GetEventTable();
     if (*m_wxAppBaseExtGetEventTable != NULL){
-      return m_wxAppBaseExtGetEventTable(this);
+      return m_wxAppBaseExtGetEventTable(this, res);
     }
     else {
       return res;
@@ -1707,7 +1705,7 @@ public:
   {
     wxLayoutDirection res = wxAppBase::GetLayoutDirection();
     if (*m_wxAppBaseExtGetLayoutDirection != NULL){
-      return m_wxAppBaseExtGetLayoutDirection(this);
+      return m_wxAppBaseExtGetLayoutDirection(this, res);
     }
     else {
       return res;
@@ -1718,7 +1716,7 @@ public:
   {
     wxWindow* res = wxAppBase::GetTopWindow();
     if (*m_wxAppBaseExtGetTopWindow != NULL){
-      return m_wxAppBaseExtGetTopWindow(this);
+      return m_wxAppBaseExtGetTopWindow(this, res);
     }
     else {
       return res;
@@ -1737,7 +1735,7 @@ public:
   {
     bool res = wxAppBase::Initialize(argc, argv);
     if (*m_wxAppBaseExtInitializeintRwxCharPP != NULL){
-      return m_wxAppBaseExtInitializeintRwxCharPP(this, argc, argv);
+      return m_wxAppBaseExtInitializeintRwxCharPP(this, argc, argv, res);
     }
     else {
       return res;
@@ -1748,7 +1746,7 @@ public:
   {
     bool res = wxAppBase::IsActive();
     if (*m_wxAppBaseExtIsActive != NULL){
-      return m_wxAppBaseExtIsActive(this);
+      return m_wxAppBaseExtIsActive(this, res);
     }
     else {
       return res;
@@ -1759,7 +1757,7 @@ public:
   {
     bool res = wxAppBase::IsGUI();
     if (*m_wxAppBaseExtIsGUI != NULL){
-      return m_wxAppBaseExtIsGUI(this);
+      return m_wxAppBaseExtIsGUI(this, res);
     }
     else {
       return res;
@@ -1770,7 +1768,7 @@ public:
   {
     int res = wxAppBase::MainLoop();
     if (*m_wxAppBaseExtMainLoop != NULL){
-      return m_wxAppBaseExtMainLoop(this);
+      return m_wxAppBaseExtMainLoop(this, res);
     }
     else {
       return res;
@@ -1797,7 +1795,7 @@ public:
   {
     bool res = wxAppBase::OnCmdLineError(parser);
     if (*m_wxAppBaseExtOnCmdLineErrorwxCmdLineParserR != NULL){
-      return m_wxAppBaseExtOnCmdLineErrorwxCmdLineParserR(this, parser);
+      return m_wxAppBaseExtOnCmdLineErrorwxCmdLineParserR(this, parser, res);
     }
     else {
       return res;
@@ -1808,7 +1806,7 @@ public:
   {
     bool res = wxAppBase::OnCmdLineHelp(parser);
     if (*m_wxAppBaseExtOnCmdLineHelpwxCmdLineParserR != NULL){
-      return m_wxAppBaseExtOnCmdLineHelpwxCmdLineParserR(this, parser);
+      return m_wxAppBaseExtOnCmdLineHelpwxCmdLineParserR(this, parser, res);
     }
     else {
       return res;
@@ -1819,7 +1817,7 @@ public:
   {
     bool res = wxAppBase::OnCmdLineParsed(parser);
     if (*m_wxAppBaseExtOnCmdLineParsedwxCmdLineParserR != NULL){
-      return m_wxAppBaseExtOnCmdLineParsedwxCmdLineParserR(this, parser);
+      return m_wxAppBaseExtOnCmdLineParsedwxCmdLineParserR(this, parser, res);
     }
     else {
       return res;
@@ -1830,7 +1828,7 @@ public:
   {
     bool res = wxAppBase::OnDynamicBind(param0);
     if (*m_wxAppBaseExtOnDynamicBindwxDynamicEventTableEntryR != NULL){
-      return m_wxAppBaseExtOnDynamicBindwxDynamicEventTableEntryR(this, param0);
+      return m_wxAppBaseExtOnDynamicBindwxDynamicEventTableEntryR(this, param0, res);
     }
     else {
       return res;
@@ -1857,7 +1855,7 @@ public:
   {
     bool res = wxAppBase::OnExceptionInMainLoop();
     if (*m_wxAppBaseExtOnExceptionInMainLoop != NULL){
-      return m_wxAppBaseExtOnExceptionInMainLoop(this);
+      return m_wxAppBaseExtOnExceptionInMainLoop(this, res);
     }
     else {
       return res;
@@ -1868,7 +1866,7 @@ public:
   {
     int res = wxAppBase::OnExit();
     if (*m_wxAppBaseExtOnExit != NULL){
-      return m_wxAppBaseExtOnExit(this);
+      return m_wxAppBaseExtOnExit(this, res);
     }
     else {
       return res;
@@ -1887,7 +1885,7 @@ public:
   {
     bool res = wxAppBase::OnInit();
     if (*m_wxAppBaseExtOnInit != NULL){
-      return m_wxAppBaseExtOnInit(this);
+      return m_wxAppBaseExtOnInit(this, res);
     }
     else {
       return res;
@@ -1906,7 +1904,7 @@ public:
   {
     bool res = wxAppBase::OnInitGui();
     if (*m_wxAppBaseExtOnInitGui != NULL){
-      return m_wxAppBaseExtOnInitGui(this);
+      return m_wxAppBaseExtOnInitGui(this, res);
     }
     else {
       return res;
@@ -1925,7 +1923,7 @@ public:
   {
     int res = wxAppBase::OnRun();
     if (*m_wxAppBaseExtOnRun != NULL){
-      return m_wxAppBaseExtOnRun(this);
+      return m_wxAppBaseExtOnRun(this, res);
     }
     else {
       return res;
@@ -1944,7 +1942,7 @@ public:
   {
     bool res = wxAppBase::Pending();
     if (*m_wxAppBaseExtPending != NULL){
-      return m_wxAppBaseExtPending(this);
+      return m_wxAppBaseExtPending(this, res);
     }
     else {
       return res;
@@ -1955,7 +1953,7 @@ public:
   {
     bool res = wxAppBase::ProcessEvent(event);
     if (*m_wxAppBaseExtProcessEventwxEventR != NULL){
-      return m_wxAppBaseExtProcessEventwxEventR(this, event);
+      return m_wxAppBaseExtProcessEventwxEventR(this, event, res);
     }
     else {
       return res;
@@ -1966,7 +1964,7 @@ public:
   {
     bool res = wxAppBase::ProcessIdle();
     if (*m_wxAppBaseExtProcessIdle != NULL){
-      return m_wxAppBaseExtProcessIdle(this);
+      return m_wxAppBaseExtProcessIdle(this, res);
     }
     else {
       return res;
@@ -2001,7 +1999,7 @@ public:
   {
     bool res = wxAppBase::SafeYield(win, onlyIfNeeded);
     if (*m_wxAppBaseExtSafeYieldwxWindowPbool != NULL){
-      return m_wxAppBaseExtSafeYieldwxWindowPbool(this, win, onlyIfNeeded);
+      return m_wxAppBaseExtSafeYieldwxWindowPbool(this, win, onlyIfNeeded, res);
     }
     else {
       return res;
@@ -2012,7 +2010,7 @@ public:
   {
     bool res = wxAppBase::SafeYieldFor(win, eventsToProcess);
     if (*m_wxAppBaseExtSafeYieldForwxWindowPlong != NULL){
-      return m_wxAppBaseExtSafeYieldForwxWindowPlong(this, win, eventsToProcess);
+      return m_wxAppBaseExtSafeYieldForwxWindowPlong(this, win, eventsToProcess, res);
     }
     else {
       return res;
@@ -2023,7 +2021,7 @@ public:
   {
     bool res = wxAppBase::SearchEventTable(table, event);
     if (*m_wxAppBaseExtSearchEventTablewxEventTableRwxEventR != NULL){
-      return m_wxAppBaseExtSearchEventTablewxEventTableRwxEventR(this, table, event);
+      return m_wxAppBaseExtSearchEventTablewxEventTableRwxEventR(this, table, event, res);
     }
     else {
       return res;
@@ -2050,7 +2048,7 @@ public:
   {
     bool res = wxAppBase::SetDisplayMode(param0);
     if (*m_wxAppBaseExtSetDisplayModewxVideoModeCR != NULL){
-      return m_wxAppBaseExtSetDisplayModewxVideoModeCR(this, param0);
+      return m_wxAppBaseExtSetDisplayModewxVideoModeCR(this, param0, res);
     }
     else {
       return res;
@@ -2061,7 +2059,7 @@ public:
   {
     bool res = wxAppBase::SetNativeTheme(param0);
     if (*m_wxAppBaseExtSetNativeThemewxStringCR != NULL){
-      return m_wxAppBaseExtSetNativeThemewxStringCR(this, param0);
+      return m_wxAppBaseExtSetNativeThemewxStringCR(this, param0, res);
     }
     else {
       return res;
@@ -2096,7 +2094,7 @@ public:
   {
     bool res = wxAppBase::StoreCurrentException();
     if (*m_wxAppBaseExtStoreCurrentException != NULL){
-      return m_wxAppBaseExtStoreCurrentException(this);
+      return m_wxAppBaseExtStoreCurrentException(this, res);
     }
     else {
       return res;
@@ -2107,7 +2105,7 @@ public:
   {
     bool res = wxAppBase::TryAfter(event);
     if (*m_wxAppBaseExtTryAfterwxEventR != NULL){
-      return m_wxAppBaseExtTryAfterwxEventR(this, event);
+      return m_wxAppBaseExtTryAfterwxEventR(this, event, res);
     }
     else {
       return res;
@@ -2118,7 +2116,7 @@ public:
   {
     bool res = wxAppBase::TryBefore(event);
     if (*m_wxAppBaseExtTryBeforewxEventR != NULL){
-      return m_wxAppBaseExtTryBeforewxEventR(this, event);
+      return m_wxAppBaseExtTryBeforewxEventR(this, event, res);
     }
     else {
       return res;
@@ -2129,7 +2127,7 @@ public:
   {
     bool res = wxAppBase::UsesEventLoop();
     if (*m_wxAppBaseExtUsesEventLoop != NULL){
-      return m_wxAppBaseExtUsesEventLoop(this);
+      return m_wxAppBaseExtUsesEventLoop(this, res);
     }
     else {
       return res;
@@ -2140,7 +2138,7 @@ public:
   {
     void* res = wxAppBase::WXReservedApp1(param0);
     if (*m_wxAppBaseExtWXReservedApp1voidP != NULL){
-      return m_wxAppBaseExtWXReservedApp1voidP(this, param0);
+      return m_wxAppBaseExtWXReservedApp1voidP(this, param0, res);
     }
     else {
       return res;
@@ -2151,7 +2149,7 @@ public:
   {
     void* res = wxAppBase::WXReservedApp2(param0);
     if (*m_wxAppBaseExtWXReservedApp2voidP != NULL){
-      return m_wxAppBaseExtWXReservedApp2voidP(this, param0);
+      return m_wxAppBaseExtWXReservedApp2voidP(this, param0, res);
     }
     else {
       return res;
@@ -2162,7 +2160,7 @@ public:
   {
     void* res = wxAppBase::WXReservedEvtHandler1(param0);
     if (*m_wxAppBaseExtWXReservedEvtHandler1voidP != NULL){
-      return m_wxAppBaseExtWXReservedEvtHandler1voidP(this, param0);
+      return m_wxAppBaseExtWXReservedEvtHandler1voidP(this, param0, res);
     }
     else {
       return res;
@@ -2173,7 +2171,7 @@ public:
   {
     void* res = wxAppBase::WXReservedEvtHandler2(param0);
     if (*m_wxAppBaseExtWXReservedEvtHandler2voidP != NULL){
-      return m_wxAppBaseExtWXReservedEvtHandler2voidP(this, param0);
+      return m_wxAppBaseExtWXReservedEvtHandler2voidP(this, param0, res);
     }
     else {
       return res;
@@ -2285,7 +2283,7 @@ public:
   {
     bool res = wxApp::CallOnInit();
     if (*m_wxAppExtCallOnInit != NULL){
-      return m_wxAppExtCallOnInit(this);
+      return m_wxAppExtCallOnInit(this, res);
     }
     else {
       return res;
@@ -2304,7 +2302,7 @@ public:
   {
     wxObjectRefData* res = wxApp::CloneRefData(data);
     if (*m_wxAppExtCloneRefDatawxObjectRefDataCP != NULL){
-      return m_wxAppExtCloneRefDatawxObjectRefDataCP(this, data);
+      return m_wxAppExtCloneRefDatawxObjectRefDataCP(this, data, res);
     }
     else {
       return res;
@@ -2315,7 +2313,7 @@ public:
   {
     wxObjectRefData* res = wxApp::CreateRefData();
     if (*m_wxAppExtCreateRefData != NULL){
-      return m_wxAppExtCreateRefData(this);
+      return m_wxAppExtCreateRefData(this, res);
     }
     else {
       return res;
@@ -2326,7 +2324,7 @@ public:
   {
     wxAppTraits* res = wxApp::CreateTraits();
     if (*m_wxAppExtCreateTraits != NULL){
-      return m_wxAppExtCreateTraits(this);
+      return m_wxAppExtCreateTraits(this, res);
     }
     else {
       return res;
@@ -2337,7 +2335,7 @@ public:
   {
     bool res = wxApp::Dispatch();
     if (*m_wxAppExtDispatch != NULL){
-      return m_wxAppExtDispatch(this);
+      return m_wxAppExtDispatch(this, res);
     }
     else {
       return res;
@@ -2348,7 +2346,7 @@ public:
   {
     void* res = wxApp::DoGetClientData();
     if (*m_wxAppExtDoGetClientData != NULL){
-      return m_wxAppExtDoGetClientData(this);
+      return m_wxAppExtDoGetClientData(this, res);
     }
     else {
       return res;
@@ -2359,7 +2357,7 @@ public:
   {
     wxClientData* res = wxApp::DoGetClientObject();
     if (*m_wxAppExtDoGetClientObject != NULL){
-      return m_wxAppExtDoGetClientObject(this);
+      return m_wxAppExtDoGetClientObject(this, res);
     }
     else {
       return res;
@@ -2402,7 +2400,7 @@ public:
   {
     int res = wxApp::FilterEvent(event);
     if (*m_wxAppExtFilterEventwxEventR != NULL){
-      return m_wxAppExtFilterEventwxEventR(this, event);
+      return m_wxAppExtFilterEventwxEventR(this, event, res);
     }
     else {
       return res;
@@ -2413,7 +2411,7 @@ public:
   {
     wxClassInfo* res = wxApp::GetClassInfo();
     if (*m_wxAppExtGetClassInfo != NULL){
-      return m_wxAppExtGetClassInfo(this);
+      return m_wxAppExtGetClassInfo(this, res);
     }
     else {
       return res;
@@ -2424,7 +2422,7 @@ public:
   {
     wxVideoMode res = wxApp::GetDisplayMode();
     if (*m_wxAppExtGetDisplayMode != NULL){
-      return m_wxAppExtGetDisplayMode(this);
+      return m_wxAppExtGetDisplayMode(this, res);
     }
     else {
       return res;
@@ -2435,7 +2433,7 @@ public:
   {
     wxEventHashTable& res = wxApp::GetEventHashTable();
     if (*m_wxAppExtGetEventHashTable != NULL){
-      return m_wxAppExtGetEventHashTable(this);
+      return m_wxAppExtGetEventHashTable(this, res);
     }
     else {
       return res;
@@ -2446,7 +2444,7 @@ public:
   {
     wxEventTable const* res = wxApp::GetEventTable();
     if (*m_wxAppExtGetEventTable != NULL){
-      return m_wxAppExtGetEventTable(this);
+      return m_wxAppExtGetEventTable(this, res);
     }
     else {
       return res;
@@ -2457,7 +2455,7 @@ public:
   {
     wxLayoutDirection res = wxApp::GetLayoutDirection();
     if (*m_wxAppExtGetLayoutDirection != NULL){
-      return m_wxAppExtGetLayoutDirection(this);
+      return m_wxAppExtGetLayoutDirection(this, res);
     }
     else {
       return res;
@@ -2468,7 +2466,7 @@ public:
   {
     int res = wxApp::GetPrintMode();
     if (*m_wxAppExtGetPrintMode != NULL){
-      return m_wxAppExtGetPrintMode(this);
+      return m_wxAppExtGetPrintMode(this, res);
     }
     else {
       return res;
@@ -2479,7 +2477,7 @@ public:
   {
     wxWindow* res = wxApp::GetTopWindow();
     if (*m_wxAppExtGetTopWindow != NULL){
-      return m_wxAppExtGetTopWindow(this);
+      return m_wxAppExtGetTopWindow(this, res);
     }
     else {
       return res;
@@ -2498,7 +2496,7 @@ public:
   {
     bool res = wxApp::Initialize(argc, argv);
     if (*m_wxAppExtInitializeintRwxCharPP != NULL){
-      return m_wxAppExtInitializeintRwxCharPP(this, argc, argv);
+      return m_wxAppExtInitializeintRwxCharPP(this, argc, argv, res);
     }
     else {
       return res;
@@ -2509,7 +2507,7 @@ public:
   {
     bool res = wxApp::IsActive();
     if (*m_wxAppExtIsActive != NULL){
-      return m_wxAppExtIsActive(this);
+      return m_wxAppExtIsActive(this, res);
     }
     else {
       return res;
@@ -2520,7 +2518,7 @@ public:
   {
     bool res = wxApp::IsGUI();
     if (*m_wxAppExtIsGUI != NULL){
-      return m_wxAppExtIsGUI(this);
+      return m_wxAppExtIsGUI(this, res);
     }
     else {
       return res;
@@ -2531,7 +2529,7 @@ public:
   {
     int res = wxApp::MainLoop();
     if (*m_wxAppExtMainLoop != NULL){
-      return m_wxAppExtMainLoop(this);
+      return m_wxAppExtMainLoop(this, res);
     }
     else {
       return res;
@@ -2558,7 +2556,7 @@ public:
   {
     bool res = wxApp::OnCmdLineError(parser);
     if (*m_wxAppExtOnCmdLineErrorwxCmdLineParserR != NULL){
-      return m_wxAppExtOnCmdLineErrorwxCmdLineParserR(this, parser);
+      return m_wxAppExtOnCmdLineErrorwxCmdLineParserR(this, parser, res);
     }
     else {
       return res;
@@ -2569,7 +2567,7 @@ public:
   {
     bool res = wxApp::OnCmdLineHelp(parser);
     if (*m_wxAppExtOnCmdLineHelpwxCmdLineParserR != NULL){
-      return m_wxAppExtOnCmdLineHelpwxCmdLineParserR(this, parser);
+      return m_wxAppExtOnCmdLineHelpwxCmdLineParserR(this, parser, res);
     }
     else {
       return res;
@@ -2580,7 +2578,7 @@ public:
   {
     bool res = wxApp::OnCmdLineParsed(parser);
     if (*m_wxAppExtOnCmdLineParsedwxCmdLineParserR != NULL){
-      return m_wxAppExtOnCmdLineParsedwxCmdLineParserR(this, parser);
+      return m_wxAppExtOnCmdLineParsedwxCmdLineParserR(this, parser, res);
     }
     else {
       return res;
@@ -2591,7 +2589,7 @@ public:
   {
     bool res = wxApp::OnDynamicBind(param0);
     if (*m_wxAppExtOnDynamicBindwxDynamicEventTableEntryR != NULL){
-      return m_wxAppExtOnDynamicBindwxDynamicEventTableEntryR(this, param0);
+      return m_wxAppExtOnDynamicBindwxDynamicEventTableEntryR(this, param0, res);
     }
     else {
       return res;
@@ -2618,7 +2616,7 @@ public:
   {
     bool res = wxApp::OnExceptionInMainLoop();
     if (*m_wxAppExtOnExceptionInMainLoop != NULL){
-      return m_wxAppExtOnExceptionInMainLoop(this);
+      return m_wxAppExtOnExceptionInMainLoop(this, res);
     }
     else {
       return res;
@@ -2629,7 +2627,7 @@ public:
   {
     int res = wxApp::OnExit();
     if (*m_wxAppExtOnExit != NULL){
-      return m_wxAppExtOnExit(this);
+      return m_wxAppExtOnExit(this, res);
     }
     else {
       return res;
@@ -2648,7 +2646,7 @@ public:
   {
     bool res = wxApp::OnInit();
     if (*m_wxAppExtOnInit != NULL){
-      return m_wxAppExtOnInit(this);
+      return m_wxAppExtOnInit(this, res);
     }
     else {
       return res;
@@ -2667,7 +2665,7 @@ public:
   {
     bool res = wxApp::OnInitGui();
     if (*m_wxAppExtOnInitGui != NULL){
-      return m_wxAppExtOnInitGui(this);
+      return m_wxAppExtOnInitGui(this, res);
     }
     else {
       return res;
@@ -2686,7 +2684,7 @@ public:
   {
     int res = wxApp::OnRun();
     if (*m_wxAppExtOnRun != NULL){
-      return m_wxAppExtOnRun(this);
+      return m_wxAppExtOnRun(this, res);
     }
     else {
       return res;
@@ -2705,7 +2703,7 @@ public:
   {
     bool res = wxApp::Pending();
     if (*m_wxAppExtPending != NULL){
-      return m_wxAppExtPending(this);
+      return m_wxAppExtPending(this, res);
     }
     else {
       return res;
@@ -2716,7 +2714,7 @@ public:
   {
     bool res = wxApp::ProcessEvent(event);
     if (*m_wxAppExtProcessEventwxEventR != NULL){
-      return m_wxAppExtProcessEventwxEventR(this, event);
+      return m_wxAppExtProcessEventwxEventR(this, event, res);
     }
     else {
       return res;
@@ -2727,7 +2725,7 @@ public:
   {
     bool res = wxApp::ProcessIdle();
     if (*m_wxAppExtProcessIdle != NULL){
-      return m_wxAppExtProcessIdle(this);
+      return m_wxAppExtProcessIdle(this, res);
     }
     else {
       return res;
@@ -2762,7 +2760,7 @@ public:
   {
     bool res = wxApp::SafeYield(win, onlyIfNeeded);
     if (*m_wxAppExtSafeYieldwxWindowPbool != NULL){
-      return m_wxAppExtSafeYieldwxWindowPbool(this, win, onlyIfNeeded);
+      return m_wxAppExtSafeYieldwxWindowPbool(this, win, onlyIfNeeded, res);
     }
     else {
       return res;
@@ -2773,7 +2771,7 @@ public:
   {
     bool res = wxApp::SafeYieldFor(win, eventsToProcess);
     if (*m_wxAppExtSafeYieldForwxWindowPlong != NULL){
-      return m_wxAppExtSafeYieldForwxWindowPlong(this, win, eventsToProcess);
+      return m_wxAppExtSafeYieldForwxWindowPlong(this, win, eventsToProcess, res);
     }
     else {
       return res;
@@ -2784,7 +2782,7 @@ public:
   {
     bool res = wxApp::SearchEventTable(table, event);
     if (*m_wxAppExtSearchEventTablewxEventTableRwxEventR != NULL){
-      return m_wxAppExtSearchEventTablewxEventTableRwxEventR(this, table, event);
+      return m_wxAppExtSearchEventTablewxEventTableRwxEventR(this, table, event, res);
     }
     else {
       return res;
@@ -2811,7 +2809,7 @@ public:
   {
     bool res = wxApp::SetDisplayMode(param0);
     if (*m_wxAppExtSetDisplayModewxVideoModeCR != NULL){
-      return m_wxAppExtSetDisplayModewxVideoModeCR(this, param0);
+      return m_wxAppExtSetDisplayModewxVideoModeCR(this, param0, res);
     }
     else {
       return res;
@@ -2822,7 +2820,7 @@ public:
   {
     bool res = wxApp::SetNativeTheme(param0);
     if (*m_wxAppExtSetNativeThemewxStringCR != NULL){
-      return m_wxAppExtSetNativeThemewxStringCR(this, param0);
+      return m_wxAppExtSetNativeThemewxStringCR(this, param0, res);
     }
     else {
       return res;
@@ -2857,7 +2855,7 @@ public:
   {
     bool res = wxApp::StoreCurrentException();
     if (*m_wxAppExtStoreCurrentException != NULL){
-      return m_wxAppExtStoreCurrentException(this);
+      return m_wxAppExtStoreCurrentException(this, res);
     }
     else {
       return res;
@@ -2868,7 +2866,7 @@ public:
   {
     bool res = wxApp::TryAfter(event);
     if (*m_wxAppExtTryAfterwxEventR != NULL){
-      return m_wxAppExtTryAfterwxEventR(this, event);
+      return m_wxAppExtTryAfterwxEventR(this, event, res);
     }
     else {
       return res;
@@ -2879,7 +2877,7 @@ public:
   {
     bool res = wxApp::TryBefore(event);
     if (*m_wxAppExtTryBeforewxEventR != NULL){
-      return m_wxAppExtTryBeforewxEventR(this, event);
+      return m_wxAppExtTryBeforewxEventR(this, event, res);
     }
     else {
       return res;
@@ -2890,7 +2888,7 @@ public:
   {
     bool res = wxApp::UsesEventLoop();
     if (*m_wxAppExtUsesEventLoop != NULL){
-      return m_wxAppExtUsesEventLoop(this);
+      return m_wxAppExtUsesEventLoop(this, res);
     }
     else {
       return res;
@@ -2901,7 +2899,7 @@ public:
   {
     void* res = wxApp::WXReservedApp1(param0);
     if (*m_wxAppExtWXReservedApp1voidP != NULL){
-      return m_wxAppExtWXReservedApp1voidP(this, param0);
+      return m_wxAppExtWXReservedApp1voidP(this, param0, res);
     }
     else {
       return res;
@@ -2912,7 +2910,7 @@ public:
   {
     void* res = wxApp::WXReservedApp2(param0);
     if (*m_wxAppExtWXReservedApp2voidP != NULL){
-      return m_wxAppExtWXReservedApp2voidP(this, param0);
+      return m_wxAppExtWXReservedApp2voidP(this, param0, res);
     }
     else {
       return res;
@@ -2923,7 +2921,7 @@ public:
   {
     void* res = wxApp::WXReservedEvtHandler1(param0);
     if (*m_wxAppExtWXReservedEvtHandler1voidP != NULL){
-      return m_wxAppExtWXReservedEvtHandler1voidP(this, param0);
+      return m_wxAppExtWXReservedEvtHandler1voidP(this, param0, res);
     }
     else {
       return res;
@@ -2934,7 +2932,7 @@ public:
   {
     void* res = wxApp::WXReservedEvtHandler2(param0);
     if (*m_wxAppExtWXReservedEvtHandler2voidP != NULL){
-      return m_wxAppExtWXReservedEvtHandler2voidP(this, param0);
+      return m_wxAppExtWXReservedEvtHandler2voidP(this, param0, res);
     }
     else {
       return res;
@@ -3021,12 +3019,6 @@ public:
   }
 };
 
-class wxAppInitializerExt: public wxAppInitializer
-{
-public:
-  wxAppInitializerExt(wxAppInitializerFunction fn): wxAppInitializer(fn)  {  }
-};
-
 
 
 #endif
diff --git a/wxheaders/wxext/event_ext.h b/wxheaders/wxext/event_ext.h
index 007ea0e..50ce78d 100644
--- a/wxheaders/wxext/event_ext.h
+++ b/wxheaders/wxext/event_ext.h
@@ -20,12 +20,6 @@ typedef wxObjectRefData* (*wxEventExtCloneRefDatawxObjectRefDataCPFunc)(const wx
 typedef wxObjectRefData* (*wxEventExtCreateRefDataFunc)(const wxEventExt* self, wxObjectRefData* res);
 typedef wxClassInfo* (*wxEventExtGetClassInfoFunc)(const wxEventExt* self, wxClassInfo* res);
 typedef wxEventCategory (*wxEventExtGetEventCategoryFunc)(const wxEventExt* self, wxEventCategory res);
-class wxPropagationDisablerExt;
-class wxPropagateOnceExt;
-class wxEventObjectOriginSetterExt;
-class wxEventProcessInHandlerOnlyExt;
-class wxEventBasicPayloadMixinExt;
-class wxEventAnyPayloadMixinExt;
 class wxIdleEventExt;
 typedef wxEvent* (*wxIdleEventExtCloneFunc)(const wxIdleEventExt* self);
 typedef wxObjectRefData* (*wxIdleEventExtCloneRefDatawxObjectRefDataCPFunc)(const wxIdleEventExt* self, wxObjectRefData const* data, wxObjectRefData* res);
@@ -315,16 +309,14 @@ typedef wxObjectRefData* (*wxContextMenuEventExtCloneRefDatawxObjectRefDataCPFun
 typedef wxObjectRefData* (*wxContextMenuEventExtCreateRefDataFunc)(const wxContextMenuEventExt* self, wxObjectRefData* res);
 typedef wxClassInfo* (*wxContextMenuEventExtGetClassInfoFunc)(const wxContextMenuEventExt* self, wxClassInfo* res);
 typedef wxEventCategory (*wxContextMenuEventExtGetEventCategoryFunc)(const wxContextMenuEventExt* self, wxEventCategory res);
-class wxEventTableEntryBaseExt;
-class wxEventTableEntryExt;
-class wxDynamicEventTableEntryExt;
-class wxEventTableExt;
-class wxEventTableEntryPointerArrayExt;
-class wxEventHashTableExt;
 class wxEvtHandlerExt;
 typedef void (*wxEvtHandlerExtAddPendingEventwxEventCRFunc)(const wxEvtHandlerExt* self, wxEvent const& event);
 typedef wxObjectRefData* (*wxEvtHandlerExtCloneRefDatawxObjectRefDataCPFunc)(const wxEvtHandlerExt* self, wxObjectRefData const* data, wxObjectRefData* res);
 typedef wxObjectRefData* (*wxEvtHandlerExtCreateRefDataFunc)(const wxEvtHandlerExt* self, wxObjectRefData* res);
+typedef void* (*wxEvtHandlerExtDoGetClientDataFunc)(const wxEvtHandlerExt* self, void* res);
+typedef wxClientData* (*wxEvtHandlerExtDoGetClientObjectFunc)(const wxEvtHandlerExt* self, wxClientData* res);
+typedef void (*wxEvtHandlerExtDoSetClientDatavoidPFunc)(const wxEvtHandlerExt* self, void* data);
+typedef void (*wxEvtHandlerExtDoSetClientObjectwxClientDataPFunc)(const wxEvtHandlerExt* self, wxClientData* data);
 typedef wxClassInfo* (*wxEvtHandlerExtGetClassInfoFunc)(const wxEvtHandlerExt* self, wxClassInfo* res);
 typedef wxEventHashTable& (*wxEvtHandlerExtGetEventHashTableFunc)(const wxEvtHandlerExt* self, wxEventHashTable& res);
 typedef wxEventTable const* (*wxEvtHandlerExtGetEventTableFunc)(const wxEvtHandlerExt* self, wxEventTable const* res);
@@ -336,7 +328,8 @@ typedef void (*wxEvtHandlerExtSetNextHandlerwxEvtHandlerPFunc)(const wxEvtHandle
 typedef void (*wxEvtHandlerExtSetPreviousHandlerwxEvtHandlerPFunc)(const wxEvtHandlerExt* self, wxEvtHandler* handler);
 typedef bool (*wxEvtHandlerExtTryAfterwxEventRFunc)(const wxEvtHandlerExt* self, wxEvent& event, bool res);
 typedef bool (*wxEvtHandlerExtTryBeforewxEventRFunc)(const wxEvtHandlerExt* self, wxEvent& event, bool res);
-class wxEvtHandlerArrayExt;
+typedef void* (*wxEvtHandlerExtWXReservedEvtHandler1voidPFunc)(const wxEvtHandlerExt* self, void* param0, void* res);
+typedef void* (*wxEvtHandlerExtWXReservedEvtHandler2voidPFunc)(const wxEvtHandlerExt* self, void* param0, void* res);
 class wxEventConnectionRefExt;
 typedef void (*wxEventConnectionRefExtOnObjectDestroyFunc)(const wxEventConnectionRefExt* self);
 typedef wxEventConnectionRef* (*wxEventConnectionRefExtToEventConnectionFunc)(const wxEventConnectionRefExt* self, wxEventConnectionRef* res);
@@ -532,43 +525,6 @@ public:
   }
 };
 
-class wxPropagationDisablerExt: public wxPropagationDisabler
-{
-public:
-  wxPropagationDisablerExt(wxEvent& event): wxPropagationDisabler(event)  {  }
-};
-
-class wxPropagateOnceExt: public wxPropagateOnce
-{
-public:
-  wxPropagateOnceExt(wxEvent& event, wxEvtHandler* handler = __null): wxPropagateOnce(event, handler)  {  }
-};
-
-class wxEventObjectOriginSetterExt: public wxEventObjectOriginSetter
-{
-public:
-  wxEventObjectOriginSetterExt(wxEvent& event, wxObject* source, int winid = 0): wxEventObjectOriginSetter(event, source, winid)  {  }
-};
-
-class wxEventProcessInHandlerOnlyExt: public wxEventProcessInHandlerOnly
-{
-public:
-  wxEventProcessInHandlerOnlyExt(wxEvent& event, wxEvtHandler* handler): wxEventProcessInHandlerOnly(event, handler)  {  }
-};
-
-class wxEventBasicPayloadMixinExt: public wxEventBasicPayloadMixin
-{
-public:
-  wxEventBasicPayloadMixinExt(): wxEventBasicPayloadMixin()  {  }
-  wxEventBasicPayloadMixinExt(wxEventBasicPayloadMixin const& param0): wxEventBasicPayloadMixin(param0)  {  }
-};
-
-class wxEventAnyPayloadMixinExt: public wxEventAnyPayloadMixin
-{
-public:
-  wxEventAnyPayloadMixinExt(): wxEventAnyPayloadMixin()  {  }
-};
-
 class wxIdleEventExt: public wxIdleEvent
 {
 public:
@@ -3860,25 +3816,6 @@ public:
   }
 };
 
-class wxEventTableEntryBaseExt: public wxEventTableEntryBase
-{
-public:
-  wxEventTableEntryBaseExt(int winid, int idLast, wxEventFunctor* fn, wxObject* data): wxEventTableEntryBase(winid, idLast, fn, data)  {  }
-  wxEventTableEntryBaseExt(wxEventTableEntryBase const& entry): wxEventTableEntryBase(entry)  {  }
-};
-
-class wxEventTableEntryExt: public wxEventTableEntry
-{
-public:
-  wxEventTableEntryExt(int const& evType, int winid, int idLast, wxEventFunctor* fn, wxObject* data): wxEventTableEntry(evType, winid, idLast, fn, data)  {  }
-};
-
-class wxDynamicEventTableEntryExt: public wxDynamicEventTableEntry
-{
-public:
-  wxDynamicEventTableEntryExt(int evType, int winid, int idLast, wxEventFunctor* fn, wxObject* data): wxDynamicEventTableEntry(evType, winid, idLast, fn, data)  {  }
-};
-
 class wxEvtHandlerExt: public wxEvtHandler
 {
 public:
@@ -3914,6 +3851,44 @@ public:
       return res;
     }
   }
+  wxEvtHandlerExtDoGetClientDataFunc m_wxEvtHandlerExtDoGetClientData = NULL;
+  virtual void* DoGetClientData() const override
+  {
+    void* res = wxEvtHandler::DoGetClientData();
+    if (*m_wxEvtHandlerExtDoGetClientData != NULL){
+      return m_wxEvtHandlerExtDoGetClientData(this, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxEvtHandlerExtDoGetClientObjectFunc m_wxEvtHandlerExtDoGetClientObject = NULL;
+  virtual wxClientData* DoGetClientObject() const override
+  {
+    wxClientData* res = wxEvtHandler::DoGetClientObject();
+    if (*m_wxEvtHandlerExtDoGetClientObject != NULL){
+      return m_wxEvtHandlerExtDoGetClientObject(this, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxEvtHandlerExtDoSetClientDatavoidPFunc m_wxEvtHandlerExtDoSetClientDatavoidP = NULL;
+  virtual void DoSetClientData(void* data) override
+  {
+    wxEvtHandler::DoSetClientData(data);
+    if (*m_wxEvtHandlerExtDoSetClientDatavoidP != NULL){
+      return m_wxEvtHandlerExtDoSetClientDatavoidP(this, data);
+    }
+  }
+  wxEvtHandlerExtDoSetClientObjectwxClientDataPFunc m_wxEvtHandlerExtDoSetClientObjectwxClientDataP = NULL;
+  virtual void DoSetClientObject(wxClientData* data) override
+  {
+    wxEvtHandler::DoSetClientObject(data);
+    if (*m_wxEvtHandlerExtDoSetClientObjectwxClientDataP != NULL){
+      return m_wxEvtHandlerExtDoSetClientObjectwxClientDataP(this, data);
+    }
+  }
   wxEvtHandlerExtGetClassInfoFunc m_wxEvtHandlerExtGetClassInfo = NULL;
   virtual wxClassInfo* GetClassInfo() const override
   {
@@ -4026,10 +4001,36 @@ public:
       return res;
     }
   }
-  wxEvtHandlerExt(wxEvtHandlerExtAddPendingEventwxEventCRFunc a_AddPendingEventwxEventCR, wxEvtHandlerExtCloneRefDatawxObjectRefDataCPFunc a_CloneRefDatawxObjectRefDataCP, wxEvtHandlerExtCreateRefDataFunc a_CreateRefData, wxEvtHandlerExtGetClassInfoFunc a_GetClassInfo, wxEvtHandlerExtGetEventHashTableFunc a_GetEventHashTable, wxEvtHandlerExtGetEventTableFunc a_GetEventTable, wxEvtHandlerExtOnDynamicBindwxDynamicEventTableEntryRFunc a_OnDynamicBindwxDynamicEventTableEntryR, wxEvtHandlerExtProcessEventwxEventRFunc a_ProcessEventwxEventR, wxEvtHandlerExtQueueEventwxEventPFunc a_QueueEventwxEventP, wxEvtHandlerExtSearchEventTablewxEventTableRwxEventRFunc a_SearchEventTablewxEventTableRwxEventR, wxEvtHandlerExtSetNextHandlerwxEvtHandlerPFunc a_SetNextHandlerwxEvtHandlerP, wxEvtHandlerExtSetPreviousHandlerwxEvtHandlerPFunc a_SetPreviousHandlerwxEvtHandlerP, wxEvtHandlerExtTryAfterwxEventRFunc a_TryAfterwxEventR, wxEvtHandlerExtTryBeforewxEventRFunc a_TryBeforewxEventR): wxEvtHandler() {
+  wxEvtHandlerExtWXReservedEvtHandler1voidPFunc m_wxEvtHandlerExtWXReservedEvtHandler1voidP = NULL;
+  virtual void* WXReservedEvtHandler1(void* param0) override
+  {
+    void* res = wxEvtHandler::WXReservedEvtHandler1(param0);
+    if (*m_wxEvtHandlerExtWXReservedEvtHandler1voidP != NULL){
+      return m_wxEvtHandlerExtWXReservedEvtHandler1voidP(this, param0, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxEvtHandlerExtWXReservedEvtHandler2voidPFunc m_wxEvtHandlerExtWXReservedEvtHandler2voidP = NULL;
+  virtual void* WXReservedEvtHandler2(void* param0) override
+  {
+    void* res = wxEvtHandler::WXReservedEvtHandler2(param0);
+    if (*m_wxEvtHandlerExtWXReservedEvtHandler2voidP != NULL){
+      return m_wxEvtHandlerExtWXReservedEvtHandler2voidP(this, param0, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxEvtHandlerExt(wxEvtHandlerExtAddPendingEventwxEventCRFunc a_AddPendingEventwxEventCR, wxEvtHandlerExtCloneRefDatawxObjectRefDataCPFunc a_CloneRefDatawxObjectRefDataCP, wxEvtHandlerExtCreateRefDataFunc a_CreateRefData, wxEvtHandlerExtDoGetClientDataFunc a_DoGetClientData, wxEvtHandlerExtDoGetClientObjectFunc a_DoGetClientObject, wxEvtHandlerExtDoSetClientDatavoidPFunc a_DoSetClientDatavoidP, wxEvtHandlerExtDoSetClientObjectwxClientDataPFunc a_DoSetClientObjectwxClientDataP, wxEvtHandlerExtGetClassInfoFunc a_GetClassInfo, wxEvtHandlerExtGetEventHashTableFunc a_GetEventHashTable, wxEvtHandlerExtGetEventTableFunc a_GetEventTable, wxEvtHandlerExtOnDynamicBindwxDynamicEventTableEntryRFunc a_OnDynamicBindwxDynamicEventTableEntryR, wxEvtHandlerExtProcessEventwxEventRFunc a_ProcessEventwxEventR, wxEvtHandlerExtQueueEventwxEventPFunc a_QueueEventwxEventP, wxEvtHandlerExtSearchEventTablewxEventTableRwxEventRFunc a_SearchEventTablewxEventTableRwxEventR, wxEvtHandlerExtSetNextHandlerwxEvtHandlerPFunc a_SetNextHandlerwxEvtHandlerP, wxEvtHandlerExtSetPreviousHandlerwxEvtHandlerPFunc a_SetPreviousHandlerwxEvtHandlerP, wxEvtHandlerExtTryAfterwxEventRFunc a_TryAfterwxEventR, wxEvtHandlerExtTryBeforewxEventRFunc a_TryBeforewxEventR, wxEvtHandlerExtWXReservedEvtHandler1voidPFunc a_WXReservedEvtHandler1voidP, wxEvtHandlerExtWXReservedEvtHandler2voidPFunc a_WXReservedEvtHandler2voidP): wxEvtHandler() {
     m_wxEvtHandlerExtAddPendingEventwxEventCR = a_AddPendingEventwxEventCR;
     m_wxEvtHandlerExtCloneRefDatawxObjectRefDataCP = a_CloneRefDatawxObjectRefDataCP;
     m_wxEvtHandlerExtCreateRefData = a_CreateRefData;
+    m_wxEvtHandlerExtDoGetClientData = a_DoGetClientData;
+    m_wxEvtHandlerExtDoGetClientObject = a_DoGetClientObject;
+    m_wxEvtHandlerExtDoSetClientDatavoidP = a_DoSetClientDatavoidP;
+    m_wxEvtHandlerExtDoSetClientObjectwxClientDataP = a_DoSetClientObjectwxClientDataP;
     m_wxEvtHandlerExtGetClassInfo = a_GetClassInfo;
     m_wxEvtHandlerExtGetEventHashTable = a_GetEventHashTable;
     m_wxEvtHandlerExtGetEventTable = a_GetEventTable;
@@ -4041,10 +4042,11 @@ public:
     m_wxEvtHandlerExtSetPreviousHandlerwxEvtHandlerP = a_SetPreviousHandlerwxEvtHandlerP;
     m_wxEvtHandlerExtTryAfterwxEventR = a_TryAfterwxEventR;
     m_wxEvtHandlerExtTryBeforewxEventR = a_TryBeforewxEventR;
+    m_wxEvtHandlerExtWXReservedEvtHandler1voidP = a_WXReservedEvtHandler1voidP;
+    m_wxEvtHandlerExtWXReservedEvtHandler2voidP = a_WXReservedEvtHandler2voidP;
   }
 };
 
-
 class wxEventConnectionRefExt: public wxEventConnectionRef
 {
 public:
diff --git a/wxheaders/wxext/toplevel_ext.h b/wxheaders/wxext/toplevel_ext.h
index c14b976..ec0c6d9 100644
--- a/wxheaders/wxext/toplevel_ext.h
+++ b/wxheaders/wxext/toplevel_ext.h
@@ -5,140 +5,207 @@
 #include <wx/vidmode.h>
 
 class wxTopLevelWindowBaseExt;
-typedef bool (*wxTopLevelWindowBaseExtEnableCloseButtonboolFunc)(const wxTopLevelWindowBaseExt* self, bool param0);
-typedef bool (*wxTopLevelWindowBaseExtEnableFullScreenViewboollongFunc)(const wxTopLevelWindowBaseExt* self, bool param0, long param1);
-typedef bool (*wxTopLevelWindowBaseExtEnableMaximizeButtonboolFunc)(const wxTopLevelWindowBaseExt* self, bool param0);
-typedef bool (*wxTopLevelWindowBaseExtEnableMinimizeButtonboolFunc)(const wxTopLevelWindowBaseExt* self, bool param0);
-typedef wxContentProtection (*wxTopLevelWindowBaseExtGetContentProtectionFunc)(const wxTopLevelWindowBaseExt* self);
+typedef bool (*wxTopLevelWindowBaseExtDestroyFunc)(const wxTopLevelWindowBaseExt* self, bool res);
+typedef void (*wxTopLevelWindowBaseExtDoCentreintFunc)(const wxTopLevelWindowBaseExt* self, int dir);
+typedef void (*wxTopLevelWindowBaseExtDoClientToScreenintPintPFunc)(const wxTopLevelWindowBaseExt* self, int* x, int* y);
+typedef void (*wxTopLevelWindowBaseExtDoGetScreenPositionintPintPFunc)(const wxTopLevelWindowBaseExt* self, int* x, int* y);
+typedef void (*wxTopLevelWindowBaseExtDoScreenToClientintPintPFunc)(const wxTopLevelWindowBaseExt* self, int* x, int* y);
+typedef void (*wxTopLevelWindowBaseExtDoUpdateWindowUIwxUpdateUIEventRFunc)(const wxTopLevelWindowBaseExt* self, wxUpdateUIEvent& event);
+typedef bool (*wxTopLevelWindowBaseExtEnableCloseButtonboolFunc)(const wxTopLevelWindowBaseExt* self, bool param0, bool res);
+typedef bool (*wxTopLevelWindowBaseExtEnableFullScreenViewboollongFunc)(const wxTopLevelWindowBaseExt* self, bool param0, long param1, bool res);
+typedef bool (*wxTopLevelWindowBaseExtEnableMaximizeButtonboolFunc)(const wxTopLevelWindowBaseExt* self, bool param0, bool res);
+typedef bool (*wxTopLevelWindowBaseExtEnableMinimizeButtonboolFunc)(const wxTopLevelWindowBaseExt* self, bool param0, bool res);
+typedef wxContentProtection (*wxTopLevelWindowBaseExtGetContentProtectionFunc)(const wxTopLevelWindowBaseExt* self, wxContentProtection res);
+typedef wxEventHashTable& (*wxTopLevelWindowBaseExtGetEventHashTableFunc)(const wxTopLevelWindowBaseExt* self, wxEventHashTable& res);
+typedef wxEventTable const* (*wxTopLevelWindowBaseExtGetEventTableFunc)(const wxTopLevelWindowBaseExt* self, wxEventTable const* res);
+typedef void (*wxTopLevelWindowBaseExtGetRectForTopLevelChildrenintPintPintPintPFunc)(const wxTopLevelWindowBaseExt* self, int* x, int* y, int* w, int* h);
 typedef wxString (*wxTopLevelWindowBaseExtGetTitleFunc)(const wxTopLevelWindowBaseExt* self);
 typedef void (*wxTopLevelWindowBaseExtIconizeboolFunc)(const wxTopLevelWindowBaseExt* self, bool iconize);
-typedef bool (*wxTopLevelWindowBaseExtIsActiveFunc)(const wxTopLevelWindowBaseExt* self);
-typedef bool (*wxTopLevelWindowBaseExtIsAlwaysMaximizedFunc)(const wxTopLevelWindowBaseExt* self);
+typedef bool (*wxTopLevelWindowBaseExtIsActiveFunc)(const wxTopLevelWindowBaseExt* self, bool res);
+typedef bool (*wxTopLevelWindowBaseExtIsAlwaysMaximizedFunc)(const wxTopLevelWindowBaseExt* self, bool res);
 typedef bool (*wxTopLevelWindowBaseExtIsFullScreenFunc)(const wxTopLevelWindowBaseExt* self);
 typedef bool (*wxTopLevelWindowBaseExtIsIconizedFunc)(const wxTopLevelWindowBaseExt* self);
 typedef bool (*wxTopLevelWindowBaseExtIsMaximizedFunc)(const wxTopLevelWindowBaseExt* self);
+typedef bool (*wxTopLevelWindowBaseExtIsOneOfBarswxWindowCPFunc)(const wxTopLevelWindowBaseExt* self, wxWindow const* param0, bool res);
+typedef bool (*wxTopLevelWindowBaseExtIsTopLevelFunc)(const wxTopLevelWindowBaseExt* self, bool res);
+typedef bool (*wxTopLevelWindowBaseExtIsTopNavigationDomainwxWindowBaseNNavigationKindFunc)(const wxTopLevelWindowBaseExt* self, wxWindowBase::NavigationKind kind, bool res);
+typedef bool (*wxTopLevelWindowBaseExtIsVisibleFunc)(const wxTopLevelWindowBaseExt* self, bool res);
+typedef bool (*wxTopLevelWindowBaseExtLayoutFunc)(const wxTopLevelWindowBaseExt* self, bool res);
 typedef void (*wxTopLevelWindowBaseExtMaximizeboolFunc)(const wxTopLevelWindowBaseExt* self, bool maximize);
+typedef bool (*wxTopLevelWindowBaseExtOSXIsModifiedFunc)(const wxTopLevelWindowBaseExt* self, bool res);
+typedef void (*wxTopLevelWindowBaseExtOSXSetModifiedboolFunc)(const wxTopLevelWindowBaseExt* self, bool modified);
 typedef void (*wxTopLevelWindowBaseExtRequestUserAttentionintFunc)(const wxTopLevelWindowBaseExt* self, int flags);
 typedef void (*wxTopLevelWindowBaseExtRestoreFunc)(const wxTopLevelWindowBaseExt* self);
-typedef bool (*wxTopLevelWindowBaseExtRestoreFieldwxStringCRintPFunc)(const wxTopLevelWindowBaseExt* self, wxString const& name, int* value);
-typedef bool (*wxTopLevelWindowBaseExtSaveFieldwxStringCRintFunc)(const wxTopLevelWindowBaseExt* self, wxString const& name, int value);
-typedef bool (*wxTopLevelWindowBaseExtSetContentProtectionwxContentProtectionFunc)(const wxTopLevelWindowBaseExt* self, wxContentProtection param0);
+typedef bool (*wxTopLevelWindowBaseExtSetContentProtectionwxContentProtectionFunc)(const wxTopLevelWindowBaseExt* self, wxContentProtection param0, bool res);
 typedef void (*wxTopLevelWindowBaseExtSetIconswxIconBundleCRFunc)(const wxTopLevelWindowBaseExt* self, wxIconBundle const& icons);
+typedef void (*wxTopLevelWindowBaseExtSetMaxSizewxSizeCRFunc)(const wxTopLevelWindowBaseExt* self, wxSize const& maxSize);
+typedef void (*wxTopLevelWindowBaseExtSetMinSizewxSizeCRFunc)(const wxTopLevelWindowBaseExt* self, wxSize const& minSize);
+typedef void (*wxTopLevelWindowBaseExtSetRepresentedFilenamewxStringCRFunc)(const wxTopLevelWindowBaseExt* self, wxString const& param0);
 typedef void (*wxTopLevelWindowBaseExtSetTitlewxStringCRFunc)(const wxTopLevelWindowBaseExt* self, wxString const& title);
-typedef bool (*wxTopLevelWindowBaseExtShouldPreventAppExitFunc)(const wxTopLevelWindowBaseExt* self);
+typedef bool (*wxTopLevelWindowBaseExtShouldPreventAppExitFunc)(const wxTopLevelWindowBaseExt* self, bool res);
 typedef bool (*wxTopLevelWindowBaseExtShowFullScreenboollongFunc)(const wxTopLevelWindowBaseExt* self, bool show, long style);
 typedef void (*wxTopLevelWindowBaseExtShowWithoutActivatingFunc)(const wxTopLevelWindowBaseExt* self);
+typedef void* (*wxTopLevelWindowBaseExtWXReservedTLW1voidPFunc)(const wxTopLevelWindowBaseExt* self, void* param0, void* res);
+typedef void* (*wxTopLevelWindowBaseExtWXReservedTLW2voidPFunc)(const wxTopLevelWindowBaseExt* self, void* param0, void* res);
+typedef void* (*wxTopLevelWindowBaseExtWXReservedTLW3voidPFunc)(const wxTopLevelWindowBaseExt* self, void* param0, void* res);
 class wxTopLevelWindowNativeExt;
-typedef bool (*wxTopLevelWindowNativeExtDestroyFunc)(const wxTopLevelWindowNativeExt* self);
+typedef bool (*wxTopLevelWindowNativeExtDestroyFunc)(const wxTopLevelWindowNativeExt* self, bool res);
 typedef void (*wxTopLevelWindowNativeExtDoCentreintFunc)(const wxTopLevelWindowNativeExt* self, int dir);
 typedef void (*wxTopLevelWindowNativeExtDoClientToScreenintPintPFunc)(const wxTopLevelWindowNativeExt* self, int* x, int* y);
 typedef void (*wxTopLevelWindowNativeExtDoGetScreenPositionintPintPFunc)(const wxTopLevelWindowNativeExt* self, int* x, int* y);
 typedef void (*wxTopLevelWindowNativeExtDoScreenToClientintPintPFunc)(const wxTopLevelWindowNativeExt* self, int* x, int* y);
 typedef void (*wxTopLevelWindowNativeExtDoUpdateWindowUIwxUpdateUIEventRFunc)(const wxTopLevelWindowNativeExt* self, wxUpdateUIEvent& event);
-typedef bool (*wxTopLevelWindowNativeExtEnableCloseButtonboolFunc)(const wxTopLevelWindowNativeExt* self, bool param0);
-typedef bool (*wxTopLevelWindowNativeExtEnableFullScreenViewboollongFunc)(const wxTopLevelWindowNativeExt* self, bool param0, long param1);
-typedef bool (*wxTopLevelWindowNativeExtEnableMaximizeButtonboolFunc)(const wxTopLevelWindowNativeExt* self, bool param0);
-typedef bool (*wxTopLevelWindowNativeExtEnableMinimizeButtonboolFunc)(const wxTopLevelWindowNativeExt* self, bool param0);
-typedef wxPoint (*wxTopLevelWindowNativeExtGetClientAreaOriginFunc)(const wxTopLevelWindowNativeExt* self);
-typedef wxContentProtection (*wxTopLevelWindowNativeExtGetContentProtectionFunc)(const wxTopLevelWindowNativeExt* self);
-typedef wxEventHashTable& (*wxTopLevelWindowNativeExtGetEventHashTableFunc)(const wxTopLevelWindowNativeExt* self);
-typedef wxEventTable const* (*wxTopLevelWindowNativeExtGetEventTableFunc)(const wxTopLevelWindowNativeExt* self);
-typedef wxString (*wxTopLevelWindowNativeExtGetLabelFunc)(const wxTopLevelWindowNativeExt* self);
+typedef bool (*wxTopLevelWindowNativeExtEnableCloseButtonboolFunc)(const wxTopLevelWindowNativeExt* self, bool param0, bool res);
+typedef bool (*wxTopLevelWindowNativeExtEnableFullScreenViewboollongFunc)(const wxTopLevelWindowNativeExt* self, bool param0, long param1, bool res);
+typedef bool (*wxTopLevelWindowNativeExtEnableMaximizeButtonboolFunc)(const wxTopLevelWindowNativeExt* self, bool param0, bool res);
+typedef bool (*wxTopLevelWindowNativeExtEnableMinimizeButtonboolFunc)(const wxTopLevelWindowNativeExt* self, bool param0, bool res);
+typedef wxPoint (*wxTopLevelWindowNativeExtGetClientAreaOriginFunc)(const wxTopLevelWindowNativeExt* self, wxPoint res);
+typedef wxContentProtection (*wxTopLevelWindowNativeExtGetContentProtectionFunc)(const wxTopLevelWindowNativeExt* self, wxContentProtection res);
+typedef wxEventHashTable& (*wxTopLevelWindowNativeExtGetEventHashTableFunc)(const wxTopLevelWindowNativeExt* self, wxEventHashTable& res);
+typedef wxEventTable const* (*wxTopLevelWindowNativeExtGetEventTableFunc)(const wxTopLevelWindowNativeExt* self, wxEventTable const* res);
+typedef wxString (*wxTopLevelWindowNativeExtGetLabelFunc)(const wxTopLevelWindowNativeExt* self, wxString res);
 typedef void (*wxTopLevelWindowNativeExtGetRectForTopLevelChildrenintPintPintPintPFunc)(const wxTopLevelWindowNativeExt* self, int* x, int* y, int* w, int* h);
 typedef wxString (*wxTopLevelWindowNativeExtGetTitleFunc)(const wxTopLevelWindowNativeExt* self);
 typedef void (*wxTopLevelWindowNativeExtIconizeboolFunc)(const wxTopLevelWindowNativeExt* self, bool iconize);
-typedef bool (*wxTopLevelWindowNativeExtIsActiveFunc)(const wxTopLevelWindowNativeExt* self);
-typedef bool (*wxTopLevelWindowNativeExtIsAlwaysMaximizedFunc)(const wxTopLevelWindowNativeExt* self);
+typedef bool (*wxTopLevelWindowNativeExtIsActiveFunc)(const wxTopLevelWindowNativeExt* self, bool res);
+typedef bool (*wxTopLevelWindowNativeExtIsAlwaysMaximizedFunc)(const wxTopLevelWindowNativeExt* self, bool res);
 typedef bool (*wxTopLevelWindowNativeExtIsFullScreenFunc)(const wxTopLevelWindowNativeExt* self);
 typedef bool (*wxTopLevelWindowNativeExtIsIconizedFunc)(const wxTopLevelWindowNativeExt* self);
 typedef bool (*wxTopLevelWindowNativeExtIsMaximizedFunc)(const wxTopLevelWindowNativeExt* self);
-typedef bool (*wxTopLevelWindowNativeExtIsOneOfBarswxWindowCPFunc)(const wxTopLevelWindowNativeExt* self, wxWindow const* param0);
-typedef bool (*wxTopLevelWindowNativeExtIsTopLevelFunc)(const wxTopLevelWindowNativeExt* self);
-typedef bool (*wxTopLevelWindowNativeExtIsTopNavigationDomainwxWindowBaseNNavigationKindFunc)(const wxTopLevelWindowNativeExt* self, wxWindowBase::NavigationKind kind);
-typedef bool (*wxTopLevelWindowNativeExtIsVisibleFunc)(const wxTopLevelWindowNativeExt* self);
-typedef bool (*wxTopLevelWindowNativeExtLayoutFunc)(const wxTopLevelWindowNativeExt* self);
+typedef bool (*wxTopLevelWindowNativeExtIsOneOfBarswxWindowCPFunc)(const wxTopLevelWindowNativeExt* self, wxWindow const* param0, bool res);
+typedef bool (*wxTopLevelWindowNativeExtIsTopLevelFunc)(const wxTopLevelWindowNativeExt* self, bool res);
+typedef bool (*wxTopLevelWindowNativeExtIsTopNavigationDomainwxWindowBaseNNavigationKindFunc)(const wxTopLevelWindowNativeExt* self, wxWindowBase::NavigationKind kind, bool res);
+typedef bool (*wxTopLevelWindowNativeExtIsVisibleFunc)(const wxTopLevelWindowNativeExt* self, bool res);
+typedef bool (*wxTopLevelWindowNativeExtLayoutFunc)(const wxTopLevelWindowNativeExt* self, bool res);
 typedef void (*wxTopLevelWindowNativeExtMaximizeboolFunc)(const wxTopLevelWindowNativeExt* self, bool maximize);
-typedef bool (*wxTopLevelWindowNativeExtOSXIsModifiedFunc)(const wxTopLevelWindowNativeExt* self);
+typedef bool (*wxTopLevelWindowNativeExtOSXIsModifiedFunc)(const wxTopLevelWindowNativeExt* self, bool res);
 typedef void (*wxTopLevelWindowNativeExtOSXSetModifiedboolFunc)(const wxTopLevelWindowNativeExt* self, bool modified);
 typedef void (*wxTopLevelWindowNativeExtRequestUserAttentionintFunc)(const wxTopLevelWindowNativeExt* self, int flags);
 typedef void (*wxTopLevelWindowNativeExtRestoreFunc)(const wxTopLevelWindowNativeExt* self);
-typedef bool (*wxTopLevelWindowNativeExtRestoreFieldwxStringCRintPFunc)(const wxTopLevelWindowNativeExt* self, wxString const& name, int* value);
-typedef bool (*wxTopLevelWindowNativeExtSaveFieldwxStringCRintFunc)(const wxTopLevelWindowNativeExt* self, wxString const& name, int value);
-typedef bool (*wxTopLevelWindowNativeExtSetContentProtectionwxContentProtectionFunc)(const wxTopLevelWindowNativeExt* self, wxContentProtection param0);
+typedef bool (*wxTopLevelWindowNativeExtSetContentProtectionwxContentProtectionFunc)(const wxTopLevelWindowNativeExt* self, wxContentProtection param0, bool res);
 typedef void (*wxTopLevelWindowNativeExtSetIconswxIconBundleCRFunc)(const wxTopLevelWindowNativeExt* self, wxIconBundle const& icons);
 typedef void (*wxTopLevelWindowNativeExtSetLabelwxStringCRFunc)(const wxTopLevelWindowNativeExt* self, wxString const& label);
 typedef void (*wxTopLevelWindowNativeExtSetMaxSizewxSizeCRFunc)(const wxTopLevelWindowNativeExt* self, wxSize const& maxSize);
 typedef void (*wxTopLevelWindowNativeExtSetMinSizewxSizeCRFunc)(const wxTopLevelWindowNativeExt* self, wxSize const& minSize);
 typedef void (*wxTopLevelWindowNativeExtSetRepresentedFilenamewxStringCRFunc)(const wxTopLevelWindowNativeExt* self, wxString const& param0);
 typedef void (*wxTopLevelWindowNativeExtSetTitlewxStringCRFunc)(const wxTopLevelWindowNativeExt* self, wxString const& title);
-typedef bool (*wxTopLevelWindowNativeExtShouldPreventAppExitFunc)(const wxTopLevelWindowNativeExt* self);
+typedef bool (*wxTopLevelWindowNativeExtShouldPreventAppExitFunc)(const wxTopLevelWindowNativeExt* self, bool res);
 typedef bool (*wxTopLevelWindowNativeExtShowFullScreenboollongFunc)(const wxTopLevelWindowNativeExt* self, bool show, long style);
 typedef void (*wxTopLevelWindowNativeExtShowWithoutActivatingFunc)(const wxTopLevelWindowNativeExt* self);
-typedef void* (*wxTopLevelWindowNativeExtWXReservedTLW1voidPFunc)(const wxTopLevelWindowNativeExt* self, void* param0);
-typedef void* (*wxTopLevelWindowNativeExtWXReservedTLW2voidPFunc)(const wxTopLevelWindowNativeExt* self, void* param0);
-typedef void* (*wxTopLevelWindowNativeExtWXReservedTLW3voidPFunc)(const wxTopLevelWindowNativeExt* self, void* param0);
+typedef void* (*wxTopLevelWindowNativeExtWXReservedTLW1voidPFunc)(const wxTopLevelWindowNativeExt* self, void* param0, void* res);
+typedef void* (*wxTopLevelWindowNativeExtWXReservedTLW2voidPFunc)(const wxTopLevelWindowNativeExt* self, void* param0, void* res);
+typedef void* (*wxTopLevelWindowNativeExtWXReservedTLW3voidPFunc)(const wxTopLevelWindowNativeExt* self, void* param0, void* res);
 class wxTopLevelWindowExt;
-typedef bool (*wxTopLevelWindowExtDestroyFunc)(const wxTopLevelWindowExt* self);
+typedef bool (*wxTopLevelWindowExtDestroyFunc)(const wxTopLevelWindowExt* self, bool res);
 typedef void (*wxTopLevelWindowExtDoCentreintFunc)(const wxTopLevelWindowExt* self, int dir);
 typedef void (*wxTopLevelWindowExtDoClientToScreenintPintPFunc)(const wxTopLevelWindowExt* self, int* x, int* y);
 typedef void (*wxTopLevelWindowExtDoGetScreenPositionintPintPFunc)(const wxTopLevelWindowExt* self, int* x, int* y);
 typedef void (*wxTopLevelWindowExtDoScreenToClientintPintPFunc)(const wxTopLevelWindowExt* self, int* x, int* y);
 typedef void (*wxTopLevelWindowExtDoUpdateWindowUIwxUpdateUIEventRFunc)(const wxTopLevelWindowExt* self, wxUpdateUIEvent& event);
-typedef bool (*wxTopLevelWindowExtEnableCloseButtonboolFunc)(const wxTopLevelWindowExt* self, bool enable);
-typedef bool (*wxTopLevelWindowExtEnableFullScreenViewboollongFunc)(const wxTopLevelWindowExt* self, bool enable, long style);
-typedef bool (*wxTopLevelWindowExtEnableMaximizeButtonboolFunc)(const wxTopLevelWindowExt* self, bool enable);
-typedef bool (*wxTopLevelWindowExtEnableMinimizeButtonboolFunc)(const wxTopLevelWindowExt* self, bool enable);
-typedef wxClassInfo* (*wxTopLevelWindowExtGetClassInfoFunc)(const wxTopLevelWindowExt* self);
-typedef wxPoint (*wxTopLevelWindowExtGetClientAreaOriginFunc)(const wxTopLevelWindowExt* self);
-typedef wxContentProtection (*wxTopLevelWindowExtGetContentProtectionFunc)(const wxTopLevelWindowExt* self);
-typedef wxEventHashTable& (*wxTopLevelWindowExtGetEventHashTableFunc)(const wxTopLevelWindowExt* self);
-typedef wxEventTable const* (*wxTopLevelWindowExtGetEventTableFunc)(const wxTopLevelWindowExt* self);
-typedef wxString (*wxTopLevelWindowExtGetLabelFunc)(const wxTopLevelWindowExt* self);
+typedef bool (*wxTopLevelWindowExtEnableCloseButtonboolFunc)(const wxTopLevelWindowExt* self, bool enable, bool res);
+typedef bool (*wxTopLevelWindowExtEnableFullScreenViewboollongFunc)(const wxTopLevelWindowExt* self, bool enable, long style, bool res);
+typedef bool (*wxTopLevelWindowExtEnableMaximizeButtonboolFunc)(const wxTopLevelWindowExt* self, bool enable, bool res);
+typedef bool (*wxTopLevelWindowExtEnableMinimizeButtonboolFunc)(const wxTopLevelWindowExt* self, bool enable, bool res);
+typedef wxClassInfo* (*wxTopLevelWindowExtGetClassInfoFunc)(const wxTopLevelWindowExt* self, wxClassInfo* res);
+typedef wxPoint (*wxTopLevelWindowExtGetClientAreaOriginFunc)(const wxTopLevelWindowExt* self, wxPoint res);
+typedef wxContentProtection (*wxTopLevelWindowExtGetContentProtectionFunc)(const wxTopLevelWindowExt* self, wxContentProtection res);
+typedef wxEventHashTable& (*wxTopLevelWindowExtGetEventHashTableFunc)(const wxTopLevelWindowExt* self, wxEventHashTable& res);
+typedef wxEventTable const* (*wxTopLevelWindowExtGetEventTableFunc)(const wxTopLevelWindowExt* self, wxEventTable const* res);
+typedef wxString (*wxTopLevelWindowExtGetLabelFunc)(const wxTopLevelWindowExt* self, wxString res);
 typedef void (*wxTopLevelWindowExtGetRectForTopLevelChildrenintPintPintPintPFunc)(const wxTopLevelWindowExt* self, int* x, int* y, int* w, int* h);
-typedef wxString (*wxTopLevelWindowExtGetTitleFunc)(const wxTopLevelWindowExt* self);
+typedef wxString (*wxTopLevelWindowExtGetTitleFunc)(const wxTopLevelWindowExt* self, wxString res);
 typedef void (*wxTopLevelWindowExtIconizeboolFunc)(const wxTopLevelWindowExt* self, bool iconize);
-typedef bool (*wxTopLevelWindowExtIsActiveFunc)(const wxTopLevelWindowExt* self);
-typedef bool (*wxTopLevelWindowExtIsAlwaysMaximizedFunc)(const wxTopLevelWindowExt* self);
-typedef bool (*wxTopLevelWindowExtIsFullScreenFunc)(const wxTopLevelWindowExt* self);
-typedef bool (*wxTopLevelWindowExtIsIconizedFunc)(const wxTopLevelWindowExt* self);
-typedef bool (*wxTopLevelWindowExtIsMaximizedFunc)(const wxTopLevelWindowExt* self);
-typedef bool (*wxTopLevelWindowExtIsOneOfBarswxWindowCPFunc)(const wxTopLevelWindowExt* self, wxWindow const* param0);
-typedef bool (*wxTopLevelWindowExtIsTopLevelFunc)(const wxTopLevelWindowExt* self);
-typedef bool (*wxTopLevelWindowExtIsTopNavigationDomainwxWindowBaseNNavigationKindFunc)(const wxTopLevelWindowExt* self, wxWindowBase::NavigationKind kind);
-typedef bool (*wxTopLevelWindowExtIsVisibleFunc)(const wxTopLevelWindowExt* self);
-typedef bool (*wxTopLevelWindowExtLayoutFunc)(const wxTopLevelWindowExt* self);
+typedef bool (*wxTopLevelWindowExtIsActiveFunc)(const wxTopLevelWindowExt* self, bool res);
+typedef bool (*wxTopLevelWindowExtIsAlwaysMaximizedFunc)(const wxTopLevelWindowExt* self, bool res);
+typedef bool (*wxTopLevelWindowExtIsFullScreenFunc)(const wxTopLevelWindowExt* self, bool res);
+typedef bool (*wxTopLevelWindowExtIsIconizedFunc)(const wxTopLevelWindowExt* self, bool res);
+typedef bool (*wxTopLevelWindowExtIsMaximizedFunc)(const wxTopLevelWindowExt* self, bool res);
+typedef bool (*wxTopLevelWindowExtIsOneOfBarswxWindowCPFunc)(const wxTopLevelWindowExt* self, wxWindow const* param0, bool res);
+typedef bool (*wxTopLevelWindowExtIsTopLevelFunc)(const wxTopLevelWindowExt* self, bool res);
+typedef bool (*wxTopLevelWindowExtIsTopNavigationDomainwxWindowBaseNNavigationKindFunc)(const wxTopLevelWindowExt* self, wxWindowBase::NavigationKind kind, bool res);
+typedef bool (*wxTopLevelWindowExtIsVisibleFunc)(const wxTopLevelWindowExt* self, bool res);
+typedef bool (*wxTopLevelWindowExtLayoutFunc)(const wxTopLevelWindowExt* self, bool res);
 typedef void (*wxTopLevelWindowExtMaximizeboolFunc)(const wxTopLevelWindowExt* self, bool maximize);
-typedef bool (*wxTopLevelWindowExtOSXIsModifiedFunc)(const wxTopLevelWindowExt* self);
+typedef bool (*wxTopLevelWindowExtOSXIsModifiedFunc)(const wxTopLevelWindowExt* self, bool res);
 typedef void (*wxTopLevelWindowExtOSXSetModifiedboolFunc)(const wxTopLevelWindowExt* self, bool modified);
 typedef void (*wxTopLevelWindowExtRequestUserAttentionintFunc)(const wxTopLevelWindowExt* self, int flags);
 typedef void (*wxTopLevelWindowExtRestoreFunc)(const wxTopLevelWindowExt* self);
-typedef bool (*wxTopLevelWindowExtRestoreFieldwxStringCRintPFunc)(const wxTopLevelWindowExt* self, wxString const& name, int* value);
-typedef bool (*wxTopLevelWindowExtSaveFieldwxStringCRintFunc)(const wxTopLevelWindowExt* self, wxString const& name, int value);
-typedef bool (*wxTopLevelWindowExtSetContentProtectionwxContentProtectionFunc)(const wxTopLevelWindowExt* self, wxContentProtection contentProtection);
+typedef bool (*wxTopLevelWindowExtSetContentProtectionwxContentProtectionFunc)(const wxTopLevelWindowExt* self, wxContentProtection contentProtection, bool res);
 typedef void (*wxTopLevelWindowExtSetIconswxIconBundleCRFunc)(const wxTopLevelWindowExt* self, wxIconBundle const& icons);
 typedef void (*wxTopLevelWindowExtSetLabelwxStringCRFunc)(const wxTopLevelWindowExt* self, wxString const& label);
 typedef void (*wxTopLevelWindowExtSetMaxSizewxSizeCRFunc)(const wxTopLevelWindowExt* self, wxSize const& maxSize);
 typedef void (*wxTopLevelWindowExtSetMinSizewxSizeCRFunc)(const wxTopLevelWindowExt* self, wxSize const& minSize);
 typedef void (*wxTopLevelWindowExtSetRepresentedFilenamewxStringCRFunc)(const wxTopLevelWindowExt* self, wxString const& filename);
 typedef void (*wxTopLevelWindowExtSetTitlewxStringCRFunc)(const wxTopLevelWindowExt* self, wxString const& title);
-typedef bool (*wxTopLevelWindowExtShouldPreventAppExitFunc)(const wxTopLevelWindowExt* self);
-typedef bool (*wxTopLevelWindowExtShowFullScreenboollongFunc)(const wxTopLevelWindowExt* self, bool show, long style);
+typedef bool (*wxTopLevelWindowExtShouldPreventAppExitFunc)(const wxTopLevelWindowExt* self, bool res);
+typedef bool (*wxTopLevelWindowExtShowFullScreenboollongFunc)(const wxTopLevelWindowExt* self, bool show, long style, bool res);
 typedef void (*wxTopLevelWindowExtShowWithoutActivatingFunc)(const wxTopLevelWindowExt* self);
-typedef void* (*wxTopLevelWindowExtWXReservedTLW1voidPFunc)(const wxTopLevelWindowExt* self, void* param0);
-typedef void* (*wxTopLevelWindowExtWXReservedTLW2voidPFunc)(const wxTopLevelWindowExt* self, void* param0);
-typedef void* (*wxTopLevelWindowExtWXReservedTLW3voidPFunc)(const wxTopLevelWindowExt* self, void* param0);
+typedef void* (*wxTopLevelWindowExtWXReservedTLW1voidPFunc)(const wxTopLevelWindowExt* self, void* param0, void* res);
+typedef void* (*wxTopLevelWindowExtWXReservedTLW2voidPFunc)(const wxTopLevelWindowExt* self, void* param0, void* res);
+typedef void* (*wxTopLevelWindowExtWXReservedTLW3voidPFunc)(const wxTopLevelWindowExt* self, void* param0, void* res);
 
 class wxTopLevelWindowBaseExt: public wxTopLevelWindowBase
 {
 public:
   wxTopLevelWindowBaseExt(): wxTopLevelWindowBase()  {  }
   virtual ~wxTopLevelWindowBaseExt() override  {  }
+  wxTopLevelWindowBaseExtDestroyFunc m_wxTopLevelWindowBaseExtDestroy = NULL;
+  virtual bool Destroy() override
+  {
+    bool res = wxTopLevelWindowBase::Destroy();
+    if (*m_wxTopLevelWindowBaseExtDestroy != NULL){
+      return m_wxTopLevelWindowBaseExtDestroy(this, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxTopLevelWindowBaseExtDoCentreintFunc m_wxTopLevelWindowBaseExtDoCentreint = NULL;
+  virtual void DoCentre(int dir) override
+  {
+    wxTopLevelWindowBase::DoCentre(dir);
+    if (*m_wxTopLevelWindowBaseExtDoCentreint != NULL){
+      return m_wxTopLevelWindowBaseExtDoCentreint(this, dir);
+    }
+  }
+  wxTopLevelWindowBaseExtDoClientToScreenintPintPFunc m_wxTopLevelWindowBaseExtDoClientToScreenintPintP = NULL;
+  virtual void DoClientToScreen(int* x, int* y) const override
+  {
+    wxTopLevelWindowBase::DoClientToScreen(x, y);
+    if (*m_wxTopLevelWindowBaseExtDoClientToScreenintPintP != NULL){
+      return m_wxTopLevelWindowBaseExtDoClientToScreenintPintP(this, x, y);
+    }
+  }
+  wxTopLevelWindowBaseExtDoGetScreenPositionintPintPFunc m_wxTopLevelWindowBaseExtDoGetScreenPositionintPintP = NULL;
+  virtual void DoGetScreenPosition(int* x, int* y) const override
+  {
+    wxTopLevelWindowBase::DoGetScreenPosition(x, y);
+    if (*m_wxTopLevelWindowBaseExtDoGetScreenPositionintPintP != NULL){
+      return m_wxTopLevelWindowBaseExtDoGetScreenPositionintPintP(this, x, y);
+    }
+  }
+  wxTopLevelWindowBaseExtDoScreenToClientintPintPFunc m_wxTopLevelWindowBaseExtDoScreenToClientintPintP = NULL;
+  virtual void DoScreenToClient(int* x, int* y) const override
+  {
+    wxTopLevelWindowBase::DoScreenToClient(x, y);
+    if (*m_wxTopLevelWindowBaseExtDoScreenToClientintPintP != NULL){
+      return m_wxTopLevelWindowBaseExtDoScreenToClientintPintP(this, x, y);
+    }
+  }
+  wxTopLevelWindowBaseExtDoUpdateWindowUIwxUpdateUIEventRFunc m_wxTopLevelWindowBaseExtDoUpdateWindowUIwxUpdateUIEventR = NULL;
+  virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) override
+  {
+    wxTopLevelWindowBase::DoUpdateWindowUI(event);
+    if (*m_wxTopLevelWindowBaseExtDoUpdateWindowUIwxUpdateUIEventR != NULL){
+      return m_wxTopLevelWindowBaseExtDoUpdateWindowUIwxUpdateUIEventR(this, event);
+    }
+  }
   wxTopLevelWindowBaseExtEnableCloseButtonboolFunc m_wxTopLevelWindowBaseExtEnableCloseButtonbool = NULL;
   virtual bool EnableCloseButton(bool param0 = true) override
   {
     bool res = wxTopLevelWindowBase::EnableCloseButton(param0);
     if (*m_wxTopLevelWindowBaseExtEnableCloseButtonbool != NULL){
-      return m_wxTopLevelWindowBaseExtEnableCloseButtonbool(this, param0);
+      return m_wxTopLevelWindowBaseExtEnableCloseButtonbool(this, param0, res);
     }
     else {
       return res;
@@ -149,7 +216,7 @@ public:
   {
     bool res = wxTopLevelWindowBase::EnableFullScreenView(param0, param1);
     if (*m_wxTopLevelWindowBaseExtEnableFullScreenViewboollong != NULL){
-      return m_wxTopLevelWindowBaseExtEnableFullScreenViewboollong(this, param0, param1);
+      return m_wxTopLevelWindowBaseExtEnableFullScreenViewboollong(this, param0, param1, res);
     }
     else {
       return res;
@@ -160,7 +227,7 @@ public:
   {
     bool res = wxTopLevelWindowBase::EnableMaximizeButton(param0);
     if (*m_wxTopLevelWindowBaseExtEnableMaximizeButtonbool != NULL){
-      return m_wxTopLevelWindowBaseExtEnableMaximizeButtonbool(this, param0);
+      return m_wxTopLevelWindowBaseExtEnableMaximizeButtonbool(this, param0, res);
     }
     else {
       return res;
@@ -171,7 +238,7 @@ public:
   {
     bool res = wxTopLevelWindowBase::EnableMinimizeButton(param0);
     if (*m_wxTopLevelWindowBaseExtEnableMinimizeButtonbool != NULL){
-      return m_wxTopLevelWindowBaseExtEnableMinimizeButtonbool(this, param0);
+      return m_wxTopLevelWindowBaseExtEnableMinimizeButtonbool(this, param0, res);
     }
     else {
       return res;
@@ -182,12 +249,42 @@ public:
   {
     wxContentProtection res = wxTopLevelWindowBase::GetContentProtection();
     if (*m_wxTopLevelWindowBaseExtGetContentProtection != NULL){
-      return m_wxTopLevelWindowBaseExtGetContentProtection(this);
+      return m_wxTopLevelWindowBaseExtGetContentProtection(this, res);
     }
     else {
       return res;
     }
   }
+  wxTopLevelWindowBaseExtGetEventHashTableFunc m_wxTopLevelWindowBaseExtGetEventHashTable = NULL;
+  virtual wxEventHashTable& GetEventHashTable() const override
+  {
+    wxEventHashTable& res = wxTopLevelWindowBase::GetEventHashTable();
+    if (*m_wxTopLevelWindowBaseExtGetEventHashTable != NULL){
+      return m_wxTopLevelWindowBaseExtGetEventHashTable(this, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxTopLevelWindowBaseExtGetEventTableFunc m_wxTopLevelWindowBaseExtGetEventTable = NULL;
+  virtual wxEventTable const* GetEventTable() const override
+  {
+    wxEventTable const* res = wxTopLevelWindowBase::GetEventTable();
+    if (*m_wxTopLevelWindowBaseExtGetEventTable != NULL){
+      return m_wxTopLevelWindowBaseExtGetEventTable(this, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxTopLevelWindowBaseExtGetRectForTopLevelChildrenintPintPintPintPFunc m_wxTopLevelWindowBaseExtGetRectForTopLevelChildrenintPintPintPintP = NULL;
+  virtual void GetRectForTopLevelChildren(int* x, int* y, int* w, int* h) override
+  {
+    wxTopLevelWindowBase::GetRectForTopLevelChildren(x, y, w, h);
+    if (*m_wxTopLevelWindowBaseExtGetRectForTopLevelChildrenintPintPintPintP != NULL){
+      return m_wxTopLevelWindowBaseExtGetRectForTopLevelChildrenintPintPintPintP(this, x, y, w, h);
+    }
+  }
   wxTopLevelWindowBaseExtGetTitleFunc m_wxTopLevelWindowBaseExtGetTitle = NULL;
   virtual wxString GetTitle() const override
   {
@@ -210,7 +307,7 @@ public:
   {
     bool res = wxTopLevelWindowBase::IsActive();
     if (*m_wxTopLevelWindowBaseExtIsActive != NULL){
-      return m_wxTopLevelWindowBaseExtIsActive(this);
+      return m_wxTopLevelWindowBaseExtIsActive(this, res);
     }
     else {
       return res;
@@ -221,7 +318,7 @@ public:
   {
     bool res = wxTopLevelWindowBase::IsAlwaysMaximized();
     if (*m_wxTopLevelWindowBaseExtIsAlwaysMaximized != NULL){
-      return m_wxTopLevelWindowBaseExtIsAlwaysMaximized(this);
+      return m_wxTopLevelWindowBaseExtIsAlwaysMaximized(this, res);
     }
     else {
       return res;
@@ -234,7 +331,7 @@ public:
       return m_wxTopLevelWindowBaseExtIsFullScreen(this);
     }
     else {
-      return NULL;
+      return false;
     }
   }
   wxTopLevelWindowBaseExtIsIconizedFunc m_wxTopLevelWindowBaseExtIsIconized = NULL;
@@ -244,7 +341,7 @@ public:
       return m_wxTopLevelWindowBaseExtIsIconized(this);
     }
     else {
-      return NULL;
+      return false;
     }
   }
   wxTopLevelWindowBaseExtIsMaximizedFunc m_wxTopLevelWindowBaseExtIsMaximized = NULL;
@@ -254,7 +351,62 @@ public:
       return m_wxTopLevelWindowBaseExtIsMaximized(this);
     }
     else {
-      return NULL;
+      return false;
+    }
+  }
+  wxTopLevelWindowBaseExtIsOneOfBarswxWindowCPFunc m_wxTopLevelWindowBaseExtIsOneOfBarswxWindowCP = NULL;
+  virtual bool IsOneOfBars(wxWindow const* param0) const override
+  {
+    bool res = wxTopLevelWindowBase::IsOneOfBars(param0);
+    if (*m_wxTopLevelWindowBaseExtIsOneOfBarswxWindowCP != NULL){
+      return m_wxTopLevelWindowBaseExtIsOneOfBarswxWindowCP(this, param0, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxTopLevelWindowBaseExtIsTopLevelFunc m_wxTopLevelWindowBaseExtIsTopLevel = NULL;
+  virtual bool IsTopLevel() const override
+  {
+    bool res = wxTopLevelWindowBase::IsTopLevel();
+    if (*m_wxTopLevelWindowBaseExtIsTopLevel != NULL){
+      return m_wxTopLevelWindowBaseExtIsTopLevel(this, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxTopLevelWindowBaseExtIsTopNavigationDomainwxWindowBaseNNavigationKindFunc m_wxTopLevelWindowBaseExtIsTopNavigationDomainwxWindowBaseNNavigationKind = NULL;
+  virtual bool IsTopNavigationDomain(wxWindowBase::NavigationKind kind) const override
+  {
+    bool res = wxTopLevelWindowBase::IsTopNavigationDomain(kind);
+    if (*m_wxTopLevelWindowBaseExtIsTopNavigationDomainwxWindowBaseNNavigationKind != NULL){
+      return m_wxTopLevelWindowBaseExtIsTopNavigationDomainwxWindowBaseNNavigationKind(this, kind, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxTopLevelWindowBaseExtIsVisibleFunc m_wxTopLevelWindowBaseExtIsVisible = NULL;
+  virtual bool IsVisible() const override
+  {
+    bool res = wxTopLevelWindowBase::IsVisible();
+    if (*m_wxTopLevelWindowBaseExtIsVisible != NULL){
+      return m_wxTopLevelWindowBaseExtIsVisible(this, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxTopLevelWindowBaseExtLayoutFunc m_wxTopLevelWindowBaseExtLayout = NULL;
+  virtual bool Layout() override
+  {
+    bool res = wxTopLevelWindowBase::Layout();
+    if (*m_wxTopLevelWindowBaseExtLayout != NULL){
+      return m_wxTopLevelWindowBaseExtLayout(this, res);
+    }
+    else {
+      return res;
     }
   }
   wxTopLevelWindowBaseExtMaximizeboolFunc m_wxTopLevelWindowBaseExtMaximizebool = NULL;
@@ -264,6 +416,25 @@ public:
       return m_wxTopLevelWindowBaseExtMaximizebool(this, maximize);
     }
   }
+  wxTopLevelWindowBaseExtOSXIsModifiedFunc m_wxTopLevelWindowBaseExtOSXIsModified = NULL;
+  virtual bool OSXIsModified() const override
+  {
+    bool res = wxTopLevelWindowBase::OSXIsModified();
+    if (*m_wxTopLevelWindowBaseExtOSXIsModified != NULL){
+      return m_wxTopLevelWindowBaseExtOSXIsModified(this, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxTopLevelWindowBaseExtOSXSetModifiedboolFunc m_wxTopLevelWindowBaseExtOSXSetModifiedbool = NULL;
+  virtual void OSXSetModified(bool modified) override
+  {
+    wxTopLevelWindowBase::OSXSetModified(modified);
+    if (*m_wxTopLevelWindowBaseExtOSXSetModifiedbool != NULL){
+      return m_wxTopLevelWindowBaseExtOSXSetModifiedbool(this, modified);
+    }
+  }
   wxTopLevelWindowBaseExtRequestUserAttentionintFunc m_wxTopLevelWindowBaseExtRequestUserAttentionint = NULL;
   virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) override
   {
@@ -279,32 +450,12 @@ public:
       return m_wxTopLevelWindowBaseExtRestore(this);
     }
   }
-  wxTopLevelWindowBaseExtRestoreFieldwxStringCRintPFunc m_wxTopLevelWindowBaseExtRestoreFieldwxStringCRintP = NULL;
-  virtual bool RestoreField(wxString const& name, int* value)
-  {
-    if (*m_wxTopLevelWindowBaseExtRestoreFieldwxStringCRintP != NULL){
-      return m_wxTopLevelWindowBaseExtRestoreFieldwxStringCRintP(this, name, value);
-    }
-    else {
-      return false;
-    }
-  }
-  wxTopLevelWindowBaseExtSaveFieldwxStringCRintFunc m_wxTopLevelWindowBaseExtSaveFieldwxStringCRint = NULL;
-  virtual bool SaveField(wxString const& name, int value) const 
-  {
-    if (*m_wxTopLevelWindowBaseExtSaveFieldwxStringCRint != NULL){
-      return m_wxTopLevelWindowBaseExtSaveFieldwxStringCRint(this, name, value);
-    }
-    else {
-      return false;
-    }
-  }
   wxTopLevelWindowBaseExtSetContentProtectionwxContentProtectionFunc m_wxTopLevelWindowBaseExtSetContentProtectionwxContentProtection = NULL;
   virtual bool SetContentProtection(wxContentProtection param0) override
   {
     bool res = wxTopLevelWindowBase::SetContentProtection(param0);
     if (*m_wxTopLevelWindowBaseExtSetContentProtectionwxContentProtection != NULL){
-      return m_wxTopLevelWindowBaseExtSetContentProtectionwxContentProtection(this, param0);
+      return m_wxTopLevelWindowBaseExtSetContentProtectionwxContentProtection(this, param0, res);
     }
     else {
       return res;
@@ -318,6 +469,30 @@ public:
       return m_wxTopLevelWindowBaseExtSetIconswxIconBundleCR(this, icons);
     }
   }
+  wxTopLevelWindowBaseExtSetMaxSizewxSizeCRFunc m_wxTopLevelWindowBaseExtSetMaxSizewxSizeCR = NULL;
+  virtual void SetMaxSize(wxSize const& maxSize) override
+  {
+    wxTopLevelWindowBase::SetMaxSize(maxSize);
+    if (*m_wxTopLevelWindowBaseExtSetMaxSizewxSizeCR != NULL){
+      return m_wxTopLevelWindowBaseExtSetMaxSizewxSizeCR(this, maxSize);
+    }
+  }
+  wxTopLevelWindowBaseExtSetMinSizewxSizeCRFunc m_wxTopLevelWindowBaseExtSetMinSizewxSizeCR = NULL;
+  virtual void SetMinSize(wxSize const& minSize) override
+  {
+    wxTopLevelWindowBase::SetMinSize(minSize);
+    if (*m_wxTopLevelWindowBaseExtSetMinSizewxSizeCR != NULL){
+      return m_wxTopLevelWindowBaseExtSetMinSizewxSizeCR(this, minSize);
+    }
+  }
+  wxTopLevelWindowBaseExtSetRepresentedFilenamewxStringCRFunc m_wxTopLevelWindowBaseExtSetRepresentedFilenamewxStringCR = NULL;
+  virtual void SetRepresentedFilename(wxString const& param0) override
+  {
+    wxTopLevelWindowBase::SetRepresentedFilename(param0);
+    if (*m_wxTopLevelWindowBaseExtSetRepresentedFilenamewxStringCR != NULL){
+      return m_wxTopLevelWindowBaseExtSetRepresentedFilenamewxStringCR(this, param0);
+    }
+  }
   wxTopLevelWindowBaseExtSetTitlewxStringCRFunc m_wxTopLevelWindowBaseExtSetTitlewxStringCR = NULL;
   virtual void SetTitle(wxString const& title) override
   {
@@ -330,7 +505,7 @@ public:
   {
     bool res = wxTopLevelWindowBase::ShouldPreventAppExit();
     if (*m_wxTopLevelWindowBaseExtShouldPreventAppExit != NULL){
-      return m_wxTopLevelWindowBaseExtShouldPreventAppExit(this);
+      return m_wxTopLevelWindowBaseExtShouldPreventAppExit(this, res);
     }
     else {
       return res;
@@ -343,7 +518,7 @@ public:
       return m_wxTopLevelWindowBaseExtShowFullScreenboollong(this, show, style);
     }
     else {
-      return NULL;
+      return false;
     }
   }
   wxTopLevelWindowBaseExtShowWithoutActivatingFunc m_wxTopLevelWindowBaseExtShowWithoutActivating = NULL;
@@ -354,12 +529,54 @@ public:
       return m_wxTopLevelWindowBaseExtShowWithoutActivating(this);
     }
   }
-  wxTopLevelWindowBaseExt(wxTopLevelWindowBaseExtEnableCloseButtonboolFunc a_EnableCloseButtonbool, wxTopLevelWindowBaseExtEnableFullScreenViewboollongFunc a_EnableFullScreenViewboollong, wxTopLevelWindowBaseExtEnableMaximizeButtonboolFunc a_EnableMaximizeButtonbool, wxTopLevelWindowBaseExtEnableMinimizeButtonboolFunc a_EnableMinimizeButtonbool, wxTopLevelWindowBaseExtGetContentProtectionFunc a_GetContentProtection, wxTopLevelWindowBaseExtGetTitleFunc a_GetTitle, wxTopLevelWindowBaseExtIconizeboolFunc a_Iconizebool, wxTopLevelWindowBaseExtIsActiveFunc a_IsActive, wxTopLevelWindowBaseExtIsAlwaysMaximizedFunc a_IsAlwaysMaximized, wxTopLevelWindowBaseExtIsFullScreenFunc a_IsFullScreen, wxTopLevelWindowBaseExtIsIconizedFunc a_IsIconized, wxTopLevelWindowBaseExtIsMaximizedFunc a_IsMaximized, wxTopLevelWindowBaseExtMaximizeboolFunc a_Maximizebool, wxTopLevelWindowBaseExtRequestUserAttentionintFunc a_RequestUserAttentionint, wxTopLevelWindowBaseExtRestoreFunc a_Restore, wxTopLevelWindowBaseExtRestoreFieldwxStringCRintPFunc a_RestoreFieldwxStringCRintP, wxTopLevelWindowBaseExtSaveFieldwxStringCRintFunc a_SaveFieldwxStringCRint, wxTopLevelWindowBaseExtSetContentProtectionwxContentProtectionFunc a_SetContentProtectionwxContentProtection, wxTopLevelWindowBaseExtSetIconswxIconBundleCRFunc a_SetIconswxIconBundleCR, wxTopLevelWindowBaseExtSetTitlewxStringCRFunc a_SetTitlewxStringCR, wxTopLevelWindowBaseExtShouldPreventAppExitFunc a_ShouldPreventAppExit, wxTopLevelWindowBaseExtShowFullScreenboollongFunc a_ShowFullScreenboollong, wxTopLevelWindowBaseExtShowWithoutActivatingFunc a_ShowWithoutActivating): wxTopLevelWindowBase() {
+  wxTopLevelWindowBaseExtWXReservedTLW1voidPFunc m_wxTopLevelWindowBaseExtWXReservedTLW1voidP = NULL;
+  virtual void* WXReservedTLW1(void* param0) override
+  {
+    void* res = wxTopLevelWindowBase::WXReservedTLW1(param0);
+    if (*m_wxTopLevelWindowBaseExtWXReservedTLW1voidP != NULL){
+      return m_wxTopLevelWindowBaseExtWXReservedTLW1voidP(this, param0, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxTopLevelWindowBaseExtWXReservedTLW2voidPFunc m_wxTopLevelWindowBaseExtWXReservedTLW2voidP = NULL;
+  virtual void* WXReservedTLW2(void* param0) override
+  {
+    void* res = wxTopLevelWindowBase::WXReservedTLW2(param0);
+    if (*m_wxTopLevelWindowBaseExtWXReservedTLW2voidP != NULL){
+      return m_wxTopLevelWindowBaseExtWXReservedTLW2voidP(this, param0, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxTopLevelWindowBaseExtWXReservedTLW3voidPFunc m_wxTopLevelWindowBaseExtWXReservedTLW3voidP = NULL;
+  virtual void* WXReservedTLW3(void* param0) override
+  {
+    void* res = wxTopLevelWindowBase::WXReservedTLW3(param0);
+    if (*m_wxTopLevelWindowBaseExtWXReservedTLW3voidP != NULL){
+      return m_wxTopLevelWindowBaseExtWXReservedTLW3voidP(this, param0, res);
+    }
+    else {
+      return res;
+    }
+  }
+  wxTopLevelWindowBaseExt(wxTopLevelWindowBaseExtDestroyFunc a_Destroy, wxTopLevelWindowBaseExtDoCentreintFunc a_DoCentreint, wxTopLevelWindowBaseExtDoClientToScreenintPintPFunc a_DoClientToScreenintPintP, wxTopLevelWindowBaseExtDoGetScreenPositionintPintPFunc a_DoGetScreenPositionintPintP, wxTopLevelWindowBaseExtDoScreenToClientintPintPFunc a_DoScreenToClientintPintP, wxTopLevelWindowBaseExtDoUpdateWindowUIwxUpdateUIEventRFunc a_DoUpdateWindowUIwxUpdateUIEventR, wxTopLevelWindowBaseExtEnableCloseButtonboolFunc a_EnableCloseButtonbool, wxTopLevelWindowBaseExtEnableFullScreenViewboollongFunc a_EnableFullScreenViewboollong, wxTopLevelWindowBaseExtEnableMaximizeButtonboolFunc a_EnableMaximizeButtonbool, wxTopLevelWindowBaseExtEnableMinimizeButtonboolFunc a_EnableMinimizeButtonbool, wxTopLevelWindowBaseExtGetContentProtectionFunc a_GetContentProtection, wxTopLevelWindowBaseExtGetEventHashTableFunc a_GetEventHashTable, wxTopLevelWindowBaseExtGetEventTableFunc a_GetEventTable, wxTopLevelWindowBaseExtGetRectForTopLevelChildrenintPintPintPintPFunc a_GetRectForTopLevelChildrenintPintPintPintP, wxTopLevelWindowBaseExtGetTitleFunc a_GetTitle, wxTopLevelWindowBaseExtIconizeboolFunc a_Iconizebool, wxTopLevelWindowBaseExtIsActiveFunc a_IsActive, wxTopLevelWindowBaseExtIsAlwaysMaximizedFunc a_IsAlwaysMaximized, wxTopLevelWindowBaseExtIsFullScreenFunc a_IsFullScreen, wxTopLevelWindowBaseExtIsIconizedFunc a_IsIconized, wxTopLevelWindowBaseExtIsMaximizedFunc a_IsMaximized, wxTopLevelWindowBaseExtIsOneOfBarswxWindowCPFunc a_IsOneOfBarswxWindowCP, wxTopLevelWindowBaseExtIsTopLevelFunc a_IsTopLevel, wxTopLevelWindowBaseExtIsTopNavigationDomainwxWindowBaseNNavigationKindFunc a_IsTopNavigationDomainwxWindowBaseNNavigationKind, wxTopLevelWindowBaseExtIsVisibleFunc a_IsVisible, wxTopLevelWindowBaseExtLayoutFunc a_Layout, wxTopLevelWindowBaseExtMaximizeboolFunc a_Maximizebool, wxTopLevelWindowBaseExtOSXIsModifiedFunc a_OSXIsModified, wxTopLevelWindowBaseExtOSXSetModifiedboolFunc a_OSXSetModifiedbool, wxTopLevelWindowBaseExtRequestUserAttentionintFunc a_RequestUserAttentionint, wxTopLevelWindowBaseExtRestoreFunc a_Restore, wxTopLevelWindowBaseExtSetContentProtectionwxContentProtectionFunc a_SetContentProtectionwxContentProtection, wxTopLevelWindowBaseExtSetIconswxIconBundleCRFunc a_SetIconswxIconBundleCR, wxTopLevelWindowBaseExtSetMaxSizewxSizeCRFunc a_SetMaxSizewxSizeCR, wxTopLevelWindowBaseExtSetMinSizewxSizeCRFunc a_SetMinSizewxSizeCR, wxTopLevelWindowBaseExtSetRepresentedFilenamewxStringCRFunc a_SetRepresentedFilenamewxStringCR, wxTopLevelWindowBaseExtSetTitlewxStringCRFunc a_SetTitlewxStringCR, wxTopLevelWindowBaseExtShouldPreventAppExitFunc a_ShouldPreventAppExit, wxTopLevelWindowBaseExtShowFullScreenboollongFunc a_ShowFullScreenboollong, wxTopLevelWindowBaseExtShowWithoutActivatingFunc a_ShowWithoutActivating, wxTopLevelWindowBaseExtWXReservedTLW1voidPFunc a_WXReservedTLW1voidP, wxTopLevelWindowBaseExtWXReservedTLW2voidPFunc a_WXReservedTLW2voidP, wxTopLevelWindowBaseExtWXReservedTLW3voidPFunc a_WXReservedTLW3voidP): wxTopLevelWindowBase() {
+    m_wxTopLevelWindowBaseExtDestroy = a_Destroy;
+    m_wxTopLevelWindowBaseExtDoCentreint = a_DoCentreint;
+    m_wxTopLevelWindowBaseExtDoClientToScreenintPintP = a_DoClientToScreenintPintP;
+    m_wxTopLevelWindowBaseExtDoGetScreenPositionintPintP = a_DoGetScreenPositionintPintP;
+    m_wxTopLevelWindowBaseExtDoScreenToClientintPintP = a_DoScreenToClientintPintP;
+    m_wxTopLevelWindowBaseExtDoUpdateWindowUIwxUpdateUIEventR = a_DoUpdateWindowUIwxUpdateUIEventR;
     m_wxTopLevelWindowBaseExtEnableCloseButtonbool = a_EnableCloseButtonbool;
     m_wxTopLevelWindowBaseExtEnableFullScreenViewboollong = a_EnableFullScreenViewboollong;
     m_wxTopLevelWindowBaseExtEnableMaximizeButtonbool = a_EnableMaximizeButtonbool;
     m_wxTopLevelWindowBaseExtEnableMinimizeButtonbool = a_EnableMinimizeButtonbool;
     m_wxTopLevelWindowBaseExtGetContentProtection = a_GetContentProtection;
+    m_wxTopLevelWindowBaseExtGetEventHashTable = a_GetEventHashTable;
+    m_wxTopLevelWindowBaseExtGetEventTable = a_GetEventTable;
+    m_wxTopLevelWindowBaseExtGetRectForTopLevelChildrenintPintPintPintP = a_GetRectForTopLevelChildrenintPintPintPintP;
     m_wxTopLevelWindowBaseExtGetTitle = a_GetTitle;
     m_wxTopLevelWindowBaseExtIconizebool = a_Iconizebool;
     m_wxTopLevelWindowBaseExtIsActive = a_IsActive;
@@ -367,17 +584,28 @@ public:
     m_wxTopLevelWindowBaseExtIsFullScreen = a_IsFullScreen;
     m_wxTopLevelWindowBaseExtIsIconized = a_IsIconized;
     m_wxTopLevelWindowBaseExtIsMaximized = a_IsMaximized;
+    m_wxTopLevelWindowBaseExtIsOneOfBarswxWindowCP = a_IsOneOfBarswxWindowCP;
+    m_wxTopLevelWindowBaseExtIsTopLevel = a_IsTopLevel;
+    m_wxTopLevelWindowBaseExtIsTopNavigationDomainwxWindowBaseNNavigationKind = a_IsTopNavigationDomainwxWindowBaseNNavigationKind;
+    m_wxTopLevelWindowBaseExtIsVisible = a_IsVisible;
+    m_wxTopLevelWindowBaseExtLayout = a_Layout;
     m_wxTopLevelWindowBaseExtMaximizebool = a_Maximizebool;
+    m_wxTopLevelWindowBaseExtOSXIsModified = a_OSXIsModified;
+    m_wxTopLevelWindowBaseExtOSXSetModifiedbool = a_OSXSetModifiedbool;
     m_wxTopLevelWindowBaseExtRequestUserAttentionint = a_RequestUserAttentionint;
     m_wxTopLevelWindowBaseExtRestore = a_Restore;
-    m_wxTopLevelWindowBaseExtRestoreFieldwxStringCRintP = a_RestoreFieldwxStringCRintP;
-    m_wxTopLevelWindowBaseExtSaveFieldwxStringCRint = a_SaveFieldwxStringCRint;
     m_wxTopLevelWindowBaseExtSetContentProtectionwxContentProtection = a_SetContentProtectionwxContentProtection;
     m_wxTopLevelWindowBaseExtSetIconswxIconBundleCR = a_SetIconswxIconBundleCR;
+    m_wxTopLevelWindowBaseExtSetMaxSizewxSizeCR = a_SetMaxSizewxSizeCR;
+    m_wxTopLevelWindowBaseExtSetMinSizewxSizeCR = a_SetMinSizewxSizeCR;
+    m_wxTopLevelWindowBaseExtSetRepresentedFilenamewxStringCR = a_SetRepresentedFilenamewxStringCR;
     m_wxTopLevelWindowBaseExtSetTitlewxStringCR = a_SetTitlewxStringCR;
     m_wxTopLevelWindowBaseExtShouldPreventAppExit = a_ShouldPreventAppExit;
     m_wxTopLevelWindowBaseExtShowFullScreenboollong = a_ShowFullScreenboollong;
     m_wxTopLevelWindowBaseExtShowWithoutActivating = a_ShowWithoutActivating;
+    m_wxTopLevelWindowBaseExtWXReservedTLW1voidP = a_WXReservedTLW1voidP;
+    m_wxTopLevelWindowBaseExtWXReservedTLW2voidP = a_WXReservedTLW2voidP;
+    m_wxTopLevelWindowBaseExtWXReservedTLW3voidP = a_WXReservedTLW3voidP;
   }
 };
 
@@ -392,7 +620,7 @@ public:
   {
     bool res = wxTopLevelWindowNative::Destroy();
     if (*m_wxTopLevelWindowNativeExtDestroy != NULL){
-      return m_wxTopLevelWindowNativeExtDestroy(this);
+      return m_wxTopLevelWindowNativeExtDestroy(this, res);
     }
     else {
       return res;
@@ -443,7 +671,7 @@ public:
   {
     bool res = wxTopLevelWindowNative::EnableCloseButton(param0);
     if (*m_wxTopLevelWindowNativeExtEnableCloseButtonbool != NULL){
-      return m_wxTopLevelWindowNativeExtEnableCloseButtonbool(this, param0);
+      return m_wxTopLevelWindowNativeExtEnableCloseButtonbool(this, param0, res);
     }
     else {
       return res;
@@ -454,7 +682,7 @@ public:
   {
     bool res = wxTopLevelWindowNative::EnableFullScreenView(param0, param1);
     if (*m_wxTopLevelWindowNativeExtEnableFullScreenViewboollong != NULL){
-      return m_wxTopLevelWindowNativeExtEnableFullScreenViewboollong(this, param0, param1);
+      return m_wxTopLevelWindowNativeExtEnableFullScreenViewboollong(this, param0, param1, res);
     }
     else {
       return res;
@@ -465,7 +693,7 @@ public:
   {
     bool res = wxTopLevelWindowNative::EnableMaximizeButton(param0);
     if (*m_wxTopLevelWindowNativeExtEnableMaximizeButtonbool != NULL){
-      return m_wxTopLevelWindowNativeExtEnableMaximizeButtonbool(this, param0);
+      return m_wxTopLevelWindowNativeExtEnableMaximizeButtonbool(this, param0, res);
     }
     else {
       return res;
@@ -476,7 +704,7 @@ public:
   {
     bool res = wxTopLevelWindowNative::EnableMinimizeButton(param0);
     if (*m_wxTopLevelWindowNativeExtEnableMinimizeButtonbool != NULL){
-      return m_wxTopLevelWindowNativeExtEnableMinimizeButtonbool(this, param0);
+      return m_wxTopLevelWindowNativeExtEnableMinimizeButtonbool(this, param0, res);
     }
     else {
       return res;
@@ -487,7 +715,7 @@ public:
   {
     wxPoint res = wxTopLevelWindowNative::GetClientAreaOrigin();
     if (*m_wxTopLevelWindowNativeExtGetClientAreaOrigin != NULL){
-      return m_wxTopLevelWindowNativeExtGetClientAreaOrigin(this);
+      return m_wxTopLevelWindowNativeExtGetClientAreaOrigin(this, res);
     }
     else {
       return res;
@@ -498,7 +726,7 @@ public:
   {
     wxContentProtection res = wxTopLevelWindowNative::GetContentProtection();
     if (*m_wxTopLevelWindowNativeExtGetContentProtection != NULL){
-      return m_wxTopLevelWindowNativeExtGetContentProtection(this);
+      return m_wxTopLevelWindowNativeExtGetContentProtection(this, res);
     }
     else {
       return res;
@@ -509,7 +737,7 @@ public:
   {
     wxEventHashTable& res = wxTopLevelWindowNative::GetEventHashTable();
     if (*m_wxTopLevelWindowNativeExtGetEventHashTable != NULL){
-      return m_wxTopLevelWindowNativeExtGetEventHashTable(this);
+      return m_wxTopLevelWindowNativeExtGetEventHashTable(this, res);
     }
     else {
       return res;
@@ -520,7 +748,7 @@ public:
   {
     wxEventTable const* res = wxTopLevelWindowNative::GetEventTable();
     if (*m_wxTopLevelWindowNativeExtGetEventTable != NULL){
-      return m_wxTopLevelWindowNativeExtGetEventTable(this);
+      return m_wxTopLevelWindowNativeExtGetEventTable(this, res);
     }
     else {
       return res;
@@ -531,7 +759,7 @@ public:
   {
     wxString res = wxTopLevelWindowNative::GetLabel();
     if (*m_wxTopLevelWindowNativeExtGetLabel != NULL){
-      return m_wxTopLevelWindowNativeExtGetLabel(this);
+      return m_wxTopLevelWindowNativeExtGetLabel(this, res);
     }
     else {
       return res;
@@ -567,7 +795,7 @@ public:
   {
     bool res = wxTopLevelWindowNative::IsActive();
     if (*m_wxTopLevelWindowNativeExtIsActive != NULL){
-      return m_wxTopLevelWindowNativeExtIsActive(this);
+      return m_wxTopLevelWindowNativeExtIsActive(this, res);
     }
     else {
       return res;
@@ -578,7 +806,7 @@ public:
   {
     bool res = wxTopLevelWindowNative::IsAlwaysMaximized();
     if (*m_wxTopLevelWindowNativeExtIsAlwaysMaximized != NULL){
-      return m_wxTopLevelWindowNativeExtIsAlwaysMaximized(this);
+      return m_wxTopLevelWindowNativeExtIsAlwaysMaximized(this, res);
     }
     else {
       return res;
@@ -591,7 +819,7 @@ public:
       return m_wxTopLevelWindowNativeExtIsFullScreen(this);
     }
     else {
-      return NULL;
+      return false;
     }
   }
   wxTopLevelWindowNativeExtIsIconizedFunc m_wxTopLevelWindowNativeExtIsIconized = NULL;
@@ -601,7 +829,7 @@ public:
       return m_wxTopLevelWindowNativeExtIsIconized(this);
     }
     else {
-      return NULL;
+      return false;
     }
   }
   wxTopLevelWindowNativeExtIsMaximizedFunc m_wxTopLevelWindowNativeExtIsMaximized = NULL;
@@ -611,7 +839,7 @@ public:
       return m_wxTopLevelWindowNativeExtIsMaximized(this);
     }
     else {
-      return NULL;
+      return false;
     }
   }
   wxTopLevelWindowNativeExtIsOneOfBarswxWindowCPFunc m_wxTopLevelWindowNativeExtIsOneOfBarswxWindowCP = NULL;
@@ -619,7 +847,7 @@ public:
   {
     bool res = wxTopLevelWindowNative::IsOneOfBars(param0);
     if (*m_wxTopLevelWindowNativeExtIsOneOfBarswxWindowCP != NULL){
-      return m_wxTopLevelWindowNativeExtIsOneOfBarswxWindowCP(this, param0);
+      return m_wxTopLevelWindowNativeExtIsOneOfBarswxWindowCP(this, param0, res);
     }
     else {
       return res;
@@ -630,7 +858,7 @@ public:
   {
     bool res = wxTopLevelWindowNative::IsTopLevel();
     if (*m_wxTopLevelWindowNativeExtIsTopLevel != NULL){
-      return m_wxTopLevelWindowNativeExtIsTopLevel(this);
+      return m_wxTopLevelWindowNativeExtIsTopLevel(this, res);
     }
     else {
       return res;
@@ -641,7 +869,7 @@ public:
   {
     bool res = wxTopLevelWindowNative::IsTopNavigationDomain(kind);
     if (*m_wxTopLevelWindowNativeExtIsTopNavigationDomainwxWindowBaseNNavigationKind != NULL){
-      return m_wxTopLevelWindowNativeExtIsTopNavigationDomainwxWindowBaseNNavigationKind(this, kind);
+      return m_wxTopLevelWindowNativeExtIsTopNavigationDomainwxWindowBaseNNavigationKind(this, kind, res);
     }
     else {
       return res;
@@ -652,7 +880,7 @@ public:
   {
     bool res = wxTopLevelWindowNative::IsVisible();
     if (*m_wxTopLevelWindowNativeExtIsVisible != NULL){
-      return m_wxTopLevelWindowNativeExtIsVisible(this);
+      return m_wxTopLevelWindowNativeExtIsVisible(this, res);
     }
     else {
       return res;
@@ -663,7 +891,7 @@ public:
   {
     bool res = wxTopLevelWindowNative::Layout();
     if (*m_wxTopLevelWindowNativeExtLayout != NULL){
-      return m_wxTopLevelWindowNativeExtLayout(this);
+      return m_wxTopLevelWindowNativeExtLayout(this, res);
     }
     else {
       return res;
@@ -681,7 +909,7 @@ public:
   {
     bool res = wxTopLevelWindowNative::OSXIsModified();
     if (*m_wxTopLevelWindowNativeExtOSXIsModified != NULL){
-      return m_wxTopLevelWindowNativeExtOSXIsModified(this);
+      return m_wxTopLevelWindowNativeExtOSXIsModified(this, res);
     }
     else {
       return res;
@@ -710,32 +938,12 @@ public:
       return m_wxTopLevelWindowNativeExtRestore(this);
     }
   }
-  wxTopLevelWindowNativeExtRestoreFieldwxStringCRintPFunc m_wxTopLevelWindowNativeExtRestoreFieldwxStringCRintP = NULL;
-  virtual bool RestoreField(wxString const& name, int* value)
-  {
-    if (*m_wxTopLevelWindowNativeExtRestoreFieldwxStringCRintP != NULL){
-      return m_wxTopLevelWindowNativeExtRestoreFieldwxStringCRintP(this, name, value);
-    }
-    else {
-      return NULL;
-    }
-  }
-  wxTopLevelWindowNativeExtSaveFieldwxStringCRintFunc m_wxTopLevelWindowNativeExtSaveFieldwxStringCRint = NULL;
-  virtual bool SaveField(wxString const& name, int value) const
-  {
-    if (*m_wxTopLevelWindowNativeExtSaveFieldwxStringCRint != NULL){
-      return m_wxTopLevelWindowNativeExtSaveFieldwxStringCRint(this, name, value);
-    }
-    else {
-      return NULL;
-    }
-  }
   wxTopLevelWindowNativeExtSetContentProtectionwxContentProtectionFunc m_wxTopLevelWindowNativeExtSetContentProtectionwxContentProtection = NULL;
   virtual bool SetContentProtection(wxContentProtection param0) override
   {
     bool res = wxTopLevelWindowNative::SetContentProtection(param0);
     if (*m_wxTopLevelWindowNativeExtSetContentProtectionwxContentProtection != NULL){
-      return m_wxTopLevelWindowNativeExtSetContentProtectionwxContentProtection(this, param0);
+      return m_wxTopLevelWindowNativeExtSetContentProtectionwxContentProtection(this, param0, res);
     }
     else {
       return res;
@@ -793,7 +1001,7 @@ public:
   {
     bool res = wxTopLevelWindowNative::ShouldPreventAppExit();
     if (*m_wxTopLevelWindowNativeExtShouldPreventAppExit != NULL){
-      return m_wxTopLevelWindowNativeExtShouldPreventAppExit(this);
+      return m_wxTopLevelWindowNativeExtShouldPreventAppExit(this, res);
     }
     else {
       return res;
@@ -806,7 +1014,7 @@ public:
       return m_wxTopLevelWindowNativeExtShowFullScreenboollong(this, show, style);
     }
     else {
-      return NULL;
+      return false;
     }
   }
   wxTopLevelWindowNativeExtShowWithoutActivatingFunc m_wxTopLevelWindowNativeExtShowWithoutActivating = NULL;
@@ -822,7 +1030,7 @@ public:
   {
     void* res = wxTopLevelWindowNative::WXReservedTLW1(param0);
     if (*m_wxTopLevelWindowNativeExtWXReservedTLW1voidP != NULL){
-      return m_wxTopLevelWindowNativeExtWXReservedTLW1voidP(this, param0);
+      return m_wxTopLevelWindowNativeExtWXReservedTLW1voidP(this, param0, res);
     }
     else {
       return res;
@@ -833,7 +1041,7 @@ public:
   {
     void* res = wxTopLevelWindowNative::WXReservedTLW2(param0);
     if (*m_wxTopLevelWindowNativeExtWXReservedTLW2voidP != NULL){
-      return m_wxTopLevelWindowNativeExtWXReservedTLW2voidP(this, param0);
+      return m_wxTopLevelWindowNativeExtWXReservedTLW2voidP(this, param0, res);
     }
     else {
       return res;
@@ -844,13 +1052,13 @@ public:
   {
     void* res = wxTopLevelWindowNative::WXReservedTLW3(param0);
     if (*m_wxTopLevelWindowNativeExtWXReservedTLW3voidP != NULL){
-      return m_wxTopLevelWindowNativeExtWXReservedTLW3voidP(this, param0);
+      return m_wxTopLevelWindowNativeExtWXReservedTLW3voidP(this, param0, res);
     }
     else {
       return res;
     }
   }
-  wxTopLevelWindowNativeExt(wxTopLevelWindowNativeExtDestroyFunc a_Destroy, wxTopLevelWindowNativeExtDoCentreintFunc a_DoCentreint, wxTopLevelWindowNativeExtDoClientToScreenintPintPFunc a_DoClientToScreenintPintP, wxTopLevelWindowNativeExtDoGetScreenPositionintPintPFunc a_DoGetScreenPositionintPintP, wxTopLevelWindowNativeExtDoScreenToClientintPintPFunc a_DoScreenToClientintPintP, wxTopLevelWindowNativeExtDoUpdateWindowUIwxUpdateUIEventRFunc a_DoUpdateWindowUIwxUpdateUIEventR, wxTopLevelWindowNativeExtEnableCloseButtonboolFunc a_EnableCloseButtonbool, wxTopLevelWindowNativeExtEnableFullScreenViewboollongFunc a_EnableFullScreenViewboollong, wxTopLevelWindowNativeExtEnableMaximizeButtonboolFunc a_EnableMaximizeButtonbool, wxTopLevelWindowNativeExtEnableMinimizeButtonboolFunc a_EnableMinimizeButtonbool, wxTopLevelWindowNativeExtGetClientAreaOriginFunc a_GetClientAreaOrigin, wxTopLevelWindowNativeExtGetContentProtectionFunc a_GetContentProtection, wxTopLevelWindowNativeExtGetEventHashTableFunc a_GetEventHashTable, wxTopLevelWindowNativeExtGetEventTableFunc a_GetEventTable, wxTopLevelWindowNativeExtGetLabelFunc a_GetLabel, wxTopLevelWindowNativeExtGetRectForTopLevelChildrenintPintPintPintPFunc a_GetRectForTopLevelChildrenintPintPintPintP, wxTopLevelWindowNativeExtGetTitleFunc a_GetTitle, wxTopLevelWindowNativeExtIconizeboolFunc a_Iconizebool, wxTopLevelWindowNativeExtIsActiveFunc a_IsActive, wxTopLevelWindowNativeExtIsAlwaysMaximizedFunc a_IsAlwaysMaximized, wxTopLevelWindowNativeExtIsFullScreenFunc a_IsFullScreen, wxTopLevelWindowNativeExtIsIconizedFunc a_IsIconized, wxTopLevelWindowNativeExtIsMaximizedFunc a_IsMaximized, wxTopLevelWindowNativeExtIsOneOfBarswxWindowCPFunc a_IsOneOfBarswxWindowCP, wxTopLevelWindowNativeExtIsTopLevelFunc a_IsTopLevel, wxTopLevelWindowNativeExtIsTopNavigationDomainwxWindowBaseNNavigationKindFunc a_IsTopNavigationDomainwxWindowBaseNNavigationKind, wxTopLevelWindowNativeExtIsVisibleFunc a_IsVisible, wxTopLevelWindowNativeExtLayoutFunc a_Layout, wxTopLevelWindowNativeExtMaximizeboolFunc a_Maximizebool, wxTopLevelWindowNativeExtOSXIsModifiedFunc a_OSXIsModified, wxTopLevelWindowNativeExtOSXSetModifiedboolFunc a_OSXSetModifiedbool, wxTopLevelWindowNativeExtRequestUserAttentionintFunc a_RequestUserAttentionint, wxTopLevelWindowNativeExtRestoreFunc a_Restore, wxTopLevelWindowNativeExtRestoreFieldwxStringCRintPFunc a_RestoreFieldwxStringCRintP, wxTopLevelWindowNativeExtSaveFieldwxStringCRintFunc a_SaveFieldwxStringCRint, wxTopLevelWindowNativeExtSetContentProtectionwxContentProtectionFunc a_SetContentProtectionwxContentProtection, wxTopLevelWindowNativeExtSetIconswxIconBundleCRFunc a_SetIconswxIconBundleCR, wxTopLevelWindowNativeExtSetLabelwxStringCRFunc a_SetLabelwxStringCR, wxTopLevelWindowNativeExtSetMaxSizewxSizeCRFunc a_SetMaxSizewxSizeCR, wxTopLevelWindowNativeExtSetMinSizewxSizeCRFunc a_SetMinSizewxSizeCR, wxTopLevelWindowNativeExtSetRepresentedFilenamewxStringCRFunc a_SetRepresentedFilenamewxStringCR, wxTopLevelWindowNativeExtSetTitlewxStringCRFunc a_SetTitlewxStringCR, wxTopLevelWindowNativeExtShouldPreventAppExitFunc a_ShouldPreventAppExit, wxTopLevelWindowNativeExtShowFullScreenboollongFunc a_ShowFullScreenboollong, wxTopLevelWindowNativeExtShowWithoutActivatingFunc a_ShowWithoutActivating, wxTopLevelWindowNativeExtWXReservedTLW1voidPFunc a_WXReservedTLW1voidP, wxTopLevelWindowNativeExtWXReservedTLW2voidPFunc a_WXReservedTLW2voidP, wxTopLevelWindowNativeExtWXReservedTLW3voidPFunc a_WXReservedTLW3voidP): wxTopLevelWindowNative() {
+  wxTopLevelWindowNativeExt(wxTopLevelWindowNativeExtDestroyFunc a_Destroy, wxTopLevelWindowNativeExtDoCentreintFunc a_DoCentreint, wxTopLevelWindowNativeExtDoClientToScreenintPintPFunc a_DoClientToScreenintPintP, wxTopLevelWindowNativeExtDoGetScreenPositionintPintPFunc a_DoGetScreenPositionintPintP, wxTopLevelWindowNativeExtDoScreenToClientintPintPFunc a_DoScreenToClientintPintP, wxTopLevelWindowNativeExtDoUpdateWindowUIwxUpdateUIEventRFunc a_DoUpdateWindowUIwxUpdateUIEventR, wxTopLevelWindowNativeExtEnableCloseButtonboolFunc a_EnableCloseButtonbool, wxTopLevelWindowNativeExtEnableFullScreenViewboollongFunc a_EnableFullScreenViewboollong, wxTopLevelWindowNativeExtEnableMaximizeButtonboolFunc a_EnableMaximizeButtonbool, wxTopLevelWindowNativeExtEnableMinimizeButtonboolFunc a_EnableMinimizeButtonbool, wxTopLevelWindowNativeExtGetClientAreaOriginFunc a_GetClientAreaOrigin, wxTopLevelWindowNativeExtGetContentProtectionFunc a_GetContentProtection, wxTopLevelWindowNativeExtGetEventHashTableFunc a_GetEventHashTable, wxTopLevelWindowNativeExtGetEventTableFunc a_GetEventTable, wxTopLevelWindowNativeExtGetLabelFunc a_GetLabel, wxTopLevelWindowNativeExtGetRectForTopLevelChildrenintPintPintPintPFunc a_GetRectForTopLevelChildrenintPintPintPintP, wxTopLevelWindowNativeExtGetTitleFunc a_GetTitle, wxTopLevelWindowNativeExtIconizeboolFunc a_Iconizebool, wxTopLevelWindowNativeExtIsActiveFunc a_IsActive, wxTopLevelWindowNativeExtIsAlwaysMaximizedFunc a_IsAlwaysMaximized, wxTopLevelWindowNativeExtIsFullScreenFunc a_IsFullScreen, wxTopLevelWindowNativeExtIsIconizedFunc a_IsIconized, wxTopLevelWindowNativeExtIsMaximizedFunc a_IsMaximized, wxTopLevelWindowNativeExtIsOneOfBarswxWindowCPFunc a_IsOneOfBarswxWindowCP, wxTopLevelWindowNativeExtIsTopLevelFunc a_IsTopLevel, wxTopLevelWindowNativeExtIsTopNavigationDomainwxWindowBaseNNavigationKindFunc a_IsTopNavigationDomainwxWindowBaseNNavigationKind, wxTopLevelWindowNativeExtIsVisibleFunc a_IsVisible, wxTopLevelWindowNativeExtLayoutFunc a_Layout, wxTopLevelWindowNativeExtMaximizeboolFunc a_Maximizebool, wxTopLevelWindowNativeExtOSXIsModifiedFunc a_OSXIsModified, wxTopLevelWindowNativeExtOSXSetModifiedboolFunc a_OSXSetModifiedbool, wxTopLevelWindowNativeExtRequestUserAttentionintFunc a_RequestUserAttentionint, wxTopLevelWindowNativeExtRestoreFunc a_Restore, wxTopLevelWindowNativeExtSetContentProtectionwxContentProtectionFunc a_SetContentProtectionwxContentProtection, wxTopLevelWindowNativeExtSetIconswxIconBundleCRFunc a_SetIconswxIconBundleCR, wxTopLevelWindowNativeExtSetLabelwxStringCRFunc a_SetLabelwxStringCR, wxTopLevelWindowNativeExtSetMaxSizewxSizeCRFunc a_SetMaxSizewxSizeCR, wxTopLevelWindowNativeExtSetMinSizewxSizeCRFunc a_SetMinSizewxSizeCR, wxTopLevelWindowNativeExtSetRepresentedFilenamewxStringCRFunc a_SetRepresentedFilenamewxStringCR, wxTopLevelWindowNativeExtSetTitlewxStringCRFunc a_SetTitlewxStringCR, wxTopLevelWindowNativeExtShouldPreventAppExitFunc a_ShouldPreventAppExit, wxTopLevelWindowNativeExtShowFullScreenboollongFunc a_ShowFullScreenboollong, wxTopLevelWindowNativeExtShowWithoutActivatingFunc a_ShowWithoutActivating, wxTopLevelWindowNativeExtWXReservedTLW1voidPFunc a_WXReservedTLW1voidP, wxTopLevelWindowNativeExtWXReservedTLW2voidPFunc a_WXReservedTLW2voidP, wxTopLevelWindowNativeExtWXReservedTLW3voidPFunc a_WXReservedTLW3voidP): wxTopLevelWindowNative() {
     m_wxTopLevelWindowNativeExtDestroy = a_Destroy;
     m_wxTopLevelWindowNativeExtDoCentreint = a_DoCentreint;
     m_wxTopLevelWindowNativeExtDoClientToScreenintPintP = a_DoClientToScreenintPintP;
@@ -884,8 +1092,6 @@ public:
     m_wxTopLevelWindowNativeExtOSXSetModifiedbool = a_OSXSetModifiedbool;
     m_wxTopLevelWindowNativeExtRequestUserAttentionint = a_RequestUserAttentionint;
     m_wxTopLevelWindowNativeExtRestore = a_Restore;
-    m_wxTopLevelWindowNativeExtRestoreFieldwxStringCRintP = a_RestoreFieldwxStringCRintP;
-    m_wxTopLevelWindowNativeExtSaveFieldwxStringCRint = a_SaveFieldwxStringCRint;
     m_wxTopLevelWindowNativeExtSetContentProtectionwxContentProtection = a_SetContentProtectionwxContentProtection;
     m_wxTopLevelWindowNativeExtSetIconswxIconBundleCR = a_SetIconswxIconBundleCR;
     m_wxTopLevelWindowNativeExtSetLabelwxStringCR = a_SetLabelwxStringCR;
@@ -912,7 +1118,7 @@ public:
   {
     bool res = wxTopLevelWindow::Destroy();
     if (*m_wxTopLevelWindowExtDestroy != NULL){
-      return m_wxTopLevelWindowExtDestroy(this);
+      return m_wxTopLevelWindowExtDestroy(this, res);
     }
     else {
       return res;
@@ -963,7 +1169,7 @@ public:
   {
     bool res = wxTopLevelWindow::EnableCloseButton(enable);
     if (*m_wxTopLevelWindowExtEnableCloseButtonbool != NULL){
-      return m_wxTopLevelWindowExtEnableCloseButtonbool(this, enable);
+      return m_wxTopLevelWindowExtEnableCloseButtonbool(this, enable, res);
     }
     else {
       return res;
@@ -974,7 +1180,7 @@ public:
   {
     bool res = wxTopLevelWindow::EnableFullScreenView(enable, style);
     if (*m_wxTopLevelWindowExtEnableFullScreenViewboollong != NULL){
-      return m_wxTopLevelWindowExtEnableFullScreenViewboollong(this, enable, style);
+      return m_wxTopLevelWindowExtEnableFullScreenViewboollong(this, enable, style, res);
     }
     else {
       return res;
@@ -985,7 +1191,7 @@ public:
   {
     bool res = wxTopLevelWindow::EnableMaximizeButton(enable);
     if (*m_wxTopLevelWindowExtEnableMaximizeButtonbool != NULL){
-      return m_wxTopLevelWindowExtEnableMaximizeButtonbool(this, enable);
+      return m_wxTopLevelWindowExtEnableMaximizeButtonbool(this, enable, res);
     }
     else {
       return res;
@@ -996,7 +1202,7 @@ public:
   {
     bool res = wxTopLevelWindow::EnableMinimizeButton(enable);
     if (*m_wxTopLevelWindowExtEnableMinimizeButtonbool != NULL){
-      return m_wxTopLevelWindowExtEnableMinimizeButtonbool(this, enable);
+      return m_wxTopLevelWindowExtEnableMinimizeButtonbool(this, enable, res);
     }
     else {
       return res;
@@ -1007,7 +1213,7 @@ public:
   {
     wxClassInfo* res = wxTopLevelWindow::GetClassInfo();
     if (*m_wxTopLevelWindowExtGetClassInfo != NULL){
-      return m_wxTopLevelWindowExtGetClassInfo(this);
+      return m_wxTopLevelWindowExtGetClassInfo(this, res);
     }
     else {
       return res;
@@ -1018,7 +1224,7 @@ public:
   {
     wxPoint res = wxTopLevelWindow::GetClientAreaOrigin();
     if (*m_wxTopLevelWindowExtGetClientAreaOrigin != NULL){
-      return m_wxTopLevelWindowExtGetClientAreaOrigin(this);
+      return m_wxTopLevelWindowExtGetClientAreaOrigin(this, res);
     }
     else {
       return res;
@@ -1029,7 +1235,7 @@ public:
   {
     wxContentProtection res = wxTopLevelWindow::GetContentProtection();
     if (*m_wxTopLevelWindowExtGetContentProtection != NULL){
-      return m_wxTopLevelWindowExtGetContentProtection(this);
+      return m_wxTopLevelWindowExtGetContentProtection(this, res);
     }
     else {
       return res;
@@ -1040,7 +1246,7 @@ public:
   {
     wxEventHashTable& res = wxTopLevelWindow::GetEventHashTable();
     if (*m_wxTopLevelWindowExtGetEventHashTable != NULL){
-      return m_wxTopLevelWindowExtGetEventHashTable(this);
+      return m_wxTopLevelWindowExtGetEventHashTable(this, res);
     }
     else {
       return res;
@@ -1051,7 +1257,7 @@ public:
   {
     wxEventTable const* res = wxTopLevelWindow::GetEventTable();
     if (*m_wxTopLevelWindowExtGetEventTable != NULL){
-      return m_wxTopLevelWindowExtGetEventTable(this);
+      return m_wxTopLevelWindowExtGetEventTable(this, res);
     }
     else {
       return res;
@@ -1062,7 +1268,7 @@ public:
   {
     wxString res = wxTopLevelWindow::GetLabel();
     if (*m_wxTopLevelWindowExtGetLabel != NULL){
-      return m_wxTopLevelWindowExtGetLabel(this);
+      return m_wxTopLevelWindowExtGetLabel(this, res);
     }
     else {
       return res;
@@ -1081,7 +1287,7 @@ public:
   {
     wxString res = wxTopLevelWindow::GetTitle();
     if (*m_wxTopLevelWindowExtGetTitle != NULL){
-      return m_wxTopLevelWindowExtGetTitle(this);
+      return m_wxTopLevelWindowExtGetTitle(this, res);
     }
     else {
       return res;
@@ -1100,7 +1306,7 @@ public:
   {
     bool res = wxTopLevelWindow::IsActive();
     if (*m_wxTopLevelWindowExtIsActive != NULL){
-      return m_wxTopLevelWindowExtIsActive(this);
+      return m_wxTopLevelWindowExtIsActive(this, res);
     }
     else {
       return res;
@@ -1111,7 +1317,7 @@ public:
   {
     bool res = wxTopLevelWindow::IsAlwaysMaximized();
     if (*m_wxTopLevelWindowExtIsAlwaysMaximized != NULL){
-      return m_wxTopLevelWindowExtIsAlwaysMaximized(this);
+      return m_wxTopLevelWindowExtIsAlwaysMaximized(this, res);
     }
     else {
       return res;
@@ -1122,7 +1328,7 @@ public:
   {
     bool res = wxTopLevelWindow::IsFullScreen();
     if (*m_wxTopLevelWindowExtIsFullScreen != NULL){
-      return m_wxTopLevelWindowExtIsFullScreen(this);
+      return m_wxTopLevelWindowExtIsFullScreen(this, res);
     }
     else {
       return res;
@@ -1133,7 +1339,7 @@ public:
   {
     bool res = wxTopLevelWindow::IsIconized();
     if (*m_wxTopLevelWindowExtIsIconized != NULL){
-      return m_wxTopLevelWindowExtIsIconized(this);
+      return m_wxTopLevelWindowExtIsIconized(this, res);
     }
     else {
       return res;
@@ -1144,7 +1350,7 @@ public:
   {
     bool res = wxTopLevelWindow::IsMaximized();
     if (*m_wxTopLevelWindowExtIsMaximized != NULL){
-      return m_wxTopLevelWindowExtIsMaximized(this);
+      return m_wxTopLevelWindowExtIsMaximized(this, res);
     }
     else {
       return res;
@@ -1155,7 +1361,7 @@ public:
   {
     bool res = wxTopLevelWindow::IsOneOfBars(param0);
     if (*m_wxTopLevelWindowExtIsOneOfBarswxWindowCP != NULL){
-      return m_wxTopLevelWindowExtIsOneOfBarswxWindowCP(this, param0);
+      return m_wxTopLevelWindowExtIsOneOfBarswxWindowCP(this, param0, res);
     }
     else {
       return res;
@@ -1166,7 +1372,7 @@ public:
   {
     bool res = wxTopLevelWindow::IsTopLevel();
     if (*m_wxTopLevelWindowExtIsTopLevel != NULL){
-      return m_wxTopLevelWindowExtIsTopLevel(this);
+      return m_wxTopLevelWindowExtIsTopLevel(this, res);
     }
     else {
       return res;
@@ -1177,7 +1383,7 @@ public:
   {
     bool res = wxTopLevelWindow::IsTopNavigationDomain(kind);
     if (*m_wxTopLevelWindowExtIsTopNavigationDomainwxWindowBaseNNavigationKind != NULL){
-      return m_wxTopLevelWindowExtIsTopNavigationDomainwxWindowBaseNNavigationKind(this, kind);
+      return m_wxTopLevelWindowExtIsTopNavigationDomainwxWindowBaseNNavigationKind(this, kind, res);
     }
     else {
       return res;
@@ -1188,7 +1394,7 @@ public:
   {
     bool res = wxTopLevelWindow::IsVisible();
     if (*m_wxTopLevelWindowExtIsVisible != NULL){
-      return m_wxTopLevelWindowExtIsVisible(this);
+      return m_wxTopLevelWindowExtIsVisible(this, res);
     }
     else {
       return res;
@@ -1199,7 +1405,7 @@ public:
   {
     bool res = wxTopLevelWindow::Layout();
     if (*m_wxTopLevelWindowExtLayout != NULL){
-      return m_wxTopLevelWindowExtLayout(this);
+      return m_wxTopLevelWindowExtLayout(this, res);
     }
     else {
       return res;
@@ -1218,7 +1424,7 @@ public:
   {
     bool res = wxTopLevelWindow::OSXIsModified();
     if (*m_wxTopLevelWindowExtOSXIsModified != NULL){
-      return m_wxTopLevelWindowExtOSXIsModified(this);
+      return m_wxTopLevelWindowExtOSXIsModified(this, res);
     }
     else {
       return res;
@@ -1248,32 +1454,12 @@ public:
       return m_wxTopLevelWindowExtRestore(this);
     }
   }
-  wxTopLevelWindowExtRestoreFieldwxStringCRintPFunc m_wxTopLevelWindowExtRestoreFieldwxStringCRintP = NULL;
-  virtual bool RestoreField(wxString const& name, int* value)
-  {
-    if (*m_wxTopLevelWindowExtRestoreFieldwxStringCRintP != NULL){
-      return m_wxTopLevelWindowExtRestoreFieldwxStringCRintP(this, name, value);
-    }
-    else {
-      return false;
-    }
-  }
-  wxTopLevelWindowExtSaveFieldwxStringCRintFunc m_wxTopLevelWindowExtSaveFieldwxStringCRint = NULL;
-  virtual bool SaveField(wxString const& name, int value) const
-  {
-    if (*m_wxTopLevelWindowExtSaveFieldwxStringCRint != NULL){
-      return m_wxTopLevelWindowExtSaveFieldwxStringCRint(this, name, value);
-    }
-    else {
-      return false;
-    }
-  }
   wxTopLevelWindowExtSetContentProtectionwxContentProtectionFunc m_wxTopLevelWindowExtSetContentProtectionwxContentProtection = NULL;
   virtual bool SetContentProtection(wxContentProtection contentProtection) override
   {
     bool res = wxTopLevelWindow::SetContentProtection(contentProtection);
     if (*m_wxTopLevelWindowExtSetContentProtectionwxContentProtection != NULL){
-      return m_wxTopLevelWindowExtSetContentProtectionwxContentProtection(this, contentProtection);
+      return m_wxTopLevelWindowExtSetContentProtectionwxContentProtection(this, contentProtection, res);
     }
     else {
       return res;
@@ -1332,7 +1518,7 @@ public:
   {
     bool res = wxTopLevelWindow::ShouldPreventAppExit();
     if (*m_wxTopLevelWindowExtShouldPreventAppExit != NULL){
-      return m_wxTopLevelWindowExtShouldPreventAppExit(this);
+      return m_wxTopLevelWindowExtShouldPreventAppExit(this, res);
     }
     else {
       return res;
@@ -1343,7 +1529,7 @@ public:
   {
     bool res = wxTopLevelWindow::ShowFullScreen(show, style);
     if (*m_wxTopLevelWindowExtShowFullScreenboollong != NULL){
-      return m_wxTopLevelWindowExtShowFullScreenboollong(this, show, style);
+      return m_wxTopLevelWindowExtShowFullScreenboollong(this, show, style, res);
     }
     else {
       return res;
@@ -1362,7 +1548,7 @@ public:
   {
     void* res = wxTopLevelWindow::WXReservedTLW1(param0);
     if (*m_wxTopLevelWindowExtWXReservedTLW1voidP != NULL){
-      return m_wxTopLevelWindowExtWXReservedTLW1voidP(this, param0);
+      return m_wxTopLevelWindowExtWXReservedTLW1voidP(this, param0, res);
     }
     else {
       return res;
@@ -1373,7 +1559,7 @@ public:
   {
     void* res = wxTopLevelWindow::WXReservedTLW2(param0);
     if (*m_wxTopLevelWindowExtWXReservedTLW2voidP != NULL){
-      return m_wxTopLevelWindowExtWXReservedTLW2voidP(this, param0);
+      return m_wxTopLevelWindowExtWXReservedTLW2voidP(this, param0, res);
     }
     else {
       return res;
@@ -1384,13 +1570,13 @@ public:
   {
     void* res = wxTopLevelWindow::WXReservedTLW3(param0);
     if (*m_wxTopLevelWindowExtWXReservedTLW3voidP != NULL){
-      return m_wxTopLevelWindowExtWXReservedTLW3voidP(this, param0);
+      return m_wxTopLevelWindowExtWXReservedTLW3voidP(this, param0, res);
     }
     else {
       return res;
     }
   }
-  wxTopLevelWindowExt(wxTopLevelWindowExtDestroyFunc a_Destroy, wxTopLevelWindowExtDoCentreintFunc a_DoCentreint, wxTopLevelWindowExtDoClientToScreenintPintPFunc a_DoClientToScreenintPintP, wxTopLevelWindowExtDoGetScreenPositionintPintPFunc a_DoGetScreenPositionintPintP, wxTopLevelWindowExtDoScreenToClientintPintPFunc a_DoScreenToClientintPintP, wxTopLevelWindowExtDoUpdateWindowUIwxUpdateUIEventRFunc a_DoUpdateWindowUIwxUpdateUIEventR, wxTopLevelWindowExtEnableCloseButtonboolFunc a_EnableCloseButtonbool, wxTopLevelWindowExtEnableFullScreenViewboollongFunc a_EnableFullScreenViewboollong, wxTopLevelWindowExtEnableMaximizeButtonboolFunc a_EnableMaximizeButtonbool, wxTopLevelWindowExtEnableMinimizeButtonboolFunc a_EnableMinimizeButtonbool, wxTopLevelWindowExtGetClassInfoFunc a_GetClassInfo, wxTopLevelWindowExtGetClientAreaOriginFunc a_GetClientAreaOrigin, wxTopLevelWindowExtGetContentProtectionFunc a_GetContentProtection, wxTopLevelWindowExtGetEventHashTableFunc a_GetEventHashTable, wxTopLevelWindowExtGetEventTableFunc a_GetEventTable, wxTopLevelWindowExtGetLabelFunc a_GetLabel, wxTopLevelWindowExtGetRectForTopLevelChildrenintPintPintPintPFunc a_GetRectForTopLevelChildrenintPintPintPintP, wxTopLevelWindowExtGetTitleFunc a_GetTitle, wxTopLevelWindowExtIconizeboolFunc a_Iconizebool, wxTopLevelWindowExtIsActiveFunc a_IsActive, wxTopLevelWindowExtIsAlwaysMaximizedFunc a_IsAlwaysMaximized, wxTopLevelWindowExtIsFullScreenFunc a_IsFullScreen, wxTopLevelWindowExtIsIconizedFunc a_IsIconized, wxTopLevelWindowExtIsMaximizedFunc a_IsMaximized, wxTopLevelWindowExtIsOneOfBarswxWindowCPFunc a_IsOneOfBarswxWindowCP, wxTopLevelWindowExtIsTopLevelFunc a_IsTopLevel, wxTopLevelWindowExtIsTopNavigationDomainwxWindowBaseNNavigationKindFunc a_IsTopNavigationDomainwxWindowBaseNNavigationKind, wxTopLevelWindowExtIsVisibleFunc a_IsVisible, wxTopLevelWindowExtLayoutFunc a_Layout, wxTopLevelWindowExtMaximizeboolFunc a_Maximizebool, wxTopLevelWindowExtOSXIsModifiedFunc a_OSXIsModified, wxTopLevelWindowExtOSXSetModifiedboolFunc a_OSXSetModifiedbool, wxTopLevelWindowExtRequestUserAttentionintFunc a_RequestUserAttentionint, wxTopLevelWindowExtRestoreFunc a_Restore, wxTopLevelWindowExtRestoreFieldwxStringCRintPFunc a_RestoreFieldwxStringCRintP, wxTopLevelWindowExtSaveFieldwxStringCRintFunc a_SaveFieldwxStringCRint, wxTopLevelWindowExtSetContentProtectionwxContentProtectionFunc a_SetContentProtectionwxContentProtection, wxTopLevelWindowExtSetIconswxIconBundleCRFunc a_SetIconswxIconBundleCR, wxTopLevelWindowExtSetLabelwxStringCRFunc a_SetLabelwxStringCR, wxTopLevelWindowExtSetMaxSizewxSizeCRFunc a_SetMaxSizewxSizeCR, wxTopLevelWindowExtSetMinSizewxSizeCRFunc a_SetMinSizewxSizeCR, wxTopLevelWindowExtSetRepresentedFilenamewxStringCRFunc a_SetRepresentedFilenamewxStringCR, wxTopLevelWindowExtSetTitlewxStringCRFunc a_SetTitlewxStringCR, wxTopLevelWindowExtShouldPreventAppExitFunc a_ShouldPreventAppExit, wxTopLevelWindowExtShowFullScreenboollongFunc a_ShowFullScreenboollong, wxTopLevelWindowExtShowWithoutActivatingFunc a_ShowWithoutActivating, wxTopLevelWindowExtWXReservedTLW1voidPFunc a_WXReservedTLW1voidP, wxTopLevelWindowExtWXReservedTLW2voidPFunc a_WXReservedTLW2voidP, wxTopLevelWindowExtWXReservedTLW3voidPFunc a_WXReservedTLW3voidP): wxTopLevelWindow() {
+  wxTopLevelWindowExt(wxTopLevelWindowExtDestroyFunc a_Destroy, wxTopLevelWindowExtDoCentreintFunc a_DoCentreint, wxTopLevelWindowExtDoClientToScreenintPintPFunc a_DoClientToScreenintPintP, wxTopLevelWindowExtDoGetScreenPositionintPintPFunc a_DoGetScreenPositionintPintP, wxTopLevelWindowExtDoScreenToClientintPintPFunc a_DoScreenToClientintPintP, wxTopLevelWindowExtDoUpdateWindowUIwxUpdateUIEventRFunc a_DoUpdateWindowUIwxUpdateUIEventR, wxTopLevelWindowExtEnableCloseButtonboolFunc a_EnableCloseButtonbool, wxTopLevelWindowExtEnableFullScreenViewboollongFunc a_EnableFullScreenViewboollong, wxTopLevelWindowExtEnableMaximizeButtonboolFunc a_EnableMaximizeButtonbool, wxTopLevelWindowExtEnableMinimizeButtonboolFunc a_EnableMinimizeButtonbool, wxTopLevelWindowExtGetClassInfoFunc a_GetClassInfo, wxTopLevelWindowExtGetClientAreaOriginFunc a_GetClientAreaOrigin, wxTopLevelWindowExtGetContentProtectionFunc a_GetContentProtection, wxTopLevelWindowExtGetEventHashTableFunc a_GetEventHashTable, wxTopLevelWindowExtGetEventTableFunc a_GetEventTable, wxTopLevelWindowExtGetLabelFunc a_GetLabel, wxTopLevelWindowExtGetRectForTopLevelChildrenintPintPintPintPFunc a_GetRectForTopLevelChildrenintPintPintPintP, wxTopLevelWindowExtGetTitleFunc a_GetTitle, wxTopLevelWindowExtIconizeboolFunc a_Iconizebool, wxTopLevelWindowExtIsActiveFunc a_IsActive, wxTopLevelWindowExtIsAlwaysMaximizedFunc a_IsAlwaysMaximized, wxTopLevelWindowExtIsFullScreenFunc a_IsFullScreen, wxTopLevelWindowExtIsIconizedFunc a_IsIconized, wxTopLevelWindowExtIsMaximizedFunc a_IsMaximized, wxTopLevelWindowExtIsOneOfBarswxWindowCPFunc a_IsOneOfBarswxWindowCP, wxTopLevelWindowExtIsTopLevelFunc a_IsTopLevel, wxTopLevelWindowExtIsTopNavigationDomainwxWindowBaseNNavigationKindFunc a_IsTopNavigationDomainwxWindowBaseNNavigationKind, wxTopLevelWindowExtIsVisibleFunc a_IsVisible, wxTopLevelWindowExtLayoutFunc a_Layout, wxTopLevelWindowExtMaximizeboolFunc a_Maximizebool, wxTopLevelWindowExtOSXIsModifiedFunc a_OSXIsModified, wxTopLevelWindowExtOSXSetModifiedboolFunc a_OSXSetModifiedbool, wxTopLevelWindowExtRequestUserAttentionintFunc a_RequestUserAttentionint, wxTopLevelWindowExtRestoreFunc a_Restore, wxTopLevelWindowExtSetContentProtectionwxContentProtectionFunc a_SetContentProtectionwxContentProtection, wxTopLevelWindowExtSetIconswxIconBundleCRFunc a_SetIconswxIconBundleCR, wxTopLevelWindowExtSetLabelwxStringCRFunc a_SetLabelwxStringCR, wxTopLevelWindowExtSetMaxSizewxSizeCRFunc a_SetMaxSizewxSizeCR, wxTopLevelWindowExtSetMinSizewxSizeCRFunc a_SetMinSizewxSizeCR, wxTopLevelWindowExtSetRepresentedFilenamewxStringCRFunc a_SetRepresentedFilenamewxStringCR, wxTopLevelWindowExtSetTitlewxStringCRFunc a_SetTitlewxStringCR, wxTopLevelWindowExtShouldPreventAppExitFunc a_ShouldPreventAppExit, wxTopLevelWindowExtShowFullScreenboollongFunc a_ShowFullScreenboollong, wxTopLevelWindowExtShowWithoutActivatingFunc a_ShowWithoutActivating, wxTopLevelWindowExtWXReservedTLW1voidPFunc a_WXReservedTLW1voidP, wxTopLevelWindowExtWXReservedTLW2voidPFunc a_WXReservedTLW2voidP, wxTopLevelWindowExtWXReservedTLW3voidPFunc a_WXReservedTLW3voidP): wxTopLevelWindow() {
     m_wxTopLevelWindowExtDestroy = a_Destroy;
     m_wxTopLevelWindowExtDoCentreint = a_DoCentreint;
     m_wxTopLevelWindowExtDoClientToScreenintPintP = a_DoClientToScreenintPintP;
@@ -1425,8 +1611,6 @@ public:
     m_wxTopLevelWindowExtOSXSetModifiedbool = a_OSXSetModifiedbool;
     m_wxTopLevelWindowExtRequestUserAttentionint = a_RequestUserAttentionint;
     m_wxTopLevelWindowExtRestore = a_Restore;
-    m_wxTopLevelWindowExtRestoreFieldwxStringCRintP = a_RestoreFieldwxStringCRintP;
-    m_wxTopLevelWindowExtSaveFieldwxStringCRint = a_SaveFieldwxStringCRint;
     m_wxTopLevelWindowExtSetContentProtectionwxContentProtection = a_SetContentProtectionwxContentProtection;
     m_wxTopLevelWindowExtSetIconswxIconBundleCR = a_SetIconswxIconBundleCR;
     m_wxTopLevelWindowExtSetLabelwxStringCR = a_SetLabelwxStringCR;