// Licence: wxWindows license
//----------------------------------------------------------------------
+#include <Python.h>
+
+
// For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h>
#endif
// Import Python and wxPython headers
-#include <Python.h>
-#include <wxPython.h>
+#include <wx/wxPython/wxPython.h>
+
//----------------------------------------------------------------------
// Class definitions
{
public:
virtual bool OnInit();
- virtual ~MyApp();
- void Init_wxPython();
+ virtual int OnExit();
+ bool Init_wxPython();
private:
PyThreadState* m_mainTState;
};
bool MyApp::OnInit()
{
- Init_wxPython();
+ if ( !Init_wxPython() )
+ // don't start the app if we can't initialize wxPython.
+ return false;
+
MyFrame *frame = new MyFrame(_T("Embedded wxPython Test"),
- wxPoint(50, 50), wxSize(700, 600));
- frame->Show(TRUE);
- return TRUE;
+ wxDefaultPosition, wxSize(700, 600));
+ frame->Show(true);
+ return true;
}
-void MyApp::Init_wxPython()
+
+bool MyApp::Init_wxPython()
{
// Initialize Python
Py_Initialize();
PyEval_InitThreads();
- // Load the wxPython core API. Imports the wxPython.wxc
- // module and sets a pointer to a function table located there.
- wxPyCoreAPI_IMPORT();
-
- // Ensure that the new classes defined in the wxPython wrappers are
- // recognised by the wx RTTI system. (If you don't use wxWindow in
- // your C++ app you won't need to do this.)
- wxClassInfo::CleanUpClasses();
- wxClassInfo::InitializeClasses();
-
+ // Load the wxPython core API. Imports the wx._core_ module and sets a
+ // local pointer to a function table located there. The pointer is used
+ // internally by the rest of the API functions.
+ if ( ! wxPyCoreAPI_IMPORT() ) {
+ wxLogError(wxT("***** Error importing the wxPython API! *****"));
+ PyErr_Print();
+ Py_Finalize();
+ return false;
+ }
+
// Save the current Python thread state and release the
// Global Interpreter Lock.
m_mainTState = wxPyBeginAllowThreads();
+
+ return true;
}
-MyApp::~MyApp()
+int MyApp::OnExit()
{
// Restore the thread state and tell Python to cleanup after itself.
+ // wxPython will do its own cleanup as part of that process. This is done
+ // in OnExit instead of ~MyApp because OnExit is only called if OnInit is
+ // successful.
wxPyEndAllowThreads(m_mainTState);
Py_Finalize();
+ return 0;
}
+
IMPLEMENT_APP(MyApp)
//----------------------------------------------------------------------
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();
// Make some child windows from C++
wxSplitterWindow* sp = new wxSplitterWindow(this, -1);
- wxPanel* p1 = new wxPanel(sp, -1);
- p1->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD));
+ wxPanel* p1 = new wxPanel(sp, -1, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER);
+
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
//----------------------------------------------------------------------
-// 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\
";
// C++ code in any way, you can execute it with PyRun_SimpleString.
- // First, whenever you do anyting with Python objects or code, you
+ // First, whenever you do anything 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);
}
// 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\
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
// Was there an exception?
if (! result) {
PyErr_Print();
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return NULL;
}
Py_DECREF(result);
// 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);
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);
}
Py_DECREF(tuple);
// Finally, after all Python stuff is done, release the GIL
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return window;
}
projects / wxWidgets.git / blobdiff