Include wx/intl.h according to precompiled headers of wx/wx.h (with other minor clean...

[wxWidgets.git] / wxPython / include / wx / wxPython / pyistream.h

diff --git a/wxPython/include/wx/wxPython/pyistream.h b/wxPython/include/wx/wxPython/pyistream.h
index ef1941b5576631f829e4aaa3d875cc7473d1da5e..0ca2da80a418d97e77d878c5287718b0f37fc5cb 100644 (file)
--- a/wxPython/include/wx/wxPython/pyistream.h
+++ b/wxPython/include/wx/wxPython/pyistream.h
@@ -69,11 +69,13 @@ public:
 class wxPyCBInputStream : public wxInputStream {
 public:
     ~wxPyCBInputStream();
-    virtual size_t GetSize() const;
+    virtual wxFileOffset GetLength() const;
 
     // factory function
     static wxPyCBInputStream* create(PyObject *py, bool block=true);
 
+    wxPyCBInputStream(const wxPyCBInputStream& other);
+    
 protected:
     // can only be created via the factory
     wxPyCBInputStream(PyObject *r, PyObject *s, PyObject *t, bool block);
@@ -81,8 +83,8 @@ protected:
     // wxStreamBase methods
     virtual size_t OnSysRead(void *buffer, size_t bufsize);
     virtual size_t OnSysWrite(const void *buffer, size_t bufsize);
-    virtual off_t OnSysSeek(off_t off, wxSeekMode mode);
-    virtual off_t OnSysTell() const;
+    virtual wxFileOffset OnSysSeek(wxFileOffset off, wxSeekMode mode);
+    virtual wxFileOffset OnSysTell() const;
 
     // helper
     static PyObject* getMethod(PyObject* py, char* name);