diff --git a/wxPython/src/build.cfg b/wxPython/src/build.cfg index 03cb509abc..edca6547f0 100644 --- a/wxPython/src/build.cfg +++ b/wxPython/src/build.cfg @@ -41,7 +41,7 @@ else: OTHERINSTALLTARGETS = 'installLib installDemo installHelpers ' OTHERUNINSTALLTARGETS = 'uninstallLib uninstallDemo uninstallHelpers ' - #OTHERLFLAGS = '-L. ' + OTHERCFLAGS = '`gtk-config --cflags`' OTHERRULES = """ HELPERLIBNAME = lib$(HELPERLIB).$(MAJVER)$(SO).$(BLDVER).0.0 helperlib: $(HELPERLIBNAME) @@ -101,12 +101,12 @@ installDemo: cp ../demo/data/*.txt $(TARGETDIR)/demo/data; \\ cp ../demo/data/*.i $(TARGETDIR)/demo/data; \\ cp ../demo/data/*.h $(TARGETDIR)/demo/data; \\ + echo "(1,0)" > $(TARGETDIR)/demo/data/showTips; \\ + chmod 666 $(TARGETDIR)/demo/data/showTips; \\ $(EXECPREFIX)/bin/python $(PYLIB)/compileall.py $(TARGETDIR)/demo;\\ $(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py $(TARGETDIR)/demo; - - uninstallLib: rm -rf $(TARGETDIR)/lib; diff --git a/wxPython/src/gtk/misc.cpp b/wxPython/src/gtk/misc.cpp index 7174a3defe..7eae08658b 100644 --- a/wxPython/src/gtk/misc.cpp +++ b/wxPython/src/gtk/misc.cpp @@ -134,7 +134,7 @@ static char* wxStringErrorMsg = "string type is required for parameter"; return retval; } -#if 0 // we want to use the definition from the header, no the +#if 0 // we want to use the definition from the header, not the // one SWIG will generate. extern wxAcceleratorTable wxNullAcceleratorTable; diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp index c0d6166eab..32578bf5f6 100644 --- a/wxPython/src/helpers.cpp +++ b/wxPython/src/helpers.cpp @@ -33,7 +33,7 @@ //#include //#include -extern GtkWidget *wxRootWindow; +//extern GtkWidget *wxRootWindow; #endif