Committing in .

 OpenVMS compile issues

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/generic/listctrl.cpp
 	wxWindows/utils/dialoged/src/winprop.cpp
 ----------------------------------------------------------------------

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

diff --git a/setup.h_vms b/setup.h_vms
index 26fe021becefa61617dfdcb259ce982686709595..37708a725dec548785651b79f2ddc3b3d960abb2 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -169,6 +169,10 @@
  */
 #define HAVE_CONST_CAST 1
 
+/*
+ * use STL for containers and wxString
+ */
+#define wxUSE_STL 0
 /*
  * Use regex support
  */

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 704fb6e867d9f13379ca1816dc668e0d1023a347..d2f8c97ac6cf61dec1c2c80c4efc921e62b6a86c 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -2894,6 +2894,10 @@ bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value)
                 le.IsAllowed();
 }
 
+#ifdef __VMS__ // Ignore unreacheable code
+# pragma message disable initnotreach
+#endif
+
 void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
 {
     // wxMSW seems not to notify the program about
@@ -2917,6 +2921,9 @@ void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
 
     GetEventHandler()->ProcessEvent( le );
 }
+#ifdef __VMS__
+# pragma message enable initnotreach
+#endif
 
 void wxListMainWindow::OnMouse( wxMouseEvent &event )
 {

diff --git a/utils/dialoged/src/winprop.cpp b/utils/dialoged/src/winprop.cpp
index 5e853be147df632ea9e17f9e5f055c9980a6a5ff..ae117834009088122391d321cd56167d5e244de7 100644 (file)
--- a/utils/dialoged/src/winprop.cpp
+++ b/utils/dialoged/src/winprop.cpp
@@ -2008,6 +2008,10 @@ bool wxScrollBarPropertyInfo::InstantiateResource(wxItemResource *resource)
 /*
 * Panels
 */
+#ifdef __VMS
+// next functions may contain unreacheable code
+# pragma message disable codcauunr
+#endif
 
 wxProperty *wxPanelPropertyInfo::GetProperty(wxString& name)
 {
@@ -2237,6 +2241,9 @@ bool wxPanelPropertyInfo::SetProperty(wxString& name, wxProperty *property)
     else
         return wxWindowPropertyInfo::SetProperty(name, property);
 }
+#ifdef __VMS
+# pragma message enable codcauunr
+#endif
 
 void wxPanelPropertyInfo::GetPropertyNames(wxStringList& names)
 {