// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#ifdef __WXMSW__
-#include <windows.h>
-#undef FindWindow
-#undef GetCharWidth
-#undef LoadAccelerators
+
+#ifdef __WXGTK__
+#include "gtk/gtk.h"
#endif
#undef DEBUG
#include <Python.h>
#include "helpers.h"
-
-#ifdef __WXGTK__
-#ifdef wxUSE_GDK_IMLIB
-#include "gdk_imlib/gdk_imlib.h"
-#endif
+#ifdef __WXMSW__
+#include <wx/msw/private.h>
+#undef FindWindow
+#undef GetCharWidth
+#undef LoadAccelerators
+#undef GetClassInfo
+#undef GetClassName
#endif
+#include <wx/module.h>
+
//---------------------------------------------------------------------------
#ifdef __WXMSW__ // If building for win32...
-extern HINSTANCE wxhInstance;
-
//----------------------------------------------------------------------
// This gets run when the DLL is loaded. We just need to save a handle.
//----------------------------------------------------------------------
LPVOID lpvReserved // reserved
)
{
- wxhInstance = hinstDLL;
+ wxSetInstance(hinstDLL);
return 1;
}
#endif
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;
return retval;
}
+
void wxPyApp::AfterMainLoop(void) {
// more stuff from wxEntry...
-#ifdef __WXMSW__
if (wxPythonApp->GetTopWindow()) {
// Forcibly delete the window.
if (wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)) ||
wxPythonApp->SetTopWindow(NULL);
}
}
-#endif
#ifdef __WXGTK__
wxPythonApp->DeletePendingObjects();
#endif
wxPythonApp->OnExit();
-#ifdef __WXMSW__
wxApp::CleanUp();
-#endif
-#ifdef __WXGTK__
- wxApp::CommonCleanUp();
-#endif
- delete wxPythonApp;
+// delete wxPythonApp;
}
#ifdef __WXMSW__
wxApp::Initialize();
#endif
-#ifdef __WXGTK__
- wxClassInfo::InitializeClasses();
+#ifdef __WXGTK__
PyObject* sysargv = PySys_GetObject("argv");
int argc = PyList_Size(sysargv);
char** argv = new char*[argc+1];
argv[x] = PyString_AsString(PyList_GetItem(sysargv, x));
argv[argc] = NULL;
+ gtk_set_locale();
gtk_init( &argc, &argv );
delete [] argv;
-#ifdef wxUSE_GDK_IMLIB
- gdk_imlib_init();
- gtk_widget_push_visual(gdk_imlib_get_visual());
- gtk_widget_push_colormap(gdk_imlib_get_colormap());
-#endif
-
- wxApp::CommonInit();
+ wxApp::Initialize(); // may return FALSE. Should we check?
#endif
}
-
+#ifdef WXP_WITH_THREAD
+PyThreadState* wxPyEventThreadState = NULL;
+bool wxPyInEvent = false;
+#endif
static char* __nullArgv[1] = { 0 };
// Start the user application, user App's OnInit method is a parameter here
PyObject* result;
long bResult;
+#ifdef WXP_WITH_THREAD
+ wxPyEventThreadState = PyThreadState_Get();
+#endif
if (!PyArg_ParseTuple(args, "O", &onInitFunc))
return NULL;
// This is the next part of the wxEntry functionality...
wxPythonApp->argc = 0;
- wxPythonApp->argv = __nullArgv;
+ wxPythonApp->argv = NULL;
wxPythonApp->OnInitGui();
// Call the Python App's OnInit function
arglist = PyTuple_New(0);
+
+ // Py_END_ALLOW_THREADS; **** __wxStart was called from Python,
+ // should already have the lock
result = PyEval_CallObject(onInitFunc, arglist);
+ // Py_BEGIN_ALLOW_THREADS;
+
if (!result) {
PyErr_Print();
exit(1);
if (! bResult) {
wxPythonApp->DeletePendingObjects();
wxPythonApp->OnExit();
-#ifdef __WXMSW__
wxApp::CleanUp();
-#endif
-#ifdef __WXGTK__
- wxApp::CommonCleanUp();
-#endif
PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting...");
return NULL;
}
}
+
+wxPyCallback::wxPyCallback(PyObject* func) {
+ m_func = func;
+ Py_INCREF(m_func);
+}
+
+wxPyCallback::~wxPyCallback() {
+#ifdef WXP_WITH_THREAD
+ //if (! wxPyInEvent)
+ PyEval_RestoreThread(wxPyEventThreadState);
+#endif
+
+ Py_DECREF(m_func);
+
+#ifdef WXP_WITH_THREAD
+ //if (! wxPyInEvent)
+ PyEval_SaveThread();
+#endif
+}
+
+
+
+
// This function is used for all events destined for Python event handlers.
void wxPyCallback::EventThunker(wxEvent& event) {
wxPyCallback* cb = (wxPyCallback*)event.m_callbackUserData;
PyObject* arg;
PyObject* tuple;
+
+#ifdef WXP_WITH_THREAD
+ PyEval_RestoreThread(wxPyEventThreadState);
+ wxPyInEvent = true;
+#endif
arg = wxPyConstructObject((void*)&event, event.GetClassInfo()->GetClassName());
tuple = PyTuple_New(1);
} else {
PyErr_Print();
}
+#ifdef WXP_WITH_THREAD
+ PyEval_SaveThread();
+ wxPyInEvent = false;
+#endif
}
}
wxPyMenu::~wxPyMenu() {
+#ifdef WXP_WITH_THREAD
+ //if (! wxPyInEvent)
+ PyEval_RestoreThread(wxPyEventThreadState);
+#endif
+
if (func)
Py_DECREF(func);
+
+#ifdef WXP_WITH_THREAD
+ //if (! wxPyInEvent)
+ PyEval_SaveThread();
+#endif
}
void wxPyMenu::MenuCallback(wxMenu& menu, wxCommandEvent& evt) {
- PyObject* evtobj = wxPyConstructObject((void*)&evt, "wxCommandEvent");
- PyObject* menuobj = wxPyConstructObject((void*)&menu, "wxMenu");
+ PyObject* evtobj;
+ PyObject* menuobj;
+ PyObject* func;
+ PyObject* args;
+ PyObject* res;
+
+#ifdef WXP_WITH_THREAD
+ PyEval_RestoreThread(wxPyEventThreadState);
+ wxPyInEvent = true;
+#endif
+ evtobj = wxPyConstructObject((void*)&evt, "wxCommandEvent");
+ menuobj = wxPyConstructObject((void*)&menu, "wxMenu");
if (PyErr_Occurred()) {
// bail out if a problem
PyErr_Print();
- return;
+ goto done;
}
// Now call the callback...
- PyObject* func = ((wxPyMenu*)&menu)->func;
- PyObject* args = PyTuple_New(2);
+ func = ((wxPyMenu*)&menu)->func;
+ args = PyTuple_New(2);
PyTuple_SET_ITEM(args, 0, menuobj);
PyTuple_SET_ITEM(args, 1, evtobj);
- PyObject* res = PyEval_CallObject(func, args);
+ res = PyEval_CallObject(func, args);
Py_DECREF(args);
Py_XDECREF(res); /* In case res is a NULL pointer */
+ done:
+#ifdef WXP_WITH_THREAD
+ PyEval_SaveThread();
+ wxPyInEvent = false;
+#endif
}
}
wxPyTimer::~wxPyTimer() {
+#ifdef WXP_WITH_THREAD
+ //if (! wxPyInEvent)
+ PyEval_RestoreThread(wxPyEventThreadState);
+#endif
+
Py_DECREF(func);
+
+#ifdef WXP_WITH_THREAD
+ //if (! wxPyInEvent)
+ PyEval_SaveThread();
+#endif
}
void wxPyTimer::Notify() {
+#ifdef WXP_WITH_THREAD
+ PyEval_RestoreThread(wxPyEventThreadState);
+ wxPyInEvent = true;
+#endif
PyObject* result;
PyObject* args = Py_BuildValue("()");
} else {
PyErr_Print();
}
+#ifdef WXP_WITH_THREAD
+ PyEval_SaveThread();
+ wxPyInEvent = false;
+#endif
}
+//----------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxPyEvent, wxCommandEvent)
+
+wxPyEvent::wxPyEvent(wxEventType commandType, PyObject* userData)
+ : wxCommandEvent(commandType), m_userData(Py_None)
+{
+ m_userData = userData;
+ if (m_userData != Py_None) {
+ Py_INCREF(m_userData);
+ }
+}
+
+
+wxPyEvent::~wxPyEvent() {
+#ifdef WXP_WITH_THREAD
+ //if (! wxPyInEvent)
+ PyEval_RestoreThread(wxPyEventThreadState);
+#endif
+ if (m_userData != Py_None) {
+ Py_DECREF(m_userData);
+ m_userData = Py_None;
+ }
+#ifdef WXP_WITH_THREAD
+ //if (! wxPyInEvent)
+ PyEval_SaveThread();
+#endif
+}
+
+
+void wxPyEvent::SetUserData(PyObject* userData) {
+ if (m_userData != Py_None) {
+ Py_DECREF(m_userData);
+ m_userData = Py_None;
+ }
+ m_userData = userData;
+ if (m_userData != Py_None) {
+ Py_INCREF(m_userData);
+ }
+}
+
+
+PyObject* wxPyEvent::GetUserData() {
+ return m_userData;
+}
//----------------------------------------------------------------------
//----------------------------------------------------------------------
return temp;
}
+
+
+//----------------------------------------------------------------------
+//----------------------------------------------------------------------
+
+wxPyCallbackHelper::wxPyCallbackHelper() {
+ m_self = NULL;
+ m_lastFound = NULL;
+}
+
+
+wxPyCallbackHelper::~wxPyCallbackHelper() {
+#ifdef WXP_WITH_THREAD
+ PyEval_RestoreThread(wxPyEventThreadState);
+#endif
+
+ Py_XDECREF(m_self);
+
+#ifdef WXP_WITH_THREAD
+ PyEval_SaveThread();
+#endif
+}
+
+void wxPyCallbackHelper::setSelf(PyObject* self) {
+ m_self = self;
+ 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...
+ }
+#ifdef WXP_WITH_THREAD
+ PyEval_SaveThread();
+#endif
+ 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) {
+#ifdef WXP_WITH_THREAD
+ PyEval_RestoreThread(wxPyEventThreadState);
+#endif
+ PyObject* result;
+
+ result = PyEval_CallObject(m_lastFound, argTuple);
+ Py_DECREF(argTuple);
+ if (!result) {
+ PyErr_Print();
+ }
+ return result;
+}
+
+
+
+
+//----------------------------------------------------------------------
+//----------------------------------------------------------------------
//----------------------------------------------------------------------
-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// Revision 1.14 1998/11/25 08:45:25 RD
-// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
-// Added events for wxGrid
-// Other various fixes and additions
-//
-// Revision 1.13 1998/11/15 23:03:45 RD
-// Removing some ifdef's for wxGTK
-//
-// Revision 1.12 1998/11/03 09:21:08 RD
-// fixed a typo
-//
-// Revision 1.11 1998/10/20 06:43:58 RD
-// New wxTreeCtrl wrappers (untested)
-// some changes in helpers
-// etc.
-//
-// Revision 1.10 1998/10/02 06:40:39 RD
-//
-// Version 0.4 of wxPython for MSW.
-//
-// Revision 1.9 1998/09/25 13:28:52 VZ
-//
-// USE_xxx constants renamed to wxUSE_xxx. This is an incompatible change, you
-// must recompile everything after upgrading!
-//
-// Revision 1.8 1998/08/27 21:59:08 RD
-// Some chicken-and-egg problems solved for wxPython on wxGTK
-//
-// Revision 1.7 1998/08/27 00:00:26 RD
-// - more tweaks
-// - have discovered some problems but not yet discovered solutions...
-//
-// Revision 1.6 1998/08/18 21:54:12 RD
-//
-// ifdef out some wxGTK specific code
-//
-// Revision 1.5 1998/08/18 19:48:17 RD
-// more wxGTK compatibility things.
-//
-// It builds now but there are serious runtime problems...
-//
-// Revision 1.4 1998/08/16 04:31:06 RD
-// More wxGTK work.
-//
-// Revision 1.3 1998/08/15 07:36:36 RD
-// - Moved the header in the .i files out of the code that gets put into
-// the .cpp files. It caused CVS conflicts because of the RCS ID being
-// different each time.
-//
-// - A few minor fixes.
-//
-// Revision 1.2 1998/08/14 23:36:36 RD
-// Beginings of wxGTK compatibility
-//
-// Revision 1.1 1998/08/09 08:25:51 RD
-// Initial version
-//
-//
projects / wxWidgets.git / blobdiff