Committing in .

 OPenVMS updates

 Modified Files:
 	wxWidgets/setup.h_vms wxWidgets/src/unix/stdpaths.cpp
 ----------------------------------------------------------------------

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

diff --git a/setup.h_vms b/setup.h_vms
index 46efdfd62e60b6df3c79ed915b54e95d148c1648..7ae15526b81542897a819550c5f544b924669d81 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -164,6 +164,8 @@
 
 #define wxUSE_DEBUG_CONTEXT 0
 
 
 #define wxUSE_DEBUG_CONTEXT 0
 

+#define wxUSE_DEBUGREPORT 0
+

 #define wxUSE_MEMORY_TRACING 0
 
 #define wxUSE_GLOBAL_MEMORY_OPERATORS 0
 #define wxUSE_MEMORY_TRACING 0
 
 #define wxUSE_GLOBAL_MEMORY_OPERATORS 0


@@ -214,6 +216,8 @@
 
 #define wxUSE_FSVOLUME      1
 
 
 #define wxUSE_FSVOLUME      1
 

+#define wxUSE_STDPATHS      1
+

 #define wxUSE_TEXTBUFFER    1
 
 #define wxUSE_TEXTFILE      1
 #define wxUSE_TEXTBUFFER    1
 
 #define wxUSE_TEXTFILE      1

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index f68392f0f41d29e5278de0edcff8aeebf0151ace..5c36bfcf7edf2dbd4e870a567455e2199eb0de0b 100644 (file)
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        unix/stdpaths.cpp
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        unix/stdpaths.cpp

-// Purpose:     wxStandardPaths implementation for Unix systems
+// Purpose:     wxStandardPaths implementation for Unix & OpenVMS systems

 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19


@@ -34,7 +34,7 @@
 
 #include "wx/stdpaths.h"
 
 
 #include "wx/stdpaths.h"
 

-#ifdef __LINUX__
+#if defined( __LINUX__ ) || defined( __VMS )

     #include <unistd.h>
 #endif
 
     #include <unistd.h>
 #endif
 


@@ -76,7 +76,11 @@ wxString wxStandardPaths::GetInstallPrefix() const
         if ( m_prefix.empty() )
 #endif // __LINUX__
         {
         if ( m_prefix.empty() )
 #endif // __LINUX__
         {

-            self->m_prefix = _T("/usr/local");
+#ifdef __VMS
+          self->m_prefix = _T("/sys$system");
+#else
+          self->m_prefix = _T("/usr/local");
+#endif

         }
     }
 
         }
     }
 


@@ -89,7 +93,11 @@ wxString wxStandardPaths::GetInstallPrefix() const
 
 wxString wxStandardPaths::GetConfigDir() const
 {
 
 wxString wxStandardPaths::GetConfigDir() const
 {

-    return _T("/etc");
+#ifdef __VMS
+   return _T("/sys$manager");
+#else
+   return _T("/etc");
+#endif

 }
 
 wxString wxStandardPaths::GetUserConfigDir() const
 }
 
 wxString wxStandardPaths::GetUserConfigDir() const


@@ -99,17 +107,29 @@ wxString wxStandardPaths::GetUserConfigDir() const
 
 wxString wxStandardPaths::GetDataDir() const
 {
 
 wxString wxStandardPaths::GetDataDir() const
 {

-    return AppendAppName(GetInstallPrefix() + _T("/share"));
+#ifdef __VMS
+   return AppendAppName(GetInstallPrefix() + _T("/sys$share"));
+#else
+   return AppendAppName(GetInstallPrefix() + _T("/share"));
+#endif

 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {

-    return AppendAppName(_T("/etc"));
+#ifdef __VMS
+   return AppendAppName(_T("/sys$manager"));
+#else
+   return AppendAppName(_T("/etc"));
+#endif

 }
 
 wxString wxStandardPaths::GetUserDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetUserDataDir() const
 {

-    return AppendAppName(wxFileName::GetHomeDir() + _T("/."));
+#ifdef __VMS
+   return wxFileName::GetHomeDir();
+#else
+   return AppendAppName(wxFileName::GetHomeDir() + _T("/."));
+#endif

 }
 
 wxString wxStandardPaths::GetPluginsDir() const
 }
 
 wxString wxStandardPaths::GetPluginsDir() const