Removed 'interface' pragma for gcc 2.96

[wxWidgets.git] / src / common / fileconf.cpp

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 643dd14fdfdef8b588ea15e1d6803dfbd3132fb6..0d5b0a4ae3132ede1a8a2547516dff0f1b1db0f6 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -230,13 +230,14 @@ wxString wxFileConfig::GetLocalDir()
 #ifndef __WXMAC__
   wxGetHomeDir(&strDir);
 
 #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
 #else
   if (strDir.Last() != wxT('\\')) strDir << wxT('\\');
 #endif

-#endif

 #else
        // no local dir concept on mac
        return GetGlobalDir() ;
 #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?
 #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
    
 #else
    wxString str = GetLocalDir();
 #endif
    

-  #ifdef  __UNIX__
+  #if defined( __UNIX__ ) && !defined( __VMS )

     str << wxT('.');
   #endif
 
     str << wxT('.');
   #endif