From: Julian Smart Date: Wed, 3 Feb 1999 10:01:34 +0000 (+0000) Subject: Cured some Latex problems; fixed i declaration; fixed filedlg.cpp X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4dba84be231243149a45a286a651d02be8487423?ds=sidebyside Cured some Latex problems; fixed i declaration; fixed filedlg.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp index e1812148a0..5c91e57c39 100644 --- a/distrib/msw/msw.rsp +++ b/distrib/msw/msw.rsp @@ -9,21 +9,23 @@ tools/gettext/msgfmt.exe tools/gettext/msgunfmt.exe src/makeb32.env +src/makeprog.b32 src/makebcc.env +src/makeprog.bcc src/makemsc.env src/makeprog.msc src/makewat.env src/makeprog.wat src/makesc.env src/makevc.env +src/makeprog.vc +src/makelib.vc src/makeg95.env src/makesl.env src/makeprog.sl src/salford.lnk src/maketwin.env src/makeprog.twn -src/makeprog.vc -src/makelib.vc src/makefile.bcc src/makefile.dos src/makefile.vc diff --git a/docs/latex/wx/strmext.tex b/docs/latex/wx/strmext.tex index a9d852de33..c793d4b42b 100644 --- a/docs/latex/wx/strmext.tex +++ b/docs/latex/wx/strmext.tex @@ -9,10 +9,11 @@ \wxheading{See also} -\helpref{wxStreamBuffer}{wxstreamBuffer},\helpref{wxInputStream}{wxinputstream} +\helpref{wxStreamBuffer}{wxstreamBuffer}, \helpref{wxInputStream}{wxinputstream} \wxheading{Short description} -This stream uncompresses all data read from it, it uses the ``filtered'' + +This stream uncompresses all data read from it. It uses the ``filtered'' stream to get new compressed data. % ----------------------------------------------------------------------------- @@ -26,9 +27,10 @@ stream to get new compressed data. \wxheading{See also} -\helpref{wxStreamBuffer}{wxstreamBuffer},\helpref{wxOutputStream}{woutputstream} +\helpref{wxStreamBuffer}{wxstreamBuffer}, \helpref{wxOutputStream}{woutputstream} \wxheading{Short description} + This stream compresses all data written to it and passed the compressed data to the ``filtered'' stream. @@ -52,24 +54,26 @@ to the ``filtered'' stream. \membersection{wxFileInputStream::wxFileInputStream} -\func{}{wxFileInputStream}{\param{const wxString&}{ ifileName}} +\func{}{wxFileInputStream}{\param{const wxString\&}{ ifileName}} Opens the specified file using its \it{ifilename} name in read-only mode. -\func{}{wxFileInputStream}{\param{wxFile&}{ file}} +\func{}{wxFileInputStream}{\param{wxFile\&}{ file}} Initializes a file stream in read-only mode using the file I/O object \it{file}. -\func{}{wxFileInputStream}{\param{int}{ fd}}; +\func{}{wxFileInputStream}{\param{int}{ fd}} Initializes a file stream in read-only mode using the specified file descriptor. \membersection{wxFileInputStream::\destruct{wxFileInputStream}} -\func{}{\destruct{wxFileInputStream}{\void} + +\func{}{\destruct{wxFileInputStream}}{\void} Destructor. \membersection{wxFileInputStream::Ok} + \constfunc{bool}{Ok}{\void} Returns TRUE if the stream is initialized and ready. @@ -94,23 +98,27 @@ Returns TRUE if the stream is initialized and ready. \membersection{wxFileOutputStream::wxFileOutputStream} -\func{}{wxFileOutputStream}{\param{const wxString&}{ ofileName}} +\func{}{wxFileOutputStream}{\param{const wxString\&}{ ofileName}} Creates a new file with \it{ofilename} name and initializes the stream in write-only mode. \func{}{wxFileOutputStream}{\param{wxFile&}{ file}} + Initializes a file stream in write-only mode using the file I/O object \it{file}. \func{}{wxFileOutputStream}{\param{int}{ fd}} + Initializes a file stream in write-only mode using the file descriptor \it{fd}. \membersection{wxFileOutputStream::\destruct{wxFileOutputStream}} -\func{}{\destruct{wxFileOutputStream}{\void} + +\func{}{\destruct{wxFileOutputStream}}{\void} Destructor. \membersection{wxFileOutputStream::Ok} + \constfunc{bool}{Ok}{\void} Returns TRUE if the stream is initialized and ready. @@ -132,9 +140,9 @@ Returns TRUE if the stream is initialized and ready. \membersection{wxFileStream::wxFileStream} -\func{}{wxFileStream}{\param{const wxString&}{ iofileName}} +\func{}{wxFileStream}{\param{const wxString\&}{ iofileName}} -Initializes a new file stream in read-write mode using the specified +Initializes a new file stream in read-write mode using the specified \it{iofilename} name. % ----------------------------------------------------------------------------- @@ -153,7 +161,8 @@ Initializes a new file stream in read-write mode using the specified \latexignore{\rtfignore{\wxheading{Members}}} \membersection{wxSocketInputStream::wxSocketInputStream} -\func{}{wxSocketInputStream}{\param{wxSocketBase&}{ s}} + +\func{}{wxSocketInputStream}{\param{wxSocketBase\&}{ s}} Initializes a new read-only socket stream using the specified initialized socket connection. @@ -174,7 +183,9 @@ socket connection. \latexignore{\rtfignore{\wxheading{Members}}} \membersection{wxSocketOutputStream::wxSocketOutputStream} -\func{}{wxSocketInputStream}{\param{wxSocketBase&}{ s}} + +\func{}{wxSocketInputStream}{\param{wxSocketBase\&}{ s}} Initializes a new write-only socket stream using the specified initialized socket connection. + diff --git a/docs/latex/wx/tex2rtf.ini b/docs/latex/wx/tex2rtf.ini index eb9d1d37ac..a4981b73c7 100644 --- a/docs/latex/wx/tex2rtf.ini +++ b/docs/latex/wx/tex2rtf.ini @@ -27,6 +27,6 @@ combineSubSections = yes \constfunc [3] {{\bf #1} {\bf #2}(#3) {\bf const}\index{#2}} \windowstyle [1] {{\bf #1}\index{#1}} %\pythonnote [1] {{\bf wxPython note: }#1} -\pythonnote [1] {{}} +\pythonnote [1] {} diff --git a/docs/latex/wx/text.tex b/docs/latex/wx/text.tex index d1229d93a1..df79879a07 100644 --- a/docs/latex/wx/text.tex +++ b/docs/latex/wx/text.tex @@ -511,4 +511,3 @@ Operator definitions for appending to a text control, for example: (*wnd) << "Welcome to text control number " << 1 << ".\n"; \end{verbatim} - diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h index 984432970f..0b8f009308 100644 --- a/include/wx/motif/textctrl.h +++ b/include/wx/motif/textctrl.h @@ -110,6 +110,7 @@ public: virtual bool LoadFile(const wxString& file); virtual bool SaveFile(const wxString& file); virtual void WriteText(const wxString& text); + virtual void AppendText(const wxString& text); virtual void DiscardEdits(); virtual bool IsModified() const; diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index 17c1d18258..e4fdd8318e 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -246,8 +246,9 @@ bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) { size_t number = 0; + size_t i; char *text = (char*) data; - for (size_t i = 0; i < size; i++) + for (i = 0; i < size; i++) if (text[i] == 0) number++; if (number == 0) return TRUE; @@ -255,7 +256,7 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) char **files = new char*[number]; text = (char*) data; - for (size_t i = 0; i < number; i++) + for (i = 0; i < number; i++) { files[i] = text; int len = strlen( text ); @@ -681,8 +682,9 @@ bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) { size_t number = 0; + size_t i; char *text = (char*) data; - for (size_t i = 0; i < size; i++) + for ( i = 0; i < size; i++) if (text[i] == 0) number++; if (number == 0) return TRUE; @@ -690,7 +692,7 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) char **files = new char*[number]; text = (char*) data; - for (size_t i = 0; i < number; i++) + for (i = 0; i < number; i++) { files[i] = text; int len = strlen( text ); diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index 17c1d18258..e4fdd8318e 100644 --- a/src/gtk1/dnd.cpp +++ b/src/gtk1/dnd.cpp @@ -246,8 +246,9 @@ bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) { size_t number = 0; + size_t i; char *text = (char*) data; - for (size_t i = 0; i < size; i++) + for (i = 0; i < size; i++) if (text[i] == 0) number++; if (number == 0) return TRUE; @@ -255,7 +256,7 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) char **files = new char*[number]; text = (char*) data; - for (size_t i = 0; i < number; i++) + for (i = 0; i < number; i++) { files[i] = text; int len = strlen( text ); @@ -681,8 +682,9 @@ bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) { size_t number = 0; + size_t i; char *text = (char*) data; - for (size_t i = 0; i < size; i++) + for ( i = 0; i < size; i++) if (text[i] == 0) number++; if (number == 0) return TRUE; @@ -690,7 +692,7 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) char **files = new char*[number]; text = (char*) data; - for (size_t i = 0; i < number; i++) + for (i = 0; i < number; i++) { files[i] = text; int len = strlen( text ); diff --git a/src/motif/dnd.cpp b/src/motif/dnd.cpp index 21dde40631..e9e57e42f8 100644 --- a/src/motif/dnd.cpp +++ b/src/motif/dnd.cpp @@ -76,7 +76,8 @@ bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * { wxLogDebug( "Got %d dropped files.", (int)nFiles ); wxLogDebug( "At x: %d, y: %d.", (int)x, (int)y ); - for (size_t i = 0; i < nFiles; i++) + size_t i; + for (i = 0; i < nFiles; i++) { wxLogDebug( aszFiles[i] ); } @@ -87,7 +88,8 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) { size_t number = 0; char *text = (char*) data; - for (size_t i = 0; i < size; i++) + size_t i; + for (i = 0; i < size; i++) if (text[i] == 0) number++; if (number == 0) return TRUE; @@ -95,7 +97,7 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) char **files = new char*[number]; text = (char*) data; - for (size_t i = 0; i < number; i++) + for ( i = 0; i < number; i++) { files[i] = text; int len = strlen( text ); diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp index bb1a996c02..845019c525 100644 --- a/src/motif/textctrl.cpp +++ b/src/motif/textctrl.cpp @@ -342,6 +342,16 @@ void wxTextCtrl::WriteText(const wxString& text) m_modified = TRUE; } +void wxTextCtrl::AppendText(const wxString& text) +{ + long textPosition = GetLastPosition() + strlen(text); + XmTextInsert ((Widget) m_mainWidget, GetLastPosition(), (char*) (const char*) text); + XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL); + SetInsertionPoint(textPosition); + XmTextShowPosition ((Widget) m_mainWidget, textPosition); + m_modified = TRUE; +} + void wxTextCtrl::Clear() { XmTextSetString ((Widget) m_mainWidget, ""); @@ -576,7 +586,7 @@ int wxTextCtrl::underflow() wxTextCtrl& wxTextCtrl::operator<<(const wxString& s) { - WriteText(s); + AppendText(s); return *this; } @@ -584,7 +594,7 @@ wxTextCtrl& wxTextCtrl::operator<<(float f) { wxString str; str.Printf("%.2f", f); - WriteText(str); + AppendText(str); return *this; } @@ -592,7 +602,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d) { wxString str; str.Printf("%.2f", d); - WriteText(str); + AppendText(str); return *this; } @@ -600,7 +610,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i) { wxString str; str.Printf("%d", i); - WriteText(str); + AppendText(str); return *this; } @@ -608,7 +618,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i) { wxString str; str.Printf("%ld", i); - WriteText(str); + AppendText(str); return *this; } @@ -618,7 +628,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c) buf[0] = c; buf[1] = 0; - WriteText(buf); + AppendText(buf); return *this; } diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index c596792816..eaed27850c 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -241,7 +241,11 @@ int wxFileDialog::ShowModal(void) */ //======================================================================= - wxString theFilter = ( Strlen(m_wildCard) == 0 ) ? wxString("*.*") : m_wildCard; + wxString theFilter; + if ( Strlen(m_wildCard) == 0 ) + theFilter = wxString("*.*"); + else + theFilter = m_wildCard ; wxString filterBuffer; if ( !strchr( theFilter, '|' ) ) { // only one filter ==> default text