diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 209b051245..a09b14714c 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -2599,8 +2599,13 @@ TestMessageBoxDialog::TestMessageBoxDialog(wxWindow *parent)
         "&Error icon"
     };
 
-    wxCOMPILE_TIME_ASSERT( WXSIZEOF(icons) == MsgDlgIcon_Max, IconMismatch );
-
+#ifndef __VMS
+   // This contruction not is not valid on OpenVMS:
+   // %CXX-W-REFNESTFUNVAR, reference to local variable of enclosing function is
+   // not allowed
+   wxCOMPILE_TIME_ASSERT( WXSIZEOF(icons) == MsgDlgIcon_Max, IconMismatch );
+#endif
+   
     m_icons = new wxRadioBox(this, wxID_ANY, "&Icon style",
                              wxDefaultPosition, wxDefaultSize,
                              WXSIZEOF(icons), icons,
diff --git a/setup.h_vms b/setup.h_vms
index e22421f97f..19ea899e70 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
- * Date : 4 February 2010                                                    *
+ * Date : 24 March 2010                                                      *
  *                                                                           *
  *****************************************************************************/
 
@@ -116,6 +116,7 @@ typedef pid_t GPid;
 #undef __NETBSD__
 #undef __OPENBSD__
 #undef __OSF__
+#undef __QNX__
 #undef __SGI__
 #undef __SOLARIS__
 #undef __SUN__
@@ -547,7 +548,7 @@ typedef pid_t GPid;
 
 #define wxUSE_MOUSEWHEEL        1
 
-
+#define wxUSE_UIACTIONSIMULATOR 1
 
 #define wxUSE_POSTSCRIPT  1
 
diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index c21a631713..67b6bedfe6 100644
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -372,7 +372,15 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
             return curLine;
     }
 
-    wxASSERT(initialCharToRemove >= 0 && initialCharToRemove <= len-1);  // see valid range for initialCharToRemove above
+#ifdef __VMS
+#pragma message disable unscomzer
+   // suppress warnings on comparison of unsigned numbers
+#endif
+   wxASSERT(initialCharToRemove >= 0 && initialCharToRemove <= len-1);  // see valid range for initialCharToRemove above
+#ifdef __VMS
+#pragma message enable unscomzer
+   // suppress warnings on comparison of unsigned numbers
+#endif
     wxASSERT(nCharsToRemove >= 1 && nCharsToRemove <= len-initialCharToRemove);  // see valid range for nCharsToRemove above
 
     // erase nCharsToRemove characters after initialCharToRemove (included);
diff --git a/src/unix/appunix.cpp b/src/unix/appunix.cpp
index 8e8e9e77f3..4bf75e675b 100644
--- a/src/unix/appunix.cpp
+++ b/src/unix/appunix.cpp
@@ -26,7 +26,7 @@
 
 #ifndef SA_RESTART
     // don't use for systems which don't define it (at least VMS and QNX)
-    #define SA_RESTART
+    #define SA_RESTART 0
 #endif
 
 // use unusual names for arg[cv] to avoid clashes with wxApp members with the