// 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
+static PyThreadState *event_tstate = NULL;
+#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
+ event_tstate = 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
+ 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;
PyObject* arg;
PyObject* tuple;
+
+#ifdef WXP_WITH_THREAD
+ PyEval_RestoreThread(event_tstate);
+#endif
arg = wxPyConstructObject((void*)&event, event.GetClassInfo()->GetClassName());
tuple = PyTuple_New(1);
} else {
PyErr_Print();
}
+#ifdef WXP_WITH_THREAD
+ PyEval_SaveThread();
+#endif
}
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()) {
PyObject* res = PyEval_CallObject(func, args);
Py_DECREF(args);
Py_XDECREF(res); /* In case res is a NULL pointer */
+#ifdef WXP_WITH_THREAD
+ PyEval_SaveThread();
+#endif
}
}
void wxPyTimer::Notify() {
+#ifdef WXP_WITH_THREAD
+ PyEval_RestoreThread(event_tstate);
+#endif
PyObject* result;
PyObject* args = Py_BuildValue("()");
} 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;
+}
//----------------------------------------------------------------------
//----------------------------------------------------------------------
/////////////////////////////////////////////////////////////////////////////
//
// $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
projects / wxWidgets.git / blobdiff