X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/714e6a9e261da3da9185acaa10c67789081a64ec..9f06bcb3b8aea7aa709754a217c26e94fe2d5954:/utils/wxPython/src/helpers.cpp diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp index c7612e140c..3dc40d7362 100644 --- a/utils/wxPython/src/helpers.cpp +++ b/utils/wxPython/src/helpers.cpp @@ -10,15 +10,23 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#undef DEBUG -#include -#include "helpers.h" #ifdef __WXGTK__ -#ifdef USE_GDK_IMLIB -#include "gdk_imlib/gdk_imlib.h" +#include "gtk/gtk.h" #endif + +#undef DEBUG +#include +#include "helpers.h" +#ifdef __WXMSW__ +#include +#undef FindWindow +#undef GetCharWidth +#undef LoadAccelerators +#undef GetClassInfo +#undef GetClassName #endif +#include //--------------------------------------------------------------------------- @@ -31,6 +39,22 @@ wxString wxPyEmptyStr(""); +#ifdef __WXMSW__ // If building for win32... +//---------------------------------------------------------------------- +// 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 + ) +{ + wxSetInstance(hinstDLL); + return 1; +} +#endif + //---------------------------------------------------------------------- // Class for implementing the wxp main application shell. //---------------------------------------------------------------------- @@ -49,8 +73,10 @@ int wxPyApp::MainLoop(void) { return retval; } + void wxPyApp::AfterMainLoop(void) { // more stuff from wxEntry... + if (wxPythonApp->GetTopWindow()) { // Forcibly delete the window. if (wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)) || @@ -64,62 +90,80 @@ void wxPyApp::AfterMainLoop(void) { wxPythonApp->SetTopWindow(NULL); } } +#ifdef __WXGTK__ + wxPythonApp->DeletePendingObjects(); +#endif wxPythonApp->OnExit(); -#ifdef __WXMSW__ wxApp::CleanUp(); -#endif -#ifdef __WXGTK__ - wxApp::CommonCleanUp(); -#endif - delete wxPythonApp; +// delete wxPythonApp; } -//---------------------------------------------------------------------- +//--------------------------------------------------------------------- // a few native methods to add to the module //---------------------------------------------------------------------- -// 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__ - wxPythonApp->argc = 0; - wxPythonApp->argv = NULL; - wxPythonApp->OnInitGui(); + wxApp::Initialize(); #endif + #ifdef __WXGTK__ - wxTheApp->argc = 0; - wxTheApp->argv = NULL; + PyObject* sysargv = PySys_GetObject("argv"); + int argc = PyList_Size(sysargv); + char** argv = new char*[argc+1]; + int x; + for(x=0; xargc, &wxTheApp->argv ); -#ifdef USE_GDK_IMLIB - gdk_imlib_init(); +static char* __nullArgv[1] = { 0 }; - gtk_widget_push_visual(gdk_imlib_get_visual()); +// 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; - gtk_widget_push_colormap(gdk_imlib_get_colormap()); -#endif + if (!PyArg_ParseTuple(args, "O", &onInitFunc)) + return NULL; - wxApp::CommonInit(); + if (wxTopLevelWindows.Number() > 0) { + PyErr_SetString(PyExc_TypeError, "Only 1 wxApp per process!"); + return NULL; + } - wxTheApp->OnInitGui(); -#endif + // This is the next part of the wxEntry functionality... + wxPythonApp->argc = 0; + wxPythonApp->argv = __nullArgv; + wxPythonApp->OnInitGui(); // Call the Python App's OnInit function @@ -138,121 +182,20 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args) if (! bResult) { wxPythonApp->DeletePendingObjects(); wxPythonApp->OnExit(); -#ifdef __WXMSW__ - wxApp::CleanUp(); -#endif -#ifdef __WXGTK__ - wxApp::CommonCleanUp(); -#endif + wxApp::CleanUp(); PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting..."); return NULL; } +#ifdef __WXGTK__ + wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0); +#endif + Py_INCREF(Py_None); return Py_None; } -//PyObject* __wxMainLoop(PyObject* /* self */, PyObject* /* args */) -//{ -// wxPythonApp->MainLoop(); -// if (wxPythonApp->wx_frame) { -// wxPythonApp->wx_frame->GetEventHandler()->OnClose(); -// delete wxPythonApp->wx_frame; -// } -// wxCleanUp(); - -// Py_INCREF(Py_None); -// return Py_None; -//} - - -//PyObject* __wxExitMainLoop(PyObject* /* self */, PyObject* /* args */) -//{ -// wxPythonApp->ExitMainLoop(); -// Py_INCREF(Py_None); -// return Py_None; -//} - - - -//PyObject* __wxAddCallback(PyObject* /* self */, PyObject* args) -//{ -// char* swigPtr; -// char* name; -// PyObject* callback; -// wxWindow* win; -// wxPyEvtHandlers* evtHdlr; - -// if (!PyArg_ParseTuple(args, "ssO", &swigPtr, &name, &callback)) -// return NULL; - -// if (!PyCallable_Check(callback)) { -// PyErr_SetString(PyExc_TypeError, "Expected a callable object."); -// return NULL; -// } - -// if (SWIG_GetPtr(swigPtr, (void **)&win, "_wxWindow_p")) { -// PyErr_SetString(PyExc_TypeError, "Expected class derived from wxWindow."); -// return NULL; -// } - -// evtHdlr = (wxPyEvtHandlers*)win->GetClientData(); -// if (! evtHdlr->addCallback(name, callback)) { -// PyErr_SetString(PyExc_TypeError, "Unknown callback name."); -// return NULL; -// } - -// Py_INCREF(Py_None); -// return Py_None; -//} - - - -//PyObject* __wxSetWinEvtHdlr(PyObject* /* self */, PyObject* args) -//{ -// char* swigPtr; -// wxWindow* win; -// wxPyEvtHandlers* evtHdlr; - -// if (!PyArg_ParseTuple(args, "s", &swigPtr)) -// return NULL; - -// if (SWIG_GetPtr(swigPtr, (void **)&win, "_wxWindow_p")) { -// PyErr_SetString(PyExc_TypeError, "Expected class derived from wxWindow."); -// return NULL; -// } - -// evtHdlr = new wxPyEvtHandlers; -// win->SetClientData((char*)evtHdlr); - -// Py_INCREF(Py_None); -// return Py_None; -//} - - - -//PyObject* __wxDelWinEvtHdlr(PyObject* /* self */, PyObject* args) -//{ -// char* swigPtr; -// wxWindow* win; -// wxPyEvtHandlers* evtHdlr; - -// if (!PyArg_ParseTuple(args, "s", &swigPtr)) -// return NULL; - -// if (SWIG_GetPtr(swigPtr, (void **)&win, "_wxWindow_p")) { -// PyErr_SetString(PyExc_TypeError, "Expected class derived from wxWindow."); -// return NULL; -// } - -// evtHdlr = (wxPyEvtHandlers*)win->GetClientData(); -// printf("__wxDelWinEvtHdlr: %p\n", evtHdlr); -// delete evtHdlr; - -// Py_INCREF(Py_None); -// return Py_None; -//} @@ -268,16 +211,19 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args) return NULL; } #ifdef __WXMOTIF__ -#define wxPlatform "__MOTIF__" +#define wxPlatform "__WXMOTIF__" +#endif +#ifdef __WXQT__ +#define wxPlatform "__WXQT__" #endif #ifdef __WXGTK__ -#define wxPlatform "__GTK__" +#define wxPlatform "__WXGTK__" #endif #if defined(__WIN32__) || defined(__WXMSW__) -#define wxPlatform "__WIN32__" +#define wxPlatform "__WXMSW__" #endif #ifdef __WXMAC__ -#define wxPlatform "__MAC__" +#define wxPlatform "__WXMAC__" #endif PyDict_SetItemString(wxPython_dict, "wxPlatform", PyString_FromString(wxPlatform)); @@ -293,7 +239,7 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args) 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); @@ -327,7 +273,6 @@ void wxPyCallback::EventThunker(wxEvent& event) { 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); @@ -365,12 +310,12 @@ 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 */ } @@ -401,384 +346,35 @@ void wxPyTimer::Notify() { -//---------------------------------------------------------------------- -// wxPyEvtHandlers class -//---------------------------------------------------------------------- - -//wxPyEvtHandlers::wxPyEvtHandlers() -// : pyOnActivate(0), -// pyOnChar(0), -// pyOnCharHook(0), -// pyOnClose(0), -// pyOnCommand(0), -// pyOnDropFiles(0), -// pyOnDefaultAction(0), -// pyOnEvent(0), -// pyOnInitMenuPopup(0), -// pyOnKillFocus(0), -// pyOnMenuCommand(0), -// pyOnMenuSelect(0), -// pyOnMove(0), -// pyOnPaint(0), -// pyOnScroll(0), -// pyOnSetFocus(0), -// pyOnSize(0), -// pyOnSysColourChange(0), -// pyOnLeftClick(0), -// pyOnMouseEnter(0), -// pyOnRightClick(0), -// pyOnDoubleClickSash(0), -// pyOnUnsplit(0) -//{ -//} - - -//wxPyEvtHandlers::~wxPyEvtHandlers() -//{ -// Py_XDECREF(pyOnActivate); -// Py_XDECREF(pyOnChar); -// Py_XDECREF(pyOnCharHook); -// Py_XDECREF(pyOnClose); -// Py_XDECREF(pyOnCommand); -// Py_XDECREF(pyOnDropFiles); -// Py_XDECREF(pyOnDefaultAction); -// Py_XDECREF(pyOnEvent); -// Py_XDECREF(pyOnInitMenuPopup); -// Py_XDECREF(pyOnKillFocus); -// Py_XDECREF(pyOnMenuCommand); -// Py_XDECREF(pyOnMenuSelect); -// Py_XDECREF(pyOnMove); -// Py_XDECREF(pyOnPaint); -// Py_XDECREF(pyOnScroll); -// Py_XDECREF(pyOnSetFocus); -// Py_XDECREF(pyOnSize); -// Py_XDECREF(pyOnSysColourChange); -// Py_XDECREF(pyOnLeftClick); -// Py_XDECREF(pyOnMouseEnter); -// Py_XDECREF(pyOnRightClick); -// Py_XDECREF(pyOnDoubleClickSash); -// Py_XDECREF(pyOnUnsplit); - -// wxNode* node = cleanupList.First(); -// while (node) { -// delete (wxPyEvtHandlers*)node->Data(); -// delete node; -// node = cleanupList.First(); -// } - -// node = decrefList.First(); -// while (node) { -// PyObject* obj = (PyObject*)node->Data(); -// Py_DECREF(obj); -// delete node; -// node = decrefList.First(); -// } -//// printf("~wxPyEvtHandlers: %p\n", this); -//} - -////---------------------------------------------------------------------- - -//Bool wxPyEvtHandlers::addCallback(char* name, PyObject* callback) -//{ -// Py_INCREF(callback); - -// if (strcmp(name, "OnActivate") == 0) { -// pyOnActivate = callback; -// return TRUE; -// } -// if (strcmp(name, "OnChar") == 0) { -// pyOnChar = callback; -// return TRUE; -// } -// if (strcmp(name, "OnCharHook") == 0) { -// pyOnCharHook = callback; -// return TRUE; -// } -// if (strcmp(name, "OnClose") == 0) { -// pyOnClose = callback; -// return TRUE; -// } -// if (strcmp(name, "OnCommand") == 0) { -// pyOnCommand = callback; -// return TRUE; -// } -// if (strcmp(name, "OnDropFiles") == 0) { -// pyOnDropFiles = callback; -// return TRUE; -// } -// if (strcmp(name, "OnDefaultAction") == 0) { -// pyOnDefaultAction = callback; -// return TRUE; -// } -// if (strcmp(name, "OnEvent") == 0) { -// pyOnEvent = callback; -// return TRUE; -// } -// if (strcmp(name, "OnInitMenuPopup") == 0) { -// pyOnInitMenuPopup = callback; -// return TRUE; -// } -// if (strcmp(name, "OnKillFocus") == 0) { -// pyOnKillFocus = callback; -// return TRUE; -// } -// if (strcmp(name, "OnMenuCommand") == 0) { -// pyOnMenuCommand = callback; -// return TRUE; -// } -// if (strcmp(name, "OnMenuSelect") == 0) { -// pyOnMenuSelect = callback; -// return TRUE; -// } -// if (strcmp(name, "OnMove") == 0) { -// pyOnMove = callback; -// return TRUE; -// } -// if (strcmp(name, "OnPaint") == 0) { -// pyOnPaint = callback; -// return TRUE; -// } -// if (strcmp(name, "OnScroll") == 0) { -// pyOnScroll = callback; -// return TRUE; -// } -// if (strcmp(name, "OnSetFocus") == 0) { -// pyOnSetFocus = callback; -// return TRUE; -// } -// if (strcmp(name, "OnSize") == 0) { -// pyOnSize = callback; -// return TRUE; -// } -// if (strcmp(name, "OnSysColourChange") == 0) { -// pyOnSysColourChange = callback; -// return TRUE; -// } -// if (strcmp(name, "OnLeftClick") == 0) { -// pyOnLeftClick = callback; -// return TRUE; -// } -// if (strcmp(name, "OnMouseEnter") == 0) { -// pyOnMouseEnter = callback; -// return TRUE; -// } -// if (strcmp(name, "OnRightClick") == 0) { -// pyOnRightClick = callback; -// return TRUE; -// } -// if (strcmp(name, "OnDoubleClickSash") == 0) { -// pyOnDoubleClickSash = callback; -// return TRUE; -// } -// if (strcmp(name, "OnUnsplit") == 0) { -// pyOnUnsplit = callback; -// return TRUE; -// } - -// // If we get here, there was no match. -// Py_DECREF(callback); -// return FALSE; -//} - - -////---------------------------------------------------------------------- -//// Helpers to assist in calling the python callable objects -////---------------------------------------------------------------------- - -//PyObject* wxPyEvtHandlers::constructObject(void* ptr, char* className) -//{ -// char buff[64]; // should be big enough... -// char swigptr[64]; - -// sprintf(buff, "_%s_p", className); -// SWIG_MakePtr(swigptr, ptr, buff); - -// sprintf(buff, "%sPtr", className); -// PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff); -// PyObject* arg = Py_BuildValue("(s)", swigptr); -// PyObject* obj = PyInstance_New(classobj, arg, NULL); -// Py_DECREF(arg); - -// return obj; -//} - - - -//int wxPyEvtHandlers::callFunc(PyObject* func, PyObject* arglist) -//{ -// PyObject* result; -// int retval = FALSE; - -// result = PyEval_CallObject(func, arglist); -// Py_DECREF(arglist); -// if (result) { // Assumes an integer return type... -// retval = PyInt_AsLong(result); -// Py_DECREF(result); -// PyErr_Clear(); // forget about it if it's not... -// } else { -// PyErr_Print(); -// } -// return retval; -//} - -////--------------------------------------------------------------------------- -//// Methods and helpers of the wxPy* classes -////--------------------------------------------------------------------------- - -//IMP_OnActivate(wxFrame, wxPyFrame); -//IMP_OnCharHook(wxFrame, wxPyFrame); -//IMP_OnClose(wxFrame, wxPyFrame); -//IMP_OnMenuCommand(wxFrame, wxPyFrame); -//IMP_OnMenuSelect(wxFrame, wxPyFrame); -//IMP_OnSize(wxFrame, wxPyFrame); -//IMP_OnDropFiles(wxFrame, wxPyFrame); - -//IMP_OnChar(wxCanvas, wxPyCanvas); -//IMP_OnEvent(wxCanvas, wxPyCanvas); -//IMP_OnPaint(wxCanvas, wxPyCanvas); -//IMP_OnScroll(wxCanvas, wxPyCanvas); -//IMP_OnDropFiles(wxCanvas, wxPyCanvas); - -//IMP_OnChar(wxPanel, wxPyPanel); -//IMP_OnEvent(wxPanel, wxPyPanel); -//IMP_OnPaint(wxPanel, wxPyPanel); -//IMP_OnScroll(wxPanel, wxPyPanel); -//IMP_OnCommand(wxPanel, wxPyPanel); -//IMP_OnDefaultAction(wxPanel, wxPyPanel); -//IMP_OnDropFiles(wxPanel, wxPyPanel); - -//IMP_OnChar(wxTextWindow, wxPyTextWindow); -//IMP_OnDropFiles(wxTextWindow, wxPyTextWindow); - -//IMP_OnCharHook(wxDialogBox, wxPyDialogBox); -//IMP_OnClose(wxDialogBox, wxPyDialogBox); -//IMP_OnSize(wxDialogBox, wxPyDialogBox); -//IMP_OnDropFiles(wxDialogBox, wxPyDialogBox); -//IMP_OnChar(wxDialogBox, wxPyDialogBox); -//IMP_OnEvent(wxDialogBox, wxPyDialogBox); -//IMP_OnPaint(wxDialogBox, wxPyDialogBox); -//IMP_OnScroll(wxDialogBox, wxPyDialogBox); -//IMP_OnCommand(wxDialogBox, wxPyDialogBox); -//IMP_OnDefaultAction(wxDialogBox, wxPyDialogBox); - -//IMP_OnChar(wxToolBar, wxPyToolBar); -//IMP_OnEvent(wxToolBar, wxPyToolBar); -//IMP_OnPaint(wxToolBar, wxPyToolBar); -//IMP_OnScroll(wxToolBar, wxPyToolBar); -//IMP_OnCommand(wxToolBar, wxPyToolBar); -//IMP_OnDefaultAction(wxToolBar, wxPyToolBar); -//IMP_OnDropFiles(wxToolBar, wxPyToolBar); -//IMP_OnMouseEnter(wxToolBar, wxPyToolBar); -//IMP_OnRightClick(wxToolBar, wxPyToolBar); - -//IMP_OnChar(wxButtonBar, wxPyButtonBar); -//IMP_OnEvent(wxButtonBar, wxPyButtonBar); -//IMP_OnPaint(wxButtonBar, wxPyButtonBar); -//IMP_OnScroll(wxButtonBar, wxPyButtonBar); -//IMP_OnCommand(wxButtonBar, wxPyButtonBar); -//IMP_OnDefaultAction(wxButtonBar, wxPyButtonBar); -//IMP_OnDropFiles(wxButtonBar, wxPyButtonBar); -//IMP_OnMouseEnter(wxButtonBar, wxPyButtonBar); -//IMP_OnRightClick(wxButtonBar, wxPyButtonBar); - -//IMP_OnDoubleClickSash(wxSplitterWindow, wxPySplitterWindow); -//IMP_OnUnsplit(wxSplitterWindow, wxPySplitterWindow); - - - -//Bool wxPyToolBar::OnLeftClick(int a, int b) { -// wxPyEvtHandlers* peh=(wxPyEvtHandlers*)GetClientData(); -// if (peh->pyOnLeftClick) -// return peh->callFunc(peh->pyOnLeftClick, Py_BuildValue("(ii)",a,b)); -// else { -// // If there is no Python callback, redirect the request to -// // the OnMenuCommand of the parent frame. -// wxFrame* frame = (wxFrame*)GetParent(); -// frame->OnMenuCommand(a); -// return TRUE; -// } -//// else -//// return wxToolBar::OnLeftClick(a,b); -//} -//Bool wxPyToolBar::baseclass_OnLeftClick(int a, int b) { -// return wxToolBar::OnLeftClick(a,b); -//} - - -//Bool wxPyButtonBar::OnLeftClick(int a, int b) { -// wxPyEvtHandlers* peh=(wxPyEvtHandlers*)GetClientData(); -// if (peh->pyOnLeftClick) -// return peh->callFunc(peh->pyOnLeftClick, Py_BuildValue("(ii)",a,b)); -// else { -// // If there is no Python callback, redirect the request to -// // the OnMenuCommand of the parent frame. -// wxFrame* frame = (wxFrame*)GetParent(); -// frame->OnMenuCommand(a); -// return TRUE; -// } -//} -//Bool wxPyButtonBar::baseclass_OnLeftClick(int a, int b) { -// return wxButtonBar::OnLeftClick(a,b); -//} - - - -//wxPyMenu::wxPyMenu(PyObject* _func) -// : wxMenu(NULL, (wxFunction)(func ? MenuCallback : NULL)), func(0) { - -// if (_func) { -// func = _func; -// Py_INCREF(func); -// } -//} - -//wxPyMenu::~wxPyMenu() { -// if (func) -// Py_DECREF(func); -//} - - -//void wxPyMenu::MenuCallback(wxWindow& win, wxCommandEvent& evt) { -// wxPyEvtHandlers* peh= new wxPyEvtHandlers; // Used for the helper methods -// PyObject* evtobj = peh->constructObject((void*)&evt, "wxCommandEvent"); -// PyObject* winobj = peh->constructObject((void*)&win, "wxWindow"); -// if (PyErr_Occurred()) { -// // bail out if a problem -// PyErr_Print(); -// delete peh; -// return; -// } -// // Now call the callback... -// PyObject* func = ((wxPyMenu*)&win)->func; -// peh->callFunc(func, Py_BuildValue("(OO)", winobj, evtobj)); -// Py_DECREF(evtobj); -// Py_DECREF(winobj); -// delete peh; -//} - - - -//wxPyTimer::wxPyTimer(PyObject* callback) { -// func = callback; -// Py_INCREF(func); -//} - -//wxPyTimer::~wxPyTimer() { -// Py_DECREF(func); -//} - -//void wxPyTimer::Notify() { -// wxPyEvtHandlers* peh= new wxPyEvtHandlers; // just for the helper methods -// peh->callFunc(func, Py_BuildValue("()")); -// delete peh; -//} - //---------------------------------------------------------------------- //---------------------------------------------------------------------- // 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; 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.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... +// +// 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. //