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

diff --git a/lib/vms_gtk.opt b/lib/vms_gtk.opt
index d7ff40ea40bd0d4c7107b053cc0b63a61d98cbb3..76c59ed611f3a06ee98ba701955ce6ca588771b7 100644 (file)
--- a/lib/vms_gtk.opt
+++ b/lib/vms_gtk.opt
@@ -1,4 +1,5 @@
 wx_root:[wxwindows.lib]libwx_gtk.olb/lib
 wx_root:[wxwindows.lib]libwx_gtk.olb/lib

+sys$library:gthread.obj

 sys$library:libjpeg.olb/lib
 sys$library:libpng.olb/lib
 sys$library:libz.olb/lib
 sys$library:libjpeg.olb/lib
 sys$library:libpng.olb/lib
 sys$library:libz.olb/lib


@@ -8,4 +9,5 @@ sys$share:libgtk.exe/share
 sys$share:libgdk.exe/share
 sys$share:libglib.exe/share
 sys$share:vms_jackets.exe/share
 sys$share:libgdk.exe/share
 sys$share:libglib.exe/share
 sys$share:vms_jackets.exe/share

+sys$share:pthread$rtl.exe/share

 sys$library:decw$xlibshr.exe/share
 sys$library:decw$xlibshr.exe/share

diff --git a/setup.h_vms b/setup.h_vms
index effba81354b09594687ef008d69e3a03024cadd3..edb52674a58d9b3626fcbd8ef182147534c85b8a 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -76,7 +76,7 @@
 #define __WXGTK127__ 1
 
 /* Define this if your version of GTK+ is greater than 1.3 */
 #define __WXGTK127__ 1
 
 /* Define this if your version of GTK+ is greater than 1.3 */

-#undef __WXGTK13__
+#undef __WXGTK20__

 
 /*
  * Define to 1 for Unix[-like] system
 
 /*
  * Define to 1 for Unix[-like] system


@@ -114,8 +114,17 @@
 #undef STRICT
 #undef WINVER
 
 #undef STRICT
 #undef WINVER
 

-/* enable rich edit not on VMS (Win32 Only) */
+/* enable native status bar under Win32 */
+#ifdef __WIN95__
+#define wxUSE_NATIVE_STATUSBAR 1
+#endif
+
+/* enable rich edit under Win32 */
+#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#define wxUSE_RICHEDIT 1
+#else

 #define wxUSE_RICHEDIT 0
 #define wxUSE_RICHEDIT 0

+#endif

 
 /*
  * Supports bool type
 
 /*
  * Supports bool type


@@ -144,14 +153,14 @@
 #define wxUSE_ODBC 0
 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_BACKWARD_COMPATABILITY 0
 #define wxUSE_ODBC 0
 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_BACKWARD_COMPATABILITY 0

+/*
+ * Use freetype
+ */
+#define wxUSE_FREETYPE 0

 /*
  * Use Threads
  */
 /*
  * Use Threads
  */

-#ifndef __WXGTK__

 #define wxUSE_THREADS 1
 #define wxUSE_THREADS 1

-#else
-#define wxUSE_THREADS 0
-#endif

 /*
  * Have glibc2
  */
 /*
  * Have glibc2
  */


@@ -174,6 +183,11 @@
  */
 #define wxUSE_NOGUI 0
 
  */
 #define wxUSE_NOGUI 0
 

+/*
+ * Catch fatal program exceptions
+ */
+#define wxUSE_ON_FATAL_EXCEPTION 0
+

 /*
  * Use constraints mechanism
  */
 /*
  * Use constraints mechanism
  */


@@ -436,11 +450,6 @@
  */
 #define wxUSE_UNICODE 0
 
  */
 #define wxUSE_UNICODE 0
 

-/*
- * Compile wxString with (limited) multibyte char support?
- */
-#define wxUSE_MULTIBYTE 1
-

 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *


@@ -476,7 +485,11 @@
 /*
  * Use dnd
  */
 /*
  * Use dnd
  */

