X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a5f1fd3e33d25740ad47e4755868c74a58c0f9eb..594f0f5bf1355fb8d58f403d3ebacc1c1767c429:/include/wx/app.h diff --git a/include/wx/app.h b/include/wx/app.h index e052dedb4c..36e9e19790 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 @@ -315,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 }; // ---------------------------------------------------------------------------- @@ -333,8 +331,6 @@ public: #include "wx/motif/app.h" #elif defined(__WXMGL__) #include "wx/mgl/app.h" - #elif defined(__WXQT__) - #include "wx/qt/app.h" #elif defined(__WXGTK__) #include "wx/gtk/app.h" #elif defined(__WXMAC__) @@ -446,7 +442,7 @@ public: // be in your main program (e.g. hello.cpp). Now IMPLEMENT_APP should add this // code if required. -#if !wxUSE_GUI || defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) +#if !wxUSE_GUI || defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMGL__) #define IMPLEMENT_WXWIN_MAIN \ extern int wxEntry( int argc, char *argv[] ); \ int main(int argc, char *argv[]) { return wxEntry(argc, argv); }