X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c039d08bfbb59c0abcbc705fb49f9b2cb321edf..4cd9591aab117574f7d0af749d0d1f774b9d7945:/utils/wxPython/src/helpers.cpp diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp index 13c94c45d8..2f5eabfb67 100644 --- a/utils/wxPython/src/helpers.cpp +++ b/utils/wxPython/src/helpers.cpp @@ -10,22 +10,24 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __WXMSW__ -#include -#undef FindWindow -#undef GetCharWidth -#undef LoadAccelerators + +#ifdef __WXGTK__ +#include "gtk/gtk.h" #endif #undef DEBUG #include #include "helpers.h" - -#ifdef __WXGTK__ -#ifdef wxUSE_GDK_IMLIB -#include "gdk_imlib/gdk_imlib.h" -#endif +#ifdef __WXMSW__ +#include +#undef FindWindow +#undef GetCharWidth +#undef LoadAccelerators +#undef GetClassInfo +#undef GetClassName #endif +#include + //--------------------------------------------------------------------------- @@ -39,8 +41,6 @@ wxString wxPyEmptyStr(""); #ifdef __WXMSW__ // If building for win32... -extern HINSTANCE wxhInstance; - //---------------------------------------------------------------------- // This gets run when the DLL is loaded. We just need to save a handle. //---------------------------------------------------------------------- @@ -51,7 +51,7 @@ BOOL WINAPI DllMain( LPVOID lpvReserved // reserved ) { - wxhInstance = hinstDLL; + wxSetInstance(hinstDLL); return 1; } #endif @@ -63,6 +63,15 @@ BOOL WINAPI DllMain( 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; @@ -74,10 +83,10 @@ int wxPyApp::MainLoop(void) { 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)) || @@ -91,19 +100,13 @@ void wxPyApp::AfterMainLoop(void) { 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; } @@ -113,7 +116,7 @@ void wxPyApp::AfterMainLoop(void) { // This is where we pick up the first part of the wxEntry functionality... -// The rest is in __wxStart and AfterMainLoop. Thi function is called when +// The rest is in __wxStart and AfterMainLoop. This function is called when // wxpc is imported. (Before there is a wxApp object.) void __wxPreStart() { @@ -126,9 +129,8 @@ void __wxPreStart() #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]; @@ -137,22 +139,19 @@ void __wxPreStart() 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 +static PyThreadState *event_tstate = NULL; +#endif static char* __nullArgv[1] = { 0 }; // Start the user application, user App's OnInit method is a parameter here @@ -163,6 +162,9 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args) PyObject* result; long bResult; +#ifdef WXP_WITH_THREAD + event_tstate = PyThreadState_Get(); +#endif if (!PyArg_ParseTuple(args, "O", &onInitFunc)) return NULL; @@ -175,13 +177,18 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args) // 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); @@ -195,12 +202,7 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args) 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; } @@ -278,6 +280,27 @@ PyObject* wxPyConstructObject(void* ptr, char* className) } + +wxPyCallback::wxPyCallback(PyObject* func) { + m_func = func; + Py_INCREF(m_func); +} + +wxPyCallback::~wxPyCallback() { +#ifdef WXP_WITH_THREAD + PyEval_RestoreThread(event_tstate); +#endif + + Py_DECREF(m_func); + +#ifdef WXP_WITH_THREAD + 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; @@ -286,12 +309,15 @@ void wxPyCallback::EventThunker(wxEvent& event) { PyObject* arg; PyObject* tuple; + +#ifdef WXP_WITH_THREAD + PyEval_RestoreThread(event_tstate); +#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); @@ -299,6 +325,9 @@ void wxPyCallback::EventThunker(wxEvent& event) { } else { PyErr_Print(); } +#ifdef WXP_WITH_THREAD + PyEval_SaveThread(); +#endif } @@ -320,6 +349,9 @@ wxPyMenu::~wxPyMenu() { void wxPyMenu::MenuCallback(wxMenu& menu, wxCommandEvent& evt) { +#ifdef WXP_WITH_THREAD + PyEval_RestoreThread(event_tstate); +#endif PyObject* evtobj = wxPyConstructObject((void*)&evt, "wxCommandEvent"); PyObject* menuobj = wxPyConstructObject((void*)&menu, "wxMenu"); if (PyErr_Occurred()) { @@ -329,12 +361,15 @@ void wxPyMenu::MenuCallback(wxMenu& menu, wxCommandEvent& evt) { } // Now call the callback... PyObject* func = ((wxPyMenu*)&menu)->func; - PyObject* args = Py_BuildValue("(OO)", menuobj, evtobj); + PyObject* args = PyTuple_New(2); + PyTuple_SET_ITEM(args, 0, menuobj); + PyTuple_SET_ITEM(args, 1, evtobj); PyObject* 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 */ +#ifdef WXP_WITH_THREAD + PyEval_SaveThread(); +#endif } @@ -350,6 +385,9 @@ wxPyTimer::~wxPyTimer() { } void wxPyTimer::Notify() { +#ifdef WXP_WITH_THREAD + PyEval_RestoreThread(event_tstate); +#endif PyObject* result; PyObject* args = Py_BuildValue("()"); @@ -361,9 +399,49 @@ void wxPyTimer::Notify() { } else { PyErr_Print(); } +#ifdef WXP_WITH_THREAD + PyEval_SaveThread(); +#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() { + if (m_userData != Py_None) { + Py_DECREF(m_userData); + m_userData = Py_None; + } +} + + +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; +} //---------------------------------------------------------------------- //---------------------------------------------------------------------- @@ -371,6 +449,29 @@ void wxPyTimer::Notify() { // 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; xargc; -// 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++; -// } -// } -// PySys_SetObject("argv", argvList); - -//#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(); - -// 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"); - -// return 0; -//} - - -//#endif - -//---------------------------------------------------------------------- ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.20 1999/04/30 03:29:18 RD +// wxPython 2.0b9, first phase (win32) +// Added gobs of stuff, see wxPython/README.txt for details +// +// Revision 1.19.4.1 1999/03/27 23:29:14 RD +// +// wxPython 2.0b8 +// Python thread support +// various minor additions +// various minor fixes +// +// Revision 1.19 1999/02/20 09:02:59 RD +// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a +// window handle. If you can get the window handle into the python code, +// it should just work... More news on this later. +// +// Added wxImageList, wxToolTip. +// +// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the +// wxRegConfig class. +// +// As usual, some bug fixes, tweaks, etc. +// +// Revision 1.18 1999/01/30 08:17:27 RD +// +// Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc. +// +// Various cleanup, tweaks, minor additions, etc. to maintain +// compatibility with the current wxWindows. +// +// Revision 1.17 1999/01/30 07:30:12 RD +// +// Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc. +// +// Various cleanup, tweaks, minor additions, etc. to maintain +// compatibility with the current wxWindows. +// +// Revision 1.16 1998/12/17 14:07:39 RR +// +// Removed minor differences between wxMSW and wxGTK +// +// Revision 1.15 1998/12/15 20:41:19 RD +// Changed the import semantics from "from wxPython import *" to "from +// wxPython.wx import *" This is for people who are worried about +// namespace pollution, they can use "from wxPython import wx" and then +// prefix all the wxPython identifiers with "wx." +// +// Added wxTaskbarIcon for wxMSW. +// +// Made the events work for wxGrid. +// +// Added wxConfig. +// +// Added wxMiniFrame for wxGTK, (untested.) +// +// Changed many of the args and return values that were pointers to gdi +// objects to references to reflect changes in the wxWindows API. +// +// Other assorted fixes and additions. +// +// 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