X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf188f1add12abe2238d51d0568acc2a386e8051..9fe52545f5b4a21e3cdeab5d0aa8d9e6a91355c3:/include/wx/app.h diff --git a/include/wx/app.h b/include/wx/app.h index b6db5db471..1e555d402d 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -65,6 +65,9 @@ public: // the virtual functions which may/must be overridden in the derived class // ----------------------------------------------------------------------- +#ifdef __DARWIN__ + virtual ~wxAppBase() { } +#endif // called during the program initialization, returning FALSE from here // prevents the program from continuing - it's a good place to create @@ -263,6 +266,16 @@ public: virtual void SetActive(bool isActive, wxWindow *lastFocus); #endif // wxUSE_GUI + // debugging support + // ----------------- + + // this function is called when an assert failure occurs, the base class + // version does the normal processing (i.e. shows the usual assert failure + // dialog box) +#ifdef __WXDEBUG__ + virtual void OnAssert(const wxChar *file, int line, const wxChar *msg); +#endif // __WXDEBUG__ + // implementation only from now on // ------------------------------- @@ -305,11 +318,6 @@ protected: // does any of our windows has focus? bool m_isActive; #endif // wxUSE_GUI - -#ifdef __WXMAC_X__ -public: - virtual ~wxAppBase() {} // Added min for Mac X -#endif }; // ----------------------------------------------------------------------------