Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Committing in .

Browse Source 
Modified Files:
 	wxWindows/descrip.mms wxWindows/src/common/filefn.cpp


 Filename problem on VMS fixed.
----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jouk Jansen
2000-09-26 10:49:41 +00:00
parent fe47ec10b7
commit 03c046d1d5
2 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
descrip.mms
View File

@@ -14,10 +14,10 @@
set def [.wxwindows] set def [.wxwindows]
all : all :
make motif make gtk
purge [...] purge [...]
delete [...]*.obj; delete [...]*.obj;
make gtk make motif
purge [...] purge [...]
delete [...]*.obj; delete [...]*.obj;

45
src/common/filefn.cpp
View File

@@ -745,10 +745,11 @@ wxPathOnly (wxChar *path)
{ {
done = TRUE; done = TRUE;
#ifdef __VMS__ #ifdef __VMS__
buf[i+1] = 0; if ( path[i] == wxT(']') )
#else buf[i+1] = 0;
else
#endif
buf[i] = 0; buf[i] = 0;
#endif
return buf; return buf;
} }
@@ -793,10 +794,11 @@ wxString wxPathOnly (const wxString& path)
{ {
done = TRUE; done = TRUE;
#ifdef __VMS__ #ifdef __VMS__
buf[i+1] = 0; if ( path[i] == wxT(']') )
#else buf[i+1] = 0;
else
#endif
buf[i] = 0; buf[i] = 0;
#endif
return wxString(buf); return wxString(buf);
} }
@@ -1261,7 +1263,10 @@ bool wxGetTempFileName(const wxString& prefix, wxString& buf)
wxString wxFindFirstFile(const wxChar *spec, int flags) wxString wxFindFirstFile(const wxChar *spec, int flags)
{ {
wxString result; wxString result;
#ifdef __VMS
wxChar *specvms = NULL;
#endif
#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 ) #if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
if (gs_dirStream) if (gs_dirStream)
closedir(gs_dirStream); // edz 941103: better housekeping closedir(gs_dirStream); // edz 941103: better housekeping
@@ -1276,11 +1281,29 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
// special case: path is really "/" // special case: path is really "/"
if ( !path && gs_strFileSpec[0u] == wxT('/') ) if ( !path && gs_strFileSpec[0u] == wxT('/') )
path = wxT('/'); #ifdef __VMS
// path is empty => Local directory {
wxStrcpy( specvms , wxT( "[000000]" ) );
gs_strFileSpec = specvms;
wxString path_vms(wxPathOnly(gs_strFileSpec));
path = path_vms;
}
#else
path = wxT('/');
#endif
// path is empty => Local directory
if ( !path ) if ( !path )
path = wxT('.'); #ifdef __VMS
{
wxStrcpy( specvms , wxT( "[]" ) );
gs_strFileSpec = specvms;
wxString path_vms1(wxPathOnly(gs_strFileSpec));
path = path_vms1;
}
#else
path = wxT('.');
#endif
gs_dirStream = opendir(path.fn_str()); gs_dirStream = opendir(path.fn_str());
if ( !gs_dirStream ) if ( !gs_dirStream )
{ {