Blind fix for daily builds

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

diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h
index a4117ce021a1af5ba34c0097ad495d9deadc6134..a39d69429c5b1768977ddccf2975a8860ff73d12 100644 (file)
--- a/wxPython/src/helpers.h
+++ b/wxPython/src/helpers.h
@@ -76,44 +76,6 @@ void           wxPyEndAllowThreads(PyThreadState* state);
 void wxPyBeginBlockThreads();
 void wxPyEndBlockThreads();
 
 void wxPyBeginBlockThreads();
 void wxPyEndBlockThreads();
 

-//----------------------------------------------------------------------
-// Handle wxInputStreams by Joerg Baumann
-// See stream.i for implementations
-
-// list class for return list of strings, e.g. readlines()
-WX_DECLARE_LIST(wxString, wxStringPtrList);
-
-
-// C++ class wxPyInputStream to act as base for python class wxInputStream
-// Use it in python like a python file object
-class wxPyInputStream {
-public:
-    // underlying wxInputStream
-    wxInputStream* wxi;
-
-public:
-    wxPyInputStream(wxInputStream* wxi_) : wxi(wxi_) {}
-    ~wxPyInputStream();
-
-    // python file object interface for input files (most of it)
-    void close();
-    void flush();
-    bool eof();
-    wxString* read(int size=-1);
-    wxString* readline(int size=-1);
-    wxStringPtrList* readlines(int sizehint=-1);
-    void seek(int offset, int whence=0);
-    int tell();
-    /*
-      bool isatty();
-      int fileno();
-      void truncate(int size=-1);
-      void write(wxString data);
-      void writelines(wxStringPtrList);
-    */
-};
-
-

 //----------------------------------------------------------------------
 // These are helpers used by the typemaps
 
 //----------------------------------------------------------------------
 // These are helpers used by the typemaps
 


@@ -143,6 +105,7 @@ bool _4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4);
 
 
 PyObject* wxArrayString2PyList_helper(const wxArrayString& arr);
 
 
 PyObject* wxArrayString2PyList_helper(const wxArrayString& arr);

+PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr);

 
 
 #define RETURN_NONE()   { Py_INCREF(Py_None); return Py_None; }
 
 
 #define RETURN_NONE()   { Py_INCREF(Py_None); return Py_None; }


@@ -281,6 +244,7 @@ struct wxPyCoreAPI {
     PyObject*   (*p_wxPyMake_wxSizer)(wxSizer* source);
     void        (*p_wxPyPtrTypeMap_Add)(const char* commonName, const char* ptrName);
     PyObject*   (*p_wxArrayString2PyList_helper)(const wxArrayString& arr);
     PyObject*   (*p_wxPyMake_wxSizer)(wxSizer* source);
     void        (*p_wxPyPtrTypeMap_Add)(const char* commonName, const char* ptrName);
     PyObject*   (*p_wxArrayString2PyList_helper)(const wxArrayString& arr);

+    PyObject*   (*p_wxArrayInt2PyList_helper)(const wxArrayInt& arr);

 };
 
 #ifdef wxPyUSE_EXPORT
 };
 
 #ifdef wxPyUSE_EXPORT