Committing in .

 Changes to get the libraries cleanly compiled on VMS

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/common/image.cpp
 	wxWindows/src/motif/dcclient.cpp
 ----------------------------------------------------------------------

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/setup.h_vms b/setup.h_vms
index 9827675f73e89e0ea5bb3cda1f5b0858321dfbca..30278ac9d4fa305e20a77017514010a4be06ba27 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -27,6 +27,9 @@
 
 #endif /* __cplusplus */
 
+/* fill in with the string wxGetOsDescription() will return */
+#define WXWIN_OS_DESCRIPTION "OpenVMS"
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef gid_t
 
@@ -102,6 +105,9 @@
 #undef STRICT
 #undef WINVER
 
+/* enable rich edit not on VMS (Win32 Only) */
+#define wxUSE_RICHEDIT 0
+
 /*
  * Supports bool type
  */
@@ -119,6 +125,10 @@
  * Use libjpeg
  */
 #define wxUSE_LIBJPEG 1
+/*
+ * Use libtiff
+ */
+#define wxUSE_LIBTIFF 1
 /*
  * Use iODBC
  */
@@ -267,6 +277,10 @@
  * Use this control
  */
 #define wxUSE_SPINBTN 1
+/*
+ * Use this control
+ */
+#define wxUSE_SPINCTRL 1
 /*
  * Use this control
  */
@@ -618,14 +632,17 @@
 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 
+/* Define if you have shl_load() */
+#undef HAVE_SHL_LOAD
+
 /* Define if you have all functions to set thread priority */
 #undef HAVE_THREAD_PRIORITY_FUNCTIONS
 
 /* Define if you can specify exit functions to a thread */
 #undef HAVE_THREAD_CLEANUP_FUNCTIONS
 
-/* Define if you have shl_load() */
-#undef HAVE_SHL_LOAD
+/* Define if you have timegm() function */
+#undef HAVE_TIMEGM
 
 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF
@@ -678,6 +695,9 @@
 /* Define if you have strtok_r function. */
 #undef HAVE_STRTOK_R
 
+/* Define if you have thr_setconcurrency function */
+#undef HaVE_THR_SETCONCURRENCY
+
 /* Define if you have the uname function.  */
 #define HAVE_UNAME
 
@@ -714,4 +734,7 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
+/* Define this if you are using gtk and gdk contains support for X11R6 XIM */
+#undef HAVE_XIM
+
 #endif /* __WX_SETUP_H__ */

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 41c25dcc685da0353194b45b42f13d60f3ca1252..5931d63cb168c253cc871c3b70ee8b25ab040109 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -692,7 +692,7 @@ bool wxImageHandler::CanRead( const wxString& name )
 
         return FALSE;
     }
-    return FALSE;
+//    return FALSE;
 }
 
 #endif // wxUSE_STREAMS

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index d126382fd20fe059775a7c804434c1cd87fa25cb..a488d9466aa8fde55cea1742ece28704b6c17b62 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -1267,7 +1267,6 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
             {
                 // draw black pixels, ignore white ones (i.e. transparent b/g)
                 if (image.GetRed(sx, sy) == 0)
-                {
                 {
                     DrawPoint(x1 + maxx - rx, cy + y1 - ry);
                 }