Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-09 20:34:51 +00:00
parent b93907ee8a
commit 2d2d4fc709
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/apptrait.h
View File

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