don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h
index b5d94c749f551c88795d1c191a4dac1d50817660..d9d339941594d2155e02d4c0955ae8574329a778 100644 (file)
--- a/include/wx/txtstrm.h
+++ b/include/wx/txtstrm.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        txtstrm.h
+// Name:        wx/txtstrm.h

 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -17,8 +17,8 @@
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-class WXDLLIMPEXP_BASE wxTextInputStream;
-class WXDLLIMPEXP_BASE wxTextOutputStream;
+class WXDLLIMPEXP_FWD_BASE wxTextInputStream;
+class WXDLLIMPEXP_FWD_BASE wxTextOutputStream;

 
 typedef wxTextInputStream& (*__wxTextInputManip)(wxTextInputStream&);
 typedef wxTextOutputStream& (*__wxTextOutputManip)(wxTextOutputStream&);
 
 typedef wxTextInputStream& (*__wxTextInputManip)(wxTextInputStream&);
 typedef wxTextOutputStream& (*__wxTextOutputManip)(wxTextOutputStream&);


@@ -52,7 +52,6 @@ public:
     wxInt16  Read16S(int base = 10);
     wxInt8   Read8S(int base = 10);
     double   ReadDouble();
     wxInt16  Read16S(int base = 10);
     wxInt8   Read8S(int base = 10);
     double   ReadDouble();

-    wxString ReadString();  // deprecated: use ReadLine or ReadWord instead

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


@@ -75,6 +74,10 @@ public:
 
     wxTextInputStream& operator>>( __wxTextInputManip func) { return func(*this); }
 
 
     wxTextInputStream& operator>>( __wxTextInputManip func) { return func(*this); }
 

+#if WXWIN_COMPATIBILITY_2_6
+    wxDEPRECATED( wxString ReadString() );  // use ReadLine or ReadWord instead
+#endif // WXWIN_COMPATIBILITY_2_6
+

 protected:
     wxInputStream &m_input;
     wxString m_separators;
 protected:
     wxInputStream &m_input;
     wxString m_separators;


@@ -90,7 +93,7 @@ protected:
     wxChar NextChar();   // this should be used instead of GetC() because of Unicode issues
     wxChar NextNonSeparators();
 
     wxChar NextChar();   // this should be used instead of GetC() because of Unicode issues
     wxChar NextNonSeparators();
 

-    DECLARE_NO_COPY_CLASS(wxTextInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxTextInputStream);

 };
 
 typedef enum
 };
 
 typedef enum


@@ -124,7 +127,8 @@ public:
 
     wxTextOutputStream& PutChar(wxChar c);
 
 
     wxTextOutputStream& PutChar(wxChar c);
 

-    wxTextOutputStream& operator<<(const wxChar *string);
+    void Flush();
+

     wxTextOutputStream& operator<<(const wxString& string);
     wxTextOutputStream& operator<<(char c);
 #if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE
     wxTextOutputStream& operator<<(const wxString& string);
     wxTextOutputStream& operator<<(char c);
 #if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE


@@ -147,7 +151,7 @@ protected:
     wxMBConv *m_conv;
 #endif
 
     wxMBConv *m_conv;
 #endif
 

-    DECLARE_NO_COPY_CLASS(wxTextOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxTextOutputStream);

 };
 
 #endif
 };
 
 #endif