Implement support for stricken-through fonts in markup parser.

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 2d570db1a4de1038687a698e3cf741532661dee7..1f42b370d02e1ad66742eb250581b57a545fa39f 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -15,16 +15,13 @@
 #define _WX_PLATFORM_H_
 
 
 #define _WX_PLATFORM_H_
 
 

+

 /*
     Codewarrior doesn't define any Windows symbols until some headers
     are included
 */
 #ifdef __MWERKS__
 #   include <stddef.h>
 /*
     Codewarrior doesn't define any Windows symbols until some headers
     are included
 */
 #ifdef __MWERKS__
 #   include <stddef.h>

-
-#  if !defined(__WXMAC__) && !defined(__WINDOWS__) && !defined(WIN32) && !defined(_WIN32_WCE)
-#    define __PALMOS__ 0x05000000
-#  endif

 #endif
 
 #ifdef __WXMAC_XCODE__
 #endif
 
 #ifdef __WXMAC_XCODE__


@@ -32,6 +29,12 @@
 #    include <TargetConditionals.h>
 #    include <AvailabilityMacros.h>
 #    include "wx/osx/config_xcode.h"
 #    include <TargetConditionals.h>
 #    include <AvailabilityMacros.h>
 #    include "wx/osx/config_xcode.h"

+#    ifndef __WXOSX__
+#        define __WXOSX__ 1
+#    endif
+#    ifndef __WXMAC__
+#        define __WXMAC__ 1
+#    endif

 #endif
 
 /*
 #endif
 
 /*


@@ -44,33 +47,6 @@
 #    endif
 #endif
 
 #    endif
 #endif
 

-#if defined(__PALMOS__)
-#   if __PALMOS__ == 0x06000000
-#       define __WXPALMOS6__ 1
-#   endif
-#   if __PALMOS__ == 0x05000000
-#       define __WXPALMOS5__ 1
-#   endif
-#   ifndef __WXPALMOS__
-#       define __WXPALMOS__ 1
-#   endif
-#   ifdef __WXMSW__
-#       undef __WXMSW__
-#   endif
-#   ifdef __WINDOWS__
-#       undef __WINDOWS__
-#   endif
-#   ifdef __WIN32__
-#       undef __WIN32__
-#   endif
-#   ifdef WIN32
-#       undef WIN32
-#   endif
-#   ifdef _WIN32
-#       undef _WIN32
-#   endif
-#endif
-

 #if defined(_WIN64)
 #    ifndef _WIN32
         /*
 #if defined(_WIN64)
 #    ifndef _WIN32
         /*


@@ -182,6 +158,13 @@
     #include "wx/setup_gccxml.h"
 #endif
 
     #include "wx/setup_gccxml.h"
 #endif
 

+/*
+   Convenience for any optional classes that use the wxAnyButton base class.
+ */
+#if wxUSE_TOGGLEBTN || wxUSE_BUTTON
+    #define wxHAS_ANY_BUTTON
+#endif
+

 
 /*
    Hardware platform detection.
 
 /*
    Hardware platform detection.


@@ -434,20 +417,6 @@
 #    endif
 #    define wxSIZE_T_IS_UINT
 
 #    endif
 #    define wxSIZE_T_IS_UINT
 

-/*
-   OS: Palm OS
- */
-#elif defined(__PALMOS__)
-#    ifdef __WIN32__
-#        error "__WIN32__ should not be defined for PalmOS"
-#    endif
-#    ifdef __WINDOWS__
-#        error "__WINDOWS__ should not be defined for PalmOS"
-#    endif
-#    ifdef __WXMSW__
-#        error "__WXMSW__ should not be defined for PalmOS"
-#    endif
-

 /*
    OS: Otherwise it must be Windows
  */
 /*
    OS: Otherwise it must be Windows
  */


@@ -586,8 +555,7 @@
     !defined(__WXPM__) && \
     !defined(__WXMOTIF__) && \
     !defined(__WXGTK__) && \
     !defined(__WXPM__) && \
     !defined(__WXMOTIF__) && \
     !defined(__WXGTK__) && \

-    !defined(__WXX11__) && \
-    !defined(__WXPALMOS__)
+    !defined(__WXX11__)

 #    include "wx/msw/gccpriv.h"
 #else
 #    undef wxCHECK_W32API_VERSION
 #    include "wx/msw/gccpriv.h"
 #else
 #    undef wxCHECK_W32API_VERSION


@@ -818,31 +786,6 @@
 #    define wxUSE_WXDIB 1
 #endif
 
 #    define wxUSE_WXDIB 1
 #endif
 

-#if defined (__WXPALMOS__)
-#include "wx/palmos/missing.h"
-#endif /* __WXPALMOS__ */
-
-#if !defined (__WXPALMOS5__)
-#define POSSEC_APPBASE
-#define POSSEC_ARCHIVE
-#define POSSEC_CLNTDATA
-#define POSSEC_CMDLINE
-#define POSSEC_CONFIG
-#define POSSEC_DATETIME
-#define POSSEC_DATETIME2
-#define POSSEC_DATSTRM
-#define POSSEC_DIRCMN
-#define POSSEC_DYNARRAY
-#define POSSEC_DYNLIB
-#define POSSEC_DYNLOAD
-#define POSSEC_ENCCONV
-#define POSSEC_EXTENDED
-#define POSSEC_FFILE
-#define POSSEC_FILE
-#define POSSEC_FILECONF
-#define POSSEC_FILEFN
-#endif /* __WXPALMOS5__ */
-

 /*
     Optionally supported C++ features.
  */
 /*
     Optionally supported C++ features.
  */