From d171743ed3ddbf0178a9d68cf78999a3ca999826 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Fri, 9 May 2003 10:53:52 +0000 Subject: [PATCH] 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 | 6 ++++++ include/wx/x11/privx.h | 6 ++++++ src/common/dbtable.cpp | 2 +- src/common/descrip.mms | 4 +++- src/motif/bmpmotif.cpp | 1 + src/motif/descrip.mms | 2 +- src/x11/bitmap.cpp | 5 +++-- src/x11/utilsx.cpp | 11 ++++++++++- 8 files changed, 31 insertions(+), 6 deletions(-) diff --git a/include/wx/x11/private.h b/include/wx/x11/private.h index e2ae2945e7..bec9db0561 100644 --- 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 2f5d931a85..6a9c5336be 100644 --- 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 8588f72fe7..c25f9dc853 100644 --- 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 98fba4d950..68702d4d98 100644 --- 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 2e800542f2..1ddb082650 100644 --- 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 9db3a5c247..7d66eedbb6 100644 --- 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 1dc3b18684..deb6241645 100644 --- 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 a2ba48cb00..14d004e2ad 100644 --- 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 +#ifdef __VMS +# include +#else +# include +#endif #include "wx/region.h" #include "wx/bitmap.h" #include "wx/dcmemory.h" -- 2.47.2