X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33381c829bba890f5d0e0642dbe2fdfa60fafd4d..5a8f04e382a2b5ebeb50e8719889910f813b9d11:/setup.h_vms diff --git a/setup.h_vms b/setup.h_vms index c56e08dfc6..602cd4946d 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -85,7 +85,10 @@ #undef __SOLARIS__ #undef __SUNOS__ #define __ALPHA__ +#undef __IA64__ #undef __OSF__ +#undef __DARWIN__ +#undef __NETBSD__ #undef __BSD__ #undef __FREEBSD__ #define __VMS__ @@ -94,6 +97,9 @@ #undef __EMX__ #undef _GNU_SOURCE +/* PowerPC Darwin & Mac OS X */ +#undef __POWERPC__ + /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */ #ifndef __WINDOWS__ #undef __WINDOWS__ @@ -106,8 +112,9 @@ #undef WINVER /* enable native status bar under Win32 */ -#ifdef __WIN95__ +#if defined(__WIN95__) && !defined(__WXUNIVERSAL__) #define wxUSE_NATIVE_STATUSBAR 1 +#define wxUSE_OWNER_DRAWN 1 #endif /* enable rich edit under Win32 */ @@ -446,7 +453,6 @@ #define wxUSE_TOOLBAR_SIMPLE 1 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__) -#define wxUSE_OWNER_DRAWN 1 #if wxUSE_TOOLBAR #define wxUSE_BUTTONBAR 1 #endif @@ -768,6 +774,11 @@ */ #define wxUSE_ZIPSTREAM 1 +/* + * wxPalette class + */ +#define wxUSE_PALETTE 1 + /* * wxImage support */ @@ -996,7 +1007,28 @@ */ #define wxUSE_MS_HTML_HELP 0 +/* Define if you have wcsrtombs() function */ +#define HAVE_WCSRTOMBS 1 + /* Define this if you are using gtk and gdk contains support for X11R6 XIM */ #undef HAVE_XIM +/* --------------------------------------------------------* + * This stuff is static, it doesn't get modified directly + * by configure. + */ + +#include "wx/chkconf.h" + +/* + define some constants identifying wxWindows version in more details t + just the version number +*/ + +/* wxLogChain class available */ +#define wxHAS_LOG_CHAIN 1 + +/* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */ +#define wxHAS_WORKING_GTK_DC_BLIT 1 + #endif /* __WX_SETUP_H__ */