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

diff --git a/include/wx/x11/private.h b/include/wx/x11/private.h
index e2ae2945e7fcb36f6720fdaa7b525a54ccc9d82d..bec9db0561348ce35dd27ba0358cc9e9bfaf1886 100644 (file)
--- a/include/wx/x11/private.h
+++ b/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"

diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h
index 2f5d931a8570f224dad94234560537a54d57c6fe..6a9c5336be2bdefe0523677ebe46682003ed2c2c 100644 (file)
--- a/include/wx/x11/privx.h
+++ b/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;

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 8588f72fe799309adc9c0a13ff7bf4a39d09fc45..c25f9dc85390459e3444d9dee0f0d0baca7a8e6c 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 98fba4d95078fe69d111901866514035fb610333..68702d4d98697e692ed7213670a4d1d918628cef 100644 (file)
--- a/src/common/descrip.mms
+++ b/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

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index 2e800542f2bc0e4b4760ad0dc9a6c371686fbc07..1ddb082650958904847a4244e2b25132c36f770e 100644 (file)
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -15,6 +15,7 @@
 
 #ifdef __VMS
 #define XtParent XTPARENT
+#define XtDisplay XTDISPLAY
 #endif
 
 #include "wx/defs.h"

diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms
index 9db3a5c24732cc84cef00259b1c94fe261308c60..7d66eedbb601cc2555fcd6dbd34a53b0741a9714 100644 (file)
--- a/src/motif/descrip.mms
+++ b/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,\

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 1dc3b18684c8119a75f1cb8b4770c2b558329e38..deb62416459b2e7d43fd5ce964b8cb1b2de02797 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -1572,9 +1572,10 @@ bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits,
     M_BMPHANDLERDATA->m_bpp = 1;
 
     return TRUE;
-#endif
-    wxCHECK_MSG( M_BMPHANDLERDATA->m_bitmap, FALSE,
+#else
+   wxCHECK_MSG( M_BMPHANDLERDATA->m_bitmap, FALSE,
                  wxT("couldn't create bitmap") );
+#endif
 }
 
 void wxBitmap::InitStandardHandlers()

diff --git a/src/x11/utilsx.cpp b/src/x11/utilsx.cpp
index a2ba48cb008b3369f17764cc379bd16be7afa4ad..14d004e2ad8206af140526c3319343ce30bdae40 100644 (file)
--- a/src/x11/utilsx.cpp
+++ b/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"