Renamed wxStream::StreamSize() to wxStream::GetSize()

Add wxStream bool operator !().
  Made wxTextStream safe for conversion from/to Mac/DOS/Unix
  Added wxFrame::Iconize()
  Applied patch for stippled brushes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-07-24 10:50:13 +00:00
parent 5a96d2f45f
commit cd25b18c8e
14 changed files with 384 additions and 198 deletions

View File

@@ -91,11 +91,11 @@ public:
virtual void MakeModal(bool modal = TRUE);
virtual void SetIcon( const wxIcon &icon );
virtual void Iconize( bool WXUNUSED(iconize)) { }
virtual bool IsIconized() const { return FALSE; }
bool Iconized() const { return IsIconized(); }
virtual void Maximize(bool WXUNUSED(maximize)) {}
virtual void Restore() {}
virtual void Maximize( bool maximize );
virtual void Restore();
virtual void Iconize( bool iconize );
virtual bool IsIconized() const;
virtual void Command( int id );

View File

@@ -91,11 +91,11 @@ public:
virtual void MakeModal(bool modal = TRUE);
virtual void SetIcon( const wxIcon &icon );
virtual void Iconize( bool WXUNUSED(iconize)) { }
virtual bool IsIconized() const { return FALSE; }
bool Iconized() const { return IsIconized(); }
virtual void Maximize(bool WXUNUSED(maximize)) {}
virtual void Restore() {}
virtual void Maximize( bool maximize );
virtual void Restore();
virtual void Iconize( bool iconize );
virtual bool IsIconized() const;
virtual void Command( int id );

View File

@@ -22,7 +22,7 @@ class wxMemoryInputStream: public wxInputStream {
public:
wxMemoryInputStream(const char *data, size_t length);
virtual ~wxMemoryInputStream();
virtual size_t StreamSize() const { return m_length; }
virtual size_t GetSize() const { return m_length; }
char Peek();
@@ -41,7 +41,7 @@ class wxMemoryOutputStream: public wxOutputStream {
public:
wxMemoryOutputStream(char *data = NULL, size_t length = 0);
virtual ~wxMemoryOutputStream();
virtual size_t StreamSize() const { return m_o_streambuf->GetLastAccess(); }
virtual size_t GetSize() const { return m_o_streambuf->GetLastAccess(); }
wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }

View File

@@ -55,8 +55,9 @@ class WXDLLEXPORT wxStreamBase {
wxStreamBase();
virtual ~wxStreamBase();
bool operator!() const { return (LastError() != wxSTR_NOERROR); }
wxStreamError LastError() const { return m_lasterror; }
virtual size_t StreamSize() const { return ~((size_t)0); }
virtual size_t GetSize() const { return ~((size_t)0); }
protected:
@@ -147,7 +148,7 @@ class WXDLLEXPORT wxFilterInputStream: public wxInputStream {
char Peek() { return m_parent_i_stream->Peek(); }
wxStreamError LastError() const { return m_parent_i_stream->LastError(); }
size_t StreamSize() const { return m_parent_i_stream->StreamSize(); }
size_t GetSize() const { return m_parent_i_stream->GetSize(); }
protected:
wxInputStream *m_parent_i_stream;
@@ -160,7 +161,7 @@ class WXDLLEXPORT wxFilterOutputStream: public wxOutputStream {
~wxFilterOutputStream();
wxStreamError LastError() const { return m_parent_o_stream->LastError(); }
size_t StreamSize() const { return m_parent_o_stream->StreamSize(); }
size_t GetSize() const { return m_parent_o_stream->GetSize(); }
protected:
wxOutputStream *m_parent_o_stream;

View File

@@ -43,6 +43,9 @@ public:
protected:
wxInputStream *m_input;
wxChar NextNonWhiteSpace();
void SkipIfEndOfLine( wxChar c );
};
class WXDLLEXPORT wxTextOutputStream {
@@ -55,7 +58,7 @@ class WXDLLEXPORT wxTextOutputStream {
void Write8(wxUint8 i);
void WriteDouble(double d);
void WriteString(const wxString& string);
wxTextOutputStream& operator<<(const wxChar *string);
wxTextOutputStream& operator<<(const wxString& string);
wxTextOutputStream& operator<<(wxChar c);

View File

@@ -33,7 +33,7 @@ class wxFileInputStream: public wxInputStream {
~wxFileInputStream();
char Peek();
size_t StreamSize() const;
size_t GetSize() const;
bool Ok() const { return m_file->IsOpened(); }
@@ -61,7 +61,7 @@ class wxFileOutputStream: public wxOutputStream {
// { return wxOutputStream::Write(buffer, size); }
void Sync();
size_t StreamSize() const;
size_t GetSize() const;
bool Ok() const { return m_file->IsOpened(); }