]> git.saurik.com Git - wxWidgets.git/blobdiff - utils/wxPython/src/helpers.cpp
merged 2.2 branch
[wxWidgets.git] / utils / wxPython / src / helpers.cpp
diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp
deleted file mode 100644 (file)
index 9a32b7f..0000000
+++ /dev/null
@@ -1,915 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        helpers.cpp
-// Purpose:     Helper functions/classes for the wxPython extension module
-//
-// Author:      Robin Dunn
-//
-// Created:     7/1/97
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>  // get the correct definition of NULL
-
-#undef DEBUG
-#include <Python.h>
-#include "helpers.h"
-
-#ifdef __WXMSW__
-#include <wx/msw/private.h>
-#undef FindWindow
-#undef GetCharWidth
-#undef LoadAccelerators
-#undef GetClassInfo
-#undef GetClassName
-#endif
-
-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#include <gdk/gdkprivate.h>
-#include <wx/gtk/win_gtk.h>
-//#include <gdk/gdk.h>
-//#include <gdk/gdkx.h>
-//#include <gtk/gtkwindow.h>
-
-extern GtkWidget *wxRootWindow;
-
-#endif
-
-
-//---------------------------------------------------------------------------
-
-//wxHashTable*  wxPyWindows = NULL;
-
-
-wxPoint     wxPyDefaultPosition;        //wxDefaultPosition);
-wxSize      wxPyDefaultSize;            //wxDefaultSize);
-wxString    wxPyEmptyStr("");
-
-
-
-#ifdef __WXMSW__             // If building for win32...
-//----------------------------------------------------------------------
-// This gets run when the DLL is loaded.  We just need to save a handle.
-//----------------------------------------------------------------------
-
-BOOL WINAPI DllMain(
-    HINSTANCE   hinstDLL,    // handle to DLL module
-    DWORD       fdwReason,   // reason for calling function
-    LPVOID      lpvReserved  // reserved
-   )
-{
-    wxSetInstance(hinstDLL);
-    return 1;
-}
-#endif
-
-//----------------------------------------------------------------------
-// Class for implementing the wxp main application shell.
-//----------------------------------------------------------------------
-
-wxPyApp *wxPythonApp = NULL;            // Global instance of application object
-
-
-wxPyApp::wxPyApp() {
-//    printf("**** ctor\n");
-}
-
-wxPyApp::~wxPyApp() {
-//    printf("**** dtor\n");
-}
-
-
-// This one isn't acutally called...  See __wxStart()
-bool wxPyApp::OnInit(void) {
-    return FALSE;
-}
-
-int  wxPyApp::MainLoop(void) {
-    int retval = 0;
-
-    DeletePendingObjects();
-#ifdef __WXGTK__
-    m_initialized = wxTopLevelWindows.GetCount() != 0;
-#endif
-
-    if (Initialized()) {
-        retval = wxApp::MainLoop();
-        wxPythonApp->OnExit();
-    }
-    return retval;
-}
-
-
-//---------------------------------------------------------------------
-//----------------------------------------------------------------------
-
-int  WXDLLEXPORT wxEntryStart( int argc, char** argv );
-int  WXDLLEXPORT wxEntryInitGui();
-void WXDLLEXPORT wxEntryCleanup();
-
-
-// This is where we pick up the first part of the wxEntry functionality...
-// The rest is in __wxStart and  AfterMainLoop.  This function is called when
-// wxcmodule is imported.  (Before there is a wxApp object.)
-void __wxPreStart()
-{
-#ifdef WXP_WITH_THREAD
-    PyEval_InitThreads();
-#endif
-
-    // Bail out if there is already windows created.  This means that the
-    // toolkit has already been initialized, as in embedding wxPython in
-    // a C++ wxWindows app.
-    if (wxTopLevelWindows.Number() > 0)
-        return;
-
-
-    PyObject* sysargv = PySys_GetObject("argv");
-    int argc = PyList_Size(sysargv);
-    char** argv = new char*[argc+1];
-    int x;
-    for(x=0; x<argc; x++)
-        argv[x] = PyString_AsString(PyList_GetItem(sysargv, x));
-    argv[argc] = NULL;
-
-    wxEntryStart(argc, argv);
-}
-
-
-
-#ifdef WXP_WITH_THREAD
-PyThreadState*  wxPyEventThreadState = NULL;
-#endif
-static char* __nullArgv[1] = { 0 };
-
-
-
-// Start the user application, user App's OnInit method is a parameter here
-PyObject* __wxStart(PyObject* /* self */, PyObject* args)
-{
-    PyObject*   onInitFunc = NULL;
-    PyObject*   arglist;
-    PyObject*   result;
-    long        bResult;
-
-#ifdef WXP_WITH_THREAD
-    wxPyEventThreadState = PyThreadState_Get();
-#endif
-
-    if (!PyArg_ParseTuple(args, "O", &onInitFunc))
-        return NULL;
-
-    if (wxTopLevelWindows.Number() > 0) {
-        PyErr_SetString(PyExc_TypeError, "Only 1 wxApp per process!");
-        return NULL;
-    }
-
-
-    // This is the next part of the wxEntry functionality...
-    wxPythonApp->argc = 0;
-    wxPythonApp->argv = NULL;
-
-    wxEntryInitGui();
-
-    // Call the Python App's OnInit function
-    arglist = PyTuple_New(0);
-    result = PyEval_CallObject(onInitFunc, arglist);
-    if (!result) {      // an exception was raised.
-        return NULL;
-    }
-
-    if (! PyInt_Check(result)) {
-        PyErr_SetString(PyExc_TypeError, "OnInit should return a boolean value");
-        return NULL;
-    }
-    bResult = PyInt_AS_LONG(result);
-    if (! bResult) {
-        PyErr_SetString(PyExc_SystemExit, "OnInit returned FALSE, exiting...");
-        return NULL;
-    }
-
-#ifdef __WXGTK__
-    wxTheApp->m_initialized = (wxTopLevelWindows.GetCount() > 0);
-#endif
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-void __wxCleanup() {
-    wxEntryCleanup();
-}
-
-
-
-PyObject* wxPython_dict;
-PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
-{
-
-    if (!PyArg_ParseTuple(args, "O", &wxPython_dict))
-        return NULL;
-
-    if (!PyDict_Check(wxPython_dict)) {
-        PyErr_SetString(PyExc_TypeError, "_wxSetDictionary must have dictionary object!");
-        return NULL;
-    }
-#ifdef __WXMOTIF__
-#define wxPlatform "__WXMOTIF__"
-#endif
-#ifdef __WXQT__
-#define wxPlatform "__WXQT__"
-#endif
-#ifdef __WXGTK__
-#define wxPlatform "__WXGTK__"
-#endif
-#if defined(__WIN32__) || defined(__WXMSW__)
-#define wxPlatform "__WXMSW__"
-#endif
-#ifdef __WXMAC__
-#define wxPlatform "__WXMAC__"
-#endif
-
-    PyDict_SetItemString(wxPython_dict, "wxPlatform", PyString_FromString(wxPlatform));
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-
-//---------------------------------------------------------------------------
-
-PyObject* wxPyConstructObject(void* ptr, const char* className) {
-    char    buff[64];               // should always be big enough...
-    char    swigptr[64];
-
-    sprintf(buff, "_%s_p", className);
-    SWIG_MakePtr(swigptr, ptr, buff);
-
-    sprintf(buff, "%sPtr", className);
-    PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff);
-    if (! classobj) {
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-
-    PyObject* arg = Py_BuildValue("(s)", swigptr);
-    PyObject* obj = PyInstance_New(classobj, arg, NULL);
-    Py_DECREF(arg);
-
-    return obj;
-}
-
-//---------------------------------------------------------------------------
-
-static unsigned int _wxPyNestCount = 0;
-
-static PyThreadState* myPyThreadState_Get() {
-    PyThreadState* current;
-    current = PyThreadState_Swap(NULL);
-    PyThreadState_Swap(current);
-    return current;
-}
-
-
-HELPEREXPORT bool wxPyRestoreThread() {
-    // NOTE: The Python API docs state that if a thread already has the
-    // interpreter lock and calls PyEval_RestoreThread again a deadlock
-    // occurs, so I put in this code as a guard condition since there are
-    // many possibilites for nested events and callbacks in wxPython.  If
-    // The current thread is our thread, then we can assume that we
-    // already have the lock.  (I hope!)
-    //
-#ifdef WXP_WITH_THREAD
-    _wxPyNestCount += 1;
-    if (wxPyEventThreadState != myPyThreadState_Get()) {
-        PyEval_RestoreThread(wxPyEventThreadState);
-        return TRUE;
-    }
-    else
-#endif
-        return FALSE;
-}
-
-
-HELPEREXPORT void wxPySaveThread(bool doSave) {
-#ifdef WXP_WITH_THREAD
-    if (doSave) {
-        wxPyEventThreadState = PyEval_SaveThread();
-    }
-    _wxPyNestCount -= 1;
-#endif
-}
-
-//---------------------------------------------------------------------------
-
-
-IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxObject);
-
-wxPyCallback::wxPyCallback(PyObject* func) {
-    m_func = func;
-    Py_INCREF(m_func);
-}
-
-wxPyCallback::wxPyCallback(const wxPyCallback& other) {
-    m_func = other.m_func;
-    Py_INCREF(m_func);
-}
-
-wxPyCallback::~wxPyCallback() {
-    bool doSave = wxPyRestoreThread();
-    Py_DECREF(m_func);
-    wxPySaveThread(doSave);
-}
-
-
-
-// This function is used for all events destined for Python event handlers.
-void wxPyCallback::EventThunker(wxEvent& event) {
-    wxPyCallback*   cb = (wxPyCallback*)event.m_callbackUserData;
-    PyObject*       func = cb->m_func;
-    PyObject*       result;
-    PyObject*       arg;
-    PyObject*       tuple;
-
-
-    bool doSave = wxPyRestoreThread();
-    wxString className = event.GetClassInfo()->GetClassName();
-
-    if (className == "wxPyEvent")
-        arg = ((wxPyEvent*)&event)->GetSelf();
-    else if (className == "wxPyCommandEvent")
-        arg = ((wxPyCommandEvent*)&event)->GetSelf();
-    else
-        arg = wxPyConstructObject((void*)&event, className);
-
-    tuple = PyTuple_New(1);
-    PyTuple_SET_ITEM(tuple, 0, arg);
-    result = PyEval_CallObject(func, tuple);
-    Py_DECREF(tuple);
-    if (result) {
-        Py_DECREF(result);
-        PyErr_Clear();
-    } else {
-        PyErr_Print();
-    }
-    wxPySaveThread(doSave);
-}
-
-
-//----------------------------------------------------------------------
-
-wxPyCallbackHelper::wxPyCallbackHelper() {
-    m_self = NULL;
-    m_lastFound = NULL;
-    m_incRef = FALSE;
-}
-
-
-wxPyCallbackHelper::~wxPyCallbackHelper() {
-    bool doSave = wxPyRestoreThread();
-    if (m_incRef)
-        Py_XDECREF(m_self);
-    wxPySaveThread(doSave);
-}
-
-wxPyCallbackHelper::wxPyCallbackHelper(const wxPyCallbackHelper& other) {
-      m_lastFound = NULL;
-      m_self = other.m_self;
-      if (m_self)
-          Py_INCREF(m_self);
-}
-
-
-void wxPyCallbackHelper::setSelf(PyObject* self, int incref) {
-    m_self = self;
-    m_incRef = incref;
-    if (incref)
-        Py_INCREF(m_self);
-}
-
-
-bool wxPyCallbackHelper::findCallback(const wxString& name) {
-    m_lastFound = NULL;
-    if (m_self && PyObject_HasAttrString(m_self, (char*)name.c_str()))
-        m_lastFound = PyObject_GetAttrString(m_self, (char*)name.c_str());
-
-    return m_lastFound != NULL;
-}
-
-
-int wxPyCallbackHelper::callCallback(PyObject* argTuple) {
-    PyObject*   result;
-    int         retval = FALSE;
-
-    result = callCallbackObj(argTuple);
-    if (result) {                       // Assumes an integer return type...
-        retval = PyInt_AsLong(result);
-        Py_DECREF(result);
-        PyErr_Clear();                  // forget about it if it's not...
-    }
-    return retval;
-}
-
-// Invoke the Python callable object, returning the raw PyObject return
-// value.  Caller should DECREF the return value and also call PyEval_SaveThread.
-PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) {
-    PyObject*   result;
-
-    result = PyEval_CallObject(m_lastFound, argTuple);
-    Py_DECREF(argTuple);
-    if (!result) {
-        PyErr_Print();
-    }
-    return result;
-}
-
-
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-// These classes can be derived from in Python and passed through the event
-// system without loosing anything.  They do this by keeping a reference to
-// themselves and some special case handling in wxPyCallback::EventThunker.
-
-
-wxPyEvtSelfRef::wxPyEvtSelfRef() {
-    //m_self = Py_None;         // **** We don't do normal ref counting to prevent
-    //Py_INCREF(m_self);        //      circular loops...
-    m_cloned = FALSE;
-}
-
-wxPyEvtSelfRef::~wxPyEvtSelfRef() {
-    bool doSave = wxPyRestoreThread();
-    if (m_cloned)
-        Py_DECREF(m_self);
-    wxPySaveThread(doSave);
-}
-
-void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) {
-    bool doSave = wxPyRestoreThread();
-    if (m_cloned)
-        Py_DECREF(m_self);
-    m_self = self;
-    if (clone) {
-        Py_INCREF(m_self);
-        m_cloned = TRUE;
-    }
-    wxPySaveThread(doSave);
-}
-
-PyObject* wxPyEvtSelfRef::GetSelf() const {
-    Py_INCREF(m_self);
-    return m_self;
-}
-
-
-wxPyEvent::wxPyEvent(int id)
-    : wxEvent(id) {
-}
-
-wxPyEvent::~wxPyEvent() {
-}
-
-// This one is so the event object can be Cloned...
-void wxPyEvent::CopyObject(wxObject& dest) const {
-    wxEvent::CopyObject(dest);
-    ((wxPyEvent*)&dest)->SetSelf(m_self, TRUE);
-}
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxPyEvent, wxEvent);
-
-
-wxPyCommandEvent::wxPyCommandEvent(wxEventType commandType, int id)
-    : wxCommandEvent(commandType, id) {
-}
-
-wxPyCommandEvent::~wxPyCommandEvent() {
-}
-
-void wxPyCommandEvent::CopyObject(wxObject& dest) const {
-    wxCommandEvent::CopyObject(dest);
-    ((wxPyCommandEvent*)&dest)->SetSelf(m_self, TRUE);
-}
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxPyCommandEvent, wxCommandEvent);
-
-
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-
-
-wxPyTimer::wxPyTimer(PyObject* callback) {
-    func = callback;
-    Py_INCREF(func);
-}
-
-wxPyTimer::~wxPyTimer() {
-    bool doSave = wxPyRestoreThread();
-    Py_DECREF(func);
-    wxPySaveThread(doSave);
-}
-
-void wxPyTimer::Notify() {
-    bool doSave = wxPyRestoreThread();
-
-    PyObject*   result;
-    PyObject*   args = Py_BuildValue("()");
-
-    result = PyEval_CallObject(func, args);
-    Py_DECREF(args);
-    if (result) {
-        Py_DECREF(result);
-        PyErr_Clear();
-    } else {
-        PyErr_Print();
-    }
-    wxPySaveThread(doSave);
-}
-
-
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-// Convert a wxList to a Python List
-
-PyObject* wxPy_ConvertList(wxListBase* list, const char* className) {
-    PyObject*   pyList;
-    PyObject*   pyObj;
-    wxObject*   wxObj;
-    wxNode*     node = list->First();
-
-    bool doSave = wxPyRestoreThread();
-    pyList = PyList_New(0);
-    while (node) {
-        wxObj = node->Data();
-        pyObj = wxPyConstructObject(wxObj, className);
-        PyList_Append(pyList, pyObj);
-        node = node->Next();
-    }
-    wxPySaveThread(doSave);
-    return pyList;
-}
-
-//----------------------------------------------------------------------
-
-long wxPyGetWinHandle(wxWindow* win) {
-#ifdef __WXMSW__
-    return (long)win->GetHandle();
-#endif
-
-    // Find and return the actual X-Window.
-#ifdef __WXGTK__
-    if (win->m_wxwindow) {
-        GdkWindowPrivate* bwin = (GdkWindowPrivate*)GTK_PIZZA(win->m_wxwindow)->bin_window;
-        if (bwin) {
-            return (long)bwin->xwindow;
-        }
-    }
-#endif
-    return 0;
-}
-
-//----------------------------------------------------------------------
-// Some helper functions for typemaps in my_typemaps.i, so they won't be
-// included in every file...
-
-
-byte* byte_LIST_helper(PyObject* source) {
-    if (!PyList_Check(source)) {
-        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        return NULL;
-    }
-    int count = PyList_Size(source);
-    byte* temp = new byte[count];
-    if (! temp) {
-        PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array");
-        return NULL;
-    }
-    for (int x=0; x<count; x++) {
-        PyObject* o = PyList_GetItem(source, x);
-        if (! PyInt_Check(o)) {
-            PyErr_SetString(PyExc_TypeError, "Expected a list of integers.");
-            return NULL;
-        }
-        temp[x] = (byte)PyInt_AsLong(o);
-    }
-    return temp;
-}
-
-
-int* int_LIST_helper(PyObject* source) {
-    if (!PyList_Check(source)) {
-        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        return NULL;
-    }
-    int count = PyList_Size(source);
-    int* temp = new int[count];
-    if (! temp) {
-        PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array");
-        return NULL;
-    }
-    for (int x=0; x<count; x++) {
-        PyObject* o = PyList_GetItem(source, x);
-        if (! PyInt_Check(o)) {
-            PyErr_SetString(PyExc_TypeError, "Expected a list of integers.");
-            return NULL;
-        }
-        temp[x] = PyInt_AsLong(o);
-    }
-    return temp;
-}
-
-
-long* long_LIST_helper(PyObject* source) {
-    if (!PyList_Check(source)) {
-        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        return NULL;
-    }
-    int count = PyList_Size(source);
-    long* temp = new long[count];
-    if (! temp) {
-        PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array");
-        return NULL;
-    }
-    for (int x=0; x<count; x++) {
-        PyObject* o = PyList_GetItem(source, x);
-        if (! PyInt_Check(o)) {
-            PyErr_SetString(PyExc_TypeError, "Expected a list of integers.");
-            return NULL;
-        }
-        temp[x] = PyInt_AsLong(o);
-    }
-    return temp;
-}
-
-
-char** string_LIST_helper(PyObject* source) {
-    if (!PyList_Check(source)) {
-        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        return NULL;
-    }
-    int count = PyList_Size(source);
-    char** temp = new char*[count];
-    if (! temp) {
-        PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array");
-        return NULL;
-    }
-    for (int x=0; x<count; x++) {
-        PyObject* o = PyList_GetItem(source, x);
-        if (! PyString_Check(o)) {
-            PyErr_SetString(PyExc_TypeError, "Expected a list of strings.");
-            return NULL;
-        }
-        temp[x] = PyString_AsString(o);
-    }
-    return temp;
-}
-
-
-
-wxPoint* wxPoint_LIST_helper(PyObject* source) {
-    if (!PyList_Check(source)) {
-        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        return NULL;
-    }
-    int count = PyList_Size(source);
-    wxPoint* temp = new wxPoint[count];
-    if (! temp) {
-        PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array");
-        return NULL;
-    }
-    for (int x=0; x<count; x++) {
-        PyObject* o = PyList_GetItem(source, x);
-        if (PyTuple_Check(o)) {
-            PyObject* o1 = PyTuple_GetItem(o, 0);
-            PyObject* o2 = PyTuple_GetItem(o, 1);
-
-            temp[x].x = PyInt_AsLong(o1);
-            temp[x].y = PyInt_AsLong(o2);
-        }
-        else if (PyInstance_Check(o)) {
-            wxPoint* pt;
-            if (SWIG_GetPtrObj(o,(void **) &pt,"_wxPoint_p")) {
-                PyErr_SetString(PyExc_TypeError,"Expected _wxPoint_p.");
-                return NULL;
-            }
-            temp[x] = *pt;
-        }
-        else {
-            PyErr_SetString(PyExc_TypeError, "Expected a list of 2-tuples or wxPoints.");
-            return NULL;
-        }
-    }
-    return temp;
-}
-
-
-wxBitmap** wxBitmap_LIST_helper(PyObject* source) {
-    if (!PyList_Check(source)) {
-        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        return NULL;
-    }
-    int count = PyList_Size(source);
-    wxBitmap** temp = new wxBitmap*[count];
-    if (! temp) {
-        PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array");
-        return NULL;
-    }
-    for (int x=0; x<count; x++) {
-        PyObject* o = PyList_GetItem(source, x);
-        if (PyInstance_Check(o)) {
-            wxBitmap*    pt;
-            if (SWIG_GetPtrObj(o, (void **) &pt,"_wxBitmap_p")) {
-                PyErr_SetString(PyExc_TypeError,"Expected _wxBitmap_p.");
-                return NULL;
-            }
-            temp[x] = pt;
-        }
-        else {
-            PyErr_SetString(PyExc_TypeError, "Expected a list of wxBitmaps.");
-            return NULL;
-        }
-    }
-    return temp;
-}
-
-
-
-wxString* wxString_LIST_helper(PyObject* source) {
-    if (!PyList_Check(source)) {
-        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        return NULL;
-    }
-    int count = PyList_Size(source);
-    wxString* temp = new wxString[count];
-    if (! temp) {
-        PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array");
-        return NULL;
-    }
-    for (int x=0; x<count; x++) {
-        PyObject* o = PyList_GetItem(source, x);
-        if (! PyString_Check(o)) {
-            PyErr_SetString(PyExc_TypeError, "Expected a list of strings.");
-            return NULL;
-        }
-        temp[x] = PyString_AsString(o);
-    }
-    return temp;
-}
-
-
-wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
-    if (!PyList_Check(source)) {
-        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        return NULL;
-    }
-    int count                = PyList_Size(source);
-    wxAcceleratorEntry* temp = new wxAcceleratorEntry[count];
-    if (! temp) {
-        PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array");
-        return NULL;
-    }
-    for (int x=0; x<count; x++) {
-        PyObject* o = PyList_GetItem(source, x);
-        if (PyInstance_Check(o)) {
-            wxAcceleratorEntry* ae;
-            if (SWIG_GetPtrObj(o, (void **) &ae,"_wxAcceleratorEntry_p")) {
-                PyErr_SetString(PyExc_TypeError,"Expected _wxAcceleratorEntry_p.");
-                return NULL;
-            }
-            temp[x] = *ae;
-        }
-        else if (PyTuple_Check(o)) {
-            PyObject* o1 = PyTuple_GetItem(o, 0);
-            PyObject* o2 = PyTuple_GetItem(o, 1);
-            PyObject* o3 = PyTuple_GetItem(o, 2);
-
-            temp[x].m_flags   = PyInt_AsLong(o1);
-            temp[x].m_keyCode = PyInt_AsLong(o2);
-            temp[x].m_command = PyInt_AsLong(o3);
-        }
-        else {
-            PyErr_SetString(PyExc_TypeError, "Expected a list of 3-tuples or wxAcceleratorEntry objects.");
-            return NULL;
-        }
-    }
-    return temp;
-}
-
-
-
-//----------------------------------------------------------------------
-
-bool wxSize_helper(PyObject* source, wxSize** obj) {
-
-    // If source is an object instance then it may already be the right type
-    if (PyInstance_Check(source)) {
-        wxSize* ptr;
-        if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxSize_p"))
-            goto error;
-        *obj = ptr;
-        return TRUE;
-    }
-    // otherwise a 2-tuple of integers is expected
-    else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
-        PyObject* o1 = PySequence_GetItem(source, 0);
-        PyObject* o2 = PySequence_GetItem(source, 1);
-        **obj = wxSize(PyInt_AsLong(o1), PyInt_AsLong(o2));
-        return TRUE;
-    }
-
- error:
-    PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxSize object.");
-    return FALSE;
-}
-
-bool wxPoint_helper(PyObject* source, wxPoint** obj) {
-
-    // If source is an object instance then it may already be the right type
-    if (PyInstance_Check(source)) {
-        wxPoint* ptr;
-        if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxPoint_p"))
-            goto error;
-        *obj = ptr;
-        return TRUE;
-    }
-    // otherwise a 2-tuple of integers is expected
-    else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
-        PyObject* o1 = PySequence_GetItem(source, 0);
-        PyObject* o2 = PySequence_GetItem(source, 1);
-        **obj = wxPoint(PyInt_AsLong(o1), PyInt_AsLong(o2));
-        return TRUE;
-    }
-
- error:
-    PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxPoint object.");
-    return FALSE;
-}
-
-
-
-bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) {
-
-    // If source is an object instance then it may already be the right type
-    if (PyInstance_Check(source)) {
-        wxRealPoint* ptr;
-        if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxRealPoint_p"))
-            goto error;
-        *obj = ptr;
-        return TRUE;
-    }
-    // otherwise a 2-tuple of floats is expected
-    else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
-        PyObject* o1 = PySequence_GetItem(source, 0);
-        PyObject* o2 = PySequence_GetItem(source, 1);
-        **obj = wxRealPoint(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2));
-        return TRUE;
-    }
-
- error:
-    PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxRealPoint object.");
-    return FALSE;
-}
-
-
-
-
-bool wxRect_helper(PyObject* source, wxRect** obj) {
-
-    // If source is an object instance then it may already be the right type
-    if (PyInstance_Check(source)) {
-        wxRect* ptr;
-        if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxRect_p"))
-            goto error;
-        *obj = ptr;
-        return TRUE;
-    }
-    // otherwise a 4-tuple of integers is expected
-    else if (PySequence_Check(source) && PyObject_Length(source) == 4) {
-        PyObject* o1 = PySequence_GetItem(source, 0);
-        PyObject* o2 = PySequence_GetItem(source, 1);
-        PyObject* o3 = PySequence_GetItem(source, 2);
-        PyObject* o4 = PySequence_GetItem(source, 3);
-        **obj = wxRect(PyInt_AsLong(o1), PyInt_AsLong(o2),
-                     PyInt_AsLong(o3), PyInt_AsLong(o4));
-        return TRUE;
-    }
-
- error:
-    PyErr_SetString(PyExc_TypeError, "Expected a 4-tuple of integers or a wxRect object.");
-    return FALSE;
-}
-
-
-
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
-
-
-