Committing in .

Fixes needed for OpenVMS

 Modified Files:
 	wxWindows/include/wx/x11/private.h
 	wxWindows/include/wx/x11/privx.h
 	wxWindows/src/common/dbtable.cpp
 	wxWindows/src/common/descrip.mms
 	wxWindows/src/motif/bmpmotif.cpp
 	wxWindows/src/motif/descrip.mms wxWindows/src/x11/bitmap.cpp
 	wxWindows/src/x11/utilsx.cpp
 ----------------------------------------------------------------------


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

include/wx/x11/private.h

@@ -14,9 +14,15 @@
 
 #include "wx/defs.h"
 #include "wx/utils.h"
+#if defined( __cplusplus ) && defined( __VMS )
+#pragma message disable nosimpint
+#endif
 #include "X11/Xlib.h"
 #include "X11/Xatom.h"
 #include "X11/Xutil.h"
+#if defined( __cplusplus ) && defined( __VMS )
+#pragma message enable nosimpint
+#endif
 
 // Include common declarations
 #include "wx/x11/privx.h"

include/wx/x11/privx.h

@@ -16,9 +16,15 @@
 #include "wx/utils.h"
 #include "wx/colour.h"
 
+#if defined( __cplusplus ) && defined( __VMS )
+#pragma message disable nosimpint
+#endif
 #include "X11/Xlib.h"
 #include "X11/Xatom.h"
 #include "X11/Xutil.h"
+#if defined( __cplusplus ) && defined( __VMS )
+#pragma message enable nosimpint
+#endif
 
 class wxMouseEvent;
 class wxKeyEvent;

src/common/dbtable.cpp

@@ -411,7 +411,7 @@ bool wxDbTable::bindParams(bool forUpdate)
         return(FALSE);
 
     SWORD   fSqlType    = 0;
-    UDWORD  precision   = 0;
+    SDWORD  precision   = 0;
     SWORD   scale       = 0;
 
     // Bind each column of the table that should be bound

src/common/descrip.mms

@@ -165,7 +165,7 @@ OBJECTS2=utilscmn.obj,\
 		zipstrm.obj,\
 		zstream.obj
 
-OBJECTS_MOTIF=bmpbase.obj
+OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
 
 SOURCES = \
 		appcmn.cpp,\
@@ -212,6 +212,7 @@ SOURCES = \
 		fs_inet.cpp,\
 		fs_zip.cpp,\
 		ftp.cpp,\
+		gaugecmn.cpp,\
 		gdicmn.cpp,\
 		gifdecod.cpp,\
 		hash.cpp,\
@@ -356,6 +357,7 @@ framecmn.obj : framecmn.cpp
 fs_inet.obj : fs_inet.cpp
 fs_zip.obj : fs_zip.cpp
 ftp.obj : ftp.cpp
+gaugecmn.obj : gaugecmn.cpp
 gdicmn.obj : gdicmn.cpp
 gifdecod.obj : gifdecod.cpp
 hash.obj : hash.cpp

src/motif/bmpmotif.cpp

@@ -15,6 +15,7 @@
 
 #ifdef __VMS
 #define XtParent XTPARENT
+#define XtDisplay XTDISPLAY
 #endif
 
 #include "wx/defs.h"

src/motif/descrip.mms

@@ -83,7 +83,7 @@ SOURCES = \
 		accel.cpp,\
 		app.cpp,\
 		bmpbuttn.cpp,\
-		bmpmotif.cpp,
+		bmpmotif.cpp,\
 		button.cpp,\
 		checkbox.cpp,\
 		checklst.cpp,\

src/x11/bitmap.cpp

@@ -1572,9 +1572,10 @@ bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits,
     M_BMPHANDLERDATA->m_bpp = 1;
 
     return TRUE;
-#endif
+#else
-    wxCHECK_MSG( M_BMPHANDLERDATA->m_bitmap, FALSE,
+   wxCHECK_MSG( M_BMPHANDLERDATA->m_bitmap, FALSE,
                  wxT("couldn't create bitmap") );
+#endif
 }
 
 void wxBitmap::InitStandardHandlers()

src/x11/utilsx.cpp

@@ -9,10 +9,19 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifdef __VMS
+#define XShapeQueryExtension XSHAPEQUERYEXTENSION
+#define XtDisplay XTDISPLAY
+#endif
+
 #include "wx/x11/privx.h"
 
 #ifdef HAVE_XSHAPE
-#include <X11/extensions/shape.h>
+#ifdef __VMS
+# include <X11/shape.h>
+#else
+# include <X11/extensions/shape.h>
+#endif
 #include "wx/region.h"
 #include "wx/bitmap.h"
 #include "wx/dcmemory.h"