Compile fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/samples/embedded/embedded.cpp b/wxPython/samples/embedded/embedded.cpp
index 67dde09ef4514605acf2f115e30dff33887a397b..1b6ebabf74bd0692e89ec77dc915afdb4655eb88 100644 (file)
--- 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.
     // 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);
     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 edb8e9e91aaff1fa1bfda06ba8ea3235a4c53e39..01fda2bb5e359a07c2bfe430c32c1fc0868c68d1 100644 (file)
--- a/wxPython/samples/embedded/makefile.unx
+++ b/wxPython/samples/embedded/makefile.unx
@@ -12,11 +12,11 @@
 PROGRAM = embedded
 OBJECTS = $(PROGRAM).o
 
 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)
 
 
 CXX = $(shell $(WX_CFG) --cxx)