Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-05-11 16:18:25 +00:00
parent 6a52ea5cb8
commit 60bfdd15eb
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,7 +270,7 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent)
// Now build an argument tuple and call the Python function. Notice the // Now build an argument tuple and call the Python function. Notice the
// use of another wxPython API to take a wxWindows object and build a // use of another wxPython API to take a wxWindows object and build a
// wxPython object that wraps it. // wxPython object that wraps it.
PyObject* arg = wxPyMake_wxObject(parent); PyObject* arg = wxPyMake_wxObject(parent, false);
wxASSERT(arg != NULL); wxASSERT(arg != NULL);
PyObject* tuple = PyTuple_New(1); PyObject* tuple = PyTuple_New(1);
PyTuple_SET_ITEM(tuple, 0, arg); PyTuple_SET_ITEM(tuple, 0, arg);
@@ -299,9 +299,3 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent)
//---------------------------------------------------------------------- //----------------------------------------------------------------------

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

@@ -12,11 +12,11 @@
PROGRAM = embedded PROGRAM = embedded
OBJECTS = $(PROGRAM).o OBJECTS = $(PROGRAM).o
#WX_CFG = wx-config WX_CFG = wx-config
WX_CFG = wxgtk2ud-2.5-config PYVER = 2.4
EXTRAINC=-I../../include -I/usr/include/python2.3 EXTRAINC=-I../../include -I/usr/include/python$(PYVER)
EXTRALIB=-L/usr/lib/python2.3/config -lpython2.3 EXTRALIB=-L/usr/lib/python$(PYVER)/config -lpython$(PYVER)
CXX = $(shell $(WX_CFG) --cxx) CXX = $(shell $(WX_CFG) --cxx)