declare wxEntry() as taking char **Argv, not char *argv[]

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

diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h
index cadc66b798b7a1a70b08cfff615efc522872a4e8..d7948933f7e3a3d6794d4d54342b1261769f8214 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_
 

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

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


@@ -28,7 +28,7 @@ typedef wxTextOutputStream& (*__wxTextOutputManip)(wxTextOutputStream&);
 
 WXDLLEXPORT wxTextOutputStream &endl( wxTextOutputStream &stream );
 
 
 WXDLLEXPORT wxTextOutputStream &endl( wxTextOutputStream &stream );
 

-class WXDLLEXPORT wxTextInputStream 
+class WXDLLEXPORT wxTextInputStream

 {
 public:
     wxTextInputStream(wxInputStream& s, const wxString &sep=wxT(" \t") );
 {
 public:
     wxTextInputStream(wxInputStream& s, const wxString &sep=wxT(" \t") );


@@ -47,16 +47,16 @@ public:
 
     // Operators
     wxTextInputStream& operator>>(wxString& word);
 
     // Operators
     wxTextInputStream& operator>>(wxString& word);

-    wxTextInputStream& operator>>(wxChar& c);
+    wxTextInputStream& operator>>(char& c);

     wxTextInputStream& operator>>(wxInt16& i);
     wxTextInputStream& operator>>(wxInt32& i);
     wxTextInputStream& operator>>(wxUint16& i);
     wxTextInputStream& operator>>(wxUint32& i);
     wxTextInputStream& operator>>(double& i);
     wxTextInputStream& operator>>(float& f);
     wxTextInputStream& operator>>(wxInt16& i);
     wxTextInputStream& operator>>(wxInt32& i);
     wxTextInputStream& operator>>(wxUint16& i);
     wxTextInputStream& operator>>(wxUint32& i);
     wxTextInputStream& operator>>(double& i);
     wxTextInputStream& operator>>(float& f);

-  
+

     wxTextInputStream& operator>>( __wxTextInputManip func) { return func(*this); }
     wxTextInputStream& operator>>( __wxTextInputManip func) { return func(*this); }

-  
+

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


@@ -70,10 +70,10 @@ typedef enum {
   wxEOL_NATIVE,
   wxEOL_UNIX,
   wxEOL_MAC,
   wxEOL_NATIVE,
   wxEOL_UNIX,
   wxEOL_MAC,

-  wxEOL_DOS,
+  wxEOL_DOS

 } wxEOL;
 
 } wxEOL;
 

-class WXDLLEXPORT wxTextOutputStream 
+class WXDLLEXPORT wxTextOutputStream

 {
 public:
     wxTextOutputStream( wxOutputStream& s, wxEOL mode = wxEOL_NATIVE );
 {
 public:
     wxTextOutputStream( wxOutputStream& s, wxEOL mode = wxEOL_NATIVE );


@@ -87,19 +87,19 @@ public:
     void Write8(wxUint8 i);
     virtual void WriteDouble(double d);
     virtual void WriteString(const wxString& string);
     void Write8(wxUint8 i);
     virtual void WriteDouble(double d);
     virtual void WriteString(const wxString& string);

-  
+

     wxTextOutputStream& operator<<(const wxChar *string);
     wxTextOutputStream& operator<<(const wxString& string);
     wxTextOutputStream& operator<<(const wxChar *string);
     wxTextOutputStream& operator<<(const wxString& string);

-    wxTextOutputStream& operator<<(wxChar c);
+    wxTextOutputStream& operator<<(char c);

     wxTextOutputStream& operator<<(wxInt16 c);
     wxTextOutputStream& operator<<(wxInt32 c);
     wxTextOutputStream& operator<<(wxUint16 c);
     wxTextOutputStream& operator<<(wxUint32 c);
     wxTextOutputStream& operator<<(double f);
     wxTextOutputStream& operator<<(float f);
     wxTextOutputStream& operator<<(wxInt16 c);
     wxTextOutputStream& operator<<(wxInt32 c);
     wxTextOutputStream& operator<<(wxUint16 c);
     wxTextOutputStream& operator<<(wxUint32 c);
     wxTextOutputStream& operator<<(double f);
     wxTextOutputStream& operator<<(float f);

- 
+

     wxTextOutputStream& operator<<( __wxTextOutputManip func) { return func(*this); }
     wxTextOutputStream& operator<<( __wxTextOutputManip func) { return func(*this); }

-  
+

 protected:
     wxOutputStream &m_output;
     wxEOL           m_mode;
 protected:
     wxOutputStream &m_output;
     wxEOL           m_mode;