From acdad9dbd300b127bf49840aa89c228f147d6461 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Tue, 13 Jan 2009 17:29:34 +0000 Subject: [PATCH] use ::wxInvalidOffset to enable autolinking git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/file.h | 12 ++++++------ interface/wx/mstream.h | 2 +- interface/wx/stream.h | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/interface/wx/file.h b/interface/wx/file.h index 18e138400d..30269c2e53 100644 --- a/interface/wx/file.h +++ b/interface/wx/file.h @@ -137,7 +137,7 @@ public: /** Returns the length of the file. - This method may return wxInvalidOffset if the length couldn't be + This method may return ::wxInvalidOffset if the length couldn't be determined or 0 even for non-empty files if the file is not seekable. In general, the only way to determine if the file for which this function @@ -162,7 +162,7 @@ public: wxSeekMode mode = wxFromStart); /** - Returns the current position or wxInvalidOffset if file is not opened or + Returns the current position or ::wxInvalidOffset if file is not opened or if another error occurred. */ wxFileOffset Tell() const; @@ -383,7 +383,7 @@ public: @param count Bytes to read - @return The number of bytes read, or the symbol wxInvalidOffset. + @return The number of bytes read, or the symbol ::wxInvalidOffset. */ ssize_t Read(void* buffer, size_t count); @@ -395,7 +395,7 @@ public: @param mode One of wxFromStart, wxFromEnd, wxFromCurrent. - @return The actual offset position achieved, or wxInvalidOffset on + @return The actual offset position achieved, or ::wxInvalidOffset on failure. */ wxFileOffset Seek(wxFileOffset ofs, @@ -409,13 +409,13 @@ public: @param ofs Number of bytes before the end of the file. - @return The actual offset position achieved, or wxInvalidOffset on + @return The actual offset position achieved, or ::wxInvalidOffset on failure. */ wxFileOffset SeekEnd(wxFileOffset ofs = 0); /** - Returns the current position or wxInvalidOffset if file is not opened or + Returns the current position or ::wxInvalidOffset if file is not opened or if another error occurred. */ wxFileOffset Tell() const; diff --git a/interface/wx/mstream.h b/interface/wx/mstream.h index 86dbd37758..4920e81e34 100644 --- a/interface/wx/mstream.h +++ b/interface/wx/mstream.h @@ -117,7 +117,7 @@ public: data from the given input stream @a stream. The @a len argument specifies the amount of data to read from the - @a stream. Setting it to @e wxInvalidOffset means that the @a stream + @a stream. Setting it to ::wxInvalidOffset means that the @a stream is to be read entirely (i.e. till the EOF is reached). */ wxMemoryInputStream(wxInputStream& stream, diff --git a/interface/wx/stream.h b/interface/wx/stream.h index 7ff04991aa..da9e126d7a 100644 --- a/interface/wx/stream.h +++ b/interface/wx/stream.h @@ -313,7 +313,7 @@ public: @return Upon successful completion, it returns the new offset as measured in bytes from the beginning of the stream. - Otherwise, it returns wxInvalidOffset. + Otherwise, it returns ::wxInvalidOffset. */ virtual wxFileOffset Seek(wxFileOffset pos, wxSeekMode mode); @@ -370,7 +370,7 @@ public: the stream. @return Returns the current position in the stream if possible, - wxInvalidOffset in the other case. + ::wxInvalidOffset in the other case. */ virtual wxFileOffset Tell() const; @@ -449,7 +449,7 @@ public: @param mode One of wxFromStart, wxFromEnd, wxFromCurrent. - @return The new stream position or wxInvalidOffset on error. + @return The new stream position or ::wxInvalidOffset on error. */ virtual wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart); @@ -844,7 +844,7 @@ public: @param mode One of wxFromStart, wxFromEnd, wxFromCurrent. - @return The new stream position or wxInvalidOffset on error. + @return The new stream position or ::wxInvalidOffset on error. */ virtual wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart); @@ -923,7 +923,7 @@ public: /** Returns the length of the stream in bytes. If the length cannot be determined (this is always the case for socket streams for example), - returns @c wxInvalidOffset. + returns ::wxInvalidOffset. @since 2.5.4 */ -- 2.45.2