X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f17924e7389618db0ac792f2b53e69d7e4bb4ec..dbaf885e8725529ba66653aabe5f7f20bc1f28db:/utils/wxPython/src/helpers.cpp?ds=inline

diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp
index df05338a93..9a32b7fc27 100644
--- a/utils/wxPython/src/helpers.cpp
+++ b/utils/wxPython/src/helpers.cpp
@@ -10,14 +10,12 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#endif
+#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
@@ -26,7 +24,18 @@
 #undef GetClassInfo
 #undef GetClassName
 #endif
-#include <wx/module.h>
+
+#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
 
 
 //---------------------------------------------------------------------------
@@ -74,64 +83,49 @@ wxPyApp::~wxPyApp() {
 
 // This one isn't acutally called...  See __wxStart()
 bool wxPyApp::OnInit(void) {
-    return false;
+    return FALSE;
 }
 
 int  wxPyApp::MainLoop(void) {
-    int retval = wxApp::MainLoop();
-//#    AfterMainLoop();
-    wxPythonApp->OnExit();  //#
-    return retval;
-}
-
+    int retval = 0;
 
-//#  void wxPyApp::AfterMainLoop(void) {
-//      // more stuff from wxEntry...
-
-//      if (wxPythonApp->GetTopWindow()) {
-//          // Forcibly delete the window.
-//          if (wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)) ||
-//              wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxDialog))) {
-
-//              wxPythonApp->GetTopWindow()->Close(TRUE);
-//              wxPythonApp->DeletePendingObjects();
-//          }
-//          else {
-//              delete wxPythonApp->GetTopWindow();
-//              wxPythonApp->SetTopWindow(NULL);
-//          }
-//      }
-//  #ifdef __WXGTK__
-//        wxPythonApp->DeletePendingObjects();
-//  #endif
+    DeletePendingObjects();
+#ifdef __WXGTK__
+    m_initialized = wxTopLevelWindows.GetCount() != 0;
+#endif
 
-//      wxPythonApp->OnExit();
-//      wxApp::CleanUp();
-//  //    delete wxPythonApp;
-//  }
+    if (Initialized()) {
+        retval = wxApp::MainLoop();
+        wxPythonApp->OnExit();
+    }
+    return retval;
+}
 
 
 //---------------------------------------------------------------------
-// a few native methods to add to the module
 //----------------------------------------------------------------------
 
+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;
 
-#ifdef __WXMSW__
-    wxApp::Initialize();
-#endif
 
-#ifdef __WXGTK__
     PyObject* sysargv = PySys_GetObject("argv");
     int argc = PyList_Size(sysargv);
     char** argv = new char*[argc+1];
@@ -140,22 +134,11 @@ void __wxPreStart()
         argv[x] = PyString_AsString(PyList_GetItem(sysargv, x));
     argv[argc] = NULL;
 
-    gtk_set_locale();
-#if wxUSE_WCHAR_T
-    if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
-#else
-    if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
-#endif
-    gtk_init( &argc, &argv );
-    wxSetDetectableAutoRepeat( TRUE );
-    delete [] argv;
-
-    wxApp::Initialize();     // may return FALSE. Should we check?
-#endif
-
+    wxEntryStart(argc, argv);
 }
 
 
+
 #ifdef WXP_WITH_THREAD
 PyThreadState*  wxPyEventThreadState = NULL;
 #endif
@@ -187,8 +170,8 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
     // This is the next part of the wxEntry functionality...
     wxPythonApp->argc = 0;
     wxPythonApp->argv = NULL;
-    wxPythonApp->OnInitGui();
 
+    wxEntryInitGui();
 
     // Call the Python App's OnInit function
     arglist = PyTuple_New(0);
@@ -203,19 +186,21 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
     }
     bResult = PyInt_AS_LONG(result);
     if (! bResult) {
-        PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting...");
+        PyErr_SetString(PyExc_SystemExit, "OnInit returned FALSE, exiting...");
         return NULL;
     }
 
 #ifdef __WXGTK__
-    wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
+    wxTheApp->m_initialized = (wxTopLevelWindows.GetCount() > 0);
 #endif
 
     Py_INCREF(Py_None);
     return Py_None;
 }
 
-
+void __wxCleanup() {
+    wxEntryCleanup();
+}
 
 
 
@@ -255,7 +240,7 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
 
 //---------------------------------------------------------------------------
 
