Some doc updates.

  Corrected wxFileDialog::GetFilenames() and GetPaths()
    if no file is selected.
  Corrceted make install.

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

diff --git a/Makefile.in b/Makefile.in
index 090b3d9b15320aac358231a2e2808908e35965c6..dc715e5b5fad847bff6530ecef6d6ae47a607442 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
 #

-# This file was automatically generated by tmake at 02:45, 1999/12/21
+# This file was automatically generated by tmake at 16:50, 1999/12/21

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #


@@ -327,9 +327,7 @@ WX_HEADERS = \
                tab.h \
                tabctrl.h \
                taskbar.h \
                tab.h \
                tabctrl.h \
                taskbar.h \

-               tbar95.h \

                tbarbase.h \
                tbarbase.h \

-               tbarmsw.h \

                tbarsmpl.h \
                textctrl.h \
                textdlg.h \
                tbarsmpl.h \
                textctrl.h \
                textdlg.h \

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index a92bd9a4ae61eea78f0631a30b4db1fc1063c2d3..af73fc462aaf6314a7d8526236f3b4b96d1ef2ec 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -590,9 +590,7 @@ string.h    W       B
 tab.h  W
 tabctrl.h      W
 taskbar.h      W
 tab.h  W
 tabctrl.h      W
 taskbar.h      W

-tbar95.h       W

 tbarbase.h     W
 tbarbase.h     W

-tbarmsw.h      W

 tbarsmpl.h     W
 textctrl.h     W
 textdlg.h      W
 tbarsmpl.h     W
 textctrl.h     W
 textdlg.h      W

diff --git a/docs/latex/wx/file.tex b/docs/latex/wx/file.tex
index 172667c788e69ab7cfc7798deef6fe85c0d099fe..4795f3e86235ccd9c55c79afc598dcd2f08a08ca 100644 (file)
--- a/docs/latex/wx/file.tex
+++ b/docs/latex/wx/file.tex
@@ -114,7 +114,7 @@ values of wxFile::read or wxFile::write really make sense here.
 
 Attaches an existing file descriptor to the wxFile object. Example of predefined
 file descriptors are 0, 1 and 2 which correspond to stdin, stdout and stderr (and
 
 Attaches an existing file descriptor to the wxFile object. Example of predefined
 file descriptors are 0, 1 and 2 which correspond to stdin, stdout and stderr (and

-have symbolic names of wxFile::fd\_stdin, wxFile::fd\_stdout and wxFile::fd\_stderr).
+have symbolic names of {\bf wxFile::fd\_stdin}, {\bf wxFile::fd\_stdout} and {\bf wxFile::fd\_stderr}).

 
 The descriptor should be already opened and it will be closed by wxFile
 object.
 
 The descriptor should be already opened and it will be closed by wxFile
 object.

diff --git a/docs/latex/wx/txtstrm.tex b/docs/latex/wx/txtstrm.tex
index 559209c18264f6bcfcd363c75d3fec3d35f23702..0783a8f76bb4ef88db93f5fa2e2e87560b9ee93b 100644 (file)
--- a/docs/latex/wx/txtstrm.tex
+++ b/docs/latex/wx/txtstrm.tex
@@ -89,7 +89,7 @@ $\backslash$n or $\backslash$r$\backslash$n or $\backslash$r.
 \section{\class{wxTextOutputStream}}\label{wxtextoutputstream}
 
 This class provides functions that write text datas using an output stream.
 \section{\class{wxTextOutputStream}}\label{wxtextoutputstream}
 
 This class provides functions that write text datas using an output stream.

-So, you can write \it{text} floats, integers.
+So, you can write {\it text} floats, integers.

 
 You can also simulate the C++ cout class:
 \begin{verbatim}
 
 You can also simulate the C++ cout class:
 \begin{verbatim}


@@ -108,7 +108,7 @@ and Unix in their native formats (concerning the line ending).
 
 \membersection{wxTextOutputStream::wxTextOutputStream}\label{wxtextoutputstreamconstr}
 
 
 \membersection{wxTextOutputStream::wxTextOutputStream}\label{wxtextoutputstreamconstr}
 

-\func{}{wxTextOutputStream}{\param{wxOutputStream\&}{ stream}}
+\func{}{wxTextOutputStream}{\param{wxOutputStream\&}{ stream}, \param{wxEOL}{ mode = wxEOL_NATIVE}}

 
 Constructs a text stream object from an output stream. Only write methods will
 be available.
 
 Constructs a text stream object from an output stream. Only write methods will
 be available.


