Added some code to demonstrate a problem and a workaround in wxTextCtrl on MSW.

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index c56e08dfc658bf94a119ea7fd5af41d8ad88baaa..bc981e106d0d0073d3c95fbf89d19945befcd11a 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -85,7 +85,10 @@
 #undef __SOLARIS__
 #undef __SUNOS__
 #define __ALPHA__
 #undef __SOLARIS__
 #undef __SUNOS__
 #define __ALPHA__

+#undef __IA64__

 #undef __OSF__
 #undef __OSF__

+#undef __DARWIN__
+#undef __NETBSD__

 #undef __BSD__
 #undef __FREEBSD__
 #define __VMS__
 #undef __BSD__
 #undef __FREEBSD__
 #define __VMS__


@@ -94,20 +97,26 @@
 #undef __EMX__
 #undef _GNU_SOURCE
 
 #undef __EMX__
 #undef _GNU_SOURCE
 

+/* PowerPC Darwin & Mac OS X */
+#undef __POWERPC__
+

 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
 #endif
 
 #undef __WIN95__
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
 #endif
 
 #undef __WIN95__

+#ifndef __WIN32__

 #undef __WIN32__
 #undef __WIN32__

+#endif

 #undef __GNUWIN32__
 #undef STRICT
 #undef WINVER
 
 /* enable native status bar under Win32 */
 #undef __GNUWIN32__
 #undef STRICT
 #undef WINVER
 
 /* enable native status bar under Win32 */

-#ifdef __WIN95__
+#if defined(__WIN95__) && !defined(__WXUNIVERSAL__)

 #define wxUSE_NATIVE_STATUSBAR 1
 #define wxUSE_NATIVE_STATUSBAR 1

+#define wxUSE_OWNER_DRAWN 1

 #endif
 
 /* enable rich edit under Win32 */
 #endif
 
 /* enable rich edit under Win32 */


@@ -145,13 +154,13 @@
 /*
  * Use iODBC
  */
 /*
  * Use iODBC
  */

-#define wxUSE_ODBC 0
+#define wxUSE_ODBC 1

 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_BACKWARD_COMPATABILITY 0
 /*
  * Use freetype
  */
 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_BACKWARD_COMPATABILITY 0
 /*
  * Use freetype
  */

-#define wxUSE_FREETYPE 0
+#define wxUSE_FREETYPE 1

 /*
  * Use Threads
  */
 /*
  * Use Threads
  */


@@ -446,7 +455,6 @@
 #define wxUSE_TOOLBAR_SIMPLE 1
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
 #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
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif


@@ -768,6 +776,11 @@
  */
 #define wxUSE_ZIPSTREAM 1
 
  */
 #define wxUSE_ZIPSTREAM 1
 

+/*
+ * wxPalette class
+ */
+#define wxUSE_PALETTE 1
+

 /*
  * wxImage support
  */
 /*
  * wxImage support
  */


@@ -996,7 +1009,28 @@
  */
 #define wxUSE_MS_HTML_HELP 0
 
  */
 #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
 
 /* 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__ */
 #endif /* __WX_SETUP_H__ */