X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83a5b533e2fbce8e272ff1c91310ad415ad00b97..ada8f807758339fe6a80070fe0935d87496dbe57:/include/wx/app.h diff --git a/include/wx/app.h b/include/wx/app.h index d1825f18a6..c25f74ae29 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -326,7 +326,7 @@ extern void WXDLLEXPORT wxWakeUpIdle(); // Post a message to the given eventhandler which will be processed during the // next event loop iteration -inline void WXDLLEXPORT wxPostEvent(wxEvtHandler *dest, wxEvent& event) +inline void wxPostEvent(wxEvtHandler *dest, wxEvent& event) { wxCHECK_RET( dest, wxT("need an object to post event to in wxPostEvent") ); @@ -372,10 +372,15 @@ 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(__WXMAC__) && defined(__UNIX__)) +#if !wxUSE_GUI || defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) #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__) + // wxMac seems to have a specific wxEntry prototype + #define IMPLEMENT_WXWIN_MAIN \ + extern int wxEntry( int argc, char *argv[], bool enterLoop = 1 ); \ + int main(int argc, char *argv[]) { return wxEntry(argc, argv); } #elif defined(__WXMSW__) && defined(WXUSINGDLL) // NT defines APIENTRY, 3.x not #if !defined(WXAPIENTRY)