Commit by: heikki Modified files: internal/wxPython-2.5/Makefile 1.27 1.28 internal/wxPython-2.5/src/generic/minical.cpp 1.1 1.2 internal/wxPython-2.5/wxPython/src/gtk/minical.py None 1.1 internal/wxPython-2.5/wxPython/src/gtk/minical_wrap.cpp None 1.1
Log message: Fix full build on Linux. ViewCVS links: http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/Makefile.diff?r1=text&tr1=1.27&r2=text&tr2=1.28 http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/src/generic/minical.cpp.diff?r1=text&tr1=1.1&r2=text&tr2=1.2 http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/src/gtk/minical.py?rev=1.1&content-type=text/vnd.viewcvs-markup http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/src/gtk/minical_wrap.cpp?rev=1.1&content-type=text/vnd.viewcvs-markup Index: internal/wxPython-2.5/Makefile diff -u internal/wxPython-2.5/Makefile:1.27 internal/wxPython-2.5/Makefile:1.28 --- internal/wxPython-2.5/Makefile:1.27 Tue Jan 25 16:08:50 2005 +++ internal/wxPython-2.5/Makefile Tue Jan 25 20:33:22 2005 @@ -9,13 +9,13 @@ DIST_OPT=--debug FINAL=0 SUFFIX=d -MANIFEST_SUFFIX=_d +PYTHON_SUFFIX=_d else CONF_OPT=--enable-optimized DIST_OPT= FINAL=1 SUFFIX= -MANIFEST_SUFFIX= +PYTHON_SUFFIX= endif @@ -38,8 +38,8 @@ cd $(SRC)/wxPython; \ export WXWIN=`cygpath -aw $(SRC)`; MAKEFLAGS=; \ cp $(SRC)/wxPython/src/winxp.manifest $(BUILD_ROOT)/$(SNAP)/bin/chandler.exe.manifest; \ - cp $(SRC)/wxPython/src/winxp.manifest $(BUILD_ROOT)/$(SNAP)/bin/python$(MANIFEST_SUFFIX).exe.manifest; \ - chmod a+x $(BUILD_ROOT)/$(SNAP)/bin/python$(MANIFEST_SUFFIX).exe.manifest; \ + cp $(SRC)/wxPython/src/winxp.manifest $(BUILD_ROOT)/$(SNAP)/bin/python$(PYTHON_SUFFIX).exe.manifest; \ + chmod a+x $(BUILD_ROOT)/$(SNAP)/bin/python$(PYTHON_SUFFIX).exe.manifest; \ $(PYTHON) setup.py BUILD_BASE=$(BUILD) BUILD_ACTIVEX=0 \ USE_SWIG=0 \ SWIG=`cygpath -aw $(SWIG)` \ @@ -49,7 +49,7 @@ install \ FINAL=$(FINAL) HYBRID=0 -MANIFEST=$(SNAP)/$(SITE)/wx $(SNAP)/bin/chandler.exe.manifest $(SNAP)/bin/python$(MANIFEST_SUFFIX).exe.manifest +MANIFEST=$(SNAP)/$(SITE)/wx $(SNAP)/bin/chandler.exe.manifest $(SNAP)/bin/python$(PYTHON_SUFFIX).exe.manifest clean: rm -rf $(SRC)/wxPython/$(BUILD) Index: internal/wxPython-2.5/src/generic/minical.cpp diff -u internal/wxPython-2.5/src/generic/minical.cpp:1.1 internal/wxPython-2.5/src/generic/minical.cpp:1.2 --- internal/wxPython-2.5/src/generic/minical.cpp:1.1 Tue Jan 25 16:08:52 2005 +++ internal/wxPython-2.5/src/generic/minical.cpp Tue Jan 25 20:33:23 2005 @@ -596,7 +596,7 @@ m_normalFont.GetStyle(), wxBOLD, m_normalFont.GetUnderlined(), m_normalFont.GetFaceName(), m_normalFont.GetEncoding()); dc.SetFont(m_boldFont); - wxString todaytext = "Today"; + wxString todaytext = wxT("Today"); dc.GetTextExtent(todaytext, &todayw, &todayh); m_todayRect = wxRect(0, 0, 0, 0); _______________________________________________ Commits mailing list Commits@osafoundation.org http://lists.osafoundation.org/mailman/listinfo/commits
