X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53c9228ead0c7c0955bdc882fc2ccc9aae8342ba..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/app.h diff --git a/include/wx/app.h b/include/wx/app.h index 04ad7f198a..ac59394d3a 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -6,7 +6,7 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -423,10 +423,10 @@ protected: #include "wx/x11/app.h" #elif defined(__WXMAC__) #include "wx/mac/app.h" + #elif defined(__WXCOCOA__) + #include "wx/cocoa/app.h" #elif defined(__WXPM__) #include "wx/os2/app.h" - #elif defined(__WXSTUBS__) - #include "wx/stubs/app.h" #endif #else // !GUI // can't use typedef because wxApp forward declared as a class @@ -530,11 +530,11 @@ 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__) || defined(__WXMGL__) +#if !wxUSE_GUI || defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMGL__) || defined(__WXCOCOA__) #define IMPLEMENT_WXWIN_MAIN \ extern int wxEntry( int argc, char **argv ); \ int main(int argc, char **argv) { return wxEntry(argc, argv); } -#elif defined(__WXMAC__) && defined(__UNIX__) +#elif defined(__WXMAC__) // wxMac seems to have a specific wxEntry prototype #define IMPLEMENT_WXWIN_MAIN \ extern int wxEntry( int argc, char **argv, bool enterLoop = TRUE ); \