@@ -117,12 +117,26 @@ be available.
 
 \docparam{stream}{The output stream.}
 
 
 \docparam{stream}{The output stream.}
 

+\docparam{mode}{The end-of-line mode. One of {\bf wxEOL_NATIVE}, {\bf wxEOL_DOS}, {\bf wxEOL_MAC} or {\bf wxEOL_UNIX}.}
+

 \membersection{wxTextOutputStream::\destruct{wxTextOutputStream}}
 
 \func{}{\destruct{wxTextOutputStream}}{\void}
 
 Destroys the wxTextOutputStream object.
 
 \membersection{wxTextOutputStream::\destruct{wxTextOutputStream}}
 
 \func{}{\destruct{wxTextOutputStream}}{\void}
 
 Destroys the wxTextOutputStream object.
 

+\membersection{wxTextOutputStream::GetMode}
+
+\func{wxEOL}{wxTextOutputStream::GetMode}{\void}
+
+Returns the end-of-line mode. One of {\bf wxEOL_DOS}, {\bf wxEOL_MAC} or {\bf wxEOL_UNIX}.
+
+\membersection{wxTextOutputStream::SetMode}
+
+\func{void}{wxTextOutputStream::SetMode}{{\param wxEOL}{ mode = wxEOL_NATIVE}}
+
+Set the end-of-line mode. One of {\bf wxEOL_NATIVE}, {\bf wxEOL_DOS}, {\bf wxEOL_MAC} or {\bf wxEOL_UNIX}.
+

 \membersection{wxTextOutputStream::Write8}
 
 \func{void}{wxTextOutputStream::Write8}{{\param wxUint8 }{i8}}
 \membersection{wxTextOutputStream::Write8}
 
 \func{void}{wxTextOutputStream::Write8}{{\param wxUint8 }{i8}}


@@ -143,14 +157,14 @@ Writes the 32 bit integer {\it i32} to the stream.
 
 \membersection{wxTextOutputStream::WriteDouble}
 
 
 \membersection{wxTextOutputStream::WriteDouble}
 

-\func{void}{wxTextOutputStream::WriteDouble}{{\param double }{f}}
+\func{virtual void}{wxTextOutputStream::WriteDouble}{{\param double }{f}}

 
 Writes the double {\it f} to the stream using the IEEE format.
 
 \membersection{wxTextOutputStream::WriteString}
 
 
 Writes the double {\it f} to the stream using the IEEE format.
 
 \membersection{wxTextOutputStream::WriteString}
 

-\func{void}{wxTextOutputStream::WriteString}{{\param const wxString\& }{string}}
+\func{virtual void}{wxTextOutputStream::WriteString}{{\param const wxString\& }{string}}

 
 

-Writes {\it string} as a line. Depending on the operating system, it adds
-$\backslash$n or $\backslash$r$\backslash$n.
+Writes {\it string} as a line. Depending on the end-of-line mode, it adds
+$\backslash$n, $\backslash$r or $\backslash$r$\backslash$n.

 
 

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 78ceba169a93b70deb856d6261ba8ce72ba1ccf6..8b1384196219f030cea48f8a8921f79346e93e35 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -901,6 +901,12 @@ void wxFileDialog::SetPath( const wxString& path )
 void wxFileDialog::GetPaths( wxArrayString& paths ) const
 {
     paths.Empty();
 void wxFileDialog::GetPaths( wxArrayString& paths ) const
 {
     paths.Empty();

+    if (m_list->GetSelectedItemCount() == 0)
+    {
+        paths.Add( GetPath() );
+        return;
+    }
+    

     paths.Alloc( m_list->GetSelectedItemCount() );
 
     wxString dir;
     paths.Alloc( m_list->GetSelectedItemCount() );
 
     wxString dir;


@@ -922,6 +928,11 @@ void wxFileDialog::GetPaths( wxArrayString& paths ) const
 void wxFileDialog::GetFilenames(wxArrayString& files) const
 {
     files.Empty();
 void wxFileDialog::GetFilenames(wxArrayString& files) const
 {
     files.Empty();

+    if (m_list->GetSelectedItemCount() == 0)
+    {
+        files.Add( GetFilename() );
+        return;
+    }

     files.Alloc( m_list->GetSelectedItemCount() );
 
     wxListItem item;
     files.Alloc( m_list->GetSelectedItemCount() );
 
     wxListItem item;