Committing in .

 samples/config/contest.cpp compilation on VMS
 Bug fix for "double home directory in fileconf.cpp

 Modified Files:
 	wxWindows/descrip.mms wxWindows/src/common/fileconf.cpp
 Added Files:
 	wxWindows/samples/config/conftest.opt
 	wxWindows/samples/config/descrip.mms
 ----------------------------------------------------------------------

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

diff --git a/descrip.mms b/descrip.mms
index 6a0cd359320202262ca299e08bc3a33cb1bc012b..b3ea7d3d300156bb80723fbe995451ed5c131559 100644 (file)
--- a/descrip.mms
+++ b/descrip.mms
@@ -21,6 +21,8 @@ all : setup.h
        $(MMS)$(MMSQUALIFIERS)
        set default [-.checklst]
        $(MMS)$(MMSQUALIFIERS)
+       set default [-.config]
+       $(MMS)$(MMSQUALIFIERS)
        set default [-.dialogs]
        $(MMS)$(MMSQUALIFIERS)
        set default [-.image]

diff --git a/samples/config/conftest.opt b/samples/config/conftest.opt
new file mode 100644 (file)
index 0000000..e05c857
--- /dev/null
+++ b/samples/config/conftest.opt
@@ -0,0 +1,6 @@
+[--.lib]libwx_motif.olb/lib
+sys$library:decw$xlibshr.exe/share
+sys$library:decw$xtlibshrr5.exe/share
+sys$library:decw$xmlibshr12.exe/share
+sys$library:decw$xmulibshrr5.exe/share
+X11:libxpm.olb/lib

diff --git a/samples/config/descrip.mms b/samples/config/descrip.mms
new file mode 100644 (file)
index 0000000..dc0b8b9
--- /dev/null
+++ b/samples/config/descrip.mms
@@ -0,0 +1,30 @@
+#*****************************************************************************
+#                                                                            *
+# Make file for VMS                                                          *
+# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
+# Date : 10 November 1999                                                     *
+#                                                                            *
+#*****************************************************************************
+.first
+       define wx [--.include.wx]
+
+.ifdef __WXMOTIF__
+CXX_DEFINE = /define=(__WXMOTIF__=1)
+.else
+CXX_DEFINE =
+.endif
+
+.suffixes : .cpp
+
+.cpp.obj :
+       cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
+
+all :
+       $(MMS)$(MMSQUALIFIERS) conftest.exe
+
+conftest.exe : conftest.obj
+.ifdef __WXMOTIF__
+       cxxlink conftest,conftest/opt
+.endif
+
+conftest.obj : conftest.cpp

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 80b528c70e5ba51b1618a24886e3411b6e3b6ad4..54bc21641a83d76157a032d94ba8e223c1e00699 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -98,7 +98,9 @@ wxString wxFileConfig::GetGlobalDir()
 {
   wxString strDir;
 
-  #ifdef __UNIX__
+  #ifdef __VMS__ // Note if __VMS is defined __UNIX is also defined
+    strDir = wxT("sys$manager:");
+  #elif defined( __UNIX__ )
     strDir = wxT("/etc/");
   #elif defined(__WXPM__)
     ULONG                           aulSysInfo[QSV_MAX] = {0};
@@ -225,11 +227,13 @@ wxString wxFileConfig::GetLocalDir()
 #ifndef __WXMAC__
   wxGetHomeDir(&strDir);
 
-#ifdef  __UNIX__
+#ifndef __VMS__
+# ifdef  __UNIX__
   if (strDir.Last() != wxT('/')) strDir << wxT('/');
 #else
   if (strDir.Last() != wxT('\\')) strDir << wxT('\\');
 #endif
+#endif
 #else
        // no local dir concept on mac
        return GetGlobalDir() ;
@@ -257,8 +261,14 @@ wxString wxFileConfig::GetGlobalFileName(const wxChar *szFile)
 
 wxString wxFileConfig::GetLocalFileName(const wxChar *szFile)
 {
-  wxString str = GetLocalDir();
-
+#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( ' ' ); 
+#else
+   wxString str = GetLocalDir();
+#endif
+   
   #ifdef  __UNIX__
     str << wxT('.');
   #endif