// 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 USE_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.
//----------------------------------------------------------------------
+
BOOL WINAPI DllMain(
HINSTANCE hinstDLL, // handle to DLL module
DWORD fdwReason, // reason for calling function
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...
+
if (wxPythonApp->GetTopWindow()) {
// Forcibly delete the window.
if (wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)) ||
wxPythonApp->SetTopWindow(NULL);
}
}
+#ifdef __WXGTK__
+ wxPythonApp->DeletePendingObjects();
+#endif
wxPythonApp->OnExit();
-#ifdef __WXMSW__
wxApp::CleanUp();
-#endif
-#ifdef __WXGTK__
- wxApp::CommonCleanUp();
-#endif
- delete wxPythonApp;
+// delete wxPythonApp;
}
//----------------------------------------------------------------------
-
-// Start the user application, user App's OnInit method is a parameter here
-PyObject* __wxStart(PyObject* /* self */, PyObject* args)
+// 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
+// wxpc is imported. (Before there is a wxApp object.)
+void __wxPreStart()
{
- PyObject* onInitFunc = NULL;
- PyObject* arglist;
- PyObject* result;
- long bResult;
-
- if (!PyArg_ParseTuple(args, "O", &onInitFunc))
- return NULL;
+ // 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;
-// This is where we pick up one part of the wxEntry functionality...
-// the rest is in AfterMainLoop.
#ifdef __WXMSW__
- wxApp::Initialize((WXHINSTANCE)wxhInstance);
-
- wxPythonApp->argc = 0;
- wxPythonApp->argv = NULL;
- wxPythonApp->OnInitGui();
+ 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;
- wxPythonApp->argc = argc;
- wxPythonApp->argv = argv;
+ wxApp::Initialize(); // may return FALSE. Should we check?
+#endif
+
+}
- gtk_init( &wxPythonApp->argc, &wxPythonApp->argv );
-#ifdef USE_GDK_IMLIB
- gdk_imlib_init();
- gtk_widget_push_visual(gdk_imlib_get_visual());
- gtk_widget_push_colormap(gdk_imlib_get_colormap());
+#ifdef WXP_WITH_THREAD
+PyThreadState* wxPyEventThreadState = NULL;
+bool wxPyInEvent = false;
#endif
+static char* __nullArgv[1] = { 0 };
- wxApp::CommonInit();
- wxTheApp->OnInitGui();
+// 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;
+ 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;
}
static
PyObject* wxPyConstructObject(void* ptr, char* className)
{
- char buff[64]; // should be big enough...
+ char buff[64]; // should always be big enough...
char swigptr[64];
sprintf(buff, "_%s_p", className);
}
+
+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);
PyTuple_SET_ITEM(tuple, 0, arg);
result = PyEval_CallObject(func, tuple);
- Py_DECREF(arg);
Py_DECREF(tuple);
if (result) {
Py_DECREF(result);
} 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 = Py_BuildValue("(OO)", menuobj, evtobj);
- PyObject* res = PyEval_CallObject(func, args);
+ func = ((wxPyMenu*)&menu)->func;
+ args = PyTuple_New(2);
+ PyTuple_SET_ITEM(args, 0, menuobj);
+ PyTuple_SET_ITEM(args, 1, evtobj);
+ res = PyEval_CallObject(func, args);
Py_DECREF(args);
- Py_DECREF(res);
- Py_DECREF(evtobj);
- Py_DECREF(menuobj);
+ 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;
+}
//----------------------------------------------------------------------
//----------------------------------------------------------------------
// imcluded 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.");
}
-#ifdef __WXMSW__
wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
if (!PyList_Check(source)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
return temp;
}
-#endif
+
+//----------------------------------------------------------------------
//----------------------------------------------------------------------
-// A WinMain for when wxWindows and Python are linked together in a single
-// application, instead of as a dynamic module
+wxPyCallbackHelper::wxPyCallbackHelper() {
+ m_self = NULL;
+ m_lastFound = NULL;
+}
-//#if !defined(WIN_PYD) && defined(WIN32)
-//extern "C" int Py_Main(int argc, char** argv);
+wxPyCallbackHelper::~wxPyCallbackHelper() {
+#ifdef WXP_WITH_THREAD
+ PyEval_RestoreThread(wxPyEventThreadState);
+#endif
-//int APIENTRY WinMain(HANDLE hInstance, HANDLE hPrevInstance, LPSTR m_lpCmdLine,
-// int nCmdShow )
-//{
+ Py_XDECREF(m_self);
-// wxpCreateApp();
+#ifdef WXP_WITH_THREAD
+ PyEval_SaveThread();
+#endif
+}
-// // Initialize wxWindows, but don't start the main loop
-// wxEntry(hInstance, hPrevInstance, m_lpCmdLine, nCmdShow, FALSE);
+void wxPyCallbackHelper::setSelf(PyObject* self) {
+ m_self = self;
+ Py_INCREF(m_self);
+}
-// Py_Initialize();
-// PyObject *argvList = PyList_New(0);
-// char* stderrfilename = "wxpstderr.log";
-// int pyargc = 1;
-// char* script = NULL;
-// int argc = wxPythonApp->argc;
-// char** argv = wxPythonApp->argv;
-// for (int i = 1; i < argc; i++) {
-// if (strncmp(argv[i], "wxpstderr=", 10) == 0)
-// stderrfilename = argv[i]+10;
-// else {
-// PyList_Append(argvList, PyString_FromString(argv[i]));
-// if (!script)
-// script = argv[i];
-// pyargc++;
-// }
-// }
+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());
-// PySys_SetObject("argv", argvList);
+ return m_lastFound != NULL;
+}
-//#if 1
-// char buf[256];
-//// //PyRun_SimpleString("import sys; sys.stdout=open('wxpstdout.log','w')");
-// sprintf(buf, "import sys; sys.stdout=sys.stderr=open('%s','w')", stderrfilename);
-// PyRun_SimpleString(buf);
-//#endif
-// initwxPythonc();
+int wxPyCallbackHelper::callCallback(PyObject* argTuple) {
+ PyObject* result;
+ int retval = FALSE;
-// if (script) {
-// FILE *fp = fopen(script, "r");
-// if (fp) {
-// PyRun_SimpleFile(fp, script);// This returns after wxpApp constructor
-// fclose(fp);
-// }
-// else {
-// char msg[256];
-// sprintf(msg, "Cannot open %s", script);
-// wxMessageBox(msg);
-// }
-// }
-// else
-// PyRun_SimpleString("import wxpide");
+ 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;
+}
-// return 0;
-//}
+// 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;
+}
-//#endif
+
+
+//----------------------------------------------------------------------
+//----------------------------------------------------------------------
//----------------------------------------------------------------------
-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// 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