checked in forgottern parts of MSLU changes

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 17ef3a44aebf6d83dd195bbbc60241754312cd57..5ef08f67418b3eb7f44e6a150633ab00afc2a57c 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -122,6 +122,10 @@
 #define wxUSE_OWNER_DRAWN 1
 #endif
 
 #define wxUSE_OWNER_DRAWN 1
 #endif
 

+#if defined(__WXPM__)
+#define wxUSE_OWNER_DRAWN 1
+#endif
+

 /* enable rich edit under Win32 */
 #if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 /* enable rich edit under Win32 */
 #if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1


@@ -838,6 +842,11 @@
  */
 #define wxUSE_PCX 1
 
  */
 #define wxUSE_PCX 1
 

+/*
+ * IFF image format support
+ */
+#define wxUSE_IFF 1
+

 /*
  * PNM image format support
  */
 /*
  * PNM image format support
  */


@@ -848,6 +857,11 @@
  */
 #define wxUSE_XPM 1
 
  */
 #define wxUSE_XPM 1
 

+/*
+ * MS Icons and Cursors format support
+ */
+#define wxUSE_ICO_CUR 1
+

 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.


@@ -878,9 +892,6 @@
  * present */
 #define WX_GMTOFF_IN_TM
 
  * present */
 #define WX_GMTOFF_IN_TM
 

-/* iconv()'s 2nd argument is char ** and not const char ** */
-#define WX_ICONV_TAKES_CHAR 1
-

 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 


@@ -1043,9 +1054,12 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 

-/* Define if you have the <iconv.h> header file.  */
+/* Define if you have the <iconv.h> header file and iconv() symbol.  */

 #define HAVE_ICONV_H 1
 
 #define HAVE_ICONV_H 1
 

+/* Define as "const" if the declaration of iconv() needs const.  */
+#undef ICONV_CONST
+

 /* Define if you have the <langinfo.h> header file.  */
 #define HAVE_LANGINFO_H 1
 
 /* Define if you have the <langinfo.h> header file.  */
 #define HAVE_LANGINFO_H 1