X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27db4210568ff8463f38e347614f40f238c9f660..03773e400b6ff2692f2a9ba045d652c3b7b7109d:/include/wx/wx_cw_cm.h?ds=sidebyside diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h index a577e2860c..6dab373f56 100644 --- a/include/wx/wx_cw_cm.h +++ b/include/wx/wx_cw_cm.h @@ -1,3 +1,14 @@ +/* + Name: wx/wx_cw_cm.h + Purpose: wxWidgets definitions for CodeWarrior builds + Author: Stefan Csomor + Modified by: + Created: + RCS-ID: $Id$ + Copyright: (c) Stefan Csomor + Licence: wxWindows licence +*/ + #define MSL_USE_PRECOMPILED_HEADERS 0 #if __WXDEBUG__ // mac os assert levels @@ -8,10 +19,12 @@ #error "this file is only for builds with Metrowerks CodeWarrior" #endif -#define WX_COMP_INLINE_NO_CLASS // defined if the compiler does not want the classname repeated for inlines within a class definition +// defined if the compiler does not want the classname repeated for inlines +// within a class definition +#define WX_COMP_INLINE_NO_CLASS -#if __MWERKS__ >= 0x2400 && __MWERKS__ <= 0x3200 -#pragma old_argmatch on +#if __MWERKS__ >= 0x2400 && __MWERKS__ < 0x3200 + #pragma old_argmatch on #endif #if (__MWERKS__ < 0x0900) || macintosh || __MACH__ @@ -44,18 +57,23 @@ #endif #endif #elif defined( __WXMAC__) - #define USE_PRECOMPILED_MAC_HEADERS 0 /*Set to 0 if you don't want to use precompiled MacHeaders*/ + /* Set to 0 if you don't want to use precompiled MacHeaders */ + #define USE_PRECOMPILED_MAC_HEADERS 0 #define ACCESSOR_CALLS_ARE_FUNCTIONS 1 #define OPAQUE_TOOLBOX_STRUCTS 1 - #ifdef __MACH__ - #include - #include - #include - #undef WCHAR_MAX - #include - #else - #include + + /* CW8.3+ has mbstate_t */ + #if defined(__MACH__) && __MWERKS__ < 0x3003 + typedef int mbstate_t; + #define _MBSTATE_T #endif + + /* CW8.3+ has ssize_t */ + #if defined(__MACH__) && __MWERKS__ >= 0x3003 + #define HAVE_SSIZE_T + #endif + + #include // for getting the correct expat includes #define MACOS_CLASSIC /*