AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

embedded sample compiles again

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-04-01 18:05:10 +00:00
parent 2e957aaeb1
commit 6b7e0a8639
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
wxPython/samples/embedded/embedded.cpp
View File

@ -11,6 +11,9 @@
// Licence: wxWindows license // Licence: wxWindows license
//---------------------------------------------------------------------- //----------------------------------------------------------------------
#include <Python.h>
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include <wx/wxprec.h>
@ -29,8 +32,8 @@
#endif #endif
// Import Python and wxPython headers // Import Python and wxPython headers
#include <Python.h> #include <wx/wxPython/wxPython.h>
#include <wxPython.h>
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Class definitions // Class definitions
@ -41,6 +44,8 @@ public:
virtual bool OnInit(); virtual bool OnInit();
virtual ~MyApp(); virtual ~MyApp();
void Init_wxPython(); void Init_wxPython();
private:
PyThreadState* m_mainTState;
}; };
@ -81,22 +86,16 @@ void MyApp::Init_wxPython()
// module and sets a pointer to a function table located there. // module and sets a pointer to a function table located there.
wxPyCoreAPI_IMPORT(); 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 // Save the current Python thread state and release the
// Global Interpreter Lock. // Global Interpreter Lock.
wxPyBeginAllowThreads(); m_mainTState = wxPyBeginAllowThreads();
} }
MyApp::~MyApp() MyApp::~MyApp()
{ {
// Restore the thread state and tell Python to cleanup after itself. // Restore the thread state and tell Python to cleanup after itself.
wxPyEndAllowThreads(true); wxPyEndAllowThreads(m_mainTState);
Py_Finalize(); Py_Finalize();
} }
@ -126,10 +125,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
wxMenuBar* mbar = new wxMenuBar; wxMenuBar* mbar = new wxMenuBar;
wxMenu* menu = new wxMenu; wxMenu* menu = new wxMenu;
menu->Append(ID_PYFRAME, "Make wx&Python frame"); menu->Append(ID_PYFRAME, _T("Make wx&Python frame"));
menu->AppendSeparator(); menu->AppendSeparator();
menu->Append(ID_EXIT, "&Close Frame\tAlt-X"); menu->Append(ID_EXIT, _T("&Close Frame\tAlt-X"));
mbar->Append(menu, "&File"); mbar->Append(menu, _T("&File"));
SetMenuBar(mbar); SetMenuBar(mbar);
CreateStatusBar(); CreateStatusBar();
@ -140,7 +139,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
wxPanel* p1 = new wxPanel(sp, -1); wxPanel* p1 = new wxPanel(sp, -1);
p1->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD)); p1->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD));
new wxStaticText(p1, -1, 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)); wxPoint(10,10));
// And get a panel from Python // And get a panel from Python
@ -156,7 +155,7 @@ void MyFrame::OnExit(wxCommandEvent& event)
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// This is were the fun begins... // This is where the fun begins...
char* python_code1 = "\ char* python_code1 = "\
@ -239,7 +238,7 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent)
// Was there an exception? // Was there an exception?
if (! result) { if (! result) {
PyErr_Print(); PyErr_Print();
wxPyEndBlockThreads(); wxPyEndBlockThreads(blocked);
return NULL; return NULL;
} }
Py_DECREF(result); Py_DECREF(result);
@ -265,8 +264,8 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent)
else { else {
// Otherwise, get the returned window out of Python-land and // Otherwise, get the returned window out of Python-land and
// into C++-ville... // into C++-ville...
bool error = SWIG_GetPtrObj(result, (void**)&window, "_wxWindow_p"); bool success = wxPyConvertSwigPtr(result, (void**)&window, _T("wxWindow"));
wxASSERT_MSG(!error, wxT("Returned object was not a wxWindow!")); wxASSERT_MSG(success, _T("Returned object was not a wxWindow!"));
Py_DECREF(result); Py_DECREF(result);
} }

13
wxPython/samples/embedded/makefile.unx
View File

@ -12,20 +12,23 @@
PROGRAM = embedded PROGRAM = embedded
OBJECTS = $(PROGRAM).o OBJECTS = $(PROGRAM).o
EXTRAINC=-I../../src -I/usr/include/python2.2 #WX_CFG = wx-config
EXTRALIB=-L/usr/lib/python2.2/config -lpython2.2 WX_CFG = wxgtk2ud-2.5-config
CXX = $(shell wx-config --cxx)
EXTRAINC=-I../../include -I/usr/include/python2.3
EXTRALIB=-L/usr/lib/python2.3/config -lpython2.3
CXX = $(shell $(WX_CFG) --cxx)
.SUFFIXES: .o .cpp .SUFFIXES: .o .cpp
.cpp.o : .cpp.o :
$(CXX) -c `wx-config --cxxflags` $(EXTRAINC) -o $@ $< $(CXX) -c -g `$(WX_CFG) --cxxflags` $(EXTRAINC) -o $@ $<
all: $(PROGRAM) all: $(PROGRAM)
$(PROGRAM): $(OBJECTS) $(PROGRAM): $(OBJECTS)
$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` $(EXTRALIB) $(CXX) -g -o $(PROGRAM) $(OBJECTS) `$(WX_CFG) --libs` $(EXTRALIB)
clean: clean:
rm -f *.o $(PROGRAM) rm -f *.o $(PROGRAM)