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
This commit is contained in:
@@ -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_MEMORY_TRACING 0
|
||||||
|
|
||||||
#define wxUSE_GLOBAL_MEMORY_OPERATORS 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_TEXTBUFFER 1
|
||||||
|
|
||||||
#define wxUSE_TEXTFILE 1
|
#define wxUSE_TEXTFILE 1
|
||||||
|
@@ -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
|
// Author: Vadim Zeitlin
|
||||||
// Modified by:
|
// Modified by:
|
||||||
// Created: 2004-10-19
|
// 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>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -76,7 +76,11 @@ wxString wxStandardPaths::GetInstallPrefix() const
|
|||||||
if ( m_prefix.empty() )
|
if ( m_prefix.empty() )
|
||||||
#endif // __LINUX__
|
#endif // __LINUX__
|
||||||
{
|
{
|
||||||
|
#ifdef __VMS
|
||||||
|
self->m_prefix = _T("/sys$system");
|
||||||
|
#else
|
||||||
self->m_prefix = _T("/usr/local");
|
self->m_prefix = _T("/usr/local");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -89,7 +93,11 @@ wxString wxStandardPaths::GetInstallPrefix() const
|
|||||||
|
|
||||||
wxString wxStandardPaths::GetConfigDir() const
|
wxString wxStandardPaths::GetConfigDir() const
|
||||||
{
|
{
|
||||||
|
#ifdef __VMS
|
||||||
|
return _T("/sys$manager");
|
||||||
|
#else
|
||||||
return _T("/etc");
|
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
|
||||||
{
|
{
|
||||||
|
#ifdef __VMS
|
||||||
|
return AppendAppName(GetInstallPrefix() + _T("/sys$share"));
|
||||||
|
#else
|
||||||
return AppendAppName(GetInstallPrefix() + _T("/share"));
|
return AppendAppName(GetInstallPrefix() + _T("/share"));
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString wxStandardPaths::GetLocalDataDir() const
|
wxString wxStandardPaths::GetLocalDataDir() const
|
||||||
{
|
{
|
||||||
|
#ifdef __VMS
|
||||||
|
return AppendAppName(_T("/sys$manager"));
|
||||||
|
#else
|
||||||
return AppendAppName(_T("/etc"));
|
return AppendAppName(_T("/etc"));
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString wxStandardPaths::GetUserDataDir() const
|
wxString wxStandardPaths::GetUserDataDir() const
|
||||||
{
|
{
|
||||||
|
#ifdef __VMS
|
||||||
|
return wxFileName::GetHomeDir();
|
||||||
|
#else
|
||||||
return AppendAppName(wxFileName::GetHomeDir() + _T("/."));
|
return AppendAppName(wxFileName::GetHomeDir() + _T("/."));
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString wxStandardPaths::GetPluginsDir() const
|
wxString wxStandardPaths::GetPluginsDir() const
|
||||||
|
Reference in New Issue
Block a user