Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Override some methods in wxF(F)ileStream to resolve ambiguities.

Browse Source 
Override virtual methods IsSeekable(), GetLength() and OnSysSeek/Tell() to
forward to wxF(F)InputStream base class as otherwise it's impossible to use
them at all because of ambiguity between the versions inherited from this
class and wxF(F)OutputStream (even though the two versions should do the same
thing as they operate on the same file descriptor/handle).

Also improve documentation of these classes: provide a brief description,
correct the base classes.

Closes #11577.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-12-27 19:39:55 +00:00
parent 9067c6c537
commit 3e97b55017
2 changed files with 82 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
interface/wx/wfstream.h
View File

@@ -122,7 +122,7 @@ class wxFileOutputStream : public wxOutputStream
public:
/**
Creates a new file with @a ofileName name and initializes the stream in write-only mode.
@warning
You should use wxStreamBase::IsOk() to verify if the constructor succeeded.
*/
@@ -171,7 +171,7 @@ class wxFileInputStream : public wxInputStream
public:
/**
Opens the specified file using its @a ifileName name in read-only mode.
@warning
You should use wxStreamBase::IsOk() to verify if the constructor succeeded.
*/
@@ -253,24 +253,34 @@ public:
/**
@class wxFFileStream
@todo describe this class.
This stream allows to both read from and write to a file using buffered
STDIO functions.
@library{wxbase}
@category{streams}
@see wxStreamBuffer
@see wxFFileInputStream, wxFFileOutputStream, wxFileStream
*/
class wxFFileStream : public wxFFileOutputStream
class wxFFileStream : public wxFFileInputStream,
public wxFFileOutputStream
{
public:
/**
Initializes a new file stream in the given @a mode using the specified
@a iofileName name.
@warning
You should use wxStreamBase::IsOk() to verify if the constructor succeeded.
*/
wxFFileStream(const wxString& iofileName, const wxString& mode = "w+b");
/**
Returns @true if the stream is initialized and ready.
This method returns @true if the stream can be both read from and
written to.
*/
bool IsOk() const;
};
@@ -278,23 +288,34 @@ public:
/**
@class wxFileStream
@todo describe this class.
This class represents data that can be both read from and written to a file.
There are actually two such groups of classes: this one is based on wxFile
whereas wxFFileStream is based in the wxFFile class.
@library{wxbase}
@category{streams}
@see wxStreamBuffer
@see wxFileInputStream, wxFileOutputStream, wxFFileStream
*/
class wxFileStream : public wxFileOutputStream
class wxFileStream : public wxFileOutputStream,
public wxFileInputStream
{
public:
/**
Initializes a new file stream in read-write mode using the specified
@a iofileName name.
@warning
You should use wxStreamBase::IsOk() to verify if the constructor succeeded.
You should use IsOk() to verify if the constructor succeeded.
*/
wxFileStream(const wxString& iofileName);
/**
Returns @true if the stream is initialized and ready.
This method returns @true if the stream can be both read from and
written to.
*/
bool IsOk() const;
};