From 60bfdd15ebbbfe897836a17cf14ad620f551916c Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 11 May 2005 16:18:25 +0000 Subject: [PATCH] Compile fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/samples/embedded/embedded.cpp | 8 +------- wxPython/samples/embedded/makefile.unx | 8 ++++---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/wxPython/samples/embedded/embedded.cpp b/wxPython/samples/embedded/embedded.cpp index 67dde09ef4..1b6ebabf74 100644 --- a/wxPython/samples/embedded/embedded.cpp +++ b/wxPython/samples/embedded/embedded.cpp @@ -270,7 +270,7 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent) // 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 // wxPython object that wraps it. - PyObject* arg = wxPyMake_wxObject(parent); + PyObject* arg = wxPyMake_wxObject(parent, false); wxASSERT(arg != NULL); PyObject* tuple = PyTuple_New(1); PyTuple_SET_ITEM(tuple, 0, arg); @@ -299,9 +299,3 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent) //---------------------------------------------------------------------- - - - - - - diff --git a/wxPython/samples/embedded/makefile.unx b/wxPython/samples/embedded/makefile.unx index edb8e9e91a..01fda2bb5e 100644 --- a/wxPython/samples/embedded/makefile.unx +++ b/wxPython/samples/embedded/makefile.unx @@ -12,11 +12,11 @@ PROGRAM = embedded OBJECTS = $(PROGRAM).o -#WX_CFG = wx-config -WX_CFG = wxgtk2ud-2.5-config +WX_CFG = wx-config +PYVER = 2.4 -EXTRAINC=-I../../include -I/usr/include/python2.3 -EXTRALIB=-L/usr/lib/python2.3/config -lpython2.3 +EXTRAINC=-I../../include -I/usr/include/python$(PYVER) +EXTRALIB=-L/usr/lib/python$(PYVER)/config -lpython$(PYVER) CXX = $(shell $(WX_CFG) --cxx) -- 2.47.2