1. moved InheritAttributes() from wxControl to wxWindow

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

diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h
index c974b6f12b93034291d3976c2b6a61cbc55270c1..83b2f5a002728774c912f4d7aa027bccde426cfb 100644 (file)
--- a/include/wx/txtstrm.h
+++ b/include/wx/txtstrm.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TXTSTREAM_H_
 #define _WX_TXTSTREAM_H_
 
 #ifndef _WX_TXTSTREAM_H_
 #define _WX_TXTSTREAM_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "txtstrm.h"
 #endif
 
 #pragma interface "txtstrm.h"
 #endif
 


@@ -56,6 +56,7 @@ public:
     wxString ReadString();  // deprecated: use ReadLine or ReadWord instead
     wxString ReadLine();
     wxString ReadWord();
     wxString ReadString();  // deprecated: use ReadLine or ReadWord instead
     wxString ReadLine();
     wxString ReadWord();

+    wxChar   GetChar() { wxChar c = NextChar(); return c != wxEOT ? c : 0; }

 
     wxString GetStringSeparators() const { return m_separators; }
     void SetStringSeparators(const wxString &c) { m_separators = c; }
 
     wxString GetStringSeparators() const { return m_separators; }
     void SetStringSeparators(const wxString &c) { m_separators = c; }


@@ -86,6 +87,8 @@ protected:
     // returns EOT (\4) if there is a stream error, or end of file
     wxChar NextChar();   // this should be used instead of GetC() because of Unicode issues
     wxChar NextNonSeparators();
     // returns EOT (\4) if there is a stream error, or end of file
     wxChar NextChar();   // this should be used instead of GetC() because of Unicode issues
     wxChar NextNonSeparators();

+
+    DECLARE_NO_COPY_CLASS(wxTextInputStream)

 };
 
 typedef enum
 };
 
 typedef enum


@@ -135,6 +138,7 @@ protected:
     wxMBConv &m_conv;
 #endif
 
     wxMBConv &m_conv;
 #endif
 

+    DECLARE_NO_COPY_CLASS(wxTextOutputStream)

 };
 
 #endif
 };
 
 #endif