From: Gilles Depeyrot <gilles_depeyrot@mac.com>
Date: Sat, 7 Apr 2001 14:42:25 +0000 (+0000)
Subject: correction for Mac OS X (wxEntry has a specific prototype for Mac?)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d5408e98bc69f9f465ab3bb40728a7f733339338

correction for Mac OS X (wxEntry has a specific prototype for Mac?)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/app.h b/include/wx/app.h
index d1825f18a6..46bde888f1 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -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)