X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd3f686c274a264e89ea97505350a82c1134f307..6c82a1fd8d02beb023b21d230b97ddce42962b02:/include/wx/msw/setup.h diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h index d8db707bba..5e58c37d5f 100644 --- a/include/wx/msw/setup.h +++ b/include/wx/msw/setup.h @@ -22,16 +22,17 @@ #define _WX_GOODCOMPILER__ // gcc can have problems, but Windows compilers // are generally OK. -#define WXWIN_COMPATIBILITY 1 - // Compatibility with 1.66 API. +#define WXWIN_COMPATIBILITY 0 + // Compatibility with 1.68 API. // Level 0: no backward compatibility, all new features - // Level 1: wxDC, OnSize (etc.) compatibility, but - // some new features such as event tables + // Level 1: Some compatibility. In fact + // the compatibility code is now very minimal so there + // is little advantage to setting it to 1. -#define wxUSE_AUTOTRANS 1 - // Define wxTString +#define wxUSE_AUTOTRANS 1 + // Define wxTString #define wxUSE_POSTSCRIPT 0 - // 0 for no PostScript device context + // 0 for no PostScript device context #define wxUSE_AFM_FOR_POSTSCRIPT 0 // 1 to use font metric files in GetTextExtent #define wxUSE_METAFILE 1 @@ -78,16 +79,8 @@ #define wxUSE_SCROLLBAR 1 // Define 1 to compile contributed wxScrollBar class -#define wxUSE_XPM_IN_X 1 #define wxUSE_XPM_IN_MSW 1 - // Define 1 to support the XPM package in wxBitmap, - // separated by platform. If 1, you must link in - // the XPM library to your applications. -#define wxUSE_IMAGE_LOADING_IN_X 1 - // Use dynamic icon/bitmap loading/saving code in utils/image under X. - // If this is 1, you will need to link your applications - // with image_X.lib. where X is motif, ol, or hp. - + // Define 1 to support the XPM package in wxBitmap. #define wxUSE_IMAGE_LOADING_IN_MSW 1 // Use dynamic DIB loading/saving code in utils/dib under MSW. #define wxUSE_RESOURCE_LOADING_IN_MSW 1 @@ -96,11 +89,11 @@ #define wxUSE_WX_RESOURCES 1 // Use .wxr resource mechanism (requires PrologIO library) -#define wxUSE_GNU_WXSTRING 0 - // Define 1 to use modified GNU wxString class - // from (stefan.hammes@urz.uni-heidelberg.de) in contrib\string - // TODO: why does this give an unresolved 'wxRegex::Search' - // symbol if 1? +// BC++/Win16 can't cope with the amount of data in resource.cpp +#if defined(__WIN16__) && defined(__BORLANDC__) +#undef wxUSE_WX_RESOURCES +#define wxUSE_WX_RESOURCES 0 +#endif #define HAVE_SOCKET 1 // Use WinSock if 1 @@ -114,12 +107,12 @@ #define wxUSE_DYNAMIC_CLASSES 1 // If 1, enables provision of run-time type information. // NOW MANDATORY: don't change. -#define wxUSE_MEMORY_TRACING 0 +#define wxUSE_MEMORY_TRACING 1 // If 1, enables debugging versions of wxObject::new and // wxObject::delete *IF* __WXDEBUG__ is also defined. // WARNING: this code may not work with all architectures, especially // if alignment is an issue. -#define wxUSE_DEBUG_CONTEXT 0 +#define wxUSE_DEBUG_CONTEXT 1 // If 1, enables wxDebugContext, for // writing error messages to file, etc. // If __WXDEBUG__ is not defined, will still use @@ -128,27 +121,29 @@ // since you may well need to output // an error log in a production // version (or non-debugging beta) -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 +#define wxUSE_GLOBAL_MEMORY_OPERATORS 1 // In debug mode, cause new and delete to be redefined globally. // If this causes problems (e.g. link errors), set this to 0. -// GnuWin32 (b19) can't copy with these operators. -#ifdef __GNUWIN32__ -#undef wxUSE_GLOBAL_MEMORY_OPERATORS 1 -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 -#endif +#define wxUSE_DEBUG_NEW_ALWAYS 1 + // In debug mode, causes new to be defined to + // be WXDEBUG_NEW (see object.h). + // If this causes problems (e.g. link errors), set this to 0. + // You may need to set this to 0 if using templates (at least + // for VC++). #define REMOVE_UNUSED_ARG 1 // Set this to 0 if your compiler can't cope // with omission of prototype parameters. -#define wxUSE_C_MAIN 0 - // Set to 1 to use main.c instead of main.cpp (UNIX only) - #define wxUSE_ODBC 1 // Define 1 to use ODBC classes +#ifndef __MWERKS__ #define wxUSE_IOSTREAMH 1 +#else +#define wxUSE_IOSTREAMH 0 +#endif // VC++ 4.2 and above allows and // but you can't mix them. Set to 1 for , // 0 for @@ -157,6 +152,18 @@ // if enabled, compiles built-in OS independent wxConfig // class and it's file (any platform) and registry (Win) // based implementations +#define wxUSE_THREADS 1 + // support for multithreaded applications: if + // 1, compile in thread classes (thread.h) + // and make the library thread safe +#define wxUSE_ZLIB 1 + // Use zlib for compression in streams and PNG code +#define wxUSE_LIBPNG 1 + // Use PNG bitmap code +#define wxUSE_STD_IOSTREAM 1 + // Use standard C++ streams if 1. If 0, use wxWin + // streams implementation. + /* * Finer detail * @@ -210,6 +217,9 @@ #define wxUSE_NATIVE_STATUSBAR 1 // Set to 0 to use cross-platform wxStatusBar +#define wxUSE_DBWIN32 1 + // Use Andrew Tucker's OutputDebugString implementation + // (required on Win95 only). See utils.cpp. /* * Any platform @@ -237,6 +247,40 @@ #define wxUSE_NATIVE_STATUSBAR 0 #endif +// Salford C++ doesn't like some of the memory operator definitions +#ifdef __SALFORDC__ +#undef wxUSE_MEMORY_TRACING +#define wxUSE_MEMORY_TRACING 0 + +#undef wxUSE_GLOBAL_MEMORY_OPERATORS +#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 + +#undef wxUSE_DEBUG_NEW_ALWAYS +#define wxUSE_DEBUG_NEW_ALWAYS 0 + +#undef wxUSE_THREADS +#define wxUSE_THREADS 0 + +#undef wxUSE_DBWIN32 +#define wxUSE_DBWIN32 0 + +#undef wxUSE_OWNER_DRAWN +#define wxUSE_OWNER_DRAWN 0 +#endif + +#ifdef __TWIN32__ + +#undef wxUSE_THREADS +#define wxUSE_THREADS 0 + +#undef wxUSE_DBWIN32 +#define wxUSE_DBWIN32 0 + +#undef wxUSE_ODBC +#define wxUSE_ODBC 0 + +#endif + // Minimal setup e.g. for compiling small utilities #define MINIMAL_WXWINDOWS_SETUP 0