Committing in .

 OpenVMS updates

 Modified Files:
 	wxWidgets/contrib/src/deprecated/resource.cpp
 	wxWidgets/src/common/descrip.mms
 	wxWidgets/src/common/wfstream.cpp

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

diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index 3d0188a9ec317a4c8091d3de51f397384707a7e8..8bdd46f0b9bcf3bbcaf38d1b94d27eee5f4bce33 100644 (file)
--- a/contrib/src/deprecated/resource.cpp
+++ b/contrib/src/deprecated/resource.cpp
@@ -712,8 +712,14 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
     }
     dialogItem->SetStyle(windowStyle);
     dialogItem->SetValue1(isModal);
-    if (windowStyle & wxDIALOG_MODAL) // Uses style in wxWin 2
+#ifdef __VMS
+#pragma message disable CODCAUUNR
+#endif
+   if (windowStyle & wxDIALOG_MODAL) // Uses style in wxWin 2
         dialogItem->SetValue1(TRUE);
+#ifdef __VMS
+#pragma message enable CODCAUUNR
+#endif
 
     dialogItem->SetName(name);
     dialogItem->SetTitle(title);

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index f9f2137e87aeba6848c0fb2015a64f22a63b4f8c..a1bd0b3fd3f689816066ed0eb1017682dd81419a 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -176,7 +176,7 @@ OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
 
 OBJECTS_X11=accesscmn.obj,bmpbase.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
        dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,gaugecmn.obj,\
-       gbsizer.obj,geometry.obj,gzstream.obj,matrix.obj,radiocmn.obj,\
+       gbsizer.obj,geometry.obj,matrix.obj,radiocmn.obj,\
        regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj
 
 SOURCES = \
@@ -317,7 +317,6 @@ SOURCES = \
                fs_mem.cpp,\
                gbsizer.cpp,\
                geometry.cpp,\
-               gzstream.cpp,\
                matrix.cpp,\
                radiocmn.cpp,\
                regex.cpp,\
@@ -489,7 +488,6 @@ fddlgcmn.obj : fddlgcmn.cpp
 fs_mem.obj : fs_mem.cpp
 gbsizer.obj : gbsizer.cpp
 geometry.obj : geometry.cpp
-gzstream.obj : gzstream.cpp
 matrix.obj : matrix.cpp
 radiocmn.obj : radiocmn.cpp
 regex.obj : regex.cpp

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index a6b287af0c84d5a7cac7d5c505c8871ae817a4e2..296f205b2e3b1f4c703c590e960d29d6302a1e5e 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -251,7 +251,13 @@ size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
 
 off_t wxFFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 {
-    return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset );
+#ifdef __VMS
+#pragma message disable intsignchange
+#endif
+   return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset );
+#ifdef __VMS
+#pragma message enable intsignchange
+#endif
 }
 
 off_t wxFFileInputStream::OnSysTell() const
@@ -324,7 +330,13 @@ off_t wxFFileOutputStream::OnSysTell() const
 
 off_t wxFFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 {
+#ifdef __VMS
+#pragma message disable intsignchange
+#endif
     return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset );
+#ifdef __VMS
+#pragma message enable intsignchange
+#endif
 }
 
 void wxFFileOutputStream::Sync()