Oops, forgot to remove the #includ

[wxWidgets.git] / wxPython / src / pyistream.h

diff --git a/wxPython/src/pyistream.h b/wxPython/src/pyistream.h
index ab43fa8b8bfd0496396fa8a9fcec805df40def9d..930af405c488e1bbc5ed338c048b31d0a4107ea1 100644 (file)
--- a/wxPython/src/pyistream.h
+++ b/wxPython/src/pyistream.h
@@ -37,9 +37,9 @@ public:
     void close();
     void flush();
     bool eof();
     void close();
     void flush();
     bool eof();

-    wxString* read(int size=-1);
-    wxString* readline(int size=-1);
-    wxStringPtrList* readlines(int sizehint=-1);
+    PyObject* read(int size=-1);
+    PyObject* readline(int size=-1);
+    PyObject* readlines(int sizehint=-1);

     void seek(int offset, int whence=0);
     int tell();
 
     void seek(int offset, int whence=0);
     int tell();
 


@@ -50,6 +50,19 @@ public:
       void write(wxString data);
       void writelines(wxStringPtrList);
     */
       void write(wxString data);
       void writelines(wxStringPtrList);
     */

+
+    // wxInputStream methods that may come in handy...
+
+    char Peek()           { if (m_wxis) return m_wxis->Peek(); else return -1; }
+    char GetC()           { if (m_wxis) return m_wxis->GetC(); else return -1; }
+    size_t LastRead()     { if (m_wxis) return m_wxis->LastRead(); else return 0; }
+    bool CanRead()        { if (m_wxis) return m_wxis->CanRead(); else return FALSE; }
+    bool Eof()            { if (m_wxis) return m_wxis->Eof(); else return FALSE; }
+    bool Ungetch(char c)  { if (m_wxis) return m_wxis->Ungetch(c); else return FALSE; }
+
+    unsigned long SeekI(unsigned long pos, wxSeekMode mode)
+          { if (m_wxis) return m_wxis->SeekI(pos, mode); else return 0; }
+    unsigned long TellI() { if (m_wxis) return m_wxis->TellI(); else return 0; }

 };
 
 
 };