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

switching to defines not having a value for __WXMAC__

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-11-01 05:57:25 +00:00
parent 7b8609300d
commit 9543e985ff
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/features.h
View File

@@ -32,7 +32,7 @@
/* taskbar is implemented in the major ports */ /* taskbar is implemented in the major ports */
#if defined(__WXMSW__) || defined(__WXCOCOA__) || \ #if defined(__WXMSW__) || defined(__WXCOCOA__) || \
defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) || \ defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) || \
(defined(__WXMAC__) && __WXMAC_OSX__) || defined(__WXCOCOA__) (defined(__WXMAC__) && defined(__WXMAC_OSX__)) || defined(__WXCOCOA__)
#define wxHAS_TASK_BAR_ICON #define wxHAS_TASK_BAR_ICON
#else #else
#undef wxHAS_TASK_BAR_ICON #undef wxHAS_TASK_BAR_ICON

8
include/wx/platform.h
View File

@@ -31,16 +31,16 @@
*/ */
#ifdef __WXMAC__ #ifdef __WXMAC__
# if defined(__MACH__) # if defined(__MACH__)
# define __WXMAC_OSX__ 1 # define __WXMAC_OSX__
# define __WXMAC_CARBON__ 1 # define __WXMAC_CARBON__
# ifdef __WXMAC_XCODE__ # ifdef __WXMAC_XCODE__
# include "wx/mac/carbon/config_xcode.h" # include "wx/mac/carbon/config_xcode.h"
# endif # endif
# else # else
# if TARGET_CARBON # if TARGET_CARBON
# define __WXMAC_CARBON__ 1 # define __WXMAC_CARBON__
# else # else
# define __WXMAC_CLASSIC__ 1 # define __WXMAC_CLASSIC__
# endif # endif
# endif # endif
#endif #endif

2
include/wx/taskbar.h
View File

@@ -47,7 +47,7 @@ private:
#include "wx/msw/taskbar.h" #include "wx/msw/taskbar.h"
#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) #elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
#include "wx/unix/taskbarx11.h" #include "wx/unix/taskbarx11.h"
#elif defined (__WXMAC__) && __WXMAC_OSX__ #elif defined (__WXMAC__) && defined(__WXMAC_OSX__)
#include "wx/mac/taskbarosx.h" #include "wx/mac/taskbarosx.h"
#elif defined (__WXCOCOA__) #elif defined (__WXCOCOA__)
#include "wx/cocoa/taskbar.h" #include "wx/cocoa/taskbar.h"