+#ifndef __WXGTK__
+#define wxUSE_DRAG_AND_DROP 1
+#else

 #define wxUSE_DRAG_AND_DROP 0
 #define wxUSE_DRAG_AND_DROP 0

+#endif

 /*
  * Use spline
  */
 /*
  * Use spline
  */


@@ -643,8 +656,11 @@
  * present */
 #define WX_GMTOFF_IN_TM
 
  * present */
 #define WX_GMTOFF_IN_TM
 

+/* Define if you have pw_gecos field in struct passwd */
+#undef HAVE_PW_GECOS
+

 /* Define if you have dlopen() */
 /* Define if you have dlopen() */

-#define HAVE_DLOPEN
+#define HAVE_DLOPEN 1

 
 /* Define if you have gettimeofday() */
 #define HAVE_GETTIMEOFDAY
 
 /* Define if you have gettimeofday() */
 #define HAVE_GETTIMEOFDAY


@@ -664,6 +680,12 @@
 /* Define if you have pthread_cancel */
 #define HAVE_PTHREAD_CANCEL 1
 
 /* Define if you have pthread_cancel */
 #define HAVE_PTHREAD_CANCEL 1
 

+/* Define if you have sigaction() */
+#define HAVE_SIGACTION 1
+
+/* Define if you have sigemptyset() */
+#define HAVE_SIGEMPTYSET 1
+

 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 


@@ -694,6 +716,9 @@
 /* The number of bytes in a char.  */
 #define SIZEOF_CHAR 1
 
 /* The number of bytes in a char.  */
 #define SIZEOF_CHAR 1
 

+/* The number of bytes in a wchar_t.  */
+#define SIZEOF_WCHAR_T 4
+

 /* The number of bytes in a int.  */
 #define SIZEOF_INT 4
 
 /* The number of bytes in a int.  */
 #define SIZEOF_INT 4
 


@@ -710,7 +735,10 @@
 #define SIZEOF_SHORT 2
 
 /* Define if you have the dlopen function.  */
 #define SIZEOF_SHORT 2
 
 /* Define if you have the dlopen function.  */

-#define HAVE_DLOPEN
+#define HAVE_DLOPEN 1
+
+/* Define if you have the dlerror function.  */
+#define HAVE_DLERROR 1

 
 /* Define if you have the gethostname function.  */
 #define HAVE_GETHOSTNAME
 
 /* Define if you have the gethostname function.  */
 #define HAVE_GETHOSTNAME


@@ -731,7 +759,7 @@
 #undef HAVE_STRTOK_R
 
 /* Define if you have thr_setconcurrency function */
 #undef HAVE_STRTOK_R
 
 /* Define if you have thr_setconcurrency function */

-#undef HaVE_THR_SETCONCURRENCY
+#undef HAVE_THR_SETCONCURRENCY

 
 /* Define if you have the uname function.  */
 #define HAVE_UNAME
 
 /* Define if you have the uname function.  */
 #define HAVE_UNAME


@@ -769,6 +797,12 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 

+/* Define if you have the <iconv.h> header file.  */
+#define HAVE_ICONV_H 1
+
+/* Define if you have the <langinfo.h> header file.  */
+#define HAVE_LANGINFO_H 1
+

 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 

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
 

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index b2fa90d046c031682dcb3818469cb7ced27dfad0..b64316f1b6e67653a3c05b74936f13276e52e703 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -640,9 +640,14 @@ long wxExecute(wxChar **argv,
 const wxChar* wxGetHomeDir( wxString *home  )
 {
     *home = wxGetUserHome( wxString() );
 const wxChar* wxGetHomeDir( wxString *home  )
 {
     *home = wxGetUserHome( wxString() );

+   wxString tmp;

     if ( home->IsEmpty() )
         *home = wxT("/");
     if ( home->IsEmpty() )
         *home = wxT("/");

-
+#ifdef __VMS
+   tmp = *home;
+   if ( tmp.Last() != wxT(']'))
+     if ( tmp.Last() != wxT('/')) *home << wxT('/');
+#endif

     return home->c_str();
 }
 
     return home->c_str();
 }