update from Jonas for 2.5.1 (patch 901921)

[wxWidgets.git] / wxPython / samples / embedded / embedded.cpp

diff --git a/wxPython/samples/embedded/embedded.cpp b/wxPython/samples/embedded/embedded.cpp
index 36ccdefc792c0bc0158c98a4242b9c2ca7d9ff81..0a3dc40d072bae0a216822e89108a4f1d62c56f0 100644 (file)
--- a/wxPython/samples/embedded/embedded.cpp
+++ b/wxPython/samples/embedded/embedded.cpp
@@ -42,7 +42,7 @@ public:
     virtual ~MyApp();
     void Init_wxPython();
 private:
     virtual ~MyApp();
     void Init_wxPython();
 private:

-    PyThreadState* main_tstate;
+    PyThreadState* m_mainTState;

 };
 
 
 };
 
 


@@ -83,16 +83,22 @@ void MyApp::Init_wxPython()
     // module and sets a pointer to a function table located there.
     wxPyCoreAPI_IMPORT();
 
     // 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 wxWindows in
+    // your C++ app you won't need to do this.)
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();
+

     // Save the current Python thread state and release the
     // Global Interpreter Lock.
     // 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.
 }
 
 
 MyApp::~MyApp()
 {
     // Restore the thread state and tell Python to cleanup after itself.

-    wxPyEndAllowThreads(main_tstate);
+    wxPyEndAllowThreads(m_mainTState);

     Py_Finalize();
 }
 
     Py_Finalize();
 }
 


@@ -212,7 +218,7 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent)
     // More complex embedded situations will require passing C++ objects to
     // Python and/or returning objects from Python to be used in C++.  This
     // sample shows one way to do it.  NOTE: The above code could just have
     // More complex embedded situations will require passing C++ objects to
     // Python and/or returning objects from Python to be used in C++.  This
     // sample shows one way to do it.  NOTE: The above code could just have

-    // easily come from a file, or the whole thing coupld be in the Python
+    // easily come from a file, or the whole thing could be in the Python

     // module that is imported and manipulated directly in this C++ code.  See
     // the Python API for more details.
 
     // module that is imported and manipulated directly in this C++ code.  See
     // the Python API for more details.