Committing in .

 Updated VMS-support
 Adding new featrure of other modes to MOTIF to get it compile cleanly.

 Modified Files:
 	wxWindows/docs/readme_vms.txt
 	wxWindows/include/wx/motif/filedlg.h wxWindows/lib/vms.opt
 	wxWindows/src/common/descrip.mms wxWindows/src/motif/data.cpp
 ----------------------------------------------------------------------

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

diff --git a/docs/readme_vms.txt b/docs/readme_vms.txt
index b905751313f37aa1ece4bd9942a17ec215086581..15f4074a4db37cbd4f48cccb7cb2066fa03c7205 100644 (file)
--- a/docs/readme_vms.txt
+++ b/docs/readme_vms.txt
@@ -17,17 +17,47 @@ To get everything compiled you'll need to have installed:
     -sys$library:libjpeg.olb  (from ftp://ftp.uu.net/graphics/jpeg/ )
     -sys$library:libpng.olb & sys$library:libz.olb (from
           http://www.cdrom.com/pub/png/pngcode.html )
+    -sys$library:libtiff.olb (from: ftp://ftp.sgi.com/graphics/tiff/ )
 
 Currently only the MOTIF GUI vcan be build by typing
   MMS/MACRO=(__WXMOTIF__=1)
  in the main directory of the distribution.
  
-It automatically makes the library in [.lib] and links the following samples
- [.samples.menu]dialogs.exe
- [.samples.menu]image.exe
- [.samples.menu]menu.exe
- [.samples.menu]minimal.exe
- 
+It automatically makes the library in [.lib] and links some of the samples
+and utils.
+
+N.B.
+ the following patch is needed in the tiff3.4 distribution:
+
+polka-jj) diff TIFFCOMP.H;3 TIFFCOMP.H;1
+************
+File $DISK2:[JOUKJ.PUBLIC.TIFF.TIFF.LIBTIFF]TIFFCOMP.H;3
+   97   #ifndef HAVE_UNISTD_H
+   98   #define HAVE_UNISTD_H   1
+   99   #endif
+  100   #endif
+******
+File $DISK2:[JOUKJ.PUBLIC.TIFF.TIFF.LIBTIFF]TIFFCOMP.H;1
+   97   #define HAVE_UNISTD_H   1
+   98   #endif
+************
+************
+File $DISK2:[JOUKJ.PUBLIC.TIFF.TIFF.LIBTIFF]TIFFCOMP.H;3
+  108   #if !defined(SEEK_SET) && defined( HAVE_UNISTD_H )
+  109   #include <unistd.h>
+******
+File $DISK2:[JOUKJ.PUBLIC.TIFF.TIFF.LIBTIFF]TIFFCOMP.H;1
+  106   #if !defined(SEEK_SET) && HAVE_UNISTD_H
+  107   #include <unistd.h>
+************
+
+Number of difference sections found: 2
+Number of difference records found: 4
+
+DIFFERENCES /IGNORE=()/MERGED=1-
+    $DISK2:[JOUKJ.PUBLIC.TIFF.TIFF.LIBTIFF]TIFFCOMP.H;3-
+    $DISK2:[JOUKJ.PUBLIC.TIFF.TIFF.LIBTIFF]TIFFCOMP.H;1
+
 
 
 Finally :

diff --git a/include/wx/motif/filedlg.h b/include/wx/motif/filedlg.h
index 29cd0fb8f7c0ecc9303a14a43b2bac67ed8a2186..510b4392fa71c5d2c2b07c853f6769efe9eb2810 100644 (file)
--- a/include/wx/motif/filedlg.h
+++ b/include/wx/motif/filedlg.h
@@ -58,8 +58,11 @@ public:
 
     inline wxString GetMessage() const { return m_message; }
     inline wxString GetPath() const { return m_path; }
+    inline void GetPaths(wxArrayString& a) { a.Empty(); a.Add(m_path); }
     inline wxString GetDirectory() const { return m_dir; }
     inline wxString GetFilename() const { return m_fileName; }
+    inline void GetFilenames(wxArrayString& a) { a.Empty();
+       a.Add( m_fileName); }
     inline wxString GetWildcard() const { return m_wildCard; }
     inline long GetStyle() const { return m_dialogStyle; }
     inline int GetFilterIndex() const { return m_filterIndex ; }

diff --git a/lib/vms.opt b/lib/vms.opt
index 9964a89a80a02ea2ebee58836d17ef37db0511fe..04f4464d0dd4855bd43a9d0a23e2c5dc6fbd8c24 100644 (file)
--- a/lib/vms.opt
+++ b/lib/vms.opt
@@ -2,6 +2,7 @@ wx_root:[wxwindows.lib]libwx_motif.olb/lib
 sys$library:libjpeg.olb/lib
 sys$library:libpng.olb/lib
 sys$library:libz.olb/lib
+sys$library:libtiff.olb/lib
 X11:libxpm.olb/lib
 sys$library:decw$xlibshr.exe/share
 sys$library:decw$xtlibshrr5.exe/share

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 9961a0a82b64b2b75867ef923515d33bbbcefeba..08d2cc9434b322efe1e51b973a218216d27300c3 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -75,6 +75,7 @@ OBJECTS1=framecmn.obj,\
                imagpcx.obj,\
                imagpng.obj,\
                imagpnm.obj,\
+               imagtiff.obj,\
                intl.obj,\
                ipcbase.obj,\
                layout.obj,\
@@ -171,6 +172,7 @@ SOURCES = \
                imagpcx.cpp,\
                imagpng.cpp,\
                imagpnm.cpp,\
+               imagtiff.cpp,\
                intl.cpp,\
                ipcbase.cpp,\
                layout.cpp,\
@@ -292,6 +294,7 @@ imagjpeg.obj : imagjpeg.cpp
 imagpcx.obj : imagpcx.cpp
 imagpng.obj : imagpng.cpp
 imagpnm.obj : imagpnm.cpp
+imagtiff.obj : imagtiff.cpp
 intl.obj : intl.cpp
 ipcbase.obj : ipcbase.cpp
 layout.obj : layout.cpp

diff --git a/src/motif/data.cpp b/src/motif/data.cpp
index 51f3690ee5833bc161947fa7e2c65a5c94c34f56..310a36eda8fa466527e9bd934a0f1f5c1c826ff1 100644 (file)
--- a/src/motif/data.cpp
+++ b/src/motif/data.cpp
@@ -127,6 +127,7 @@ const char *wxInternalErrorStr = "wxWindows Internal Error";
 const char *wxFatalErrorStr = "wxWindows Fatal Error";
 const char *wxDirDialogNameStr = "wxDirCtrl";
 const char *wxDirDialogDefaultFolderStr = "/";
+const wxChar *wxTreeCtrlNameStr = wxT("wxTreeCtrl");
 
 // See wx/utils.h
 const char *wxFloatToStringStr = "%.2f";