[Commits] (bear) Turning on Unicode support

[commits at osafoundation.org]

Commit by: bear
Modified files:
internal/wxPython-2.5/Makefile 1.49 1.50
internal/wxPython-2.5/include/wx/msw/setup.h 2.4 2.5

Log message:
Turning on Unicode support
bug 401 r=bear


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/Makefile.diff?r1=text&tr1=1.49&r2=text&tr2=1.50
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/include/wx/msw/setup.h.diff?r1=text&tr1=2.4&r2=text&tr2=2.5

Index: internal/wxPython-2.5/Makefile
diff -u internal/wxPython-2.5/Makefile:1.49 internal/wxPython-2.5/Makefile:1.50
--- internal/wxPython-2.5/Makefile:1.49	Mon Apr  4 00:13:16 2005
+++ internal/wxPython-2.5/Makefile	Mon Apr  4 08:55:51 2005
@@ -1,7 +1,7 @@
 
 include ../Makefile.inc
 
-RELVER=2.5.3.1-13
+RELVER=2.5.3.1-14
 SRC=$(INTERNAL)/wxPython-2.5
 SWIG_OPTION=1
 WXMAJORVERSIONCOMPACT=253
@@ -43,7 +43,7 @@
 	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) \
-                UNICODE=0 BUILD_ACTIVEX=0 \
+                UNICODE=1 BUILD_ACTIVEX=0 \
                 USE_SWIG=$(SWIG_OPTION) \
                 SWIG=`cygpath -aw $(SWIG)` \
                 INSTALL_MULTIVERSION=0 \
@@ -71,7 +71,7 @@
 	cd $(SRC); mkdir -p $(BUILD); cd $(BUILD); \
 	MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) ../configure --prefix=$(PREFIX) $(CONF_OPT) \
                      --enable-monolithic \
-                     --disable-unicode \
+                     --enable-unicode \
                      --enable-geometry \
                      --enable-sound \
                      --enable-display \
@@ -83,7 +83,7 @@
 wxPython:
 	cd $(SRC)/wxPython; \
         MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) $(PYTHON) setup.py \
-                UNICODE=0 BUILD_OGL=0 BUILD_GLCANVAS=0 \
+                UNICODE=1 BUILD_OGL=0 BUILD_GLCANVAS=0 \
                 USE_SWIG=$(SWIG_OPTION) \
                 SWIG=$(SWIG) \
                 INSTALL_MULTIVERSION=0 \
@@ -109,7 +109,7 @@
 	cd $(SRC); mkdir -p $(BUILD); cd $(BUILD); \
 	../configure --prefix=$(PREFIX) $(CONF_OPT) \
                      --enable-monolithic \
-                     --disable-unicode \
+                     --enable-unicode \
                      --enable-geometry \
                      --enable-sound \
                      --enable-display \
@@ -122,7 +122,7 @@
 	cd $(SRC)/wxPython; \
         export LD_LIBRARY_PATH=$(PREFIX)/lib; \
         $(PYTHON) setup.py \
-                UNICODE=0 BUILD_OGL=0 BUILD_GLCANVAS=0 \
+                UNICODE=1 BUILD_OGL=0 BUILD_GLCANVAS=0 \
                 USE_SWIG=$(SWIG_OPTION) \
                 SWIG=$(SWIG) \
                 INSTALL_MULTIVERSION=0 \

Index: internal/wxPython-2.5/include/wx/msw/setup.h
diff -u internal/wxPython-2.5/include/wx/msw/setup.h:2.4 internal/wxPython-2.5/include/wx/msw/setup.h:2.5
--- internal/wxPython-2.5/include/wx/msw/setup.h:2.4	Tue Dec  7 22:45:23 2004
+++ internal/wxPython-2.5/include/wx/msw/setup.h	Mon Apr  4 08:55:52 2005
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: setup.h,v 2.4 2004/12/08 06:45:23 davids Exp $
+// RCS-ID:      $Id: setup.h,v 2.5 2005/04/04 15:55:52 bear Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -149,7 +149,7 @@
 //
 // Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
 #ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 0
+    #define wxUSE_UNICODE 1
 #endif
 
 // Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode