Fixed initialisation order warning

[wxWidgets.git] / include / wx / features.h

diff --git a/include/wx/features.h b/include/wx/features.h
index 89dde316d2e059ad66aa72d37d0527df1be994c7..dbf93b4ff733839825e07ffc9cfb9896827feb8c 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -1,12 +1,12 @@
 /**
 *  Name:        wx/features.h
 *  Purpose:     test macros for the features which might be available in some
 /**
 *  Name:        wx/features.h
 *  Purpose:     test macros for the features which might be available in some

-*               wxWindows ports but not others
+*               wxWidgets ports but not others

 *  Author:      Vadim Zeitlin
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     18.03.02
 *  RCS-ID:      $Id$
 *  Author:      Vadim Zeitlin
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     18.03.02
 *  RCS-ID:      $Id$

-*  Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
+*  Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>

 *  Licence:     wxWindows licence
 */
 
 *  Licence:     wxWindows licence
 */
 


@@ -15,31 +15,27 @@
 #ifndef _WX_FEATURES_H_
 #define _WX_FEATURES_H_
 
 #ifndef _WX_FEATURES_H_
 #define _WX_FEATURES_H_
 

-/*  radio menu items are currently only implemented in wxGTK and wxMSW */
-#if defined(__WXGTK__) || defined(__WXMSW__)
+/*  radio menu items are currently not implemented in wxMotif, use this
+    symbol (kept for compatibility from the time when they were not implemented
+    under other platforms as well) to test for this */
+#if !defined(__WXMOTIF__)

     #define wxHAS_RADIO_MENU_ITEMS
 #else
     #undef wxHAS_RADIO_MENU_ITEMS
 #endif
 
 /*  the raw keyboard codes are generated under wxGTK and wxMSW only */
     #define wxHAS_RADIO_MENU_ITEMS
 #else
     #undef wxHAS_RADIO_MENU_ITEMS
 #endif
 
 /*  the raw keyboard codes are generated under wxGTK and wxMSW only */

-#if defined(__WXGTK__) || defined(__WXMSW__)
+#if defined(__WXGTK__) || defined(__WXMSW__) || defined(__WXMAC__) \
+    || defined(__WXDFB__)

     #define wxHAS_RAW_KEY_CODES
 #else
     #undef wxHAS_RAW_KEY_CODES
 #endif
 
     #define wxHAS_RAW_KEY_CODES
 #else
     #undef wxHAS_RAW_KEY_CODES
 #endif
 

-/*  detect SmartPhone */
-#ifdef WIN32_PLATFORM_WFSP
-    #ifdef wxUSE_SMARTPHONE
-    #undef wxUSE_SMARTPHONE
-    #endif
-    #define wxUSE_SMARTPHONE 1
-#endif
-
-/*  taskbar is only implemented in wxMSW and X11 ports */
-#if defined(__WXMSW__) || \
-        defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__)
+/*  taskbar is implemented in the major ports */
+#if defined(__WXMSW__) || defined(__WXCOCOA__) \
+    || defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) \
+    || defined(__WXMAC_OSX__) || defined(__WXCOCOA__)

     #define wxHAS_TASK_BAR_ICON
 #else
     #undef wxHAS_TASK_BAR_ICON
     #define wxHAS_TASK_BAR_ICON
 #else
     #undef wxHAS_TASK_BAR_ICON