From 02ce738d3e47cf83193fed9db58ed2b20c83fdbb Mon Sep 17 00:00:00 2001 From: Joey Yakimowich-Payne Date: Mon, 6 Feb 2023 10:40:04 -0700 Subject: [PATCH] Remove custom classes in original wx headers --- swigtemplates/window.i | 1 + wxheaders/wx/app.h | 16 +- wxheaders/wx/frame.h | 9 +- wxheaders/wx/generic/panelg.h | 2 +- wxheaders/wx/osx/app.h | 3 +- wxheaders/wx/osx/frame.h | 2 +- wxheaders/wx/osx/window.h | 2 +- wxheaders/wx/panel.h | 10 +- wxheaders/wx/unix/app.h | 3 +- wxheaders/wx/window.h | 8 +- wxheaders/wxext/app_ext.h | 455 +++++++++++++++++++++++++++++++++- wxheaders/wxext/osx/app_ext.h | 78 ------ wxheaders/wxext/window_ext.h | 1 + 13 files changed, 466 insertions(+), 124 deletions(-) diff --git a/swigtemplates/window.i b/swigtemplates/window.i index ee6bd27..2b71cfc 100644 --- a/swigtemplates/window.i +++ b/swigtemplates/window.i @@ -2,6 +2,7 @@ %include %{ #include +#include "wxext/window_ext.h" %} diff --git a/wxheaders/wx/app.h b/wxheaders/wx/app.h index fed675a..a2ee467 100644 --- a/wxheaders/wx/app.h +++ b/wxheaders/wx/app.h @@ -16,7 +16,7 @@ // headers we have to include here // ---------------------------------------------------------------------------- -#include "wxext/event_ext.h" // for the base class +#include "wx/event.h" // for the base class #include "wx/eventfilter.h" // (and another one) #include "wx/build.h" #include "wx/cmdargs.h" // for wxCmdLineArgsArray used by wxApp::argv @@ -70,7 +70,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete; // wxAppConsoleBase: wxApp for non-GUI applications // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_BASE wxAppConsoleBase : public wxEvtHandlerExt, +class WXDLLIMPEXP_BASE wxAppConsoleBase : public wxEvtHandler, public wxEventFilter { public: @@ -546,16 +546,11 @@ protected: wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase); }; -#include "wxext/appconsole_ext.h" - #if defined(__UNIX__) && !defined(__WINDOWS__) #include "wx/unix/app.h" #else // this has to be a class and not a typedef as we forward declare it - class wxAppConsole : public wxAppConsoleBaseExt { - public: - using wxAppConsoleBaseExt::wxAppConsoleBaseExt; - }; + class wxAppConsole : public wxAppConsoleBase { }; #endif // ---------------------------------------------------------------------------- @@ -564,11 +559,9 @@ protected: #if wxUSE_GUI - class WXDLLIMPEXP_CORE wxAppBase : public wxAppConsole { public: - using wxAppConsole::wxAppConsole; wxAppBase(); virtual ~wxAppBase(); @@ -750,8 +743,6 @@ protected: // now include the declaration of the real class // ---------------------------------------------------------------------------- -#include "wxext/app_ext.h" - #if defined(__WXMSW__) #include "wx/msw/app.h" #elif defined(__WXMOTIF__) @@ -766,7 +757,6 @@ protected: #include "wx/x11/app.h" #elif defined(__WXMAC__) #include "wx/osx/app.h" - #include "wxext/osx/app_ext.h" #elif defined(__WXQT__) #include "wx/qt/app.h" #endif diff --git a/wxheaders/wx/frame.h b/wxheaders/wx/frame.h index 6540597..c202f57 100644 --- a/wxheaders/wx/frame.h +++ b/wxheaders/wx/frame.h @@ -15,7 +15,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wxext/toplevel_ext.h" // the base class +#include "wx/toplevel.h" // the base class #include "wx/statusbr.h" // the default names for various classes @@ -53,7 +53,7 @@ class WXDLLIMPEXP_FWD_CORE wxToolBar; // CreateXXXBar() is called. // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxFrameBase : public wxTopLevelWindowExt +class WXDLLIMPEXP_CORE wxFrameBase : public wxTopLevelWindow { public: // construction @@ -181,7 +181,7 @@ public: virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE { - return !IsOneOfBars(child) && wxTopLevelWindowExt::IsClientAreaChild(child); + return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child); } protected: @@ -255,8 +255,6 @@ protected: wxDECLARE_NO_COPY_CLASS(wxFrameBase); }; -#include "wxext/frame_ext.h" - // include the real class declaration #if defined(__WXUNIVERSAL__) #include "wx/univ/frame.h" @@ -271,7 +269,6 @@ protected: #include "wx/motif/frame.h" #elif defined(__WXMAC__) #include "wx/osx/frame.h" - #include "wxext/osx/frame_ext.h" #elif defined(__WXQT__) #include "wx/qt/frame.h" #endif diff --git a/wxheaders/wx/generic/panelg.h b/wxheaders/wx/generic/panelg.h index b056d9e..61124e0 100644 --- a/wxheaders/wx/generic/panelg.h +++ b/wxheaders/wx/generic/panelg.h @@ -13,7 +13,7 @@ #include "wx/bitmap.h" -class WXDLLIMPEXP_CORE wxPanel : public wxPanelBaseExt +class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase { public: wxPanel() { } diff --git a/wxheaders/wx/osx/app.h b/wxheaders/wx/osx/app.h index 0adeabb..317a0ca 100644 --- a/wxheaders/wx/osx/app.h +++ b/wxheaders/wx/osx/app.h @@ -31,7 +31,7 @@ bool WXDLLIMPEXP_CORE wxYield(); // Represents the application. Derive OnInit and declare // a new App object to start application -class WXDLLIMPEXP_CORE wxApp: public wxAppBaseExt +class WXDLLIMPEXP_CORE wxApp: public wxAppBase { wxDECLARE_DYNAMIC_CLASS(wxApp); @@ -64,7 +64,6 @@ protected: wxMacAutoreleasePool* m_macPool; public: - using wxAppBaseExt::wxAppBaseExt; static bool sm_isEmbedded; // Implementation diff --git a/wxheaders/wx/osx/frame.h b/wxheaders/wx/osx/frame.h index fd7166f..9fef19f 100644 --- a/wxheaders/wx/osx/frame.h +++ b/wxheaders/wx/osx/frame.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxMacToolTip ; -class WXDLLIMPEXP_CORE wxFrame: public wxFrameBaseExt +class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase { public: // construction diff --git a/wxheaders/wx/osx/window.h b/wxheaders/wx/osx/window.h index 24ff466..25a4fc5 100644 --- a/wxheaders/wx/osx/window.h +++ b/wxheaders/wx/osx/window.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow; #endif -class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBaseExt +class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase { wxDECLARE_DYNAMIC_CLASS(wxWindowMac); diff --git a/wxheaders/wx/panel.h b/wxheaders/wx/panel.h index ce7b980..d07724a 100644 --- a/wxheaders/wx/panel.h +++ b/wxheaders/wx/panel.h @@ -16,9 +16,7 @@ // headers and forward declarations // ---------------------------------------------------------------------------- -#include "wx/wx.h" -#include "wxext/window_ext.h" -#include "wxext/window_ext_inc.h" +#include "wx/window.h" #include "wx/containr.h" class WXDLLIMPEXP_FWD_CORE wxControlContainer; @@ -29,7 +27,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[]; // wxPanel contains other controls and implements TAB traversal between them // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxPanelBase : public wxNavigationEnabled +class WXDLLIMPEXP_CORE wxPanelBase : public wxNavigationEnabled { public: wxPanelBase() { } @@ -62,8 +60,6 @@ private: wxDECLARE_NO_COPY_CLASS(wxPanelBase); }; -#include "wxext/panel_ext.h" - #if defined(__WXUNIVERSAL__) #include "wx/univ/panel.h" #elif defined(__WXMSW__) @@ -71,8 +67,6 @@ private: #else #define wxHAS_GENERIC_PANEL #include "wx/generic/panelg.h" - #include "wxext/generic/panelg_ext.h" #endif - #endif // _WX_PANELH_BASE_ diff --git a/wxheaders/wx/unix/app.h b/wxheaders/wx/unix/app.h index 99561a9..8b17354 100644 --- a/wxheaders/wx/unix/app.h +++ b/wxheaders/wx/unix/app.h @@ -15,10 +15,9 @@ class wxFDIOHandler; class wxWakeUpPipe; // wxApp subclass implementing event processing for console applications -class WXDLLIMPEXP_BASE wxAppConsole : public wxAppConsoleBaseExt +class WXDLLIMPEXP_BASE wxAppConsole : public wxAppConsoleBase { public: - using wxAppConsoleBaseExt::wxAppConsoleBaseExt; wxAppConsole(); virtual ~wxAppConsole(); diff --git a/wxheaders/wx/window.h b/wxheaders/wx/window.h index d5272f6..d728345 100644 --- a/wxheaders/wx/window.h +++ b/wxheaders/wx/window.h @@ -15,7 +15,7 @@ // headers which we must include here // ---------------------------------------------------------------------------- -#include "wxext/event_ext.h" // the base class +#include "wx/event.h" // the base class #include "wx/list.h" // defines wxWindowList @@ -172,7 +172,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete; // temporarily switches event handlers). // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxWindowBase : public wxEvtHandlerExt +class WXDLLIMPEXP_CORE wxWindowBase : public wxEvtHandler { public: // creating the window @@ -2066,8 +2066,6 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size) // now include the declaration of wxWindow class // ---------------------------------------------------------------------------- -#include "wxext/window_ext.h" - // include the declaration of the platform-specific class #if defined(__WXMSW__) #ifdef __WXUNIVERSAL__ @@ -2128,8 +2126,6 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size) #include "wx/univ/window.h" #endif // wxUniv -#include "wxext/window_ext_inc.h" - // ---------------------------------------------------------------------------- // inline functions which couldn't be declared in the class body because of // forward dependencies diff --git a/wxheaders/wxext/app_ext.h b/wxheaders/wxext/app_ext.h index 21996cb..c38b757 100644 --- a/wxheaders/wxext/app_ext.h +++ b/wxheaders/wxext/app_ext.h @@ -1,6 +1,47 @@ #ifndef _WX_APP_H_EXT_ #define _WX_APP_H_EXT_ +#include +#include + +class wxAppConsoleBaseExt; +typedef bool (*wxAppConsoleBaseExtInitializeFunc)(const wxAppConsoleBaseExt* self, int& argc, wxChar** argv); +typedef bool (*wxAppConsoleBaseExtCallOnInitFunc)(const wxAppConsoleBaseExt* self); +typedef bool (*wxAppConsoleBaseExtOnInitFunc)(const wxAppConsoleBaseExt* self); +typedef int (*wxAppConsoleBaseExtOnRunFunc)(const wxAppConsoleBaseExt* self); +typedef void (*wxAppConsoleBaseExtOnLaunchedFunc)(const wxAppConsoleBaseExt* self); +typedef void (*wxAppConsoleBaseExtOnEventLoopEnterFunc)(const wxAppConsoleBaseExt* self, wxEventLoopBase* param0); +typedef int (*wxAppConsoleBaseExtOnExitFunc)(const wxAppConsoleBaseExt* self); +typedef void (*wxAppConsoleBaseExtOnEventLoopExitFunc)(const wxAppConsoleBaseExt* self, wxEventLoopBase* param0); +typedef void (*wxAppConsoleBaseExtCleanUpFunc)(const wxAppConsoleBaseExt* self); +typedef void (*wxAppConsoleBaseExtOnFatalExceptionFunc)(const wxAppConsoleBaseExt* self); +typedef void (*wxAppConsoleBaseExtExitFunc)(const wxAppConsoleBaseExt* self); +typedef void (*wxAppConsoleBaseExtOnInitCmdLineFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser); +typedef bool (*wxAppConsoleBaseExtOnCmdLineParsedFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser); +typedef bool (*wxAppConsoleBaseExtOnCmdLineHelpFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser); +typedef bool (*wxAppConsoleBaseExtOnCmdLineErrorFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser); +typedef void (*wxAppConsoleBaseExtSetCLocaleFunc)(const wxAppConsoleBaseExt* self); +typedef int (*wxAppConsoleBaseExtFilterEventFunc)(const wxAppConsoleBaseExt* self, wxEvent& event); +typedef void (*wxAppConsoleBaseExtCallEventHandlerFunc)(const wxAppConsoleBaseExt* self, wxEvtHandler* handler, wxEventFunctor& functor, wxEvent& event); +typedef void (*wxAppConsoleBaseExtHandleEventFunc)(const wxAppConsoleBaseExt* self, wxEvtHandler* handler, wxEventFunction func, wxEvent& event); +typedef void (*wxAppConsoleBaseExtOnUnhandledExceptionFunc)(const wxAppConsoleBaseExt* self); +typedef bool (*wxAppConsoleBaseExtOnExceptionInMainLoopFunc)(const wxAppConsoleBaseExt* self); +typedef bool (*wxAppConsoleBaseExtStoreCurrentExceptionFunc)(const wxAppConsoleBaseExt* self); +typedef void (*wxAppConsoleBaseExtRethrowStoredExceptionFunc)(const wxAppConsoleBaseExt* self); +typedef void (*wxAppConsoleBaseExtProcessPendingEventsFunc)(const wxAppConsoleBaseExt* self); +typedef bool (*wxAppConsoleBaseExtPendingFunc)(const wxAppConsoleBaseExt* self); +typedef bool (*wxAppConsoleBaseExtDispatchFunc)(const wxAppConsoleBaseExt* self); +typedef int (*wxAppConsoleBaseExtMainLoopFunc)(const wxAppConsoleBaseExt* self); +typedef void (*wxAppConsoleBaseExtExitMainLoopFunc)(const wxAppConsoleBaseExt* self); +typedef void (*wxAppConsoleBaseExtWakeUpIdleFunc)(const wxAppConsoleBaseExt* self); +typedef bool (*wxAppConsoleBaseExtProcessIdleFunc)(const wxAppConsoleBaseExt* self); +typedef bool (*wxAppConsoleBaseExtUsesEventLoopFunc)(const wxAppConsoleBaseExt* self); +typedef void (*wxAppConsoleBaseExtOnAssertFailureFunc)(const wxAppConsoleBaseExt* self, wxChar const* file, int line, wxChar const* func, wxChar const* cond, wxChar const* msg); +typedef void (*wxAppConsoleBaseExtOnAssertFunc)(const wxAppConsoleBaseExt* self, wxChar const* file, int line, wxChar const* cond, wxChar const* msg); +typedef bool (*wxAppConsoleBaseExtIsGUIFunc)(const wxAppConsoleBaseExt* self); +typedef wxAppTraits* (*wxAppConsoleBaseExtCreateTraitsFunc)(const wxAppConsoleBaseExt* self); +typedef void* (*wxAppConsoleBaseExtWXReservedApp1Func)(const wxAppConsoleBaseExt* self, void* param0); +typedef void* (*wxAppConsoleBaseExtWXReservedApp2Func)(const wxAppConsoleBaseExt* self, void* param0); class wxAppBaseExt; typedef bool (*wxAppBaseExtInitializeFunc)(const wxAppBaseExt* self, int& argc, wxChar** argv); typedef bool (*wxAppBaseExtOnInitGuiFunc)(const wxAppBaseExt* self); @@ -23,11 +64,413 @@ typedef void (*wxAppBaseExtOnInitCmdLineFunc)(const wxAppBaseExt* self, wxCmdLin typedef void (*wxAppBaseExtSetActiveFunc)(const wxAppBaseExt* self, bool isActive, wxWindow* lastFocus); typedef bool (*wxAppBaseExtIsGUIFunc)(const wxAppBaseExt* self); typedef wxAppTraits* (*wxAppBaseExtCreateTraitsFunc)(const wxAppBaseExt* self); +class wxAppInitializerExt; + +class wxAppConsoleBaseExt: public wxAppConsoleBase +{ +public: + wxAppConsoleBaseExt(): wxAppConsoleBase() { } + virtual ~wxAppConsoleBaseExt() override { } + wxAppConsoleBaseExtInitializeFunc m_wxAppConsoleBaseExtInitialize = NULL; + virtual bool Initialize(int& argc, wxChar** argv) override + { + bool res = wxAppConsoleBase::Initialize(argc, argv); + if (*m_wxAppConsoleBaseExtInitialize != NULL){ + return m_wxAppConsoleBaseExtInitialize(this, argc, argv); + } + else { + return res; + } + } + wxAppConsoleBaseExtCallOnInitFunc m_wxAppConsoleBaseExtCallOnInit = NULL; + virtual bool CallOnInit() override + { + bool res = wxAppConsoleBase::CallOnInit(); + if (*m_wxAppConsoleBaseExtCallOnInit != NULL){ + return m_wxAppConsoleBaseExtCallOnInit(this); + } + else { + return res; + } + } + wxAppConsoleBaseExtOnInitFunc m_wxAppConsoleBaseExtOnInit = NULL; + virtual bool OnInit() override + { + bool res = wxAppConsoleBase::OnInit(); + if (*m_wxAppConsoleBaseExtOnInit != NULL){ + return m_wxAppConsoleBaseExtOnInit(this); + } + else { + return res; + } + } + wxAppConsoleBaseExtOnRunFunc m_wxAppConsoleBaseExtOnRun = NULL; + virtual int OnRun() override + { + int res = wxAppConsoleBase::OnRun(); + if (*m_wxAppConsoleBaseExtOnRun != NULL){ + return m_wxAppConsoleBaseExtOnRun(this); + } + else { + return res; + } + } + wxAppConsoleBaseExtOnLaunchedFunc m_wxAppConsoleBaseExtOnLaunched = NULL; + virtual void OnLaunched() override + { + wxAppConsoleBase::OnLaunched(); + if (*m_wxAppConsoleBaseExtOnLaunched != NULL){ + return m_wxAppConsoleBaseExtOnLaunched(this); + } + } + wxAppConsoleBaseExtOnEventLoopEnterFunc m_wxAppConsoleBaseExtOnEventLoopEnter = NULL; + virtual void OnEventLoopEnter(wxEventLoopBase* param0) override + { + wxAppConsoleBase::OnEventLoopEnter(param0); + if (*m_wxAppConsoleBaseExtOnEventLoopEnter != NULL){ + return m_wxAppConsoleBaseExtOnEventLoopEnter(this, param0); + } + } + wxAppConsoleBaseExtOnExitFunc m_wxAppConsoleBaseExtOnExit = NULL; + virtual int OnExit() override + { + int res = wxAppConsoleBase::OnExit(); + if (*m_wxAppConsoleBaseExtOnExit != NULL){ + return m_wxAppConsoleBaseExtOnExit(this); + } + else { + return res; + } + } + wxAppConsoleBaseExtOnEventLoopExitFunc m_wxAppConsoleBaseExtOnEventLoopExit = NULL; + virtual void OnEventLoopExit(wxEventLoopBase* param0) override + { + wxAppConsoleBase::OnEventLoopExit(param0); + if (*m_wxAppConsoleBaseExtOnEventLoopExit != NULL){ + return m_wxAppConsoleBaseExtOnEventLoopExit(this, param0); + } + } + wxAppConsoleBaseExtCleanUpFunc m_wxAppConsoleBaseExtCleanUp = NULL; + virtual void CleanUp() override + { + wxAppConsoleBase::CleanUp(); + if (*m_wxAppConsoleBaseExtCleanUp != NULL){ + return m_wxAppConsoleBaseExtCleanUp(this); + } + } + wxAppConsoleBaseExtOnFatalExceptionFunc m_wxAppConsoleBaseExtOnFatalException = NULL; + virtual void OnFatalException() override + { + wxAppConsoleBase::OnFatalException(); + if (*m_wxAppConsoleBaseExtOnFatalException != NULL){ + return m_wxAppConsoleBaseExtOnFatalException(this); + } + } + wxAppConsoleBaseExtExitFunc m_wxAppConsoleBaseExtExit = NULL; + virtual void Exit() override + { + wxAppConsoleBase::Exit(); + if (*m_wxAppConsoleBaseExtExit != NULL){ + return m_wxAppConsoleBaseExtExit(this); + } + } + wxAppConsoleBaseExtOnInitCmdLineFunc m_wxAppConsoleBaseExtOnInitCmdLine = NULL; + virtual void OnInitCmdLine(wxCmdLineParser& parser) override + { + wxAppConsoleBase::OnInitCmdLine(parser); + if (*m_wxAppConsoleBaseExtOnInitCmdLine != NULL){ + return m_wxAppConsoleBaseExtOnInitCmdLine(this, parser); + } + } + wxAppConsoleBaseExtOnCmdLineParsedFunc m_wxAppConsoleBaseExtOnCmdLineParsed = NULL; + virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override + { + bool res = wxAppConsoleBase::OnCmdLineParsed(parser); + if (*m_wxAppConsoleBaseExtOnCmdLineParsed != NULL){ + return m_wxAppConsoleBaseExtOnCmdLineParsed(this, parser); + } + else { + return res; + } + } + wxAppConsoleBaseExtOnCmdLineHelpFunc m_wxAppConsoleBaseExtOnCmdLineHelp = NULL; + virtual bool OnCmdLineHelp(wxCmdLineParser& parser) override + { + bool res = wxAppConsoleBase::OnCmdLineHelp(parser); + if (*m_wxAppConsoleBaseExtOnCmdLineHelp != NULL){ + return m_wxAppConsoleBaseExtOnCmdLineHelp(this, parser); + } + else { + return res; + } + } + wxAppConsoleBaseExtOnCmdLineErrorFunc m_wxAppConsoleBaseExtOnCmdLineError = NULL; + virtual bool OnCmdLineError(wxCmdLineParser& parser) override + { + bool res = wxAppConsoleBase::OnCmdLineError(parser); + if (*m_wxAppConsoleBaseExtOnCmdLineError != NULL){ + return m_wxAppConsoleBaseExtOnCmdLineError(this, parser); + } + else { + return res; + } + } + wxAppConsoleBaseExtSetCLocaleFunc m_wxAppConsoleBaseExtSetCLocale = NULL; + virtual void SetCLocale() override + { + wxAppConsoleBase::SetCLocale(); + if (*m_wxAppConsoleBaseExtSetCLocale != NULL){ + return m_wxAppConsoleBaseExtSetCLocale(this); + } + } + wxAppConsoleBaseExtFilterEventFunc m_wxAppConsoleBaseExtFilterEvent = NULL; + virtual int FilterEvent(wxEvent& event) override + { + int res = wxAppConsoleBase::FilterEvent(event); + if (*m_wxAppConsoleBaseExtFilterEvent != NULL){ + return m_wxAppConsoleBaseExtFilterEvent(this, event); + } + else { + return res; + } + } + wxAppConsoleBaseExtCallEventHandlerFunc m_wxAppConsoleBaseExtCallEventHandler = NULL; + virtual void CallEventHandler(wxEvtHandler* handler, wxEventFunctor& functor, wxEvent& event) const override + { + wxAppConsoleBase::CallEventHandler(handler, functor, event); + if (*m_wxAppConsoleBaseExtCallEventHandler != NULL){ + return m_wxAppConsoleBaseExtCallEventHandler(this, handler, functor, event); + } + } + wxAppConsoleBaseExtHandleEventFunc m_wxAppConsoleBaseExtHandleEvent = NULL; + virtual void HandleEvent(wxEvtHandler* handler, wxEventFunction func, wxEvent& event) const override + { + wxAppConsoleBase::HandleEvent(handler, func, event); + if (*m_wxAppConsoleBaseExtHandleEvent != NULL){ + return m_wxAppConsoleBaseExtHandleEvent(this, handler, func, event); + } + } + wxAppConsoleBaseExtOnUnhandledExceptionFunc m_wxAppConsoleBaseExtOnUnhandledException = NULL; + virtual void OnUnhandledException() override + { + wxAppConsoleBase::OnUnhandledException(); + if (*m_wxAppConsoleBaseExtOnUnhandledException != NULL){ + return m_wxAppConsoleBaseExtOnUnhandledException(this); + } + } + wxAppConsoleBaseExtOnExceptionInMainLoopFunc m_wxAppConsoleBaseExtOnExceptionInMainLoop = NULL; + virtual bool OnExceptionInMainLoop() override + { + bool res = wxAppConsoleBase::OnExceptionInMainLoop(); + if (*m_wxAppConsoleBaseExtOnExceptionInMainLoop != NULL){ + return m_wxAppConsoleBaseExtOnExceptionInMainLoop(this); + } + else { + return res; + } + } + wxAppConsoleBaseExtStoreCurrentExceptionFunc m_wxAppConsoleBaseExtStoreCurrentException = NULL; + virtual bool StoreCurrentException() override + { + bool res = wxAppConsoleBase::StoreCurrentException(); + if (*m_wxAppConsoleBaseExtStoreCurrentException != NULL){ + return m_wxAppConsoleBaseExtStoreCurrentException(this); + } + else { + return res; + } + } + wxAppConsoleBaseExtRethrowStoredExceptionFunc m_wxAppConsoleBaseExtRethrowStoredException = NULL; + virtual void RethrowStoredException() override + { + wxAppConsoleBase::RethrowStoredException(); + if (*m_wxAppConsoleBaseExtRethrowStoredException != NULL){ + return m_wxAppConsoleBaseExtRethrowStoredException(this); + } + } + wxAppConsoleBaseExtProcessPendingEventsFunc m_wxAppConsoleBaseExtProcessPendingEvents = NULL; + virtual void ProcessPendingEvents() override + { + wxAppConsoleBase::ProcessPendingEvents(); + if (*m_wxAppConsoleBaseExtProcessPendingEvents != NULL){ + return m_wxAppConsoleBaseExtProcessPendingEvents(this); + } + } + wxAppConsoleBaseExtPendingFunc m_wxAppConsoleBaseExtPending = NULL; + virtual bool Pending() override + { + bool res = wxAppConsoleBase::Pending(); + if (*m_wxAppConsoleBaseExtPending != NULL){ + return m_wxAppConsoleBaseExtPending(this); + } + else { + return res; + } + } + wxAppConsoleBaseExtDispatchFunc m_wxAppConsoleBaseExtDispatch = NULL; + virtual bool Dispatch() override + { + bool res = wxAppConsoleBase::Dispatch(); + if (*m_wxAppConsoleBaseExtDispatch != NULL){ + return m_wxAppConsoleBaseExtDispatch(this); + } + else { + return res; + } + } + wxAppConsoleBaseExtMainLoopFunc m_wxAppConsoleBaseExtMainLoop = NULL; + virtual int MainLoop() override + { + int res = wxAppConsoleBase::MainLoop(); + if (*m_wxAppConsoleBaseExtMainLoop != NULL){ + return m_wxAppConsoleBaseExtMainLoop(this); + } + else { + return res; + } + } + wxAppConsoleBaseExtExitMainLoopFunc m_wxAppConsoleBaseExtExitMainLoop = NULL; + virtual void ExitMainLoop() override + { + wxAppConsoleBase::ExitMainLoop(); + if (*m_wxAppConsoleBaseExtExitMainLoop != NULL){ + return m_wxAppConsoleBaseExtExitMainLoop(this); + } + } + wxAppConsoleBaseExtWakeUpIdleFunc m_wxAppConsoleBaseExtWakeUpIdle = NULL; + virtual void WakeUpIdle() override + { + wxAppConsoleBase::WakeUpIdle(); + if (*m_wxAppConsoleBaseExtWakeUpIdle != NULL){ + return m_wxAppConsoleBaseExtWakeUpIdle(this); + } + } + wxAppConsoleBaseExtProcessIdleFunc m_wxAppConsoleBaseExtProcessIdle = NULL; + virtual bool ProcessIdle() override + { + bool res = wxAppConsoleBase::ProcessIdle(); + if (*m_wxAppConsoleBaseExtProcessIdle != NULL){ + return m_wxAppConsoleBaseExtProcessIdle(this); + } + else { + return res; + } + } + wxAppConsoleBaseExtUsesEventLoopFunc m_wxAppConsoleBaseExtUsesEventLoop = NULL; + virtual bool UsesEventLoop() const override + { + bool res = wxAppConsoleBase::UsesEventLoop(); + if (*m_wxAppConsoleBaseExtUsesEventLoop != NULL){ + return m_wxAppConsoleBaseExtUsesEventLoop(this); + } + else { + return res; + } + } + wxAppConsoleBaseExtOnAssertFailureFunc m_wxAppConsoleBaseExtOnAssertFailure = NULL; + virtual void OnAssertFailure(wxChar const* file, int line, wxChar const* func, wxChar const* cond, wxChar const* msg) override + { + wxAppConsoleBase::OnAssertFailure(file, line, func, cond, msg); + if (*m_wxAppConsoleBaseExtOnAssertFailure != NULL){ + return m_wxAppConsoleBaseExtOnAssertFailure(this, file, line, func, cond, msg); + } + } + wxAppConsoleBaseExtOnAssertFunc m_wxAppConsoleBaseExtOnAssert = NULL; + virtual void OnAssert(wxChar const* file, int line, wxChar const* cond, wxChar const* msg) override + { + wxAppConsoleBase::OnAssert(file, line, cond, msg); + if (*m_wxAppConsoleBaseExtOnAssert != NULL){ + return m_wxAppConsoleBaseExtOnAssert(this, file, line, cond, msg); + } + } + wxAppConsoleBaseExtIsGUIFunc m_wxAppConsoleBaseExtIsGUI = NULL; + virtual bool IsGUI() const override + { + bool res = wxAppConsoleBase::IsGUI(); + if (*m_wxAppConsoleBaseExtIsGUI != NULL){ + return m_wxAppConsoleBaseExtIsGUI(this); + } + else { + return res; + } + } + wxAppConsoleBaseExtCreateTraitsFunc m_wxAppConsoleBaseExtCreateTraits = NULL; + virtual wxAppTraits* CreateTraits() override + { + wxAppTraits* res = wxAppConsoleBase::CreateTraits(); + if (*m_wxAppConsoleBaseExtCreateTraits != NULL){ + return m_wxAppConsoleBaseExtCreateTraits(this); + } + else { + return res; + } + } + wxAppConsoleBaseExtWXReservedApp1Func m_wxAppConsoleBaseExtWXReservedApp1 = NULL; + virtual void* WXReservedApp1(void* param0) override + { + void* res = wxAppConsoleBase::WXReservedApp1(param0); + if (*m_wxAppConsoleBaseExtWXReservedApp1 != NULL){ + return m_wxAppConsoleBaseExtWXReservedApp1(this, param0); + } + else { + return res; + } + } + wxAppConsoleBaseExtWXReservedApp2Func m_wxAppConsoleBaseExtWXReservedApp2 = NULL; + virtual void* WXReservedApp2(void* param0) override + { + void* res = wxAppConsoleBase::WXReservedApp2(param0); + if (*m_wxAppConsoleBaseExtWXReservedApp2 != NULL){ + return m_wxAppConsoleBaseExtWXReservedApp2(this, param0); + } + else { + return res; + } + } + wxAppConsoleBaseExt(wxAppConsoleBaseExtInitializeFunc a_Initialize, wxAppConsoleBaseExtCallOnInitFunc a_CallOnInit, wxAppConsoleBaseExtOnInitFunc a_OnInit, wxAppConsoleBaseExtOnRunFunc a_OnRun, wxAppConsoleBaseExtOnLaunchedFunc a_OnLaunched, wxAppConsoleBaseExtOnEventLoopEnterFunc a_OnEventLoopEnter, wxAppConsoleBaseExtOnExitFunc a_OnExit, wxAppConsoleBaseExtOnEventLoopExitFunc a_OnEventLoopExit, wxAppConsoleBaseExtCleanUpFunc a_CleanUp, wxAppConsoleBaseExtOnFatalExceptionFunc a_OnFatalException, wxAppConsoleBaseExtExitFunc a_Exit, wxAppConsoleBaseExtOnInitCmdLineFunc a_OnInitCmdLine, wxAppConsoleBaseExtOnCmdLineParsedFunc a_OnCmdLineParsed, wxAppConsoleBaseExtOnCmdLineHelpFunc a_OnCmdLineHelp, wxAppConsoleBaseExtOnCmdLineErrorFunc a_OnCmdLineError, wxAppConsoleBaseExtSetCLocaleFunc a_SetCLocale, wxAppConsoleBaseExtFilterEventFunc a_FilterEvent, wxAppConsoleBaseExtCallEventHandlerFunc a_CallEventHandler, wxAppConsoleBaseExtHandleEventFunc a_HandleEvent, wxAppConsoleBaseExtOnUnhandledExceptionFunc a_OnUnhandledException, wxAppConsoleBaseExtOnExceptionInMainLoopFunc a_OnExceptionInMainLoop, wxAppConsoleBaseExtStoreCurrentExceptionFunc a_StoreCurrentException, wxAppConsoleBaseExtRethrowStoredExceptionFunc a_RethrowStoredException, wxAppConsoleBaseExtProcessPendingEventsFunc a_ProcessPendingEvents, wxAppConsoleBaseExtPendingFunc a_Pending, wxAppConsoleBaseExtDispatchFunc a_Dispatch, wxAppConsoleBaseExtMainLoopFunc a_MainLoop, wxAppConsoleBaseExtExitMainLoopFunc a_ExitMainLoop, wxAppConsoleBaseExtWakeUpIdleFunc a_WakeUpIdle, wxAppConsoleBaseExtProcessIdleFunc a_ProcessIdle, wxAppConsoleBaseExtUsesEventLoopFunc a_UsesEventLoop, wxAppConsoleBaseExtOnAssertFailureFunc a_OnAssertFailure, wxAppConsoleBaseExtOnAssertFunc a_OnAssert, wxAppConsoleBaseExtIsGUIFunc a_IsGUI, wxAppConsoleBaseExtCreateTraitsFunc a_CreateTraits, wxAppConsoleBaseExtWXReservedApp1Func a_WXReservedApp1, wxAppConsoleBaseExtWXReservedApp2Func a_WXReservedApp2): wxAppConsoleBase() { + m_wxAppConsoleBaseExtInitialize = a_Initialize; + m_wxAppConsoleBaseExtCallOnInit = a_CallOnInit; + m_wxAppConsoleBaseExtOnInit = a_OnInit; + m_wxAppConsoleBaseExtOnRun = a_OnRun; + m_wxAppConsoleBaseExtOnLaunched = a_OnLaunched; + m_wxAppConsoleBaseExtOnEventLoopEnter = a_OnEventLoopEnter; + m_wxAppConsoleBaseExtOnExit = a_OnExit; + m_wxAppConsoleBaseExtOnEventLoopExit = a_OnEventLoopExit; + m_wxAppConsoleBaseExtCleanUp = a_CleanUp; + m_wxAppConsoleBaseExtOnFatalException = a_OnFatalException; + m_wxAppConsoleBaseExtExit = a_Exit; + m_wxAppConsoleBaseExtOnInitCmdLine = a_OnInitCmdLine; + m_wxAppConsoleBaseExtOnCmdLineParsed = a_OnCmdLineParsed; + m_wxAppConsoleBaseExtOnCmdLineHelp = a_OnCmdLineHelp; + m_wxAppConsoleBaseExtOnCmdLineError = a_OnCmdLineError; + m_wxAppConsoleBaseExtSetCLocale = a_SetCLocale; + m_wxAppConsoleBaseExtFilterEvent = a_FilterEvent; + m_wxAppConsoleBaseExtCallEventHandler = a_CallEventHandler; + m_wxAppConsoleBaseExtHandleEvent = a_HandleEvent; + m_wxAppConsoleBaseExtOnUnhandledException = a_OnUnhandledException; + m_wxAppConsoleBaseExtOnExceptionInMainLoop = a_OnExceptionInMainLoop; + m_wxAppConsoleBaseExtStoreCurrentException = a_StoreCurrentException; + m_wxAppConsoleBaseExtRethrowStoredException = a_RethrowStoredException; + m_wxAppConsoleBaseExtProcessPendingEvents = a_ProcessPendingEvents; + m_wxAppConsoleBaseExtPending = a_Pending; + m_wxAppConsoleBaseExtDispatch = a_Dispatch; + m_wxAppConsoleBaseExtMainLoop = a_MainLoop; + m_wxAppConsoleBaseExtExitMainLoop = a_ExitMainLoop; + m_wxAppConsoleBaseExtWakeUpIdle = a_WakeUpIdle; + m_wxAppConsoleBaseExtProcessIdle = a_ProcessIdle; + m_wxAppConsoleBaseExtUsesEventLoop = a_UsesEventLoop; + m_wxAppConsoleBaseExtOnAssertFailure = a_OnAssertFailure; + m_wxAppConsoleBaseExtOnAssert = a_OnAssert; + m_wxAppConsoleBaseExtIsGUI = a_IsGUI; + m_wxAppConsoleBaseExtCreateTraits = a_CreateTraits; + m_wxAppConsoleBaseExtWXReservedApp1 = a_WXReservedApp1; + m_wxAppConsoleBaseExtWXReservedApp2 = a_WXReservedApp2; + } +}; class wxAppBaseExt: public wxAppBase { public: - using wxAppBase::wxAppBase; wxAppBaseExt(): wxAppBase() { } virtual ~wxAppBaseExt() override { } wxAppBaseExtInitializeFunc m_wxAppBaseExtInitialize = NULL; @@ -274,11 +717,11 @@ public: } }; -/* class wxAppInitializerExt: public wxAppInitializer */ -/* { */ -/* public: */ -/* wxAppInitializerExt(wxAppInitializerFunction fn): wxAppInitializer(fn) { } */ -/* }; */ +class wxAppInitializerExt: public wxAppInitializer +{ +public: + wxAppInitializerExt(wxAppInitializerFunction fn): wxAppInitializer(fn) { } +}; diff --git a/wxheaders/wxext/osx/app_ext.h b/wxheaders/wxext/osx/app_ext.h index c87ce8e..5384191 100644 --- a/wxheaders/wxext/osx/app_ext.h +++ b/wxheaders/wxext/osx/app_ext.h @@ -1,6 +1,5 @@ #ifndef _WX_OSX_APP_H_EXT_ #define _WX_OSX_APP_H_EXT_ -#include class wxAppExt; typedef void (*wxAppExtWakeUpIdleFunc)(const wxAppExt* self); @@ -41,48 +40,10 @@ typedef void (*wxAppBaseExtOnInitCmdLineFunc)(const wxAppBaseExt* self, wxCmdLin typedef void (*wxAppBaseExtSetActiveFunc)(const wxAppBaseExt* self, bool isActive, wxWindow* lastFocus); typedef wxAppTraits* (*wxAppBaseExtCreateTraitsFunc)(const wxAppBaseExt* self); -typedef bool (*wxAppConsoleBaseExtInitializeFunc)(const wxAppConsoleBaseExt* self, int& argc, wxChar** argv); -typedef bool (*wxAppConsoleBaseExtCallOnInitFunc)(const wxAppConsoleBaseExt* self); -typedef bool (*wxAppConsoleBaseExtOnInitFunc)(const wxAppConsoleBaseExt* self); -typedef int (*wxAppConsoleBaseExtOnRunFunc)(const wxAppConsoleBaseExt* self); -typedef void (*wxAppConsoleBaseExtOnLaunchedFunc)(const wxAppConsoleBaseExt* self); -typedef void (*wxAppConsoleBaseExtOnEventLoopEnterFunc)(const wxAppConsoleBaseExt* self, wxEventLoopBase* param0); -typedef int (*wxAppConsoleBaseExtOnExitFunc)(const wxAppConsoleBaseExt* self); -typedef void (*wxAppConsoleBaseExtOnEventLoopExitFunc)(const wxAppConsoleBaseExt* self, wxEventLoopBase* param0); -typedef void (*wxAppConsoleBaseExtCleanUpFunc)(const wxAppConsoleBaseExt* self); -typedef void (*wxAppConsoleBaseExtOnFatalExceptionFunc)(const wxAppConsoleBaseExt* self); -typedef void (*wxAppConsoleBaseExtExitFunc)(const wxAppConsoleBaseExt* self); -typedef void (*wxAppConsoleBaseExtOnInitCmdLineFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser); -typedef bool (*wxAppConsoleBaseExtOnCmdLineParsedFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser); -typedef bool (*wxAppConsoleBaseExtOnCmdLineHelpFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser); -typedef bool (*wxAppConsoleBaseExtOnCmdLineErrorFunc)(const wxAppConsoleBaseExt* self, wxCmdLineParser& parser); -typedef void (*wxAppConsoleBaseExtSetCLocaleFunc)(const wxAppConsoleBaseExt* self); -typedef int (*wxAppConsoleBaseExtFilterEventFunc)(const wxAppConsoleBaseExt* self, wxEvent& event); -typedef void (*wxAppConsoleBaseExtCallEventHandlerFunc)(const wxAppConsoleBaseExt* self, wxEvtHandler* handler, wxEventFunctor& functor, wxEvent& event); -typedef void (*wxAppConsoleBaseExtHandleEventFunc)(const wxAppConsoleBaseExt* self, wxEvtHandler* handler, wxEventFunction func, wxEvent& event); -typedef void (*wxAppConsoleBaseExtOnUnhandledExceptionFunc)(const wxAppConsoleBaseExt* self); -typedef bool (*wxAppConsoleBaseExtOnExceptionInMainLoopFunc)(const wxAppConsoleBaseExt* self); -typedef bool (*wxAppConsoleBaseExtStoreCurrentExceptionFunc)(const wxAppConsoleBaseExt* self); -typedef void (*wxAppConsoleBaseExtRethrowStoredExceptionFunc)(const wxAppConsoleBaseExt* self); -typedef void (*wxAppConsoleBaseExtProcessPendingEventsFunc)(const wxAppConsoleBaseExt* self); -typedef bool (*wxAppConsoleBaseExtPendingFunc)(const wxAppConsoleBaseExt* self); -typedef bool (*wxAppConsoleBaseExtDispatchFunc)(const wxAppConsoleBaseExt* self); -typedef int (*wxAppConsoleBaseExtMainLoopFunc)(const wxAppConsoleBaseExt* self); -typedef void (*wxAppConsoleBaseExtExitMainLoopFunc)(const wxAppConsoleBaseExt* self); -typedef void (*wxAppConsoleBaseExtWakeUpIdleFunc)(const wxAppConsoleBaseExt* self); -typedef bool (*wxAppConsoleBaseExtProcessIdleFunc)(const wxAppConsoleBaseExt* self); -typedef bool (*wxAppConsoleBaseExtUsesEventLoopFunc)(const wxAppConsoleBaseExt* self); -typedef void (*wxAppConsoleBaseExtOnAssertFailureFunc)(const wxAppConsoleBaseExt* self, wxChar const* file, int line, wxChar const* func, wxChar const* cond, wxChar const* msg); -typedef void (*wxAppConsoleBaseExtOnAssertFunc)(const wxAppConsoleBaseExt* self, wxChar const* file, int line, wxChar const* cond, wxChar const* msg); -typedef bool (*wxAppConsoleBaseExtIsGUIFunc)(const wxAppConsoleBaseExt* self); -typedef wxAppTraits* (*wxAppConsoleBaseExtCreateTraitsFunc)(const wxAppConsoleBaseExt* self); -typedef void* (*wxAppConsoleBaseExtWXReservedApp1Func)(const wxAppConsoleBaseExt* self, void* param0); -typedef void* (*wxAppConsoleBaseExtWXReservedApp2Func)(const wxAppConsoleBaseExt* self, void* param0); class wxAppExt: public wxApp { public: - using wxApp::wxApp; wxAppExt(): wxApp() { } virtual ~wxAppExt() { } wxAppExtWakeUpIdleFunc m_wxAppExtWakeUpIdle = NULL; @@ -290,45 +251,6 @@ public: m_wxAppExtOSXOnShouldTerminate = a_OSXOnShouldTerminate; m_wxAppExtOSXOnWillTerminate = a_OSXOnWillTerminate; } - wxAppExt(wxAppConsoleBaseExtInitializeFunc a_Initialize, wxAppConsoleBaseExtCallOnInitFunc a_CallOnInit, wxAppConsoleBaseExtOnInitFunc a_OnInit, wxAppConsoleBaseExtOnRunFunc a_OnRun, wxAppConsoleBaseExtOnLaunchedFunc a_OnLaunched, wxAppConsoleBaseExtOnEventLoopEnterFunc a_OnEventLoopEnter, wxAppConsoleBaseExtOnExitFunc a_OnExit, wxAppConsoleBaseExtOnEventLoopExitFunc a_OnEventLoopExit, wxAppConsoleBaseExtCleanUpFunc a_CleanUp, wxAppConsoleBaseExtOnFatalExceptionFunc a_OnFatalException, wxAppConsoleBaseExtExitFunc a_Exit, wxAppConsoleBaseExtOnInitCmdLineFunc a_OnInitCmdLine, wxAppConsoleBaseExtOnCmdLineParsedFunc a_OnCmdLineParsed, wxAppConsoleBaseExtOnCmdLineHelpFunc a_OnCmdLineHelp, wxAppConsoleBaseExtOnCmdLineErrorFunc a_OnCmdLineError, wxAppConsoleBaseExtSetCLocaleFunc a_SetCLocale, wxAppConsoleBaseExtFilterEventFunc a_FilterEvent, wxAppConsoleBaseExtCallEventHandlerFunc a_CallEventHandler, wxAppConsoleBaseExtHandleEventFunc a_HandleEvent, wxAppConsoleBaseExtOnUnhandledExceptionFunc a_OnUnhandledException, wxAppConsoleBaseExtOnExceptionInMainLoopFunc a_OnExceptionInMainLoop, wxAppConsoleBaseExtStoreCurrentExceptionFunc a_StoreCurrentException, wxAppConsoleBaseExtRethrowStoredExceptionFunc a_RethrowStoredException, wxAppConsoleBaseExtProcessPendingEventsFunc a_ProcessPendingEvents, wxAppConsoleBaseExtPendingFunc a_Pending, wxAppConsoleBaseExtDispatchFunc a_Dispatch, wxAppConsoleBaseExtMainLoopFunc a_MainLoop, wxAppConsoleBaseExtExitMainLoopFunc a_ExitMainLoop, wxAppConsoleBaseExtWakeUpIdleFunc a_WakeUpIdle, wxAppConsoleBaseExtProcessIdleFunc a_ProcessIdle, wxAppConsoleBaseExtUsesEventLoopFunc a_UsesEventLoop, wxAppConsoleBaseExtOnAssertFailureFunc a_OnAssertFailure, wxAppConsoleBaseExtOnAssertFunc a_OnAssert, wxAppConsoleBaseExtIsGUIFunc a_IsGUI, wxAppConsoleBaseExtCreateTraitsFunc a_CreateTraits, wxAppConsoleBaseExtWXReservedApp1Func a_WXReservedApp1, wxAppConsoleBaseExtWXReservedApp2Func a_WXReservedApp2): wxApp() { - m_wxAppConsoleBaseExtInitialize = a_Initialize; - m_wxAppConsoleBaseExtCallOnInit = a_CallOnInit; - m_wxAppConsoleBaseExtOnInit = a_OnInit; - m_wxAppConsoleBaseExtOnRun = a_OnRun; - m_wxAppConsoleBaseExtOnLaunched = a_OnLaunched; - m_wxAppConsoleBaseExtOnEventLoopEnter = a_OnEventLoopEnter; - m_wxAppConsoleBaseExtOnExit = a_OnExit; - m_wxAppConsoleBaseExtOnEventLoopExit = a_OnEventLoopExit; - m_wxAppConsoleBaseExtCleanUp = a_CleanUp; - m_wxAppConsoleBaseExtOnFatalException = a_OnFatalException; - m_wxAppConsoleBaseExtExit = a_Exit; - m_wxAppConsoleBaseExtOnInitCmdLine = a_OnInitCmdLine; - m_wxAppConsoleBaseExtOnCmdLineParsed = a_OnCmdLineParsed; - m_wxAppConsoleBaseExtOnCmdLineHelp = a_OnCmdLineHelp; - m_wxAppConsoleBaseExtOnCmdLineError = a_OnCmdLineError; - m_wxAppConsoleBaseExtSetCLocale = a_SetCLocale; - m_wxAppConsoleBaseExtFilterEvent = a_FilterEvent; - m_wxAppConsoleBaseExtCallEventHandler = a_CallEventHandler; - m_wxAppConsoleBaseExtHandleEvent = a_HandleEvent; - m_wxAppConsoleBaseExtOnUnhandledException = a_OnUnhandledException; - m_wxAppConsoleBaseExtOnExceptionInMainLoop = a_OnExceptionInMainLoop; - m_wxAppConsoleBaseExtStoreCurrentException = a_StoreCurrentException; - m_wxAppConsoleBaseExtRethrowStoredException = a_RethrowStoredException; - m_wxAppConsoleBaseExtProcessPendingEvents = a_ProcessPendingEvents; - m_wxAppConsoleBaseExtPending = a_Pending; - m_wxAppConsoleBaseExtDispatch = a_Dispatch; - m_wxAppConsoleBaseExtMainLoop = a_MainLoop; - m_wxAppConsoleBaseExtExitMainLoop = a_ExitMainLoop; - m_wxAppConsoleBaseExtWakeUpIdle = a_WakeUpIdle; - m_wxAppConsoleBaseExtProcessIdle = a_ProcessIdle; - m_wxAppConsoleBaseExtUsesEventLoop = a_UsesEventLoop; - m_wxAppConsoleBaseExtOnAssertFailure = a_OnAssertFailure; - m_wxAppConsoleBaseExtOnAssert = a_OnAssert; - m_wxAppConsoleBaseExtIsGUI = a_IsGUI; - m_wxAppConsoleBaseExtCreateTraits = a_CreateTraits; - m_wxAppConsoleBaseExtWXReservedApp1 = a_WXReservedApp1; - m_wxAppConsoleBaseExtWXReservedApp2 = a_WXReservedApp2; - } }; diff --git a/wxheaders/wxext/window_ext.h b/wxheaders/wxext/window_ext.h index 1dc7e4d..9e4d397 100644 --- a/wxheaders/wxext/window_ext.h +++ b/wxheaders/wxext/window_ext.h @@ -1,6 +1,7 @@ #ifndef _WX_WINDOW_H_EXT_ #define _WX_WINDOW_H_EXT_ +#include class wxVisualAttributesExt; class wxWindowListNodeExt;