From 9543e985ff1ac8d10d9c9574343427e1df14bb31 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 1 Nov 2004 05:57:25 +0000 Subject: [PATCH] switching to defines not having a value for __WXMAC__ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/features.h | 2 +- include/wx/platform.h | 8 ++++---- include/wx/taskbar.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wx/features.h b/include/wx/features.h index d372e97f0d..62370ae63b 100644 --- a/include/wx/features.h +++ b/include/wx/features.h @@ -32,7 +32,7 @@ /* taskbar is implemented in the major ports */ #if defined(__WXMSW__) || defined(__WXCOCOA__) || \ defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) || \ - (defined(__WXMAC__) && __WXMAC_OSX__) || defined(__WXCOCOA__) + (defined(__WXMAC__) && defined(__WXMAC_OSX__)) || defined(__WXCOCOA__) #define wxHAS_TASK_BAR_ICON #else #undef wxHAS_TASK_BAR_ICON diff --git a/include/wx/platform.h b/include/wx/platform.h index aa05fa683d..03ae258679 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -31,16 +31,16 @@ */ #ifdef __WXMAC__ # if defined(__MACH__) -# define __WXMAC_OSX__ 1 -# define __WXMAC_CARBON__ 1 +# define __WXMAC_OSX__ +# define __WXMAC_CARBON__ # ifdef __WXMAC_XCODE__ # include "wx/mac/carbon/config_xcode.h" # endif # else # if TARGET_CARBON -# define __WXMAC_CARBON__ 1 +# define __WXMAC_CARBON__ # else -# define __WXMAC_CLASSIC__ 1 +# define __WXMAC_CLASSIC__ # endif # endif #endif diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h index a97354fe78..97f912ceb8 100644 --- a/include/wx/taskbar.h +++ b/include/wx/taskbar.h @@ -47,7 +47,7 @@ private: #include "wx/msw/taskbar.h" #elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) #include "wx/unix/taskbarx11.h" -#elif defined (__WXMAC__) && __WXMAC_OSX__ +#elif defined (__WXMAC__) && defined(__WXMAC_OSX__) #include "wx/mac/taskbarosx.h" #elif defined (__WXCOCOA__) #include "wx/cocoa/taskbar.h"