Modified Files:
wxWindows/setup.h_vms wxWindows/lib/vms_gtk.opt wxWindows/src/common/fileconf.cpp wxWindows/src/unix/utilsunx.cpp Patches for VMS: Updated Setup The conftest sample in wxGTK now can read_to/write_from the home-directory. ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -230,13 +230,14 @@ wxString wxFileConfig::GetLocalDir()
|
||||
#ifndef __WXMAC__
|
||||
wxGetHomeDir(&strDir);
|
||||
|
||||
#ifndef __VMS__
|
||||
# ifdef __UNIX__
|
||||
if (strDir.Last() != wxT('/')) strDir << wxT('/');
|
||||
#ifdef __UNIX__
|
||||
#ifdef __VMS
|
||||
if (strDir.Last() != wxT(']'))
|
||||
#endif
|
||||
if (strDir.Last() != wxT('/')) strDir << wxT('/');
|
||||
#else
|
||||
if (strDir.Last() != wxT('\\')) strDir << wxT('\\');
|
||||
#endif
|
||||
#endif
|
||||
#else
|
||||
// no local dir concept on mac
|
||||
return GetGlobalDir() ;
|
||||
@@ -267,12 +268,12 @@ wxString wxFileConfig::GetLocalFileName(const wxChar *szFile)
|
||||
#ifdef __VMS__ // On VMS I saw the problem that the home directory was appended
|
||||
// twice for the configuration file. Does that also happen for other
|
||||
// platforms?
|
||||
wxString str = wxT( ' ' );
|
||||
wxString str = wxT( '.' );
|
||||
#else
|
||||
wxString str = GetLocalDir();
|
||||
#endif
|
||||
|
||||
#ifdef __UNIX__
|
||||
#if defined( __UNIX__ ) && !defined( __VMS )
|
||||
str << wxT('.');
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user