-PyObject* wxPyConstructObject(void* ptr, char* className) {
+PyObject* wxPyConstructObject(void* ptr, const char* className) {
     char    buff[64];               // should always be big enough...
     char    swigptr[64];
 
@@ -278,36 +263,30 @@ PyObject* wxPyConstructObject(void* ptr, char* className) {
 
 //---------------------------------------------------------------------------
 
-//static bool _wxPyInEvent = false;
 static unsigned int _wxPyNestCount = 0;
 
-HELPEREXPORT bool wxPyRestoreThread() {
-//  #ifdef WXP_WITH_THREAD
-//      //if (wxPyEventThreadState != PyThreadState_Get()) {
-//      if (! _wxPyInEvent) {
-//          PyEval_RestoreThread(wxPyEventThreadState);
-//          _wxPyInEvent = true;
-//          return TRUE;
-//      } else
-//  #endif
-//          return FALSE;
+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 the above code as a guard condition since there are
-    // many possibilites for nested events and callbacks in wxPython.
-    //
-    // Unfortunately, it seems like somebody was lying (or I'm not
-    // understanding...) because each of the nested calls to this function
-    // MUST call PyEval_RestoreThread or Python pukes with a thread error (at
-    // least on Win32.)
+    // 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!)
     //
-    // until I know better, this is how I am doing it instead:
 #ifdef WXP_WITH_THREAD
-    PyEval_RestoreThread(wxPyEventThreadState);
     _wxPyNestCount += 1;
-    if (_wxPyNestCount == 1)
+    if (wxPyEventThreadState != myPyThreadState_Get()) {
+        PyEval_RestoreThread(wxPyEventThreadState);
         return TRUE;
+    }
     else
 #endif
         return FALSE;
@@ -317,8 +296,7 @@ HELPEREXPORT bool wxPyRestoreThread() {
 HELPEREXPORT void wxPySaveThread(bool doSave) {
 #ifdef WXP_WITH_THREAD
     if (doSave) {
-        PyEval_SaveThread();
-        //_wxPyInEvent = false;
+        wxPyEventThreadState = PyEval_SaveThread();
     }
     _wxPyNestCount -= 1;
 #endif
@@ -347,7 +325,6 @@ wxPyCallback::~wxPyCallback() {
 
 
 
-
 // This function is used for all events destined for Python event handlers.
 void wxPyCallback::EventThunker(wxEvent& event) {
     wxPyCallback*   cb = (wxPyCallback*)event.m_callbackUserData;
@@ -358,7 +335,14 @@ void wxPyCallback::EventThunker(wxEvent& event) {
 
 
     bool doSave = wxPyRestoreThread();
-    arg = wxPyConstructObject((void*)&event, event.GetClassInfo()->GetClassName());
+    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);
@@ -379,12 +363,14 @@ void wxPyCallback::EventThunker(wxEvent& event) {
 wxPyCallbackHelper::wxPyCallbackHelper() {
     m_self = NULL;
     m_lastFound = NULL;
+    m_incRef = FALSE;
 }
 
 
 wxPyCallbackHelper::~wxPyCallbackHelper() {
     bool doSave = wxPyRestoreThread();
-    Py_XDECREF(m_self);
+    if (m_incRef)
+        Py_XDECREF(m_self);
     wxPySaveThread(doSave);
 }
 
@@ -398,6 +384,7 @@ wxPyCallbackHelper::wxPyCallbackHelper(const wxPyCallbackHelper& other) {
 
 void wxPyCallbackHelper::setSelf(PyObject* self, int incref) {
     m_self = self;
+    m_incRef = incref;
     if (incref)
         Py_INCREF(m_self);
 }
@@ -440,6 +427,78 @@ PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) {
 
 
 
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+// 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);
+
+
+
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
@@ -478,7 +537,7 @@ void wxPyTimer::Notify() {
 //---------------------------------------------------------------------------
 // Convert a wxList to a Python List
 
-PyObject* wxPy_ConvertList(wxListBase* list, char* className) {
+PyObject* wxPy_ConvertList(wxListBase* list, const char* className) {
     PyObject*   pyList;
     PyObject*   pyObj;
     wxObject*   wxObj;
@@ -496,6 +555,25 @@ PyObject* wxPy_ConvertList(wxListBase* list, char* className) {
     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...