X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9f4542f8a6f349acb424081ed19a885c2da697b..7bdfb981a826d29e292738a27700543fa10d2bfb:/wxPython/samples/embedded/embedded.cpp diff --git a/wxPython/samples/embedded/embedded.cpp b/wxPython/samples/embedded/embedded.cpp index c3766e20b0..20213fdae0 100644 --- a/wxPython/samples/embedded/embedded.cpp +++ b/wxPython/samples/embedded/embedded.cpp @@ -11,6 +11,9 @@ // Licence: wxWindows license //---------------------------------------------------------------------- +#include + + // For compilers that support precompilation, includes "wx/wx.h". #include @@ -29,8 +32,8 @@ #endif // Import Python and wxPython headers -#include -#include +#include + //---------------------------------------------------------------------- // Class definitions @@ -42,7 +45,7 @@ public: virtual ~MyApp(); void Init_wxPython(); private: - PyThreadState* main_tstate; + PyThreadState* m_mainTState; }; @@ -79,23 +82,25 @@ void MyApp::Init_wxPython() Py_Initialize(); PyEval_InitThreads(); - // Load the wxPython core API. Imports the wxPython.wxc - // module and sets a pointer to a function table located there. + // Load the wxPython core API. Imports the wx._core module and sets a + // local pointer to a function table located there. wxPyCoreAPI_IMPORT(); // Save the current Python thread state and release the // Global Interpreter Lock. - main_tstate = wxPyBeginAllowThreads(); + m_mainTState = wxPyBeginAllowThreads(); } MyApp::~MyApp() { // Restore the thread state and tell Python to cleanup after itself. - wxPyEndAllowThreads(main_tstate); + // wxPython will do its own cleanup as part of that process. + wxPyEndAllowThreads(m_mainTState); Py_Finalize(); } + IMPLEMENT_APP(MyApp) //---------------------------------------------------------------------- @@ -122,10 +127,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) wxMenuBar* mbar = new wxMenuBar; wxMenu* menu = new wxMenu; - menu->Append(ID_PYFRAME, "Make wx&Python frame"); + menu->Append(ID_PYFRAME, _T("Make wx&Python frame")); menu->AppendSeparator(); - menu->Append(ID_EXIT, "&Close Frame\tAlt-X"); - mbar->Append(menu, "&File"); + menu->Append(ID_EXIT, _T("&Close Frame\tAlt-X")); + mbar->Append(menu, _T("&File")); SetMenuBar(mbar); CreateStatusBar(); @@ -136,7 +141,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) wxPanel* p1 = new wxPanel(sp, -1); p1->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD)); new wxStaticText(p1, -1, - wxT("The frame, menu, splitter, this panel and this text were created in C++..."), + _T("The frame, menu, splitter, this panel and this text were created in C++..."), wxPoint(10,10)); // And get a panel from Python @@ -152,12 +157,12 @@ void MyFrame::OnExit(wxCommandEvent& event) //---------------------------------------------------------------------- -// This is were the fun begins... +// This is where the fun begins... char* python_code1 = "\ -from wxPython.wx import wxFrame\n\ -f = wxFrame(None, -1, 'Hello from wxPython!', size=(250, 150))\n\ +import wx\n\ +f = wx.Frame(None, -1, 'Hello from wxPython!', size=(250, 150))\n\ f.Show()\n\ "; @@ -170,13 +175,13 @@ void MyFrame::OnPyFrame(wxCommandEvent& event) // First, whenever you do anyting with Python objects or code, you // *MUST* aquire the Global Interpreter Lock and block other // Python threads from running. - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); // Execute the code in the __main__ module PyRun_SimpleString(python_code1); // Finally, release the GIL and let other Python threads run. - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } @@ -187,19 +192,21 @@ void MyFrame::RedirectStdio() // only on demand when something is printed, like a traceback. char* python_redirect = "\ import sys\n\ -from wxPython.wx import wxPyOnDemandOutputWindow\n\ -output = wxPyOnDemandOutputWindow()\n\ +import wx\n\ +output = wx.PyOnDemandOutputWindow()\n\ sys.stdin = sys.stderr = output\n\ "; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); PyRun_SimpleString(python_redirect); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); } char* python_code2 = "\ +import sys\n\ +sys.path.append('.')\n\ import embedded_sample\n\ \n\ def makeWindow(parent):\n\ @@ -220,7 +227,7 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent) PyObject* result; // As always, first grab the GIL - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); // Now make a dictionary to serve as the global namespace when the code is // executed. Put a reference to the builtins module in it. (Yes, the @@ -235,7 +242,7 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent) // Was there an exception? if (! result) { PyErr_Print(); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return NULL; } Py_DECREF(result); @@ -250,7 +257,6 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent) // wxPython object that wraps it. PyObject* arg = wxPyMake_wxObject(parent); wxASSERT(arg != NULL); - PyObject* tuple = PyTuple_New(1); PyTuple_SET_ITEM(tuple, 0, arg); result = PyEval_CallObject(func, tuple); @@ -261,8 +267,8 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent) else { // Otherwise, get the returned window out of Python-land and // into C++-ville... - bool error = SWIG_GetPtrObj(result, (void**)&window, "_wxWindow_p"); - wxASSERT_MSG(!error, wxT("Returned object was not a wxWindow!")); + bool success = wxPyConvertSwigPtr(result, (void**)&window, _T("wxWindow")); + wxASSERT_MSG(success, _T("Returned object was not a wxWindow!")); Py_DECREF(result); } @@ -271,7 +277,7 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent) Py_DECREF(tuple); // Finally, after all Python stuff is done, release the GIL - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return window; }