X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c085e333984dc079a001cd3f581aeb1f51a1f227..c606a9a4010b859981b99e4699b61f63f9ba037d:/include/wx/msw/setup.h?ds=sidebyside diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h index 323da34925..9e91bbdfa2 100644 --- a/include/wx/msw/setup.h +++ b/include/wx/msw/setup.h @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_SETUP_H_ @@ -19,48 +19,41 @@ #define wxUSE_CONFIG 1 // Use wxConfig, with CreateConfig in wxApp -#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_POSTSCRIPT 1 - // 0 for no PostScript device context +#define wxUSE_POSTSCRIPT 0 + // 0 for no PostScript device context #define wxUSE_AFM_FOR_POSTSCRIPT 0 // 1 to use font metric files in GetTextExtent #define wxUSE_METAFILE 1 // 0 for no Metafile and metafile device context -#define wxUSE_FORM 0 - // 0 for no wxForm #define wxUSE_IPC 1 // 0 for no interprocess comms // Note: wxHELP uses IPC under X so these are interdependent! #define wxUSE_HELP 1 // 0 for no help facility #define wxUSE_RESOURCES 1 - // 0 for no wxGetResource/wxWriteResource + // 0 for no wxGetResource/wxWriteResource #define wxUSE_CONSTRAINTS 1 // 0 for no window layout constraint system - + #define wxUSE_TIMEDATE 1 // 0 for no wxTime/wxDate classes - + #define wxUSE_CLIPBOARD 1 - // 0 for no clipboard functions + // 0 for no clipboard functions + #define wxUSE_SPLINES 1 - // 0 for no splines -#define wxUSE_XFIG_SPLINE_CODE 1 - // 1 for XFIG spline code, 0 for AIAI spline code. -// AIAI spline code is slower, but freer of copyright issues. + // 0 for no splines #define wxUSE_DRAG_AND_DROP 1 - // 0 for no drag and drop + // 0 for no drag and drop #define wxUSE_TOOLBAR 1 // Define 1 to use toolbar classes @@ -78,16 +71,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,14 +81,12 @@ #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 #define wxUSE_DOC_VIEW_ARCHITECTURE 1 // Set to 0 to disable document/view architecture #define wxUSE_PRINTING_ARCHITECTURE 1 @@ -114,35 +97,43 @@ #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. + // 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 + // If __WXDEBUG__ is not defined, will still use // normal memory operators. // It's recommended to set this to 1, // 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. +#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 0 +#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 @@ -151,15 +142,32 @@ // 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_LIBJPEG 0 + // Use JPEG bitmap code +#define wxUSE_STD_IOSTREAM 1 + // Use standard C++ streams if 1. If 0, use wxWin + // streams implementation. + +#define wxUSE_TOOLTIPS 1 + // Define to use wxToolTip class and + // wxWindow::SetToolTip() method /* * Finer detail * */ -#define wxUSE_APPLE_IEEE 1 - // if enabled, the float codec written by Apple - // will be used to write, in a portable way, - // float on the disk +#define wxUSE_APPLE_IEEE 1 + // if enabled, the float codec written by Apple + // will be used to write, in a portable way, + // float on the disk /* * MS Windows/Windows NT @@ -167,9 +175,9 @@ */ #if defined(__WIN95__) -#define CTL3D 0 +#define wxUSE_CTL3D 0 #else -#define CTL3D 1 +#define wxUSE_CTL3D 1 // Define 1 to use Microsoft CTL3D library. // See note above about using FAFA and CTL3D. #endif @@ -189,7 +197,7 @@ #define wxUSE_PORTABLE_FONTS_IN_MSW 0 // Define 1 to use new portable font scheme in Windows // (used by default under X) -#define FONT_SIZE_COMPATIBILITY 0 +#define wxFONT_SIZE_COMPATIBILITY 0 // Define 1 for font size to be backward compatible // to 1.63 and earlier. 1.64 and later define point // sizes to be compatible with Windows. @@ -204,6 +212,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 @@ -212,9 +223,9 @@ #define wxUSE_TYPEDEFS 0 // Use typedefs not classes for wxPoint - // and others, to reduce overhead and avoid - // MS C7 memory bug. Bounds checker - // complains about deallocating + // and others, to reduce overhead and avoid + // MS C7 memory bug. Bounds checker + // complains about deallocating // arrays of wxPoints if wxPoint is a class. #if (!defined(WIN32) && !defined(__WIN32__)) || defined(__GNUWIN32__) || defined(__BORLANDC__) @@ -231,52 +242,49 @@ #define wxUSE_NATIVE_STATUSBAR 0 #endif -// Minimal setup e.g. for compiling small utilities -#define MINIMAL_WXWINDOWS_SETUP 0 - -#if MINIMAL_WXWINDOWS_SETUP -#undef wxUSE_POSTSCRIPT -# define wxUSE_POSTSCRIPT 0 -#undef wxUSE_PRINTING_ARCHITECTURE -# define wxUSE_PRINTING_ARCHITECTURE 0 -#undef wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW -# define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 -#undef wxUSE_METAFILE -# define wxUSE_METAFILE 0 -#undef wxUSE_FORM -# define wxUSE_FORM 0 -#undef wxUSE_SPLINES -# define wxUSE_SPLINES 0 -#undef wxUSE_SCROLLBAR -# define wxUSE_SCROLLBAR 0 -#undef wxUSE_COMBOBOX -# define wxUSE_COMBOBOX 0 -#undef wxUSE_RADIOBUTTON -# define wxUSE_RADIOBUTTON 0 -#undef wxUSE_XPM_IN_MSW -# define wxUSE_XPM_IN_MSW 0 -#undef wxUSE_WX_RESOURCES -# define wxUSE_WX_RESOURCES 0 -#undef wxUSE_DOC_VIEW_ARCHITECTURE -# define wxUSE_DOC_VIEW_ARCHITECTURE 0 -#undef wxUSE_GNU_WXSTRING -# define wxUSE_GNU_WXSTRING 0 +// 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 -#undef wxUSE_TIMEDATE -# define wxUSE_TIMEDATE 0 -#undef CTL3D -# define CTL3D 0 -#undef wxUSE_ITSY_BITSY -# define wxUSE_ITSY_BITSY 0 -#undef wxUSE_IMAGE_LOADING_IN_MSW -# define wxUSE_IMAGE_LOADING_IN_MSW 0 -#undef wxUSE_GAUGE -# define wxUSE_GAUGE 0 -#undef wxUSE_RESOURCE_LOADING_IN_MSW -# define wxUSE_RESOURCE_LOADING_IN_MSW 0 -#undef wxUSE_DRAG_AND_DROP -# define wxUSE_DRAG_AND_DROP 0 +#define wxUSE_ODBC 0 + +#endif + +// Things that don't work for 16-bit compilation +#if defined(__WXMSW__) && !defined(__WIN32__) + +#undef wxUSE_THREADS +#define wxUSE_THREADS 0 + +#undef wxUSE_TOOLTIPS +#define wxUSE_TOOLTIPS 0 + #endif #endif