From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 9 Jul 2003 20:34:51 +0000 (+0000)
Subject: test for Mac before Unix as __UNIX__ is defined as well when building wxBase under Mac
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2d2d4fc70965a477ee8aba3d1afd8138bab5c2e2

test for Mac before Unix as __UNIX__ is defined as well when building wxBase under Mac


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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index efd605f499..6fa87d9e25 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -92,12 +92,11 @@ public:
 
 #if defined(__WXMSW__)
     #include "wx/msw/apptbase.h"
-#elif defined(__UNIX__)
-    #include "wx/unix/apptbase.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/apptbase.h"
+#elif defined(__UNIX__)
+    #include "wx/unix/apptbase.h"
 #else // no platform-specific methods to add to wxAppTraits
-    typedef 
     // wxAppTraits must be a class because it was forward declared as class
     class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
     {
@@ -166,10 +165,10 @@ public:
 
 #if defined(__WXMSW__)
     #include "wx/msw/apptrait.h"
-#elif defined(__UNIX__)
-    #include "wx/unix/apptrait.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/apptrait.h"
+#elif defined(__UNIX__)
+    #include "wx/unix/apptrait.h"
 #else // no platform-specific methods to add to wxAppTraits
     #if wxUSE_GUI
         typedef wxGUIAppTraitsBase wxGUIAppTraits;