Make wxTR_NO_LINES default under GTK2

[wxWidgets.git] / include / wx / wfstream.h

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index a38322818f13e846c50d38ce7213b1860e331f65..b26ec29f5bc582a8adf87af72a504c3ab5fc78b6 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -37,7 +37,7 @@ class WXDLLIMPEXP_BASE wxFileInputStream: public wxInputStream {
   wxFileInputStream(int fd);
   ~wxFileInputStream();
 
   wxFileInputStream(int fd);
   ~wxFileInputStream();
 

-  size_t GetSize() const;
+  wxFileOffset GetLength() const;

 
   bool Ok() const { return m_file->IsOpened(); }
 
 
   bool Ok() const { return m_file->IsOpened(); }
 


@@ -67,7 +67,8 @@ class WXDLLIMPEXP_BASE wxFileOutputStream: public wxOutputStream {
 //     { return wxOutputStream::Write(buffer, size); }
 
   void Sync();
 //     { return wxOutputStream::Write(buffer, size); }
 
   void Sync();

-  size_t GetSize() const;
+  bool Close() { return m_file_destroy ? m_file->Close() : true; }
+  wxFileOffset GetLength() const;

 
   bool Ok() const { return m_file->IsOpened(); }
 
 
   bool Ok() const { return m_file->IsOpened(); }
 


@@ -106,7 +107,7 @@ class WXDLLIMPEXP_BASE wxFFileInputStream: public wxInputStream {
   wxFFileInputStream(FILE *file);
   ~wxFFileInputStream();
 
   wxFFileInputStream(FILE *file);
   ~wxFFileInputStream();
 

-  size_t GetSize() const;
+  wxFileOffset GetLength() const;

 
   bool Ok() const { return m_file->IsOpened(); }
 
 
   bool Ok() const { return m_file->IsOpened(); }
 


@@ -136,7 +137,8 @@ class WXDLLIMPEXP_BASE wxFFileOutputStream: public wxOutputStream {
 //     { return wxOutputStream::Write(buffer, size); }
 
   void Sync();
 //     { return wxOutputStream::Write(buffer, size); }
 
   void Sync();

-  size_t GetSize() const;
+  bool Close() { return m_file_destroy ? m_file->Close() : true; }
+  wxFileOffset GetLength() const;

 
   bool Ok() const { return m_file->IsOpened(); }
 
 
   bool Ok() const { return m_file->IsOpened(); }