// 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
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());
-#endif
- wxApp::CommonInit();
- wxTheApp->OnInitGui();
-#endif
+static char* __nullArgv[1] = { 0 };
+
+// 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;
+
+
+ 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 = __nullArgv;
+ wxPythonApp->OnInitGui();
// Call the Python App's OnInit function
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);
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);
}
// 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 */
}
-
//----------------------------------------------------------------------
//----------------------------------------------------------------------
// Some helper functions for typemaps in my_typemaps.i, so they won't be
// 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
-
-
-//#if !defined(WIN_PYD) && defined(WIN32)
-
-//extern "C" int Py_Main(int argc, char** argv);
-
-//int APIENTRY WinMain(HANDLE hInstance, HANDLE hPrevInstance, LPSTR m_lpCmdLine,
-// int nCmdShow )
-//{
-
-// wxpCreateApp();
-
-// // Initialize wxWindows, but don't start the main loop
-// wxEntry(hInstance, hPrevInstance, m_lpCmdLine, nCmdShow, FALSE);
-
-// 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++;
-// }
-// }
-
-// 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.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
+//
+// 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...
projects / wxWidgets.git / blobdiff