Removed deprecation warnings in OGL and Gizmos

[wxWidgets.git] / wxPython / src / streams.i

diff --git a/wxPython/src/streams.i b/wxPython/src/streams.i
index ee087b4f9699b3c110988683450cc2d0bb7d3ab9..8bf7f2156d904f1400dee93982a58cc7a2d20696 100644 (file)
--- a/wxPython/src/streams.i
+++ b/wxPython/src/streams.i
@@ -28,7 +28,6 @@
 %import _defs.i
 
 %pragma(python) code = "import wx"
-%pragma(python) code = "import string"
 
 //----------------------------------------------------------------------
 // typemaps for wxInputStream
@@ -39,7 +38,7 @@
         $target = temp->m_wxis;
         created = FALSE;
     } else {
-        $target = wxPyCBInputStream::create($source, FALSE);
+        $target = wxPyCBInputStream_create($source, FALSE);
         if ($target == NULL) {
             PyErr_SetString(PyExc_TypeError,"Expected _wxInputStream_p or Python file-like object.");
             return NULL;
@@ -61,7 +60,7 @@
     if ($source) {
         _ptr = new wxPyInputStream($source);
     }
-    $target = wxPyConstructObject(_ptr, "wxInputStream", TRUE);
+    $target = wxPyConstructObject(_ptr, wxT("wxInputStream"), TRUE);
 }
 
 //----------------------------------------------------------------------
@@ -88,6 +87,12 @@
 //          $target=0;
 //  }
 
+enum wxSeekMode
+{
+  wxFromStart,
+  wxFromCurrent,
+  wxFromEnd
+};
 
 
 
@@ -118,6 +123,16 @@ public:
       void write(wxString data);
       void writelines(wxStringPtrList);
     */
+
+    char Peek();
+    char GetC();
+    size_t LastRead();
+    bool CanRead();
+    bool Eof();
+    bool Ungetch(char c);
+
+    long SeekI(long pos, wxSeekMode mode = wxFromStart);
+    long TellI();
 }